From d7fa3ba14d4dba7bd65d28eec14361b72f0b22c0 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 16 七月 2025 09:12:51 +0800
Subject: [PATCH] 模具上模，下模校验修改；添康三周排产；
---
WebTM/views/模治具管理/上模单/Sc_MouldLowerBillEdit.html | 14 +-
WebTM/views/模治具管理/上模单/Sc_MouldUpperBillEdit.html | 14 +-
WebTM/views/生产管理/添康三周排产/JIT_MaterialLevelShorAnalysisReport_TK.html | 35 ++++++
WebTM/views/生产管理/添康三周排产/ReportPODemandPlanBillList_S_TK.html | 43 ++++++++
WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html | 2
WebTM/views/生产管理/添康三周排产/JIT_DayPlanPlatForm_TK2.html | 183 ++++++++++++++++++++++++++++-------
6 files changed, 235 insertions(+), 56 deletions(-)
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldLowerBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldLowerBillEdit.html"
index d01d500..2d28d3e 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldLowerBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldLowerBillEdit.html"
@@ -939,29 +939,31 @@
return false;
}
- for (var i = 0; i < option.data.length; i++) {
+ var data = JSON.parse(JSON.stringify(table.cache['mainTable']));
- if (option.data[i] != "") {
+ for (var i = 0; i < data.length; i++) {
+
+ if (data[i] != "") {
//妯″叿涓嶄负绌�
- if (option.data[i]["HMouldID"] == "0") {
+ if (data[i]["HMouldID"] == "0") {
layer.msg("绗�" + (i + 1) + "琛�:妯″叿涓嶈兘涓虹┖!");
return false;
}
//鐢熶骇璧勬簮涓嶄负绌�
- if (option.data[i]["HSourceID"] == "0") {
+ if (data[i]["HSourceID"] == "0") {
layer.msg("绗�" + (i + 1) + "琛�:鐢熶骇璧勬簮涓嶈兘涓虹┖!");
return false;
}
//鐢熶骇璁㈠崟涓嶄负绌�
- if (option.data[i]["HICMOBillNo"] == "") {
+ if (data[i]["HICMOBillNo"] == "") {
layer.msg("绗�" + (i + 1) + "琛�:鐢熶骇璁㈠崟涓嶈兘涓虹┖!");
return false;
}
//鏁伴噺涓嶄负0
- if (option.data[i]["HQty"] == "0") {
+ if (data[i]["HQty"] == "0") {
layer.msg("绗�" + (i + 1) + "琛�:鏁伴噺涓嶈兘涓�0!");
return false;
}
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit.html"
index d96edd8..c4c65b3 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit.html"
@@ -980,29 +980,31 @@
return false;
}
- for (var i = 0; i < option.data.length; i++) {
+ var data = JSON.parse(JSON.stringify(table.cache['mainTable']));
- if (option.data[i] != "") {
+ for (var i = 0; i < data.length; i++) {
+
+ if (data[i] != "") {
//妯″叿涓嶄负绌�
- if (option.data[i]["HMouldID"] == "0") {
+ if (data[i]["HMouldID"] == "0") {
layer.msg("绗�" + (i + 1) + "琛�:妯″叿涓嶈兘涓虹┖!");
return false;
}
//鐢熶骇璧勬簮涓嶄负绌�
- if (option.data[i]["HSourceID"] == "0") {
+ if (data[i]["HSourceID"] == "0") {
layer.msg("绗�" + (i + 1) + "琛�:鐢熶骇璧勬簮涓嶈兘涓虹┖!");
return false;
}
//鐢熶骇璁㈠崟涓嶄负绌�
- if (option.data[i]["HICMOBillNo"] == "") {
+ if (data[i]["HICMOBillNo"] == "") {
layer.msg("绗�" + (i + 1) + "琛�:鐢熶骇璁㈠崟涓嶈兘涓虹┖!");
return false;
}
//鏁伴噺涓嶄负0
- if (option.data[i]["HQty"] == "0") {
+ if (data[i]["HQty"] == "0") {
layer.msg("绗�" + (i + 1) + "琛�:鏁伴噺涓嶈兘涓�0!");
return false;
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\267\273\345\272\267\344\270\211\345\221\250\346\216\222\344\272\247/JIT_DayPlanPlatForm_TK2.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\267\273\345\272\267\344\270\211\345\221\250\346\216\222\344\272\247/JIT_DayPlanPlatForm_TK2.html"
index 58f435d..3bedde3 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\267\273\345\272\267\344\270\211\345\221\250\346\216\222\344\272\247/JIT_DayPlanPlatForm_TK2.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\267\273\345\272\267\344\270\211\345\221\250\346\216\222\344\272\247/JIT_DayPlanPlatForm_TK2.html"
@@ -24,8 +24,8 @@
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnLock" id="btnLock">閿佸畾</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnUnlock" id="btnUnlock">瑙ｉ攣</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnCompleteSetAnalysis" id="btnCompleteSetAnalysis">榻愬鍒嗘瀽</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnYLYS" id="btnYLYS">瑕佹枡杩愮畻</button>
+ <!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnCompleteSetAnalysis" id="btnCompleteSetAnalysis">榻愬鍒嗘瀽</button>-->
+ <!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnYLYS" id="btnYLYS">瑕佹枡杩愮畻</button>-->
<!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnTLYS" id="btnTLYS">鎻愭枡杩愮畻</button>-->
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnAddICMO" id="btnAddICMO">娣诲姞璁㈠崟</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnProZZPC" id="btnProZZPC">缁勮鎺掍骇</button>
@@ -796,8 +796,8 @@
columns.push({ field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', hide: true, sort: true });
columns.push({ field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿', width: 150, sort: true, filter: true });
columns.push({ field: '鐢熶骇璁㈠崟鍙�', title: '鐢熶骇璁㈠崟鍙�', width: 150, style: 'background-color: #f9f9f9;', sort: true, filter: true });
- columns.push({ field: '閿佸畾宸ュ崟', title: '閿佸畾宸ュ崟', width: 105, sort: true, filter: true });//0
- columns.push({ field: '鐢熶骇缁勭粐', title: '鐢熶骇缁勭粐', width: 150, sort: true, hide: true });
+ columns.push({ field: '閿佸畾宸ュ崟', title: '閿佸畾宸ュ崟', width: 150, sort: true, filter: true });//0
+ columns.push({ field: '鐢熶骇缁勭粐', title: '鐢熶骇缁勭粐', width: 150, sort: true });
columns.push({ field: '鐗╂枡浠ｇ爜', title: '鐗╂枡缂栫爜', width: 150, sort: true, filter: true });
columns.push({ field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, sort: true, filter: true });
columns.push({ field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 150, sort: true, filter: true });
@@ -808,8 +808,8 @@
columns.push({ field: '鏄ㄦ棩鏁伴噺', title: '鏄ㄦ棩鏁伴噺', filter: true });
columns.push({ field: '浼樺厛绾�', title: '浼樺厛绾�', width: 150, edit: 'text', sort: true });
columns.push({ field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮', width: 150, edit: 'text', event: "HSourceID", filter: true });
- columns.push({ field: '浣跨敤宸ヨ', title: '浣跨敤宸ヨ', width: 150, hide: true });
- columns.push({ field: '鏈�鏃╁紑宸ユ棩鏈�', title: '鏈�鏃╁紑宸ユ棩鏈�', width: 150, templet: "<div>{{d.鏈�鏃╁紑宸ユ棩鏈� ==null ?'':layui.util.toDateString(d.鏈�鏃╁紑宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>", event: "HEarlyDate", sort: true, hide: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
+ columns.push({ field: '浣跨敤宸ヨ', title: '浣跨敤宸ヨ', width: 150, hide: true });
+ columns.push({ field: '閿�鍞鍗曞鏍告棩鏈�', title: '閿�鍞鍗曞鏍告棩鏈�', width: 150, templet: "<div>{{d.閿�鍞鍗曞鏍告棩鏈� ==null ?'':layui.util.toDateString(d.閿�鍞鍗曞鏍告棩鏈�, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
columns.push({ field: '涓氬姟鐘舵��', title: '涓氬姟鐘舵��', width: 150, sort: true, hide: true });
columns.push({ field: '浜х嚎鍏ュ簱鏁伴噺', title: '浜х嚎鍏ュ簱鏁伴噺', width: 150, sort: true, hide: true });
columns.push({ field: '鏈帓鏁伴噺', title: '鍙帓鏁伴噺', width: 150, sort: true, hide: true });
@@ -854,7 +854,7 @@
columns.push({ field: '浠婃棩涔嬪墠鏃ヨ鍒掓暟閲�', title: '浠婃棩涔嬪墠鏃ヨ鍒掓暟閲�', width: 150, sort: true });//0
columns.push({ field: '璁″垝寮�濮嬫棩鏈�', title: '棰勮寮�宸ユ棩鏈�', width: 150, templet: "<div>{{d.璁″垝寮�濮嬫棩鏈� ==null ?'':layui.util.toDateString(d.璁″垝寮�濮嬫棩鏈�, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
columns.push({ field: '璁″垝缁撴潫鏃ユ湡', title: '璁″垝缁撴潫鏃ユ湡', width: 150, templet: "<div>{{d.璁″垝缁撴潫鏃ユ湡 ==null ?'':layui.util.toDateString(d.璁″垝缁撴潫鏃ユ湡, 'yyyy-MM-dd')}}</div>", event: "HPlanEndDate", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
- columns.push({ field: '閿�鍞鍗曞鏍告棩鏈�', title: '閿�鍞鍗曞鏍告棩鏈�', width: 150, templet: "<div>{{d.閿�鍞鍗曞鏍告棩鏈� ==null ?'':layui.util.toDateString(d.閿�鍞鍗曞鏍告棩鏈�, 'yyyy-MM-dd')}}</div>", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
+ columns.push({ field: '鏈�鏃╁紑宸ユ棩鏈�', title: '鏈�鏃╁紑宸ユ棩鏈�', width: 150, templet: "<div>{{d.鏈�鏃╁紑宸ユ棩鏈� ==null ?'':layui.util.toDateString(d.鏈�鏃╁紑宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>", event: "HEarlyDate", sort: true, filter: { type: 'date[yyyy-MM-dd HH:mm:ss]' } });
columns.push({ field: '鎿嶄綔宸�', title: '鎿嶄綔宸�', width: 150, edit: 'text', event: "HEmpID" });
columns.push({ field: 'HMouldID', title: 'HMouldID', width: 150, hide: true });
columns.push({ field: 'HMouldPCTime', title: 'HMouldPCTime', width: 150, hide: true });
@@ -1316,7 +1316,7 @@
});
}
- sWorkQty = option.data[i]["灏忔椂浜ц兘"];
+ sWorkQty = option.data[i]["浜х嚎鎬讳骇鑳�"];
//鑾峰彇鏇存柊璁″垝鏁伴噺
if (SDSum > 0) {
sPlanQty = sPlanQty - SDSum - HReportQty;
@@ -1374,7 +1374,7 @@
});
if (dsSub == null || dsSub.length == 0) {
- get_HFData(1, i);
+ //get_HFData(1, i);
continue;//濡傛灉娌℃湁鍓╀綑鍒� 鎵ц涓嬩竴涓敓浜ц鍗�
}
if (dsSub != null)//涓嶅姞鐝帓绋�
@@ -1386,9 +1386,11 @@
set_AddNew1(option.data[i]);
}
bFind = true;
+
+ break
}
} else {
- get_HFData(1, i);
+ //get_HFData(1, i);
}
}
}
@@ -1411,11 +1413,61 @@
if (sLeftQty > 0) {
if (ds[i]["鏃ユ湡"] == grd.cols[0][j].field) //琛ㄦ牸鐨勬爣棰樹笂 淇濆瓨浜嗘棩鏈燂紱
{
+ //濡傛灉鏃堕棿琚� 涓婇亾浣欓噺鍗犵敤 鍒� 璺宠繃
b = false;
-
+ //if (dsPre != null && dsPre.Tables[0].Rows.Count > 0) {
+ // for (var m = 0; m < dsPre.Tables[0].Rows.Count; m++)
+ // {
+ // if (ds[i]["鏃ユ湡"] < DBUtility.ClsPub.isDate(dsPre.Tables[0].Rows[m]["鏃ユ湡"])) {
+ // b = true;
+ // }
+ // }
+ //}
if (b == false) {
if (dsPre != null && ds[i]["鏃ユ湡"] == dsPre[0]["鏃ユ湡"]) {
-
+ ////HUseTimes 涓� 涓婇亾浣欓噺鍚� 鍓╀綑宸ユ椂銆�
+ //if (ds[i]["鏈�澶у墿浣欏伐鏃�"] > dsPre[0]["HUseTimes"]) {
+ // if (parseFloat(sLeftQty) > parseFloat(sWorkQty * dsPre[0]["HUseTimes"])) {
+ // grd.data[iRow][j] = parseFloat(sWorkQty * (dsPre[0]["HUseTimes"]));
+ // sLeftQty = sLeftQty - parseFloat(sWorkQty * (dsPre[0]["HUseTimes"]));
+ // oSub = new ClsGridValues();
+ // oSub.iRow = iRow;
+ // oSub.iCol = j;
+ // oSub.HLeftTimes = DBUtility.ClsPub.isSingle(dsPre[0]["HUseTimes"]);
+ // oClsGridValues.Add(oSub);
+ // }
+ // else {
+ // grd.data[iRow][j]= sLeftQty;
+ // sLeftQty = 0;
+ // oSub = new ClsGridValues();
+ // oSub.iRow = iRow;
+ // oSub.iCol = j;
+ // oSub.HLeftTimes = DBUtility.ClsPub.isSingle(dsPre.Tables[0].Rows[0]["HUseTimes"]);
+ // oClsGridValues.Add(oSub);
+ // }
+ //}
+ //else //鍗撳姏涓嶉渶瑕佽�冭檻鍔犵彮锛屼笅闈㈢殑杩欎竴娈典笉闇�瑕�
+ //{
+ // if (sLeftQty > sWorkQty * ds[i]["鏈�澶у墿浣欏伐鏃�"]) {
+ // grd.data[iRow][j]= parseFloat(sWorkQty * ds[i]["鏈�澶у墿浣欏伐鏃�"]);
+ // sLeftQty = sLeftQty - (parseFloat(sWorkQty * ds[i]["鏈�澶у墿浣欏伐鏃�"]));
+ // sLeftQty = 0;
+ // oSub = new ClsGridValues();
+ // oSub.iRow = iRow;
+ // oSub.iCol = j;
+ // oSub.HLeftTimes = ds[i]["鏈�澶у墿浣欏伐鏃�"];
+ // oClsGridValues.Add(oSub);
+ // }
+ // else {
+ // grd.data[iRow][j]= sLeftQty;
+ // sLeftQty = 0;
+ // oSub = new ClsGridValues();
+ // oSub.iRow = iRow;
+ // oSub.iCol = j;
+ // oSub.HLeftTimes = ds[i]["鏈�澶у墿浣欏伐鏃�"];
+ // oClsGridValues.Add(oSub);
+ // }
+ //}
}
else {
var dayWorkQty = sWorkQty * ds[i]["鍓╀綑宸ユ椂"];
@@ -1424,22 +1476,32 @@
if (sLeftQty > dayWorkQty) {
grd.data[iRow][grd.cols[0][j].field] = dayWorkQty;
sLeftQty = sLeftQty - dayWorkQty;
-
+ //oSub = new ClsGridValues();
+ //oSub.iRow = iRow;
+ //oSub.iCol = j;
option.data[iRow]["HLeftTimes"] = ds[i]["鏈�澶у墿浣欏伐鏃�"];
break;
+ //oSub.HLeftTimes = ds[i]["鏈�澶у墿浣欏伐鏃�"];
+ //oClsGridValues.Add(oSub);
}
else {
grd.data[iRow][grd.cols[0][j + HPlanDay].field] = Math.round(sLeftQty * 10) / 10;
sLeftQty = 0;
-
+ //oSub = new ClsGridValues();
+ //oSub.iRow = iRow;
+ //oSub.iCol = j;
option.data[iRow]["HLeftTimes"] = ds[i]["鏈�澶у墿浣欏伐鏃�"];
break;
+ //oSub.HLeftTimes = ds[i]["鏈�澶у墿浣欏伐鏃�"];
+ //oClsGridValues.Add(oSub);
+
}
}
}
}
}
}
+
}
}
@@ -1452,10 +1514,57 @@
if (ds[i]["鏃ユ湡"] == grd.cols[0][j].field) {
//濡傛灉鏃堕棿琚� 涓婇亾浣欓噺鍗犵敤 鍒� 璺宠繃
b = false;
-
+ //if (dsPre != null && dsPre.Tables[0].Rows.Count > 0) {
+ // for (var m = 0; m < dsPre.Tables[0].Rows.Count; m++)
+ // {
+ // if (DBUtility.ClsPub.isDate(ds[i]["鏃ユ湡"]) < DBUtility.ClsPub.isDate(dsPre.Tables[0].Rows[m]["鏃ユ湡"])) {
+ // b = true;
+ // }
+ // }
+ //}
if (b == false) {
if (dsPre != null && s[i]["鏃ユ湡"] == dsPre[0]["鏃ユ湡"]) {
-
+ //if (ds[i]["鍓╀綑宸ユ椂"] > (DBUtility.ClsPub.isSingle(dsPre.Tables[0].Rows[0]["HUseTimes"]))) {
+ // if (sLeftQty > parseFloat(sWorkQty * (DBUtility.ClsPub.isSingle(dsPre.Tables[0].Rows[0]["HUseTimes"])))) {
+ // grd.data[iRow][j]= parseFloat(sWorkQty * (DBUtility.ClsPub.isSingle(dsPre.Tables[0].Rows[0]["HUseTimes"])));
+ // sLeftQty = sLeftQty - parseFloat(sWorkQty * (DBUtility.ClsPub.isSingle(dsPre.Tables[0].Rows[0]["HUseTimes"])));
+ // oSub = new ClsGridValues();
+ // oSub.iRow = iRow;
+ // oSub.iCol = j;
+ // oSub.HLeftTimes = DBUtility.ClsPub.isSingle(dsPre.Tables[0].Rows[0]["HUseTimes"]);
+ // oClsGridValues.Add(oSub);
+ // }
+ // else {
+ // grd.data[iRow][j]= sLeftQty;
+ // sLeftQty = 0;
+ // oSub = new ClsGridValues();
+ // oSub.iRow = iRow;
+ // oSub.iCol = j;
+ // oSub.HLeftTimes = DBUtility.ClsPub.isSingle(dsPre.Tables[0].Rows[0]["HUseTimes"]);
+ // oClsGridValues.Add(oSub);
+ // }
+ //}
+ //else {
+ // if (sLeftQty > sWorkQty * ds[i]["鍓╀綑宸ユ椂"]) {
+ // grd.data[iRow][j]= parseFloat(sWorkQty * ds[i]["鍓╀綑宸ユ椂"]);
+ // sLeftQty = sLeftQty - (parseFloat(sWorkQty * ds[i]["鍓╀綑宸ユ椂"]));
+ // sLeftQty = 0;
+ // oSub = new ClsGridValues();
+ // oSub.iRow = iRow;
+ // oSub.iCol = j;
+ // oSub.HLeftTimes = ds[i]["鍓╀綑宸ユ椂"];
+ // oClsGridValues.Add(oSub);
+ // }
+ // else {
+ // grd.data[iRow][j]= sLeftQty;
+ // sLeftQty = 0;
+ // oSub = new ClsGridValues();
+ // oSub.iRow = iRow;
+ // oSub.iCol = j;
+ // oSub.HLeftTimes = ds[i]["鍓╀綑宸ユ椂"];
+ // oClsGridValues.Add(oSub);
+ // }
+ //}
}
else {
var dayWorkQty = sWorkQty * ds[i]["鍓╀綑宸ユ椂"];
@@ -1468,16 +1577,26 @@
if (sLeftQty > dayWorkQty) {
grd.data[iRow][grd.cols[0][j].field] = dayWorkQty;
sLeftQty = sLeftQty - dayWorkQty;
-
+ //oSub = new ClsGridValues();
+ //oSub.iRow = iRow;
+ //oSub.iCol = j;
+ //option.data[iRow]["HLeftTimes"] = ds[i]["鏈�澶у墿浣欏伐鏃�"];
+ //option.data[iRow]["HUseTimes"] = ds[i]["鍓╀綑宸ユ椂"];
break;
-
+ //oSub.HLeftTimes = ds[i]["鍓╀綑宸ユ椂"];
+ //oClsGridValues.Add(oSub);
}
else {
grd.data[iRow][grd.cols[0][j].field] = Math.round(sLeftQty * 10) / 10;
-
+ //option.data[iRow]["HUseTimes"] = parseFloat(sLeftQty / sWorkQty);
sLeftQty = 0;
-
+ //oSub = new ClsGridValues();
+ //oSub.iRow = iRow;
+ //oSub.iCol = j;
+ //option.data[iRow]["HLeftTimes"] = ds[i]["鏈�澶у墿浣欏伐鏃�"];
break;
+ //oSub.HLeftTimes = ds[i]["鍓╀綑宸ユ椂"];
+ //oClsGridValues.Add(oSub);
}
}
}
@@ -1485,6 +1604,7 @@
}
}
}
+
}
}
//#endregion
@@ -2026,25 +2146,10 @@
var old_date = new Date();
var data = option.data;//table.cache["mainTable"];
- if ($("#HWorkShopIDName").val().indexOf("缁勮") !== -1) {
- //鏍规嵁璁″垝寮�宸ユ棩鏈熸帓搴忔暟缁�
- data.sort(function (a, b) {
- // 榛樿鏍规嵁鏈�鏃╁紑宸ユ棩鏈熸帓搴忥紝鏈�鏃╁紑宸ユ棩鏈熺浉鍚屽垯鎸夌収閿�鍞鍗曞鏍告棩鏈熸帓搴�
- if (new Date(a.鏈�鏃╁紑宸ユ棩鏈�) == new Date(b.鏈�鏃╁紑宸ユ棩鏈�)) {
- return new Date(a.閿�鍞鍗曞鏍告棩鏈�) - new Date(b.閿�鍞鍗曞鏍告棩鏈�)
- }
- return new Date(a.鏈�鏃╁紑宸ユ棩鏈�) - new Date(b.鏈�鏃╁紑宸ユ棩鏈�)
- });
- } else {
- //鏍规嵁璁″垝缁撴潫鏃ユ湡鎺掑簭鏁扮粍
- data.sort(function (a, b) {
- // 榛樿鏍规嵁璁″垝缁撴潫鏃ユ湡鎺掑簭锛岃鍒掔粨鏉熸棩鏈熺浉鍚屽垯鎸夌収閿�鍞鍗曞鏍告棩鏈熸帓搴�
- if (Format(a.璁″垝缁撴潫鏃ユ湡, 'yyyy/MM/dd') == Format(b.璁″垝缁撴潫鏃ユ湡, 'yyyy/MM/dd')) {
- return Format(a.閿�鍞鍗曞鏍告棩鏈�, 'yyyy/MM/dd') - Format(b.閿�鍞鍗曞鏍告棩鏈�, 'yyyy/MM/dd')
- }
- return Format(a.璁″垝缁撴潫鏃ユ湡, 'yyyy/MM/dd') - Format(b.璁″垝缁撴潫鏃ユ湡, 'yyyy/MM/dd')
- });
- }
+ //鏍规嵁閿�鍞鍗曞鏍告棩鏈熸帓搴忔暟缁�
+ data.sort(function (a, b) {
+ return new Date(a.閿�鍞鍗曞鏍告棩鏈�) - new Date(b.閿�鍞鍗曞鏍告棩鏈�)
+ });
for (var i = 0; i < data.length; i++) {
data[i]["浼樺厛绾�"] = ((i + 1) * 5);
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\267\273\345\272\267\344\270\211\345\221\250\346\216\222\344\272\247/JIT_MaterialLevelShorAnalysisReport_TK.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\267\273\345\272\267\344\270\211\345\221\250\346\216\222\344\272\247/JIT_MaterialLevelShorAnalysisReport_TK.html"
index aff4e9c..fb534ee 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\267\273\345\272\267\344\270\211\345\221\250\346\216\222\344\272\247/JIT_MaterialLevelShorAnalysisReport_TK.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\267\273\345\272\267\344\270\211\345\221\250\346\216\222\344\272\247/JIT_MaterialLevelShorAnalysisReport_TK.html"
@@ -75,6 +75,12 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜у搧缂栫爜</label>
<div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="width: 60%;display: inline-block;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜у搧鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
<input type="hidden" class="layui-input" lay-verify="HMATERIALID" name="HMATERIALID" id="HMATERIALID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
<input type="text" class="layui-input" lay-verify="HMATERIALNAME" name="HMATERIALNAME" id="HMATERIALNAME" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMATERIALID" id="btnHMATERIALID" style="padding: 0 10px;float: right;margin-right: 3px;">
@@ -91,6 +97,18 @@
<option value="2">鑷埗</option>
<option value="3">濮斿</option>
</select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇璁㈠崟</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HICMOBillNo" name="HICMOBillNo" id="HICMOBillNo" value="" style="width: 60%;display: inline-block;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">閿�鍞鍗�</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HSeOrderBillNo" name="HSeOrderBillNo" id="HSeOrderBillNo" value="" style="width: 60%;display: inline-block;">
</div>
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">鏌ヨ</button>
@@ -599,6 +617,9 @@
var HWorkShopID = $("#HWorkShopID").val();//鐗╂枡/浜у搧
var HWorkShopID2 = $("#HWorkShopID2").val();//鐗╂枡/浜у搧闇�姹傝溅闂�
var HMaterClsID = $("#HMaterClsID").val();//鐗╂枡灞炴��
+ var HSeOrderBillNo = $("#HSeOrderBillNo").val();//閿�鍞鍗�
+ var HMaterNumber = $("#HMaterNumber").val();//浜у搧缂栫爜
+ var HICMOBillNo = $("#HICMOBillNo").val();//鐢熶骇璁㈠崟
if (HBEGINDATE > HENDDATE) {
return layer.msg("寮�濮嬫棩鏈熶笉鑳藉皬浜庣粨鏉熸棩鏈�!");
}
@@ -622,8 +643,17 @@
sWhere += " and T1.HMaterID= " + HMATERIALID + " ";
} else {
if (HMATERIALNAME != "") {
- sWhere += " and (T2.HName like ''%" + HMATERIALNAME + "%'' or T2.HNumber like ''%" + HMATERIALNAME + "%'') ";
+ sWhere += " and T2.HName like ''%" + HMATERIALNAME + "%''";
}
+ }
+ if (HSeOrderBillNo != "") {
+ sWhere += " and T1.HSeOrderBillNo like''%" + HSeOrderBillNo + "%''";
+ }
+ if (HMaterNumber != "") {
+ sWhere += " and T2.HNumber like''%" + HMaterNumber + "%''";
+ }
+ if (HICMOBillNo != "") {
+ sWhere += " and T1.HICMOBillNo like''%" + HICMOBillNo + "%''";
}
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -640,6 +670,9 @@
$("#HWorkShopID").val("0");
$("#HWorkShopID2").val("0");
$("#HMaterClsID").val("0");
+ $("#HSeOrderBillNo").val("");//閿�鍞鍗�
+ $("#HMaterNumber").val("");//浜у搧缂栫爜
+ $("#HICMOBillNo").val("");//鐢熶骇璁㈠崟
form.render('select');
sWhere = "";
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\267\273\345\272\267\344\270\211\345\221\250\346\216\222\344\272\247/ReportPODemandPlanBillList_S_TK.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\267\273\345\272\267\344\270\211\345\221\250\346\216\222\344\272\247/ReportPODemandPlanBillList_S_TK.html"
index 534cf31..44c6fa9 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\267\273\345\272\267\344\270\211\345\221\250\346\216\222\344\272\247/ReportPODemandPlanBillList_S_TK.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\267\273\345\272\267\344\270\211\345\221\250\346\216\222\344\272\247/ReportPODemandPlanBillList_S_TK.html"
@@ -55,10 +55,16 @@
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
<div class="layui-row" style="margin-top:10px;">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜у搧缂栫爜</label>
+ <label class="layui-form-label" style="width: 85px;">浜у搧浠ｇ爜</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜у搧鍚嶇О</label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="hidden" class="layui-input" lay-verify="HMATERIALID" name="HMATERIALID" id="HMATERIALID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="text" class="layui-input" lay-verify="HMATERIALNAME" name="HMATERIALNAME" id="HMATERIALNAME" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" lay-verify="HMATERIALNAME" name="HMATERIALNAME" id="HMATERIALNAME" value="" style="width: 60%;display: inline-block;" >
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMATERIALID" id="btnHMATERIALID" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
@@ -68,7 +74,7 @@
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">渚涘簲鍟�</label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="hidden" class="layui-input" lay-verify="HSUPPLIERID" name="HSUPPLIERID" id="HSUPPLIERID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="text" class="layui-input" lay-verify="HSUPPLIERNAME" name="HSUPPLIERNAME" id="HSUPPLIERNAME" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" lay-verify="HSUPPLIERNAME" name="HSUPPLIERNAME" id="HSUPPLIERNAME" value="" style="width: 60%;display: inline-block;">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSUPPLIERID" id="btnHSUPPLIERID" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
@@ -86,6 +92,18 @@
<label class="layui-form-label" style="width: 85px;">閲囪喘璁㈠崟鍙�</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HPURORDERNO" id="HPURORDERNO">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">渚涘簲鍟嗕唬鐮�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HSupNumber" id="HSupNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">渚涘簲鍟嗗悕绉�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HSupName" id="HSupName">
</div>
</div>
</div>
@@ -392,6 +410,10 @@
var HSUPPLIERID = $("#HSUPPLIERID").val();//渚涘簲鍟�
var HXQD = $("#HXQD").val();//闇�姹傚崟鍙�
var HPURORDERNO = $("#HPURORDERNO").val();//閲囪喘璁㈠崟鍙�
+ var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡浠ｇ爜
+ var HMaterName = $("#HMaterName").val();//鐗╂枡鍚嶇О
+ var HSupNumber = $("#HSupNumber").val();//渚涘簲鍟嗕唬鐮�
+ var HSupName = $("#HSupName").val();//渚涘簲鍟嗗悕绉�
if (HBEGINDATE > HENDDATE) {
return layer.msg("寮�濮嬫棩鏈熶笉鑳藉皬浜庣粨鏉熸棩鏈�!");
@@ -416,6 +438,18 @@
if (HPURORDERNO) {
sWhere += " and HPOOrderBillNo like''%" + HPURORDERNO + "%'' ";
}
+ if (HMaterNumber != "") {
+ sWhere += " and t1.鐗╂枡浠ｇ爜 like ''%" + HMaterNumber + "%'' ";
+ }
+ if (HMaterName != "") {
+ sWhere += " and t1.鐗╂枡鍚嶇О like ''%" + HMaterName + "%'' ";
+ }
+ if (HSupNumber != "") {
+ sWhere += " and t3.HNumber like ''%" + HSupNumber + "%'' ";
+ }
+ if (HSupName != "") {
+ sWhere += " and t3.HName like ''%" + HSupName + "%'' ";
+ }
//鍒濆鍖栬〃鏍�
set_InitGrid();
get_Display(sWhere);
@@ -434,6 +468,9 @@
$("#HSUPPLIERNAME").val("");
$("#HXQD").val("");//闇�姹傚崟鍙�
$("#HPURORDERNO").val("");//閲囪喘璁㈠崟鍙�
+ $("#HMaterNumber").val("");
+ $("#HSupNumber").val("");//渚涘簲鍟嗕唬鐮�
+ $("#HSupName").val("");//渚涘簲鍟嗗悕绉�
form.render('select');
sWhere = " where 1=1 ";
}
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
index 9052fc9..7cd2cc3 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
@@ -1819,7 +1819,7 @@
$("#HQCSchemeID").val(checkStatus.data[0].hmainid);
$("#HQCSchemeName").val(checkStatus.data[0].妫�楠屾柟妗堝悕绉�);
get_CheckItem();
- layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
//鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
--
Gitblit v1.9.1