From a03addb5fbf4da382275f3c9dff8dbc916c4e021 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期三, 17 九月 2025 09:52:01 +0800
Subject: [PATCH] 其他出库、其他入库：子表件数可以输入为0 乔一客户物料即时库存报表：把米数和件数的合计加上去 （按生产订单）客户订单：过滤条件改为模糊查询
---
WebTM/views/验收入库/其他入库/Add_Edit_Kf_OtherInBill.html | 7 ++++---
WebTM/views/仓存管理/条码报表/Kf_ICInventory_Cus.html | 2 +-
WebTM/views/领料发货/其他出库/Add_Edit_Kf_OtherOutBill.html | 7 ++++---
WebTM/views/车间管理/报表分析/sc_ICOMReport.html | 8 ++++----
4 files changed, 13 insertions(+), 11 deletions(-)
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\346\212\245\350\241\250/Kf_ICInventory_Cus.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\346\212\245\350\241\250/Kf_ICInventory_Cus.html"
index 204e176..bf3f87e 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\346\212\245\350\241\250/Kf_ICInventory_Cus.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\346\212\245\350\241\250/Kf_ICInventory_Cus.html"
@@ -335,7 +335,7 @@
data: { "sql": sql, "user": sessionStorage["HUserName"], "ModRightNameCheck": ModRightNameCheck},
success: function (data1) {
if (data1.count == 1) {
- var totalArray = [];
+ var totalArray = ["鏁伴噺","浠舵暟"];
var data = [];
var col = [];
//缁欑┖鐨勬暟缁勮祴鍊�
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/sc_ICOMReport.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/sc_ICOMReport.html"
index 0323b3b..f4223cc 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/sc_ICOMReport.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/sc_ICOMReport.html"
@@ -429,19 +429,19 @@
sWhere = " and 鏃ユ湡 between ''" + HBeginDate + "'' and ''" + HEndDate + "'' ";
if (HMaterNumber != "") {
- sWhere += " and 鐗╂枡浠ｇ爜=''" + HMaterNumber + "'' ";
+ sWhere += " and 鐗╂枡浠ｇ爜 like ''%" + HMaterNumber + "%'' ";
}
if (HBillNo != "") {
- sWhere += " and 鍗曟嵁鍙�=''" + HBillNo + "'' ";
+ sWhere += " and 鍗曟嵁鍙� like ''%" + HBillNo + "%'' ";
}
if (HProductName != "") {
- sWhere += " and 鐗╂枡鍚嶇О=''" + HProductName + "'' ";
+ sWhere += " and 鐗╂枡鍚嶇О like ''%" + HProductName + "%'' ";
}
if (HProductModel != "") {
- sWhere += " and 瑙勬牸鍨嬪彿=''" + HProductModel + "'' ";
+ sWhere += " and 瑙勬牸鍨嬪彿 like ''%" + HProductModel + "%'' ";
}
//浠绘剰瀛楁鏉′欢杩囨护 鏉′欢鎻愬彇
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Add_Edit_Kf_OtherOutBill.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Add_Edit_Kf_OtherOutBill.html"
index b101ddf..3dcb17d 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Add_Edit_Kf_OtherOutBill.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Add_Edit_Kf_OtherOutBill.html"
@@ -530,10 +530,11 @@
if (!ref1.test(temp)) {
layer.msg("绗�" + (i + 1) + "琛岋細浠舵暟璇疯緭鍏ヤ笉涓�0鐨勬暣鏁帮紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
- } else if (temp * 1 == 0) {
- layer.msg("绗�" + (i + 1) + "琛岋細浠舵暟璇疯緭鍏ヤ笉涓�0鐨勬暣鏁帮紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
}
+ //else if (temp * 1 == 0) {
+ // layer.msg("绗�" + (i + 1) + "琛岋細浠舵暟璇疯緭鍏ヤ笉涓�0鐨勬暣鏁帮紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ //}
}
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Add_Edit_Kf_OtherInBill.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Add_Edit_Kf_OtherInBill.html"
index 82298c0..891971b 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Add_Edit_Kf_OtherInBill.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Add_Edit_Kf_OtherInBill.html"
@@ -520,10 +520,11 @@
if (!ref1.test(temp)) {
layer.msg("绗�" + (i + 1) + "琛岋細浠舵暟璇疯緭鍏ヤ笉涓�0鐨勬暣鏁帮紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
- } else if (temp * 1 == 0) {
- layer.msg("绗�" + (i + 1) + "琛岋細浠舵暟璇疯緭鍏ヤ笉涓�0鐨勬暣鏁帮紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
}
+ //else if (temp * 1 == 0) {
+ // layer.msg("绗�" + (i + 1) + "琛岋細浠舵暟璇疯緭鍏ヤ笉涓�0鐨勬暣鏁帮紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ //}
}
var num = [];
--
Gitblit v1.9.1