下架采集

src/pages/historystore/Histore/index.jsx

@@ -18,7 +18,7 @@ function Instore(props) {
             "dataIndex": "operateTime",
             "key": "operateTimeList",
             "valueType": "dateRange",
-            "render": (_, row) => {return (<div>{row.operateTime}</div>)},
+            "render": (_, row) => { return (<div>{row.operateTime}</div>) },
         },
         {
             "title": "操作人",
@@ -66,7 +66,12 @@ function Instore(props) {
         {
             "title": "仓库名称",
             "dataIndex": "storeName",
-            "key": "storeName"
+            "key": "storeId",
+            options: {
+                database: () => doFetch({ url: "/ngic-auth/sysStore/selectionBox", params: { factoryIdList: [] } }),
+                params: {}
+            },
+            valueType: "select",
         },
         {
             "title": "库位",

src/pages/outsetstore/Outstore/fields.js

@@ -14,8 +14,6 @@ const EditUpload = ({ record, fid, storeId }) => {
     if (!value) {
       return
     }
-    console.log(value);
-
     let newlist = Object.keys(value)?.map?.(it => {
       let id = it;
       let newArr = value[id]?.filter(it => typeof (it.id) == "number") ?? [];
@@ -23,8 +21,9 @@ const EditUpload = ({ record, fid, storeId }) => {
         id,
         downloadList: newArr.map(its => {
           return {
-            storeId: its?.storeId,
+            storePositionId: its?.storePositionId,
             outstroeNum: its?.outstroeNum,
+            stockNum: its?.stockNum,
             remark: its?.remark,
             materieControlNo: its?.materieControlNo
           }
@@ -49,12 +48,13 @@ const EditUpload = ({ record, fid, storeId }) => {
     maxLength={1000}
     linkconfig={{
       urlchangeval: {
-        database: (params) => doFetch({ url: "/ngic-workmanship/wmsMaterieStockStore/queryByMaterieAndStoreId", params }),
-        params: { "storeId": "linked",materieId:record.materieId},
+        database: (params) => doFetch({ url: "/ngic-workmanship/wmsMaterieStore/queryStoreOne", params }),
+        params: { "storePositionId": "linked",materieControlNo:"linked"},
         effectresult: {
           "supplierNo": "supplierNo",
           "supplierName": "supplierName",
-          "productionNum": "productionNum",
+          "stockNum": "stockNum",
+          "materieControlNo":"materieControlNo"
         }
       }
     }}
@@ -63,7 +63,7 @@ const EditUpload = ({ record, fid, storeId }) => {
       {
         title: "库位名称",
         dataIndex: "storePositionName",
-        key: "storeId",
+        key: "storePositionId",
         search: false,
         valueType: "select",
         request: async () => {
@@ -79,9 +79,18 @@ const EditUpload = ({ record, fid, storeId }) => {
         dataIndex: "materieControlNo",
         key: "materieControlNo",
         search: false,
+        valueType: "select",
+        request: async (params) => {
+          let res = await doFetch({ url: "/ngic-workmanship/wmsMaterieStore/queryPCList", params:{materieId:params.materieId,storePositionId:params.storePositionId}});
+          return res?.data?.dataList
+        },
         editable: (text, record, index) => {
           return !record.materieOutstoreDetailId
-        }
+        },
+        params:(row)=>{
+          return {materieId:record.materieId,storePositionId:row.storePositionId}
+        },
+        width:200
       },
       {
         title: "下架数量",
@@ -90,22 +99,27 @@ const EditUpload = ({ record, fid, storeId }) => {
         search: false,
         editable: (text, record, index) => {
           return !record.materieOutstoreDetailId
-        }
+        },
+        valueType: "digit"
       },
       {
-        title: "供应商编号-名称",
+        title: "供应商编号",
         dataIndex: "supplierNo",
         key: "supplierNo",
         search: false,
-        readonly: true,
-        render: (dom, row) => {
-          return (row?.supplierNo ?? '') + " - " + (row?.supplierName ?? '')
-        }
+        readonly: true
+      },
+      {
+        title: "供应商名称",
+        dataIndex: "supplierName",
+        key: "supplierName",
+        search: false,
+        readonly: true
       },
       {
         title: "库存数量",
-        dataIndex: "productionNum",
-        key: "productionNum",
+        dataIndex: "stockNum",
+        key: "stockNum",
         search: false,
         "readonly": true,
       },
@@ -234,6 +248,7 @@ const one = {
             rules: [{ required: true, message: '此项为必填项' }],
           };
         },
+        valueType: "digit"
       },
       {
         "title": "可用库存",
@@ -357,6 +372,7 @@ const one = {
               rules: [{ required: true, message: '此项为必填项' }],
             };
           },
+          valueType: "digit"
         },
         {
           "title": "可用库存",
@@ -480,6 +496,7 @@ const one = {
               rules: [{ required: true, message: '此项为必填项' }],
             };
           },
+          valueType: "digit"
         },
         {
           "title": "可用库存",
@@ -603,6 +620,7 @@ const one = {
               rules: [{ required: true, message: '此项为必填项' }],
             };
           },
+          valueType: "digit"
         },
         {
           "title": "可用库存",