From e235d483194ab95bf62d1cfd343a172ff12781e8 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期六, 13 四月 2024 14:58:24 +0800
Subject: [PATCH] 聚乳酸库存明细 1.批号与包号排序需同步,增加水分,挥发段,分解段搜索,按照最大最小范围,包装类型跟托盘类型增加删选功能。 2.已经出库的物料,在明细表里面隐藏掉,但是数据保留。 3.增加二个跟聚乳酸一样的明细表,分改性树脂,纯树脂库存明细表,所有功能跟总的聚乳酸库存明细表一样 4.明细表整体框架调整一下,相对压缩一下,搜索功能框看看能否弄成二行 5.表里面的包装类型与托盘类型这些不主要的信息放到指标后面 6.关于分包再处理,举例原有系统里面销售选定的10包物料,再二次重新弄后,车间打印新标签,使用新的包号,在明细表里面体现原有所有指标信息及批号,包号,牌号跟新的关联 7.出库时候时间可选历史,不要就只能出现4天 8.提取库存里面需要有最大包号跟最小包号选择

---
 src/main/webapp/static/js/cool.js |   29 ++++++++++++++++++++---------
 1 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/main/webapp/static/js/cool.js b/src/main/webapp/static/js/cool.js
index 511bbd9..e3ae972 100644
--- a/src/main/webapp/static/js/cool.js
+++ b/src/main/webapp/static/js/cool.js
@@ -40,6 +40,9 @@
     if(type){
         inputDomVal = inputDomVal + "," + type;
     }
+    if(getForeignKeyQuery(val) === 'orderDetlQuery'){
+        inputDomVal = inputDomVal + "," + $('#orderNo').val();
+    }
     //debugger;
     selectDom.length = 0;
     var defaultOption = new Option("鍙栨秷閫夋嫨", "");
@@ -61,6 +64,9 @@
                     option.addr = list[i].addr;
                     option.phone = list[i].phone;
                     option.customer = list[i].customer;
+                    option.allocate = list[i].allocate;
+                    option.weight =  list[i].weight;
+                    option.type = list[i].type;
                     selectDom.options[i+1] = option;
                 }
                 selectDom.style.display='block';
@@ -99,18 +105,23 @@
     } else {
         cacd.val(selectOptionDom.html());
         realDom.val(selectOptionDom.attr("title"));
-        if(selectOptionDom[0].phone){
-            $('#phone').val(selectOptionDom[0].phone);
+        if(selectOptionDom[0].type === "docType"){
+            $('#weight').val("");
+            $('#maktxV').val("");
         }
-        if(selectOptionDom[0].addr){
-            $('#addr').val(selectOptionDom[0].addr);
+        if(selectOptionDom[0].type === "order" || selectOptionDom[0].type === "locOwner"){
+            $('#allocate').val(selectOptionDom[0].allocate ? selectOptionDom[0].allocate : "");
+            $('#customer').val(selectOptionDom[0].customer ? selectOptionDom[0].customer : "");
+            $('#phone').val(selectOptionDom[0].phone ? selectOptionDom[0].phone : "");
+            $('#addr').val(selectOptionDom[0].addr ? selectOptionDom[0].addr : "");
         }
-        if(selectOptionDom[0].customer){
-            $('#customerR').val(selectOptionDom[0].customer);
+        if(selectOptionDom[0].type === "returned"){
+            $('#customer').val(selectOptionDom[0].customer ? selectOptionDom[0].customer : "");
             tableReload();
+        }
 
-        }else {
-            $('#customerR').val("");
+        if(selectOptionDom[0].type === "orderDetl"){
+            $('#weight').val(selectOptionDom[0].weight);
         }
     }
     inputDom.val("");
@@ -138,7 +149,7 @@
                 {field: 'id', title: 'id', hide:true},
                 {field: 'batch', title: '鎵瑰彿'},
                 {field: 'packageNo', title: '鍖呭彿'},
-                {field: 'orderWeight', title: '閲嶉噺'}
+                {field: 'orderWeight', title: '閲嶉噺',edit:true}
 
             ]],
             request: {

--
Gitblit v1.9.1