From a5a895300d2eb192ceac55f20331b3764c699c35 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 11 三月 2025 15:47:28 +0800
Subject: [PATCH] 产品器具清单新增字段：器具类型，工装优先级，工位数；生产资源新增字段：工位数量，产线标准人数；工序新增字段：标准工价；工艺路线新增标准工价；物料新增字段：工位数；
---
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm_TK.html | 401 +++++++++++++++++++++++++++++++++++---------
WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Source.html | 66 +++++++
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html | 26 ++
WebTM/Files/Cj_StationOutBill/GZRW00004122/销售出库提交报错.jpg | 0
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Material.html | 8
WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Process.html | 8
WebTM/views/模治具管理/模治具管理/Gy_MaterialMouldBillMain.html | 14 +
7 files changed, 427 insertions(+), 96 deletions(-)
diff --git "a/WebTM/Files/Cj_StationOutBill/GZRW00004122/\351\224\200\345\224\256\345\207\272\345\272\223\346\217\220\344\272\244\346\212\245\351\224\231.jpg" "b/WebTM/Files/Cj_StationOutBill/GZRW00004122/\351\224\200\345\224\256\345\207\272\345\272\223\346\217\220\344\272\244\346\212\245\351\224\231.jpg"
new file mode 100644
index 0000000..cfe6453
--- /dev/null
+++ "b/WebTM/Files/Cj_StationOutBill/GZRW00004122/\351\224\200\345\224\256\345\207\272\345\272\223\346\217\220\344\272\244\346\212\245\351\224\231.jpg"
Binary files differ
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
index e2e88f9..7ac4ec9 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
@@ -552,6 +552,12 @@
<input class="layui-input" name="HLotcardQty" lay-verify="HLotcardQty" id="HLotcardQty" autocomplete="off" value="0">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label"> 宸ヤ綅鏁伴噺锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HCubicleQty" lay-verify="HCubicleQty" id="HCubicleQty" autocomplete="off" value="0">
+ </div>
+ </div>
</div>
<div class="layui-row">
@@ -1092,7 +1098,7 @@
, "HUnderTela_M": data.搴曚笣
, "HSizing_M": data.瀹氬瀷娴嗘枡
, "HLotcardQty": data.鍗曚釜娴佽浆鍗℃暟閲�
-
+ , "HCubicleQty": data.宸ヤ綅鏁伴噺
});
colorpicker.render({
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html"
index 4e289ca..84d599f 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html"
@@ -265,6 +265,13 @@
<input type="hidden" value="false" name="HTypeFlow" id="HTypeFlow">
</div>
</div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鏍囧噯宸ヤ环</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HStandardWages" lay-verify="HStandardWages" id="HStandardWages" value="0" autocomplete="off">
+
+ </div>
+ </div>
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
@@ -695,6 +702,7 @@
, "HQCSchemeID_Patrol": data.HQCSchemeID_Patrol
, "HQCSchemeName_Patrol": data.宸℃妫�楠屾柟妗�
, "HPayMentType": data.璁′欢宸ヨ祫绫诲瀷
+ , "HStandardWages": data.鏍囧噯宸ヤ环
});
layer.close(ajaxLoad);
} else {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Source.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Source.html"
index 5a20f21..7193a01 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Source.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Source.html"
@@ -210,8 +210,31 @@
</button>
</div>
</div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">涓昏祫婧�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HPrimarySourceName" id="HPrimarySourceName" class="layui-input" value="" style="float:left;width:150px; background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HPrimarySourceID" id="HPrimarySourceID" value="0">
+ <input type="hidden" name="HParentID" id="HParentID" value="0">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="PrimarySource-BT" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">宸ヤ綅鏁伴噺</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HCubicleQty" id="HCubicleQty" value="1" lay-verify="" autocomplete="off" class="layui-input" onfocus="this.select();">
+ </div>
+ </div>
</div>
<div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">浜х嚎浜烘暟</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HProdLinePeopleNum" id="HProdLinePeopleNum" value="0" lay-verify="" autocomplete="off" class="layui-input" onfocus="this.select();">
+ </div>
+ </div>
</div>
</div>
</div>
@@ -364,6 +387,12 @@
get_checkGroup();
});
+ //閫夋嫨涓昏祫婧愭寜閽�
+ form.on('submit(PrimarySource-BT)', function () {
+ get_checkPrimarySource();
+ });
+
+
//淇濆瓨鎸夐挳
form.on('submit(set_SaveBill)', function (data) {
set_SaveBill(data);
@@ -459,7 +488,11 @@
, "HMacAddr": data.mac鍦板潃
, "HEmpID": data.HEmpID == undefined ? 0 : data.HEmpID
, "HEmpName": data.璐熻矗浜�
-
+ , "HPrimarySourceID": data.HParentID
+ , "HPrimarySourceName": data.涓昏祫婧愬悕绉�
+ , "HParentID": data.HParentID
+ , "HCubicleQty": data.鍗犵敤宸ヤ綅鏁�
+ , "HProdLinePeopleNum": data.浜х嚎浜烘暟
});
layer.close(ajaxLoad);
} else {
@@ -689,6 +722,32 @@
})
}
//#endregion
+
+ //#region 閫夋嫨涓昏祫婧愭柟娉�
+ function get_checkPrimarySource() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鐢熶骇璧勬簮鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HParentID").val(checkStatus.data[0].HItemID);
+ $("#HPrimarySourceID").val(checkStatus.data[0].HItemID);
+ $("#HPrimarySourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ //#endregion
//閫夋嫨璐熻矗浜�
function get_HEmpID() {
@@ -756,6 +815,11 @@
$("#HGroup").val(obj[0].鐝粍鍚嶇О);
$("#HGroupID").val(obj[0].HItemID);
}
+ function GetGySource(obj) {
+ $("#HParentID").val(obj[0].HItemID);
+ $("#HPrimarySourceID").val(obj[0].HItemID);
+ $("#HPrimarySourceName").val(obj[0].鐢熶骇璧勬簮鍚嶇О);
+ }
</script>
</body>
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MaterialMouldBillMain.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MaterialMouldBillMain.html"
index 26d9ef0..f3983d6 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MaterialMouldBillMain.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MaterialMouldBillMain.html"
@@ -494,14 +494,17 @@
"HMouldID": 0,
"HMouldNumber": "",
"HMouldName": "",
- "HMouldType": "",
+ "HModel2": "",
"HQty": "1",
"HMouldQty": "",
"HRate": "",
"HSourceBillNo": "0",
"HSourceBillType": "0",
"HSourceEntryID": "0",
- "HSourceInterID": "0"
+ "HSourceInterID": "0",
+ "HMouldType": "",
+ "HMouldPriority": "0",
+ "HCubicleQty": "0",
};
switch (obj.event) {
case 'btn-AddLine':
@@ -574,10 +577,13 @@
, { field: 'HMouldID', title: 'HMouldID', hide: true, style: 'background-color: #f9f9f9;' }
, { field: 'HMouldNumber', title: '鍣ㄥ叿缂栫爜', edit: 'text', event: "HMouldNumber" } //f7
, { field: 'HMouldName', title: '鍣ㄥ叿鍚嶇О' }
- , { field: 'HMouldType', title: '鍣ㄥ叿鍨嬪彿' }
+ , { field: 'HModel2', title: '鍣ㄥ叿鍨嬪彿' }
, { field: 'HQty', title: '鏁伴噺', edit: 'text', totalRow: true }
, { field: 'HMouldQty', title: '妯＄┐鏁�', edit: 'text', totalRow: true }
, { field: 'HRate', title: '鍗犳瘮', edit: 'text', totalRow: true }
+ , { field: 'HMouldType', title: '鍣ㄥ叿绫诲埆', edit: 'text' }
+ , { field: 'HMouldPriority', title: '浼樺厛绾�', edit: 'text' }
+ , { field: 'HCubicleQty', title: '宸ヤ綅鏁�', edit: 'text', totalRow: true }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
]]
}
@@ -827,7 +833,7 @@
"HMouldID": checkStatus.data[0].hmainid,
"HMouldNumber": checkStatus.data[0].妯″叿缂栧彿,
"HMouldName": checkStatus.data[0].妯″叿鍚嶇О,
- "HMouldType": checkStatus.data[0].妯″叿鍨嬪彿,
+ "HModel2": checkStatus.data[0].妯″叿鍨嬪彿,
"HMouldQty": checkStatus.data[0].绌存暟,
"HSourceInterID": checkStatus.data[0].hmainid,
"HSourceEntryID": checkStatus.data[0].hsubid,
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm_TK.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm_TK.html"
index e807bc7..f8cfdf5 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm_TK.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm_TK.html"
@@ -948,7 +948,7 @@
var myDate = new Date();
var oneday = 1000 * 60 * 60 * 24;
- columns.push({ type: 'checkbox', fixed: 'left', sort: true });
+ columns.push({ type: 'checkbox', fixed: 'left', sort: true });
columns.push({ type: 'numbers', field: '搴忓彿', title: '搴忓彿', sort: true, filter: true });
columns.push({ field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', hide: true, sort: true, filter: true});
columns.push({ field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿', width: 150, sort: true, filter: true });
@@ -959,13 +959,13 @@
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, edit: 'text', filter: true });
+ columns.push({ field: '浜х嚎鎬讳骇鑳�', title: '浜х嚎鎬讳骇鑳�', width: 150, sort: true, edit: 'text', filter: true });
columns.push({ field: '璁″垝鏁伴噺', title: '鐢熶骇璁㈠崟鏁伴噺', width: 150, sort: true, filter: true });//0
- columns.push({ field: '鏃ヨ鍒掓暟閲忔�婚噺', title: '鏃ヨ鍒掓暟閲忔�婚噺', width: 150, sort: true, filter: true});//0
columns.push({ field: '璁㈠崟鍙帓鏁伴噺', title: '璁㈠崟鍙帓鏁伴噺', width: 150, filter: true});
- columns.push({ field: '鎷嗗崟鏁伴噺', title: '鎷嗗崟鏁伴噺', width: 150, edit: 'text', filter: true});
columns.push({ field: '鏄ㄦ棩鏁伴噺', title: '鏄ㄦ棩鏁伴噺', filter: true});
columns.push({ field: '浼樺厛绾�', title: '浼樺厛绾�', width: 150, edit: 'text', sort: true, filter: true });
columns.push({ field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮', width: 150, edit: 'text', event: "HSourceID", filter: true });
+ columns.push({ field: '浣跨敤宸ヨ', title: '浣跨敤宸ヨ', width: 150, filter: true });
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({
@@ -1181,6 +1181,8 @@
columns.push({ field: 'HEmpID', title: 'HEmpID', hide: true });
columns.push({ field: '鎷嗗崟姹囨姤鏁伴噺', title: '鎷嗗崟姹囨姤鏁伴噺', width: 150, edit: 'text', sort: true });
columns.push({ field: '閿�鍞鍗曟暟閲�', title: '閿�鍞鍗曟暟閲�', width: 150, sort: true, filter: true });//0
+ columns.push({ field: '鏃ヨ鍒掓暟閲忔�婚噺', title: '鏃ヨ鍒掓暟閲忔�婚噺', width: 150, sort: true, filter: true });//0
+ columns.push({ field: '鎷嗗崟鏁伴噺', title: '鎷嗗崟鏁伴噺', width: 150, edit: 'text', filter: true });
columns.push({ field: '浠婃棩涔嬪墠鏃ヨ鍒掓暟閲�', title: '浠婃棩涔嬪墠鏃ヨ鍒掓暟閲�', width: 150, sort: true, filter: 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]' } });
@@ -1188,6 +1190,7 @@
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 });
+ columns.push({ field: '鎵�闇�宸ヤ綅鏁�', title: '鎵�闇�宸ヤ綅鏁�', width: 150 });
columns.push({ fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' });
option_columns = columns;
option = {
@@ -2214,7 +2217,7 @@
i = option.data.length - 1;
}
}
- console.log("1.寮�濮嬫帓浜х" + (i + 1) + "琛岃鍗曪細" + option.data[i].鐢熶骇璁㈠崟鍙� + "锛屽綋鍓嶆帓浜ф棩鏈燂細" + HPCDate + ",鏈�鏃╁紑宸ユ棩鏈�:" + option.data[i].鏈�鏃╁紑宸ユ棩鏈�);
+ //console.log("1.寮�濮嬫帓浜х" + (i + 1) + "琛岃鍗曪細" + option.data[i].鐢熶骇璁㈠崟鍙� + "锛屽綋鍓嶆帓浜ф棩鏈燂細" + HPCDate + ",鏈�鏃╁紑宸ユ棩鏈�:" + option.data[i].鏈�鏃╁紑宸ユ棩鏈�);
//鎺掍骇鏈�鍚庝竴绗旇鍗曪紙鑻ユ湰娆′负鏈�鍚庝竴绗旇鍗曟帓浜э紝浣嗗綋鍓嶆帓浜ф棩鏈熻繕涓嶆弧瓒虫渶鏃╁紑宸ユ棩鏈燂紝鍒欏綋鍓嶆棩鏈熻繘琛岀疮鍔狅紝鐩村埌婊¤冻鏈�鏃╁紑宸ユ棩鏈熶负姝級
if (HArrIndex_PC.length == option.data.length - 1 && HArrIndex.length > 0 && Format(option.data[HArrIndex[0]].鏈�鏃╁紑宸ユ棩鏈�, 'yyyy/MM/dd') > HPCDate) {
for (var k = 0; k < 100; k++) {
@@ -2305,21 +2308,9 @@
sMaterNumber = option.data[i]["鐗╂枡浠ｇ爜"];
sMaterName = option.data[i]["鐗╂枡鍚嶇О"];
sMaterModel = option.data[i]["瑙勬牸鍨嬪彿"];
- sWorkQty = option.data[i]["灏忔椂浜ц兘"];
sYX = option.data[i]["浼樺厛绾�"];
HReportQty = option.data[i]["鎷嗗崟姹囨姤鏁伴噺"];
-
- if (SDSum > 0) {
- sPlanQty = sPlanQty - SDSum - HReportQty;
- }
- //鍓╀綑闇�姹傚伐鏃�
- iLeftQty = sPlanQty - HReportQty;
- if (sWorkQty <= 0) {
- sLeftProdTimes = 0;
- }
- else {
- sLeftProdTimes = iLeftQty / sWorkQty;
- }
+
//鑻ユ湰浠诲姟鍗曞凡鏈夊畨鎺掕祫婧愶紙涓婃鎺掔▼鎴栬�呮墜宸ユ帓绋嬶級 鍒欎笉鍐嶅鎵捐祫婧愶紝鐩存帴鎺掔▼
if (option.data[i]["HSourceID"] != 0 && option.data[i]["鐢熶骇璧勬簮"] != "") {
//鑾峰彇璇ョ敓浜ц祫婧愮殑鍓╀綑宸ユ椂杩涜鎺掔▼銆�
@@ -2336,6 +2327,9 @@
success: function (data1) {
if (data1.count == 1) {
ds = data1.data
+ if (ds.length > 0) {
+ option.data[i]["浜х嚎鎬讳骇鑳�"] = option.data[i]["灏忔椂浜ц兘"] * ds[0]["浜х嚎浜烘暟"]
+ }
} else {
layer.alert(data1.code + data1.Message, { icon: 5 });
}
@@ -2356,6 +2350,9 @@
success: function (data1) {
if (data1.count == 1) {
ds = data1.data
+ if (ds.length > 0) {
+ option.data[i]["浜х嚎鎬讳骇鑳�"] = option.data[i]["灏忔椂浜ц兘"] * ds[0]["浜х嚎浜烘暟"]
+ }
} else {
layer.alert(data1.code + data1.Message, { icon: 5 });
}
@@ -2364,6 +2361,22 @@
}
});
}
+
+ //鑾峰彇灏忔椂浜ц兘
+ sWorkQty = option.data[i]["浜х嚎鎬讳骇鑳�"];
+ //鑾峰彇鏇存柊璁″垝鏁伴噺
+ if (SDSum > 0) {
+ sPlanQty = sPlanQty - SDSum - HReportQty;
+ }
+ //鍓╀綑闇�姹傚伐鏃�
+ iLeftQty = sPlanQty - HReportQty;
+ if (sWorkQty <= 0) {
+ sLeftProdTimes = 0;
+ }
+ else {
+ sLeftProdTimes = iLeftQty / sWorkQty;
+ }
+
if (ds == null || ds.length == 0) //娌℃湁鍙互鎺掔殑璧勬簮
{
get_HFData(1, i);
@@ -2391,7 +2404,7 @@
option.data[i]["鐢熶骇璧勬簮"] = sSourceName;
option.data[i]["鐢熶骇璧勬簮浠ｇ爜"] = sSourceNumber;
- console.log("======" + "绗�" + (i + 1) + "琛岃鍗�:" + option.data[i].鐢熶骇璁㈠崟鍙� + ", 鑷姩鍖归厤" + ds.length + "涓敓浜ц祫婧愶紝鏈�缁堥�夋嫨锛�" + sSourceName);
+ //console.log("======" + "绗�" + (i + 1) + "琛岃鍗�:" + option.data[i].鐢熶骇璁㈠崟鍙� + ", 鑷姩鍖归厤" + ds.length + "涓敓浜ц祫婧愶紝鏈�缁堥�夋嫨锛�" + sSourceName);
var sql = "exec h_p_Sc_ICMOGetWorkSourceTime " + lSourceID;
$.ajax({
@@ -2430,15 +2443,7 @@
get_HFData(1, i);
}
}
- }
- var new_date = new Date();
- var difftime = (new_date - old_date) / 1000; //璁＄畻鏃堕棿宸�,骞舵妸姣杞崲鎴愮
-
- var days = parseInt(difftime / 86400); // 澶� 24*60*60*1000
- var hours = parseInt(difftime / 3600) - 24 * days; // 灏忔椂 60*60 鎬诲皬鏃舵暟-杩囧幓鐨勫皬鏃舵暟=鐜板湪鐨勫皬鏃舵暟
- var minutes = parseInt(difftime % 3600 / 60); // 鍒嗛挓 -(day*24) 浠�60绉掍负涓�鏁翠唤 鍙栦綑 鍓╀笅绉掓暟 绉掓暟/60 灏辨槸鍒嗛挓鏁�
- var seconds = parseInt(difftime % 60); // 浠�60绉掍负涓�鏁翠唤 鍙栦綑 鍓╀笅绉掓暟
- console.log("鏃堕棿宸槸: " + days + "澶�, " + hours + "灏忔椂, " + minutes + "鍒嗛挓, " + seconds + "绉�");
+ }
}
table.render(option);
get_FastQuery(2);
@@ -2474,6 +2479,9 @@
JDTLen = (100 / option.data.length).toFixed(2);
var HJDLen = 0;
var HReportQty = 0;
+ var HProducedTogether = [];
+ var HProducedTogetherIndex = [];
+ var HChildSourceData = []; //瀛愮敓浜ц祫婧�
//濡傛灉閿佸畾璁″垝锛屽垯涓嶉渶瑕佸啀鎺掔▼
//鏌ヨ鏈溅闂存槸鍚︽湁閿佸畾璁″垝鐨勬暟鎹�
@@ -2520,7 +2528,7 @@
});
//鏍规嵁杞﹂棿鍒犻櫎鍣ㄥ叿鍗犵敤鏃堕棿
- var sql2 = "delete from Gy_MouldOccupancyTime where HICMOEntryID not in ( select HICMOEntryID from Sc_WorkBillSortBillMain where HInterID in (select HInterID from Sc_WorkBillSortBillSub))";
+ var sql2 = "delete from Gy_MouldOccupancyTime where HICMOEntryID not in ( select HICMOEntryID from Sc_WorkBillSortBillMain where HInterID in (select HInterID from Sc_WorkBillSortBillSub where HMasterDate>=convert(varchar(10) ,DATEADD(DAY," + HPlanDay + ",GETDATE()),20)))";
$.ajax({
url: GetWEBURL() + '/Gy_SOPBillList/UpDelSQL',
type: "GET",
@@ -2568,8 +2576,7 @@
HCount++;
if (HCount > 50000) {
break;
- }
- var old_date = new Date();
+ }
//element.progress('demo', (i + 1) * HProgress + '%')
//鍒ゆ柇鏁扮粍闀垮害鏄惁鍙戠敓鍙樺寲锛屾槸鍒欓噸缃暟缁勯暱搴�
@@ -2579,7 +2586,7 @@
i = option.data.length - 1;
}
}
- console.log("1.寮�濮嬫帓浜х" + (i + 1) + "琛岃鍗曪細" + option.data[i].鐢熶骇璁㈠崟鍙� + "锛屽綋鍓嶆帓浜ф棩鏈燂細" + HPCDate + ",鏈�鏃╁紑宸ユ棩鏈�:" + option.data[i].鏈�鏃╁紑宸ユ棩鏈�);
+ //console.log("1.寮�濮嬫帓浜х" + (i + 1) + "琛岃鍗曪細" + option.data[i].鐢熶骇璁㈠崟鍙� + "锛屽綋鍓嶆帓浜ф棩鏈燂細" + HPCDate + ",鏈�鏃╁紑宸ユ棩鏈�:" + option.data[i].鏈�鏃╁紑宸ユ棩鏈�);
//鎺掍骇鏈�鍚庝竴绗旇鍗曪紙鑻ユ湰娆′负鏈�鍚庝竴绗旇鍗曟帓浜э紝浣嗗綋鍓嶆帓浜ф棩鏈熻繕涓嶆弧瓒虫渶鏃╁紑宸ユ棩鏈燂紝鍒欏綋鍓嶆棩鏈熻繘琛岀疮鍔狅紝鐩村埌婊¤冻鏈�鏃╁紑宸ユ棩鏈熶负姝級
if (HArrIndex_PC.length == option.data.length - 1 && HArrIndex.length > 0 && Format(option.data[HArrIndex[0]].鏈�鏃╁紑宸ユ棩鏈�, 'yyyy/MM/dd') > HPCDate) {
for (var k = 0; k < 100; k++) {
@@ -2688,6 +2695,7 @@
var HIsContinue = false; //鏄惁鑳藉尮閰嶅埌鍚堥�傜殑浜у搧鍣ㄥ叿娓呭崟锛屽尮閰嶄笉鍒板垯璺宠繃褰撳墠璁㈠崟
+ //#region 宸插尮閰嶄簡璧勬簮锛岀洿鎺ユ帓浜�
//鑻ユ湰浠诲姟鍗曞凡鏈夊畨鎺掕祫婧愶紙涓婃鎺掔▼鎴栬�呮墜宸ユ帓绋嬶級 鍒欎笉鍐嶅鎵捐祫婧愶紝鐩存帴鎺掔▼
if (option.data[i]["HSourceID"] != 0 && option.data[i]["鐢熶骇璧勬簮"] != "") {
//鑾峰彇璇ョ敓浜ц祫婧愮殑鍓╀綑宸ユ椂杩涜鎺掔▼銆�
@@ -2704,13 +2712,16 @@
success: function (data1) {
if (data1.count == 1) {
ds = data1.data
+
//鐪嬫槸鍚﹁兘鍖归厤鍒版弧瓒崇敓浜ф潯浠剁殑浜у搧鍣ㄥ叿娓呭崟
- var HMaterMouldData = get_MouldByMater(lMaterID, lSourceID);
+ var HMaterMouldData = get_MouldByMater(lMaterID, lSourceID, Format(HPCDate, 'yyyy-MM-dd'));
+ console.log("绗�" + (i + 1) + "琛岋紝鐢熶骇璁㈠崟锛�" + option.data[i].鐢熶骇璁㈠崟鍙� + " exec h_p_Gy_MaterialMouldByMater " + lMaterID + "," + lSourceID + ",'" + Format(HPCDate, 'yyyy-MM-dd') + "' 銆傚尮閰嶅櫒鍏锋竻鍗曟暟涓�:" + HMaterMouldData.length);
if (HMaterMouldData.length < 1) {
//娌℃湁鍖归厤鍒板櫒鍏凤紝鐢熶骇涓嶄簡锛屾妸璁㈠崟鎸傚埌寰呮帓浜у垪琛ㄤ腑锛屽厛鍖归厤涓嬩竴浼樺厛绾х殑璁㈠崟
if (HArrIndex.indexOf(i) == -1) {
HArrIndex.push(i);
}
+
HIsPriority = true;
//涓烘弧瓒虫渶鍚庝竴绗斿尮閰嶈鍗曚篃鑳借繘琛屾帓浜э紝鏀瑰彉鎬绘帓浜ц鍗曟暟缁勯暱搴︼紝缁х画寰幆鍖归厤
if (HArrIndex.length > 0 && i == HDataLen - 1) {
@@ -2718,20 +2729,29 @@
}
HIsContinue = true;
} else {
- //鍒ゆ柇鍖归厤鍑虹殑鍣ㄥ叿鏄惁鑳藉湪姝よ祫婧愪笂浣跨敤
- var HSourceMouldData = get_MouldBySource(lSourceID, HMaterMouldData[0].HMouldID);
- if (HSourceMouldData.length < 1) {
- //娌℃湁鍖归厤鍒拌祫婧愬櫒鍏锋竻鍗曪紝鐢熶骇涓嶄簡锛屾妸璁㈠崟鎸傚埌寰呮帓浜у垪琛ㄤ腑锛屽厛鍖归厤涓嬩竴浼樺厛绾х殑璁㈠崟
- if (HArrIndex.indexOf(i) == -1) {
- HArrIndex.push(i);
- }
- HIsPriority = true;
- //涓烘弧瓒虫渶鍚庝竴绗斿尮閰嶈鍗曚篃鑳借繘琛屾帓浜э紝鏀瑰彉鎬绘帓浜ц鍗曟暟缁勯暱搴︼紝缁х画寰幆鍖归厤
- if (HArrIndex.length > 0 && i == HDataLen - 1) {
- HDataLen = HDataLen + 1;
- }
- HIsContinue = true;
- }
+ //var HSourceMouldData = [];
+ ////鍒ゆ柇鍖归厤鍑虹殑鍣ㄥ叿鏄惁鑳藉湪姝よ祫婧愪笂浣跨敤
+ //for (var index = 0; index < HMaterMouldData.length; index++) {
+ // HSourceMouldData = get_MouldBySource(lSourceID, HMaterMouldData[index].HMouldID);
+ // if (HSourceMouldData.length > 0) {
+ // break;
+ // }
+ //}
+
+
+ //if (HSourceMouldData.length < 1) {
+ // //娌℃湁鍖归厤鍒拌祫婧愬櫒鍏锋竻鍗曪紝鐢熶骇涓嶄簡锛屾妸璁㈠崟鎸傚埌寰呮帓浜у垪琛ㄤ腑锛屽厛鍖归厤涓嬩竴浼樺厛绾х殑璁㈠崟
+ // if (HArrIndex.indexOf(i) == -1) {
+ // HArrIndex.push(i);
+ // }
+
+ // HIsPriority = true;
+ // //涓烘弧瓒虫渶鍚庝竴绗斿尮閰嶈鍗曚篃鑳借繘琛屾帓浜э紝鏀瑰彉鎬绘帓浜ц鍗曟暟缁勯暱搴︼紝缁х画寰幆鍖归厤
+ // if (HArrIndex.length > 0 && i == HDataLen - 1) {
+ // HDataLen = HDataLen + 1;
+ // }
+ // HIsContinue = true;
+ //}
option.data[i].HMouldID = HMaterMouldData[0].HMouldID;
option.data[i].HMouldPCTime = HMaterMouldData[0].HPCTime;
}
@@ -2744,6 +2764,8 @@
});
}
+ //#endregion
+ //#region 娌℃湁璧勬簮鍒� 鑷姩鎵惧埌璧勬簮
else //娌℃湁璧勬簮鍒� 鑷姩鎵惧埌璧勬簮
{
//鏌ヨ鐢熶骇璧勬簮鐨勫墿浣欏伐鏃惰繘琛屾帓绋嬨��
@@ -2758,24 +2780,12 @@
ds = data1.data
if (ds.length > 0) {
- //鐪嬫槸鍚﹁兘鍖归厤鍒版弧瓒崇敓浜ф潯浠剁殑浜у搧鍣ㄥ叿娓呭崟
- var HMaterMouldData = get_MouldByMater(lMaterID, ds[0]["HitemID"]);
- if (HMaterMouldData.length < 1) {
- //娌℃湁鍖归厤鍒板櫒鍏凤紝鐢熶骇涓嶄簡锛屾妸璁㈠崟鎸傚埌寰呮帓浜у垪琛ㄤ腑锛屽厛鍖归厤涓嬩竴浼樺厛绾х殑璁㈠崟
- if (HArrIndex.indexOf(i) == -1) {
- HArrIndex.push(i);
- }
- HIsPriority = true;
- //涓烘弧瓒虫渶鍚庝竴绗斿尮閰嶈鍗曚篃鑳借繘琛屾帓浜э紝鏀瑰彉鎬绘帓浜ц鍗曟暟缁勯暱搴︼紝缁х画寰幆鍖归厤
- if (HArrIndex.length > 0 && i == HDataLen - 1) {
- HDataLen = HDataLen + 1;
- }
- HIsContinue = true;
- } else {
- //鍒ゆ柇鍖归厤鍑虹殑鍣ㄥ叿鏄惁鑳藉湪姝よ祫婧愪笂浣跨敤
- var HSourceMouldData = get_MouldBySource(ds[0]["HitemID"], HMaterMouldData[0].HMouldID);
- if (HSourceMouldData.length < 1) {
- //娌℃湁鍖归厤鍒拌祫婧愬櫒鍏锋竻鍗曪紝鐢熶骇涓嶄簡锛屾妸璁㈠崟鎸傚埌寰呮帓浜у垪琛ㄤ腑锛屽厛鍖归厤涓嬩竴浼樺厛绾х殑璁㈠崟
+ //#region 璧勬簮宸ヤ綅鏁扮瓑浜庨渶姹傚伐浣嶆暟
+ if (ds[0].璧勬簮宸ヤ綅鏁� == ds[0].鎵�闇�宸ヤ綅鏁�) {
+ //鐪嬫槸鍚﹁兘鍖归厤鍒版弧瓒崇敓浜ф潯浠剁殑浜у搧鍣ㄥ叿娓呭崟
+ var HMaterMouldData = get_MouldByMater(lMaterID, ds[0]["HitemID"], Format(HPCDate, 'yyyy-MM-dd'));
+ if (HMaterMouldData.length < 1) {
+ //娌℃湁鍖归厤鍒板櫒鍏凤紝鐢熶骇涓嶄簡锛屾妸璁㈠崟鎸傚埌寰呮帓浜у垪琛ㄤ腑锛屽厛鍖归厤涓嬩竴浼樺厛绾х殑璁㈠崟
if (HArrIndex.indexOf(i) == -1) {
HArrIndex.push(i);
}
@@ -2785,17 +2795,112 @@
HDataLen = HDataLen + 1;
}
HIsContinue = true;
+ } else {
+ ////鍒ゆ柇鍖归厤鍑虹殑鍣ㄥ叿鏄惁鑳藉湪姝よ祫婧愪笂浣跨敤
+ //var HSourceMouldData = get_MouldBySource(ds[0]["HitemID"], HMaterMouldData[0].HMouldID);
+ //if (HSourceMouldData.length < 1) {
+ // //娌℃湁鍖归厤鍒拌祫婧愬櫒鍏锋竻鍗曪紝鐢熶骇涓嶄簡锛屾妸璁㈠崟鎸傚埌寰呮帓浜у垪琛ㄤ腑锛屽厛鍖归厤涓嬩竴浼樺厛绾х殑璁㈠崟
+ // if (HArrIndex.indexOf(i) == -1) {
+ // HArrIndex.push(i);
+ // }
+ // HIsPriority = true;
+ // //涓烘弧瓒虫渶鍚庝竴绗斿尮閰嶈鍗曚篃鑳借繘琛屾帓浜э紝鏀瑰彉鎬绘帓浜ц鍗曟暟缁勯暱搴︼紝缁х画寰幆鍖归厤
+ // if (HArrIndex.length > 0 && i == HDataLen - 1) {
+ // HDataLen = HDataLen + 1;
+ // }
+ // HIsContinue = true;
+ //}
+ option.data[i].HMouldID = HMaterMouldData[0].HMouldID;
+ option.data[i].HMouldPCTime = HMaterMouldData[0].HPCTime;
}
}
- }
+ //#endregion
+ //#region 璧勬簮宸ヤ綅鏁板ぇ浜庨渶姹傚伐浣嶆暟
+ else if (ds[0].璧勬簮宸ヤ綅鏁� > ds[0].鎵�闇�宸ヤ綅鏁�) {
+ //鐪嬫槸鍚﹁兘鍖归厤鍒版弧瓒崇敓浜ф潯浠剁殑浜у搧鍣ㄥ叿娓呭崟
+ var HMaterMouldData = get_MouldByMater(lMaterID, ds[0]["HitemID"], Format(HPCDate, 'yyyy-MM-dd'));
+ if (HMaterMouldData.length < 1) {
+ //娌℃湁鍖归厤鍒板櫒鍏凤紝鐢熶骇涓嶄簡锛屾妸璁㈠崟鎸傚埌寰呮帓浜у垪琛ㄤ腑锛屽厛鍖归厤涓嬩竴浼樺厛绾х殑璁㈠崟
+ if (HArrIndex.indexOf(i) == -1) {
+ HArrIndex.push(i);
+ }
+ HIsPriority = true;
+ //涓烘弧瓒虫渶鍚庝竴绗斿尮閰嶈鍗曚篃鑳借繘琛屾帓浜э紝鏀瑰彉鎬绘帓浜ц鍗曟暟缁勯暱搴︼紝缁х画寰幆鍖归厤
+ if (HArrIndex.length > 0 && i == HDataLen - 1) {
+ HDataLen = HDataLen + 1;
+ }
+ HIsContinue = true;
+ } else {
+ option.data[i].HMouldID = HMaterMouldData[0].HMouldID;
+ option.data[i].HMouldPCTime = HMaterMouldData[0].HPCTime;
+ }
+
+ //鍖归厤姝ょ敓浜ц祫婧愪笅鐨勫瓙鐢熶骇璧勬簮
+ HChildSourceData = get_ChildSource(ds[0]["HitemID"]);
+ option.data[i].鐢熶骇璧勬簮 = "";
+ for (var k = 0; k < option.data[i].鎵�闇�宸ヤ綅鏁�; k++) {
+ if (k == 0) {
+ option.data[i].HSourceID = HChildSourceData[k].瀛愯祫婧怚D;
+ }
+ option.data[i].鐢熶骇璧勬簮 += HChildSourceData[k].瀛愯祫婧愬悕绉� + "&";
+ }
+ option.data[i].鐢熶骇璧勬簮 = option.data[i].鐢熶骇璧勬簮.substring(0, option.data[i].鐢熶骇璧勬簮.length - 1)
+
+ //鍒ゆ柇璧勬簮鏄惁鏈夊墿浣欏伐浣�,鎺ョ潃鍖归厤鍏朵粬璁㈠崟鍚屾椂鐢熶骇
+ var HRestCubicleQty = ds[0].璧勬簮宸ヤ綅鏁� - ds[0].鎵�闇�宸ヤ綅鏁�
+ for (var x = i + 1; x < option.data.length; x++) {
+ if (HRestCubicleQty >= option.data[x].鎵�闇�宸ヤ綅鏁� && HArrIndex_PC.indexOf(x) == -1) {
+ console.log("&&&&&绗�" + (i + 1) + "琛屾湁璁㈠崟涓�璧峰弬涓庡尮閰�," + option.data[x].HMaterID)
+ //鍒ゆ柇姝よ鍗曪紙鐗╂枡锛夋槸鍚︿篃鑳芥斁鍦ㄦ鐢熶骇璧勬簮涓婄敓浜�
+ var HMaterSourceData = get_MaterSource(option.data[x].HMaterID);
+
+ for (var y = 0; y < HMaterSourceData.length; y++) {
+ if (ds[0]["HitemID"] == HMaterSourceData[y]["HitemID"]) {
+ //鐪嬫槸鍚﹁兘鍖归厤鍒版弧瓒崇敓浜ф潯浠剁殑浜у搧鍣ㄥ叿娓呭崟
+ var HMaterMouldData_Level2 = get_MouldByMater(option.data[x].HMaterID, ds[0]["HitemID"], Format(HPCDate, 'yyyy-MM-dd'));
+ if (HMaterMouldData_Level2.length >= 1) {
+ option.data[x].HMouldID = HMaterMouldData_Level2[0].HMouldID;
+ option.data[x].HMouldPCTime = HMaterMouldData_Level2[0].HPCTime;
+
+ option.data[x].鐢熶骇璧勬簮 = "";
+ for (var k = HChildSourceData.length - HRestCubicleQty; k < HChildSourceData.length; k++) {
+ if (k == HChildSourceData.length - HRestCubicleQty) {
+ option.data[x].HSourceID = HChildSourceData[k].瀛愯祫婧怚D;
+ }
+
+ option.data[x].鐢熶骇璧勬簮 += HChildSourceData[k].瀛愯祫婧愬悕绉� + "&";
+ }
+ option.data[x].鐢熶骇璧勬簮 = option.data[x].鐢熶骇璧勬簮.substring(0, option.data[x].鐢熶骇璧勬簮.length - 1)
+
+ HProducedTogether.push(HMaterSourceData[y]);
+ HProducedTogetherIndex.push(x);
+ console.log("鐢熶骇璁㈠崟锛�" + option.data[x].鐢熶骇璁㈠崟鍙� + ",鍙互涓庤鍗�" + option.data[i].鐢熶骇璁㈠崟鍙� + "涓�璧疯繘琛岀敓浜�")
+ HArrIndex_PC.push(x);
+ break;
+
+ } else {
+ //娌℃湁鍖归厤鍒颁骇鍝佸櫒鍏锋竻鍗曪紝缁х画鍖归厤涓嬩竴浼樺厛绾ц鍗曞叡鍚岀敓浜�
+
+ continue;
+ }
+ }
+ }
+ }
+ }
+ }
+ //#endregion
+ } else {
+ console.log("绗�" + (i + 1) + "琛岋紝浼樺厛绾�" + option.data[i].浼樺厛绾� + "锛屾病鏈夊尮閰嶅埌鐢熶骇璧勬簮锛�" + sql);
+ }
} else {
- layer.alert(data1.code + data1.Message, { icon: 5 });
+ layer.alert(data1.code + data1.Message, { icon: 5 });
}
}, error: function () {
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
}
+ //#endregion
//鏄惁鑳藉尮閰嶅埌鍚堥�傜殑浜у搧鍣ㄥ叿娓呭崟锛屽尮閰嶄笉鍒板垯璺宠繃褰撳墠璁㈠崟
if (HIsContinue) {
@@ -2825,13 +2930,13 @@
lSourceID = ds[j]["HitemID"];
sSourceName = ds[j]["璧勬簮鍚嶇О"];
sSourceNumber = ds[j]["璧勬簮浠ｇ爜"];
- option.data[i]["HSourceID"] = lSourceID;
- option.data[i]["鐢熶骇璧勬簮"] = sSourceName;
+ option.data[i]["HSourceID"] = option.data[i]["HSourceID"] == null ? lSourceID : option.data[i]["HSourceID"];
+ option.data[i]["鐢熶骇璧勬簮"] = option.data[i]["鐢熶骇璧勬簮"] == null ? sSourceName : option.data[i]["鐢熶骇璧勬簮"];
option.data[i]["鐢熶骇璧勬簮浠ｇ爜"] = sSourceNumber;
- console.log("======" + "绗�" + (i + 1) + "琛岃鍗�:" + option.data[i].鐢熶骇璁㈠崟鍙� + ", 鑷姩鍖归厤" + ds.length + "涓敓浜ц祫婧愶紝鏈�缁堥�夋嫨锛�" + sSourceName);
+ //console.log("======" + "绗�" + (i + 1) + "琛岃鍗�:" + option.data[i].鐢熶骇璁㈠崟鍙� + ", 鑷姩鍖归厤" + ds.length + "涓敓浜ц祫婧愶紝鏈�缁堥�夋嫨锛�" + sSourceName);
- var sql = "exec h_p_Sc_ICMOGetWorkSourceTime " + lSourceID;
+ var sql = "exec h_p_Sc_ICMOGetWorkSourceTime_TK_HJPC " + option.data[i]["HSourceID"] + "," + option.data[i].HMouldID;
$.ajax({
url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
type: "GET",
@@ -2858,7 +2963,14 @@
//灏嗘暟鎹帓鍒扮綉鏍间腑
SetInfoToGrid(option, dsSub, null, (iRow - 1), iLeftQty, sWorkQty, false, HPlanDay);
- set_AddNew_HJPC(option.data[i]);
+ for (var z = 0; z < option.data[i].鎵�闇�宸ヤ綅鏁�; z++) {
+ if (z == 0) {
+ set_AddNew_HJPC(option.data[i]);
+ } else {
+ //option.data[i].HSourceID = HChildSourceData[z].瀛愯祫婧怚D;
+ //set_AddNew_HJPC(option.data[i]);
+ }
+ }
}
bFind = true;
@@ -2869,14 +2981,84 @@
}
}
}
- var new_date = new Date();
- var difftime = (new_date - old_date) / 1000; //璁＄畻鏃堕棿宸�,骞舵妸姣杞崲鎴愮
+ //鍏卞悓鐢熶骇璁㈠崟鎺掍骇
+ if (HProducedTogether.length > 0) {
+ //寮�濮嬫帓鍗�
+ bFind = false;
+ //瓒呬氦璐ф湡 浠嶇劧鎺掔▼
+ for (var j = 0; j < HProducedTogether.length; j++) {
+ $("tr[data-index='" + HProducedTogetherIndex[j] + "']").attr({ "style": "background:White;color:black;" });
- var days = parseInt(difftime / 86400); // 澶� 24*60*60*1000
- var hours = parseInt(difftime / 3600) - 24 * days; // 灏忔椂 60*60 鎬诲皬鏃舵暟-杩囧幓鐨勫皬鏃舵暟=鐜板湪鐨勫皬鏃舵暟
- var minutes = parseInt(difftime % 3600 / 60); // 鍒嗛挓 -(day*24) 浠�60绉掍负涓�鏁翠唤 鍙栦綑 鍓╀笅绉掓暟 绉掓暟/60 灏辨槸鍒嗛挓鏁�
- var seconds = parseInt(difftime % 60); // 浠�60绉掍负涓�鏁翠唤 鍙栦綑 鍓╀笅绉掓暟
- console.log("鏃堕棿宸槸: " + days + "澶�, " + hours + "灏忔椂, " + minutes + "鍒嗛挓, " + seconds + "绉�");
+ sPlanQty = option.data[HProducedTogetherIndex[j]]["鎷嗗崟鏁伴噺"];
+ HReportQty = option.data[HProducedTogetherIndex[j]]["鎷嗗崟姹囨姤鏁伴噺"];
+ sWorkQty = option.data[HProducedTogetherIndex[j]]["灏忔椂浜ц兘"];
+ if (SDSum > 0) {
+ sPlanQty = sPlanQty - SDSum - HReportQty;
+ }
+ //鍓╀綑闇�姹傚伐鏃�
+ iLeftQty = sPlanQty - HReportQty;
+ if (sWorkQty <= 0) {
+ sLeftProdTimes = 0;
+ }
+ else {
+ sLeftProdTimes = iLeftQty / sWorkQty;
+ }
+
+ //鍒ゆ柇璧勬簮鍓╀綑宸ユ椂锛屾槸鍚﹀ぇ浜� 鐢熶骇鍛ㄦ湡
+ if (parseFloat(HProducedTogether[j]["鍓╀綑宸ユ椂"]) >= sLeftProdTimes) {
+ if (iLeftQty > 0) // 鐢熶骇璁㈠崟鍓╀綑鏁伴噺
+ {
+ //鍦ㄦ湰璧勬簮涓婄敓浜�
+ //鑾峰彇璇ョ敓浜ц祫婧愮殑鍓╀綑宸ユ椂杩涜鎺掔▼銆�
+ lSourceID = HProducedTogether[j]["HitemID"];
+ sSourceName = HProducedTogether[j]["璧勬簮鍚嶇О"];
+ sSourceNumber = HProducedTogether[j]["璧勬簮浠ｇ爜"];
+ option.data[HProducedTogetherIndex[j]]["HSourceID"] = option.data[HProducedTogetherIndex[j]]["HSourceID"] == null ? lSourceID : option.data[HProducedTogetherIndex[j]]["HSourceID"]
+ option.data[HProducedTogetherIndex[j]]["鐢熶骇璧勬簮"] = option.data[HProducedTogetherIndex[j]]["鐢熶骇璧勬簮"] == null ? sSourceName : option.data[HProducedTogetherIndex[j]]["鐢熶骇璧勬簮"];
+
+ option.data[HProducedTogetherIndex[j]]["鐢熶骇璧勬簮浠ｇ爜"] = sSourceNumber;
+
+ //console.log("======" + "绗�" + (i + 1) + "琛岃鍗�:" + option.data[i].鐢熶骇璁㈠崟鍙� + ", 鑷姩鍖归厤" + ds.length + "涓敓浜ц祫婧愶紝鏈�缁堥�夋嫨锛�" + sSourceName);
+
+ var sql = "exec h_p_Sc_ICMOGetWorkSourceTime_TK_HJPC " + option.data[HProducedTogetherIndex[j]]["HSourceID"] + "," + option.data[HProducedTogetherIndex[j]].HMouldID;
+ $.ajax({
+ url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sql },
+ success: function (data1) {
+ if (data1.count == 1) {
+ dsSub = data1.data
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ if (dsSub == null || dsSub.length == 0) {
+ get_HFData(1, HProducedTogetherIndex[j]);
+ continue;//濡傛灉娌℃湁鍓╀綑鍒� 鎵ц涓嬩竴涓敓浜ц鍗�
+ }
+ if (dsSub != null)//涓嶅姞鐝帓绋�
+ {
+ iRow = HProducedTogetherIndex[j] + 1;
+ //灏嗘暟鎹帓鍒扮綉鏍间腑
+ SetInfoToGrid(option, dsSub, null, (iRow - 1), iLeftQty, sWorkQty, false, HPlanDay);
+
+ set_AddNew_HJPC(option.data[HProducedTogetherIndex[j]]);
+ }
+ bFind = true;
+
+ break;
+ }
+ } else {
+ get_HFData(1, HProducedTogetherIndex[j]);
+ }
+ }
+ HProducedTogether = [];
+ }
}
table.render(option);
get_FastQuery(2);
@@ -3150,13 +3332,13 @@
}
//鐗╂枡鍖归厤浜у搧鍣ㄥ叿娓呭崟
- function get_MouldByMater(HMaterID, HSourceID) {
+ function get_MouldByMater(HMaterID, HSourceID, HPCDate) {
var HReturnData = [];
$.ajax({
url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/GetMouldByMater',
type: "GET",
async: false,
- data: { "HMaterID": HMaterID, "HSourceID": HSourceID },
+ data: { "HMaterID": HMaterID, "HSourceID": HSourceID, "HPCDate": HPCDate},
success: function (data1) {
if (data1.count == 1) {
HReturnData = data1.data;
@@ -3164,7 +3346,7 @@
console.log(new Date() + ",鍖归厤浜у搧鍣ㄥ叿娓呭崟鍑洪敊1");
}
}, error: function () {
- console.log(new Date() + ",鍖归厤浜у搧鍣ㄥ叿娓呭崟鍑洪敊1");
+ console.log(new Date() + ",鍖归厤浜у搧鍣ㄥ叿娓呭崟鍑洪敊2");
}
});
return HReturnData;
@@ -3182,13 +3364,55 @@
if (data1.count == 1) {
HReturnData = data1.data;
} else {
- console.log(new Date() + ",鍖归厤浜у搧鍣ㄥ叿娓呭崟鍑洪敊1");
+ console.log(new Date() + ",鍖归厤浜у搧鍣ㄥ叿娓呭崟鍑洪敊2");
}
}, error: function () {
console.log(new Date() + ",鍖归厤浜у搧鍣ㄥ叿娓呭崟鍑洪敊1");
}
});
return HReturnData;
+ }
+
+ //鍒ゆ柇澶氫釜璁㈠崟鏄惁鑳戒竴璧锋斁鍒板悓涓�涓敓浜ц祫婧愯繘琛岀敓浜�
+ function get_MaterSource(HMaterID) {
+ var HMaterSourceData = [];
+ $.ajax({
+ url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/GetSourceByMater',
+ type: "GET",
+ async: false,
+ data: { "HMaterID": HMaterID },
+ success: function (data1) {
+ if (data1.count == 1) {
+ HMaterSourceData = data1.data;
+ } else {
+ console.log(new Date() + ",鍖归厤鐗╂枡璧勬簮鍑洪敊1");
+ }
+ }, error: function () {
+ console.log(new Date() + ",鍖归厤鐗╂枡璧勬簮鍑洪敊2");
+ }
+ });
+ return HMaterSourceData;
+ }
+
+ //閫氳繃涓荤敓浜ц祫婧愬尮閰嶅嚭瀛愮敓浜ц祫婧�
+ function get_ChildSource(HSourceID) {
+ var HChildSource = [];
+ $.ajax({
+ url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/GetChildSource',
+ type: "GET",
+ async: false,
+ data: { "HSourceID": HSourceID },
+ success: function (data1) {
+ if (data1.count == 1) {
+ HChildSource = data1.data;
+ } else {
+ console.log(new Date() + ",鑾峰彇瀛愮敓浜ц祫婧�2");
+ }
+ }, error: function () {
+ console.log(new Date() + ",鑾峰彇瀛愮敓浜ц祫婧�1");
+ }
+ });
+ return HChildSource;
}
//鏌ヨ鐢熶骇璁㈠崟
@@ -3665,12 +3889,11 @@
dataType: "json",
success: function (data) {
if (data.count == 1) {
-
$.ajax({
url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/AddMouldOccupancyTime',
type: "GET",
async: false,
- data: { "HMouldID": num.HMouldID, "HSourceID": num.HSourceID, "HICMOInterID": num.HICMOInterID, "HICMOEntryID": num.HICMOEntryID, "HMouldPCTime": num.HMouldPCTime },
+ data: { "HMouldID": num.HMouldID, "HSourceID": num.HSourceID, "HICMOInterID": num.HICMOInterID, "HICMOEntryID": num.HICMOEntryID, "HICMOBillNo": num.鐢熶骇璁㈠崟鍙�, "HMouldPCTime": num.HMouldPCTime },
success: function (data1) {
if (data1.count == 1) {
@@ -4191,7 +4414,17 @@
item.瑙勬牸鍨嬪彿 = item.瑙勬牸鍨嬪彿.replace(/[,]+/g, '锛�'); // 灏嗘崲鍒嗗彿鏇挎崲涓虹┖瀛楃涓�
}
});
+
+ for (let i = 19; i < option.cols[0].length - 42; i++)
+ {
+ option.cols[0][i].title = Format(option.cols[0][i].title, 'MM-dd').toString();
+ }
+
table.exportFile(ins.config.id, data, "xls");
+
+ for (let i = 19; i < option.cols[0].length - 42; i++) {
+ option.cols[0][i].title = Format(option.cols[0][i].title, 'MM.dd');
+ }
}
//鎺掍骇鍔熻兘
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
index 8d343d3..5e8d71a 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
@@ -589,7 +589,7 @@
, "HQCSchemeID_Proc": 0, "HQCSchemeNumber_Proc": "", "HQCSchemeName_Proc": ""
, "HQCSchemeID_Patrol": 0, "HQCSchemeNumber_Patrol": "", "HQCSchemeName_Patrol": ""
, "HQCFst": false, "HQCProc": false, "HQCPatrol": false, "HMaterToSourceCtrl": false
- ,"HSubStdEmpAvg_S": 0
+ , "HSubStdEmpAvg_S": 0, "鏍囧噯宸ヤ环": 0
}];
var HModName = "Gy_RoutingBill";
//#endregion
@@ -617,8 +617,9 @@
, { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績' }//f7
, { field: 'HTechnologyParameter', title: '宸ヨ壓鍙傛暟', edit: 'text' }
, { field: 'HProcPrice', title: '宸ヤ环', edit: 'text' }
+ , { field: '鏍囧噯宸ヤ环', title: '鏍囧噯宸ヤ环' }
, { field: 'HRemark', title: '澶囨敞', edit: 'text' }
- , { field: 'HSupID', title: '渚涘簲鍟咺D', hide: true }
+ , { field: 'HSupID', title: '渚涘簲鍟咺D', hide: true }
, { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', edit: 'text', width: 110, event: "CheckHSupID" }
, { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }//f7
, { field: 'HSupFlag', title: '澶栧崗鏍囪', templet: "#HSupFlag" }//checkbox
@@ -1209,7 +1210,7 @@
, "HQCSchemeID_Proc": 0, "HQCSchemeNumber_Proc": "", "HQCSchemeName_Proc": ""
, "HQCSchemeID_Patrol": 0, "HQCSchemeNumber_Patrol": "", "HQCSchemeName_Patrol": ""
, "HQCFst": false, "HQCProc": false, "HQCPatrol": false, "HMaterToSourceCtrl": false
- , "HSubStdEmpAvg_S": 0
+ , "HSubStdEmpAvg_S": 0, "鏍囧噯宸ヤ环": 0
};
switch (obj.event) {
case 'btn-AddLine':
@@ -1396,6 +1397,13 @@
HWorkQty: Number((value * data.HSubStdEmpQty_S).toFixed(2))
});
//table.render(option)
+ }
+ break;
+ case 'HProcPrice': //宸ヤ环
+ if (data.HProcPrice != 0) {
+ obj.update({
+ HWorkQty: (data.鏍囧噯宸ヤ环 / value).toFixed(2)
+ });
}
break;
}
@@ -2224,6 +2232,8 @@
option.data[i]["宸ヤ綔涓績浠ｇ爜"] = WorkCente[j]["宸ヤ綔涓績浠ｇ爜"];
option.data[i]["HProcID_S"] = checkStatus.data[j]["HProcMulID"];
option.data[i]["宸ユ"] = checkStatus.data[j]["宸ユ鍚嶇О"];
+ option.data[i]["鏍囧噯宸ヤ环"] = checkStatus.data[j]["鏍囧噯宸ヤ环"];
+
j++;
}
@@ -2246,7 +2256,7 @@
, "HQCSchemeID_Proc": 0, "HQCSchemeNumber_Proc": "", "HQCSchemeName_Proc": ""
, "HQCSchemeID_Patrol": 0, "HQCSchemeNumber_Patrol": "", "HQCSchemeName_Patrol": ""
, "HQCFst": false, "HQCProc": false, "HQCPatrol": false, "HMaterToSourceCtrl": false
- , "HSubStdEmpAvg_S": 0
+ , "HSubStdEmpAvg_S": 0, "鏍囧噯宸ヤ环": 0
})
j++;
}
@@ -2262,6 +2272,8 @@
option.data[i]["宸ヤ綔涓績浠ｇ爜"] = WorkCente[j]["宸ヤ綔涓績浠ｇ爜"];
option.data[i]["HProcID_S"] = checkStatus.data[j]["HProcMulID"];
option.data[i]["宸ユ"] = checkStatus.data[j]["宸ユ鍚嶇О"];
+ option.data[i]["鏍囧噯宸ヤ环"] = checkStatus.data[j]["鏍囧噯宸ヤ环"];
+ option.data[i]["HWorkQty"] = option.data[i]["HProcPrice"] != 0 ? (checkStatus.data[j]["鏍囧噯宸ヤ环"] / option.data[i]["HProcPrice"]).toFixed(2) : option.data[i]["HWorkQty"];
j++;
}
}
@@ -2294,6 +2306,8 @@
, "宸ヤ綔涓績浠ｇ爜": OptionData[0].宸ヤ綔涓績浠ｇ爜
, "HProcID_S": OptionData[0].HProcMulID
, "宸ユ": OptionData[0].宸ユ鍚嶇О
+ , "鏍囧噯宸ヤ环": OptionData[0].鏍囧噯宸ヤ环
+ , "HWorkQty": obj.data.HProcPrice != 0 ? (OptionData[0].鏍囧噯宸ヤ环 / obj.data.HProcPrice).toFixed(2) : obj.data.HWorkQty
})
OptionData = [];
}
@@ -2713,7 +2727,7 @@
, "HQCSchemeID_Proc": 0, "HQCSchemeNumber_Proc": "", "HQCSchemeName_Proc": ""
, "HQCSchemeID_Patrol": 0, "HQCSchemeNumber_Patrol": "", "HQCSchemeName_Patrol": ""
, "HQCFst": false, "HQCProc": false, "HQCPatrol": false, "HMaterToSourceCtrl": false
- , "HSubStdEmpAvg_S": 0
+ , "HSubStdEmpAvg_S": 0, "鏍囧噯宸ヤ环": 0
})
j++;
}
@@ -2833,7 +2847,7 @@
, "HQCSchemeID_Proc": d.data[i].HQCSchemeID_Proc, "HQCSchemeNumber_Proc": d.data[i].杞簭妫�楠屾柟妗堜唬鐮�, "HQCSchemeName_Proc": d.data[i].杞簭妫�楠屾柟妗�
, "HQCSchemeID_Patrol": d.data[i].HQCSchemeID_Patrol, "HQCSchemeNumber_Patrol": d.data[i].宸℃妫�楠屾柟妗堜唬鐮�, "HQCSchemeName_Patrol": d.data[i].宸℃妫�楠屾柟妗�
, "HQCFst": d.data[i].HQCFst == 1 ? true : false, "HQCProc": d.data[i].HQCProc == 1 ? true : false, "HQCPatrol": d.data[i].HQCPatrol == 1 ? true : false, "HMaterToSourceCtrl": d.data[i].HMaterToSourceCtrl == 1 ? true : false
- , "HSubStdEmpAvg_S": d.data[i].浜哄潎浜ц兘
+ , "HSubStdEmpAvg_S": d.data[i].浜哄潎浜ц兘, "鏍囧噯宸ヤ环": d.data[i].鏍囧噯宸ヤ环
}
)
}
--
Gitblit v1.9.1