Merge branch 'jinfa-0518' into 'jinfa-0518'

src/pages/orderManage/orderSystem/index.tsx

@@ -95,6 +95,10 @@ const tableListSchema: ISchema = {
 
 export const baseOrderListColumns: any[] = [
   {
+    title: 'SAP物料编码',
+    dataIndex: 'sapGoodsGlobalMQID',
+  },
+  {
     title: '订单号',
     align: 'center',
     dataIndex: 'orderNo',

src/pages/orderManage/orderSystem/orderDetail/index.tsx

@@ -57,7 +57,8 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
     { label: '订单类型', name: 'orderTypeName', span: 8 },
     { label: '下单时间', name: 'createTime', span: 8, render: text => formatTimeString(text) },
     { label: '外部状态', name: 'outerStatusName', span: 8 },
-    { label: 'SAP订单编号', name: 'purchaseOrderNumber', span: 8},
+    { label: 'SAP订单编号', name: 'orderId', span: 8, render: (_text, record) => record.sapOrderNo},
+    { label: 'SAP物料编码', name: 'orderId', span: 8, render: (_text, record) => record.sapGoodsGlobalMQID},
     { label: '订单分类', name: 'documentTypeName', span: 8},
     { label: '业务类型', name: 'businessTypeName', span: 8},
   ]

src/pages/productManage/material/common/columns.tsx

@@ -13,6 +13,10 @@ export function getColumn(params: Params) {
   const columns = [
 
     {
+      title: intl.formatMessage({ id: 'material.sapGoodsGlobalMQID', defaultMessage: 'SAP物料编码' }),
+      dataIndex: 'sapGoodsGlobalMQID',
+    },
+    {
       title: intl.formatMessage({ id: 'material.code', defaultMessage: '物料编号' }),
       dataIndex: 'code',
       render: (text, record) => {

src/pages/productManage/material/common/useGetDetailCommon.tsx

@@ -51,6 +51,10 @@ function useGetDetailCommon<T extends GetProductGoodsGetGoodsProcessDetailRespon
   const basicInfoList = useMemo(() => {
     return [
       {
+        title: intl.formatMessage({ id: 'material.sapGoodsGlobalMQID', defaultMessage: 'SAP物料编码' }),
+        value: initialValue?.sapGoodsGlobalMQID
+      },
+      {
         title: intl.formatMessage({ id: 'material.code', defaultMessage: '物料编号' }),
         value: initialValue?.code
       },