From 8a36bbee40f5e1069b15a98b1e64ac9719ee8a46 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 23 四月 2024 17:17:13 +0800
Subject: [PATCH] 1.销售出库单 增加 反写源单 销售订单和发货通知单 超出 关联数量 关闭源单 2.应收单 增加 反写源单 销售出库单 和 销售订单 超出关联数量 关闭源单 3.动态获取源单增加参数 Num 0蓝单 1红单 2全部 4.销售流程的测试并完善功能； 销售订单-》发货通知单-》销售出库单-》应收单 （注意： 源单类型的下拉框 需要 根据数据库 表动态加载， 关联数量 要准确 ， 审核 且 未关闭 未行关闭的行 才能下推 ，关联数量超额后，要 反写 关闭 源单 ）
---
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html | 214 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 142 insertions(+), 72 deletions(-)
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.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.html"
index 215c28c..bec6514 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.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.html"
@@ -242,6 +242,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Routing"><i class="layui-icon layui-icon-form"></i>宸ヨ壓璺嚎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Calendar"><i class="layui-icon layui-icon-form"></i>宸ュ巶鏃ュ巻</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
</div>
</script>
<script type="text/html" id="toolbarDemo2">
@@ -280,7 +281,7 @@
, excel = layui.excel
, soulTable = layui.soulTable
, element = layui.element;
-
+ var ins;
var sWhere = "";
var sWhere_ICMO = "";
var option = [];
@@ -503,6 +504,11 @@
case 'set_Calendar':
set_Calendar();
break;
+ break;
+ //瀵煎嚭excel
+ case 'get_export':
+ get_Export();
+ break;
}
});
@@ -543,7 +549,7 @@
if (table.cache["mainTable"][i] != "") {
if (parseFloat(table.cache["mainTable"][i]["浼樺厛绾�"]) == 0) {
HYxjQty++
- }
+ }
}
}
if (HYxjQty > 0) {
@@ -748,11 +754,11 @@
columns.push({ field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿', width: 150, sort: true });
columns.push({ field: '鐢熶骇璁㈠崟鍙�', title: '鐢熶骇璁㈠崟鍙�', width: 150, style: 'background-color: #f9f9f9;', sort: true });
columns.push({ field: '鐢熶骇璁㈠崟鏄庣粏琛屽彿', title: '鐢熶骇璁㈠崟鏄庣粏琛屽彿', width: 150, sort: true });
- columns.push({ field: '鐢熶骇缁勭粐', title: '鐢熶骇缁勭粐', width: 150, sort: true });
- columns.push({ field: 'HMaterID', title: 'HMaterID', hide: true });
+ columns.push({ field: '鐢熶骇缁勭粐', title: '鐢熶骇缁勭粐', width: 150, sort: true });
columns.push({ field: '鐗╂枡浠ｇ爜', title: '鐗╂枡缂栫爜', width: 150, sort: true });
columns.push({ field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, sort: true });
columns.push({ field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 150, sort: true });
+ columns.push({ field: '灏忔椂浜ц兘', title: '灏忔椂浜ц兘', width: 150, sort: true, edit: 'text' });
columns.push({ field: '閿�鍞鍗曟暟閲�', title: '閿�鍞鍗曟暟閲�', width: 150, sort: true });//0
columns.push({ field: '璁″垝鏁伴噺', title: '鐢熶骇璁㈠崟鏁伴噺', width: 150, sort: true });//0
columns.push({ field: '鏃ヨ鍒掓暟閲忔�婚噺', title: '鏃ヨ鍒掓暟閲忔�婚噺', width: 150, sort: true });//0
@@ -899,8 +905,7 @@
columns.push({ field: '璁㈠崟绛夌骇', title: '璁㈠崟绛夌骇', width: 150, sort: true });
columns.push({ field: '璁㈠崟浜よ揣鏈�', title: '璁㈠崟浜よ揣鏈�', width: 150, templet: "<div>{{d.璁㈠崟浜よ揣鏈� =='1900-01-01' ?'':layui.util.toDateString(d.璁㈠崟浜よ揣鏈�, 'yyyy-MM-dd')}}</div>", sort: true });
columns.push({ field: '璁㈠崟闇�姹傛暟閲�', title: '璁㈠崟闇�姹傛暟閲�', width: 150, sort: true });
- columns.push({ field: '寮�宸ヤ綑閲�', title: '寮�宸ヤ綑閲�', width: 150, sort: true });
- columns.push({ field: '灏忔椂浜ц兘', title: '灏忔椂浜ц兘', width: 150, sort: true, edit: 'text' });
+ columns.push({ field: '寮�宸ヤ綑閲�', title: '寮�宸ヤ綑閲�', width: 150, sort: true });
columns.push({ field: '鐢熶骇鍛ㄦ湡', title: '鐢熶骇鍛ㄦ湡', width: 150, sort: true });
columns.push({ field: '鏈�杩熷紑宸ユ棩鏈�', title: '鏈�杩熷紑宸ユ棩鏈�', width: 150, templet: "<div>{{d.鏈�杩熷紑宸ユ棩鏈� =='' ?'':layui.util.toDateString(d.鏈�杩熷紑宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>", sort: true });
columns.push({ field: '鏈�杩熷畬宸ユ棩鏈�', title: '鏈�杩熷畬宸ユ棩鏈�', width: 150, templet: "<div>{{d.鏈�杩熷畬宸ユ棩鏈� =='' ?'':layui.util.toDateString(d.鏈�杩熷畬宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>", sort: true });
@@ -917,7 +922,7 @@
columns.push({ field: 'HGroupName', title: 'HGroupName', width: 150, hide:true });
columns.push({ field: '鐢熶骇璧勬簮浠ｇ爜', title: '鐢熶骇璧勬簮浠ｇ爜', width: 150, hide: true });
columns.push({ field: 'HSourceID', title: 'HSourceID', hide: true });
-
+ columns.push({ field: 'HMaterID', title: 'HMaterID', hide: true });
columns.push({ field: 'HWorkShopID', title: 'HWorkShopID', hide: true });
columns.push({ field: 'HUnitID', title: 'HUnitID', hide: true });
columns.push({ field: 'HProdORGID', title: 'HProdORGID', hide: true });
@@ -964,7 +969,7 @@
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
- table.render(option);
+ ins = table.render(option);
var HinterID_S = [];
for (var i = 0; i < data1.data.length; i++) {
HinterID_S.push(data1.data[i]["hmainid"]);
@@ -1158,7 +1163,7 @@
, area: ['90%', '90%']//澶у皬
, title: '鐗╂枡鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1168,9 +1173,9 @@
}
//鑾峰彇鏁版嵁
$("#HMaterID").val(checkStatus.data[0].HItemID);
- $("#HMaterNumber").val(checkStatus.data[0].HNumber);
- $("#HMaterName").val(checkStatus.data[0].HName);
- $("#HMaterModel").val(checkStatus.data[0].HModel);
+ $("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠ｇ爜);
+ $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
+ $("#HMaterModel").val(checkStatus.data[0].瑙勬牸鍨嬪彿);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
@@ -1484,9 +1489,10 @@
}
if (isNaN(data[i]["HSourceID"])) {
return layer.msg("閫夋嫨鐢熶骇璧勬簮!!")
- }
+ }
HICOMNum.push(data[i]["HICMOInterID"] + ";" + data[i]["HICMOEntryID"] + ";" + data[i]["HSourceID"]);
}
+
$('#HProgressBar').html(`
<div class="layui-progress" lay-filter="demo-filter-progress">
<div class="layui-progress-bar" lay-percent="40%"></div>
@@ -1548,6 +1554,13 @@
table.render(option);
+ data = table.cache["mainTable"];
+ for (var i = 0; i < data.length; i++) {
+ if (parseFloat(data[i]["灏忔椂浜ц兘"]) == 0 || parseFloat(data[i]["灏忔椂浜ц兘"]) == null || parseFloat(data[i]["灏忔椂浜ц兘"]) == undefined) {
+ return layer.alert("绗�" + (i + 1) + '琛岋紝灏忔椂浜ц兘鏈缃紝璇锋牳瀵规暟鎹��' + '</br>' + '1.鐗╂枡鏈坊鍔犲伐鑹鸿矾绾�' + '</br>' + '2.宸ヨ壓璺嚎涓湭璁剧疆灏忔椂浜ц兘' + '</br>' + '3.鐢熶骇璧勬簮鏈缃崟鐝伐鏃�' + '</br>' + '4.鐢熶骇璧勬簮涓粦瀹氬伐浣滀腑蹇冧笌宸ヨ壓璺嚎涓缃殑宸ヤ綔涓績涓嶄竴鑷�');
+ }
+ }
+
} else {
//layer.close(ajaxLoad);
layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -1574,7 +1587,7 @@
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
if (data.data.length == 0) {
- return layer.msg("褰撳墠鐗╂枡娌℃湁宸ヨ壓璺嚎!");
+ return layer.msg("褰撳墠鐗╂枡娌℃湁宸ヨ壓璺嚎!璇锋煡鐪嬬墿鏂欐墍瀵瑰簲鐨勫伐浣滀腑蹇冩槸鍚︽纭�!");
} else {
var HInterID = data.data[0]["HInterID"];
@@ -2209,6 +2222,27 @@
}
option.data = dataPush;
table.render(option);
+
+ //鑾峰彇涓婃柟鎺掍骇鍒楄〃鏁版嵁,鐢ㄤ簬瀵规瘮涓嬫柟鐢熶骇璁㈠崟鍒楄〃锛屽皢涓嬫柟鐢熶骇璁㈠崟鍒楄〃鐩稿悓鐨勬暟鎹笉鏄剧ず
+ var compareList = [];
+ for (var i = 0; i < option.data.length; i++) {
+ var temp = option.data[i]["婧愬崟涓诲唴鐮�"] + "|" + option.data[i]["婧愬崟瀛愬唴鐮�"];
+ compareList.push(temp);
+ }
+
+ //鍓旈櫎涓婃柟鎺掍骇鍒楄〃涓凡缁忓姞鍏ョ殑鐢熶骇璁㈠崟
+ var tables = [];
+ for (var i = 0; i < option2.data.length; i++) {
+ var temp = option2.data[i]["hmainid"] + "|" + option2.data[i]["HEntryID"];
+ if ($.inArray(temp, compareList) == -1) {
+ tables.push(option2.data[i]);
+ }
+ }
+ option2.data = tables;
+
+ //閲嶆柊娓叉煋瀛愯〃2
+ table.render(option2);
+
layer.close(ajaxLoad);
} else {
layer.close(ajaxLoad);
@@ -2428,7 +2462,7 @@
if (checkStatus.data.length != 1) {
return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
}
- OptionData = checkStatus.data[0];
+ OptionData[0] = checkStatus.data[0];
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
@@ -2439,8 +2473,8 @@
break;
}
if (option.data[i]["LAY_CHECKED"] == true) {
- option.data[i]["HSourceID"] = OptionData.HItemID;
- option.data[i]["鐢熶骇璧勬簮"] = OptionData.鐢熶骇璧勬簮鍚嶇О;
+ option.data[i]["HSourceID"] = OptionData[0].HItemID;
+ option.data[i]["鐢熶骇璧勬簮"] = OptionData[0].鐢熶骇璧勬簮鍚嶇О;
num += 1;
}
}
@@ -2566,7 +2600,7 @@
if (checkStatus.data.length != 1) {
return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
}
- OptionData = checkStatus.data[0];
+ OptionData[0] = checkStatus.data[0];
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
"HSourceID": checkStatus.data[0].HItemID
@@ -2575,17 +2609,60 @@
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
- obj.update({
- "HSourceID": OptionData.HItemID
- , "鐢熶骇璧勬簮": OptionData.鐢熶骇璧勬簮鍚嶇О
- })
+ if (OptionData.length > 0) {
+ obj.update({
+ "HSourceID": OptionData[0].HItemID
+ , "鐢熶骇璧勬簮": OptionData[0].鐢熶骇璧勬簮鍚嶇О
+ })
+ OptionData = [];
+ }
}
})
}
obj.event = "";
return false;
- }
+ } else if (event.key == "F8") {
+ //鐢熶骇璧勬簮
+ if (obj.event == "HSourceID") {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鐢熶骇璧勬簮鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ["../../Baseset/鍩虹璧勬枡/Gy_Source.html?HMaterID=" + obj.data["HMaterID"], "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ OptionData[0] = checkStatus.data[0];
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HSourceID": checkStatus.data[0].HItemID
+ , "鐢熶骇璧勬簮": checkStatus.data[0].HName
+ })
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+ if (OptionData.length > 0) {
+ obj.update({
+ "HSourceID": OptionData[0].HItemID
+ , "鐢熶骇璧勬簮": OptionData[0].HName
+ })
+ OptionData = [];
+ }
+ }
+ })
+ }
+ obj.event = "";
+ }
})
}
@@ -2646,7 +2723,6 @@
}
}
-
//鏌ヨ鏈帓浜х殑鐢熶骇璁㈠崟
function get_Display2(sWhere_ICMO) {
var ajaxLoad = layer.load();
@@ -2697,6 +2773,27 @@
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn_ICMO();
+
+
+ //鑾峰彇涓婃柟鎺掍骇鍒楄〃鏁版嵁,鐢ㄤ簬瀵规瘮涓嬫柟鐢熶骇璁㈠崟鍒楄〃锛屽皢涓嬫柟鐢熶骇璁㈠崟鍒楄〃鐩稿悓鐨勬暟鎹笉鏄剧ず
+ var compareList = [];
+ for (var i = 0; i < option.data.length; i++) {
+ var temp = option.data[i]["婧愬崟涓诲唴鐮�"] + "|" + option.data[i]["婧愬崟瀛愬唴鐮�"];
+ compareList.push(temp);
+ }
+
+ //鍓旈櫎涓婃柟鎺掍骇鍒楄〃涓凡缁忓姞鍏ョ殑鐢熶骇璁㈠崟
+ var tables = [];
+ for (var i = 0; i < option2.data.length; i++) {
+ var temp = option2.data[i]["hmainid"] + "|" + option2.data[i]["HEntryID"];
+ if ($.inArray(temp, compareList) == -1) {
+ tables.push(option2.data[i]);
+ }
+ }
+ option2.data = tables;
+
+ //閲嶆柊娓叉煋瀛愯〃2
+ table.render(option2);
layer.close(ajaxLoad);
//if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
@@ -2806,6 +2903,18 @@
})
}
+ function get_Export() {
+ var data = option.data
+ data.forEach((item) => {
+ // 濡傛灉鏌愪釜瀛楁鐨勫�煎お闀匡紝闇�瑕佸幓闄ゆ崲琛岀
+ if (item.瑙勬牸鍨嬪彿.length > 0) { // 鍋囪瀛楁鍚嶄负field
+ item.瑙勬牸鍨嬪彿 = item.瑙勬牸鍨嬪彿.replace(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ item.瑙勬牸鍨嬪彿 = item.瑙勬牸鍨嬪彿.replace(/[,]+/g, '锛�'); // 灏嗘崲鍒嗗彿鏇挎崲涓虹┖瀛楃涓�
+ }
+ });
+ table.exportFile(ins.config.id, data, "xls");
+ }
+
//鎺掍骇鍔熻兘
function set_Arrangement() {
var checkStatus = table.checkStatus('mainTable_ICMO')
@@ -2826,57 +2935,17 @@
// obj[key] = value;
//}
//鑾峰彇鍕鹃�変笂鐨勫緟鎺掔敓浜ц鍗�
+ //鑾峰彇鏁版嵁
+ var hmainid = [];
+ //var HEntryID = [];
for (var i = 0; i < checkStatus.data.length; i++) {
- var newObj = {
- "HMaterID" : data[i].HMaterID,
- "HProdORGID" : data[i].HPRDORGID,
- "HUnitID" : data[i].HUnitID,
- "HWorkShopID" : data[i].HDeptID,
- "鎷嗗崟鏁伴噺" : data[i].鐢熶骇浠诲姟鍗曟暟閲�,
- "婧愬崟涓诲唴鐮�" : data[i].hmainid,
- "婧愬崟瀛愬唴鐮�" : data[i].HEntryID,
- "鐗╂枡浠ｇ爜" : data[i].浜у搧浠ｇ爜,
- "鐗╂枡鍚嶇О" : data[i].浜у搧鍚嶇О,
- "鐢熶骇缁勭粐": data[i].鐢熶骇缁勭粐,
- "鐢熶骇璁㈠崟鍗曟嵁绫诲瀷" : data[i].鍗曟嵁绫诲瀷,
- "鐢熶骇璁㈠崟鍙�" : data[i].鍗曟嵁鍙�,
- "鐢熶骇璁㈠崟鏄庣粏琛屽彿" : data[i].HEntryID,
- "鐢熶骇杞﹂棿" : data[i].鐢熶骇杞﹂棿,
- "瑙勬牸鍨嬪彿" : data[i].瑙勬牸鍨嬪彿,
- "璁″垝寮�濮嬫棩鏈�" : data[i].璁″垝寮�宸ユ棩鏈�,
- "璁″垝鏁伴噺" : data[i].鐢熶骇浠诲姟鍗曟暟閲�,
- "璁″垝缁撴潫鏃ユ湡" : data[i].璁″垝瀹屽伐鏃ユ湡,
- "璁￠噺鍗曚綅" : data[i].璁￠噺鍗曚綅,
- "璁㈠崟鍙帓鏁伴噺" : data[i].鐢熶骇浠诲姟鍗曟暟閲�,
- "璁㈠崟绛夌骇" : data[i].璁㈠崟绛夌骇,
- "璁㈠崟绫诲瀷" : data[i].鍗曟嵁绫诲瀷,
- "閿�鍞鍗曞彿" : data[i].閿�鍞鍗曞彿,
- "閿�鍞鍗曟暟閲�" : data[i].閿�鍞暟閲�
- }
-
- option.data.push(newObj);
- table.render(option)
- }
-
- //鑾峰彇涓婃柟鎺掍骇鍒楄〃鏁版嵁,鐢ㄤ簬瀵规瘮涓嬫柟鐢熶骇璁㈠崟鍒楄〃锛屽皢涓嬫柟鐢熶骇璁㈠崟鍒楄〃鐩稿悓鐨勬暟鎹笉鏄剧ず
- var compareList = [];
- for (var i = 0; i < option.data.length; i++) {
- var temp = option.data[i]["婧愬崟涓诲唴鐮�"] + "|" + option.data[i]["婧愬崟瀛愬唴鐮�"];
- compareList.push(temp);
- }
-
- //鍓旈櫎涓婃柟鎺掍骇鍒楄〃涓凡缁忓姞鍏ョ殑鐢熶骇璁㈠崟
- var tables = [];
- for (var i = 0; i < option2.data.length; i++) {
- var temp = option2.data[i]["hmainid"] + "|" + option2.data[i]["HEntryID"];
- if ($.inArray(temp, compareList) == -1) {
- tables.push(option2.data[i]);
+ if ($.inArray(checkStatus.data[i]["hmainid"] + '_' + checkStatus.data[i]["HEntryID"], hmainid) == -1) {
+ hmainid.push(checkStatus.data[i]["hmainid"] + '_' + checkStatus.data[i]["HEntryID"]);
}
}
- option2.data = tables;
- //閲嶆柊娓叉煋瀛愯〃2
- table.render(option2);
+ //鏌ヨ鐢熶骇璁㈠崟
+ SelectICMOBill(hmainid);
//var wait = layer.load();
////閫昏緫鏂规硶
@@ -3164,6 +3233,7 @@
//鍙屽嚮杩斿洖鐢熶骇璧勬簮
function GetGySource(data) {
- OptionData = data
+ OptionData[0] = data
}
+
</script>
\ No newline at end of file
--
Gitblit v1.9.1