From e0fac38b26845f25de479783e0c76cf12a5311e0 Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期五, 19 一月 2024 10:31:28 +0800
Subject: [PATCH] 修改数据采集

---
 guns-vip-main/src/main/webapp/assets/modular/kb/materialRegistration/materialRegistration.js |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/guns-vip-main/src/main/webapp/assets/modular/kb/materialRegistration/materialRegistration.js b/guns-vip-main/src/main/webapp/assets/modular/kb/materialRegistration/materialRegistration.js
index b1da3de..f5b7be0 100644
--- a/guns-vip-main/src/main/webapp/assets/modular/kb/materialRegistration/materialRegistration.js
+++ b/guns-vip-main/src/main/webapp/assets/modular/kb/materialRegistration/materialRegistration.js
@@ -128,16 +128,18 @@
     MaterialShortage.initColumn = function () {
         return [[
             {type: 'checkbox', fixed: 'left'},
+
             {field: 'id', hide: true, title: 'ID'},
-            {field: 'workOrderNo', sort: true, title: '宸ュ崟鍙�', width: 150},
+          /*  {field: 'workOrderNo', sort: true, title: '宸ュ崟鍙�', width: 150},*/
             // {field: 'loadingCode', sort: true, title: '涓婃枡宸ヤ綅', width: 105},
             {field: 'locationCode', sort: true, title: '宸ヤ綅缂栧彿', width: 100},
             //{field: 'loadingCode', sort: true, title: '鎵爜宸ヤ綅缂栧彿', width: 105},
             {field: 'materialCode', sort: true, title: '鐗╂枡缂栫爜', width: 170},
-            {field: 'spareField1', sort: true, title: '涓婃枡鏁伴噺'},
-            {field: 'spareField2', sort: true, title: '鍗曚綅'},
-            {field: 'loadingCode', sort: true, title: '鐗╂枡鎵规',width: 120},
-            {field: 'state', sort: true, title: '鏄惁涓婃枡', width: 105,templet: '#stateTpl'},
+            {field: 'batch', sort: true, title: '鐗╂枡鎵规',width: 120},
+            {field: 'quantity', sort: true, title: '涓婃枡鏁伴噺',width: 120},
+            {field: 'residueQuantity', sort: true, title: '鍓╀綑鏁伴噺',width: 120},
+            {field: 'unit', sort: true, title: '鍗曚綅'},
+            {field: 'status', sort: true, title: '鏄惁涓婃枡', width: 105,templet: '#stateTpl'},
             // {field: 'orderStatus', sort: true, title: '鐘舵��',align:'center',width:80,templet: '#orderStatusTpl'},
 
         ]];
@@ -367,7 +369,7 @@
         //     Feng.error("鏉$爜淇℃伅寮傚父")
         //     return
         // }
-        var updateOrderBatchInfo = new $ax(Feng.ctxPath + "/productionOrderBatchInfo/updateOrderBatchInfo?materialCode=" + barCode.substring(0, 14) + "&workOrderNo="+ $('#workOrderNo').val()+ "&spareField1="+ number + "&loadingCode="+ batch);
+        var updateOrderBatchInfo = new $ax(Feng.ctxPath + "/productionOrderBatchInfo/updateOrderBatchInfo?materialCode=" + barCode.substring(0, 14) + "&workOrderNo="+ $('#workOrderNo').val()+ "&quantity="+ number + "&batch="+ batch+ "&residueQuantity="+ number);
         var updateOrderBatchInfoResult = updateOrderBatchInfo.start();
         if(updateOrderBatchInfoResult.data === "0"){
             Feng.error("鎵规涓嶅悓鏃犳硶褰曞叆");

--
Gitblit v1.9.3