From f6b711a161021377b17e161d5bbd36d2aa47d1b3 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 02 六月 2022 13:56:15 +0800
Subject: [PATCH] 工序流转卡 功能更新
---
WebTM/views/生产管理/生产日计划工单/JIT_DayPlanBillList.html | 23 +++++++++++
WebTM/views/生产管理/生产日计划工单/JIT_DayPlanBillEdit.html | 14 +++---
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html | 60 +++++++++++++++++++++++++++++-
WebTM/views/index.html | 8 ++++
WebTM/WebTM.csproj | 1
5 files changed, 97 insertions(+), 9 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 2b62edd..e8d2189 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -1350,6 +1350,7 @@
<ItemGroup>
<Folder Include="views\浠撳瓨绠＄悊\璋冩嫧鍗曟牳瀵筡" />
<Folder Include="views\浠撳瓨绠＄悊\璋冩嫧鍗曠ń鏍竆" />
+ <Folder Include="views\鐢熶骇绠＄悊\鏃ヨ鍒掓姤琛╘" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 655b643..a59a836 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -403,6 +403,14 @@
<dd><a lay-href="鐢熶骇绠＄悊/鍗虫椂搴撳瓨/JIT_InventoryList.html" style="margin: 0 0 0 13px;">鍗虫椂搴撳瓨鍒楄〃</a></dd>
</dl>
</dd>
+ <dd>
+ <a>鎶ヨ〃</a>
+ <dl class="layui-nav-child">
+ <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/Gy_WorkWarehouseBillList.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝鎶ヨ〃(閲囪喘璁㈠崟缁村害)</a></dd>
+ <!--<dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/Cg_PODemandPlanConfigBillList.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝淇℃伅鍒楄〃</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/JIT_NeedMaterPlanConfigBillList.html" style="margin: 0 0 0 13px;">瑕佹枡璁″垝淇℃伅鍒楄〃</a></dd>-->
+ </dl>
+ </dd>
</dl>
</dd>
</dl>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillEdit.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillEdit.html"
index 3f766d1..19c0454 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillEdit.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillEdit.html"
@@ -272,8 +272,8 @@
<label class="layui-form-label" style="width: 85px;">鐢熶骇璁㈠崟鍙�</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" lay-verify="HICMOBillNo" name="HICMOBillNo" id="HICMOBillNo">
- <input type="text" class="layui-input" lay-verify="HMainSourceInterID" name="HMainSourceInterID" id="HMainSourceInterID" hidden>
- <input type="text" class="layui-input" lay-verify="HMainSourceEntryID" name="HMainSourceEntryID" id="HMainSourceEntryID" hidden>
+ <input type="text" lay-verify="HMainSourceInterID" name="HMainSourceInterID" id="HMainSourceInterID" hidden />
+ <input type="text" lay-verify="HMainSourceEntryID" name="HMainSourceEntryID" id="HMainSourceEntryID" hidden />
</div>
</div>
<div class="layui-inline">
@@ -574,11 +574,11 @@
set_ClearBill();
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
- if (sessionStorage.login != "login") {
- layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
- icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
- }, function () { window.location.href = "../../user/login.html"; });
- }
+ //if (sessionStorage.login != "login") {
+ // layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+ // icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+ // }, function () { window.location.href = "../../user/login.html"; });
+ //}
var params = getUrlVars();
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 娣诲姞 淇濆瓨
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html"
index cee9a13..67d94bc 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\267\245\345\215\225/JIT_DayPlanBillList.html"
@@ -62,6 +62,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CloseBill"><i class="layui-icon layui-icon-logout"></i>鍏抽棴</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_TuiBill"><i class="layui-icon layui-icon-form"></i>涓嬫帹</button>
</div>
</script>
</form>
@@ -119,6 +120,9 @@
break;
//鍏抽棴
case 'set_CloseBill': set_CloseBill();
+ break;
+ //涓嬫帹
+ case 'set_TuiBill': set_TuiBill();
break;
};
});
@@ -435,6 +439,25 @@
}
//#endregion
+ //缂栬緫鍗曟嵁 涓嬫帹
+ function set_TuiBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (data.length === 1) {
+ var linterid = data[0].婧愬崟涓诲唴鐮�.toString();
+ var HEntryID = data[0].婧愬崟瀛愬唴鐮�.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '宸ュ簭娴佽浆鍗�-缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html?OperationType=2&linterid=' + linterid + '&HEntryID=' + HEntryID + '&HSouceBillType=3772'
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹笅鎺紒');
+ }
+ }
+
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
});
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
index e30b47d..3651e83 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
@@ -317,6 +317,15 @@
<input type="text" class="layui-input" name="HICMOEntryID" id="HICMOEntryID" value="0" style="background-color:#efefef4d;" readonly>
</div>
</div>
+ <div class="layui-col-xs3 layui-inline">
+ <label class="layui-form-label">鏃ヨ鍒掑伐鍗曢�夊崟鍙�</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="WorkBillSortNo" id="WorkBillSortNo" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchWorkBillSort" id="btnSearchWorkBillSort" 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-xs3 layui-inline">
<label class="layui-form-label">娴佽浆鍗＄被鍨�</label>
<div class="layui-input-inline">
@@ -645,6 +654,20 @@
$("#HMaker").val(sessionStorage["HUserName"]);
}
});
+
+ $.ajax({
+ url: GetWEBURL() + "/Sc_WorkBillSortBill/Sc_WorkBillSortBillList",
+ type: "GET",
+ data: { "sWhere": " and 婧愬崟涓诲唴鐮�='" + linterid + "' and 婧愬崟瀛愬唴鐮�='" + HEntryID + "' ", "user": sessionStorage["HUserName"] },
+ success: function (d) {
+ if (d.data[0] != null) {
+ $("#WorkBillSortNo").val(d.data[0].鍗曟嵁鍙�);
+ }
+ }
+ })
+
+
+
GetICMOBillValue(linterid, HEntryID);
option.data = [{
"HProcNo": "", "HProcID": 0, "HProcNumber": "", "HProcName": "", "HWorkRemark": "",
@@ -1171,7 +1194,32 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
+
GetICMOBillValue(checkStatus.data[0].hmainid, checkStatus.data[0].HEntryID)
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ });
+
+ //閫夋嫨鏃ヨ鍒掑伐鍗�
+ form.on('submit(btnSearchWorkBillSort)', function () {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鐢熶骇浠诲姟鍗曞垪琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../../views/鐢熶骇绠＄悊/鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillList.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#WorkBillSortNo").val(checkStatus.data[0].鍗曟嵁鍙�);
+ GetICMOBillValue(checkStatus.data[0].婧愬崟涓诲唴鐮�, checkStatus.data[0].婧愬崟瀛愬唴鐮�)
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
@@ -1198,7 +1246,14 @@
layer.msg("璇烽�夋嫨璁″垝瀹屽伐鏃ユ湡锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
- var sSubTable = table.cache['mainTable'];
+ //鍒犻櫎瀛愯〃鏁版嵁鏃� 浼氬崰鐢ㄦ暟缁勭殑浣嶇疆,闇�瑕侀噸鏂版帓涓�涓嬮『搴�
+ var sSubTable = [];
+ for (var i = 0; i < table.cache["mainTable"].length; i++) {
+ if (table.cache["mainTable"][i] != "") {
+ table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+ sSubTable.push(table.cache["mainTable"][i])
+ }
+ }
for (var i = 0; i < sSubTable.length; i++) {
if (!sSubTable[i].HProcNo) {
var indexRow = i + 1;
@@ -1232,7 +1287,7 @@
var HBLFlag = document.getElementById("HBLFlag").checked;
HBLFlag == "on" ? data.field.HBLFlag = 'true' : data.field.HBLFlag = 'false';//灏嗘暟缁勫悎骞舵垚瀛楃涓�
var sMainStr = JSON.stringify(data.field);
- var sSubStr = JSON.stringify(table.cache['mainTable']);
+ var sSubStr = JSON.stringify(sSubTable);
var flag = "xz";
if (OperationType == 3) {
flag = "xg";
@@ -1336,6 +1391,7 @@
, "HWorkShopName": data.鐢熶骇杞﹂棿
, "HWorkShopID": data.HWorkShopID
, "textBox2": data.浠诲姟鍗曞彿
+ , "WorkBillSortNo": data.鏃ヨ鍒掑伐鍗曞彿
, "HSupName": data.濮斿鍔犲伐鍗曚綅
, "HSupID": data.HSupID
, "HMaterName": data.瀛愪欢鍚嶇О
--
Gitblit v1.9.1