From 76edf702b20ed1b4fb642a6d9c5e3294cd246fbc Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期二, 07 十一月 2023 23:29:09 +0800
Subject: [PATCH] 生产订单下推生产订单变更单 生产订单变更单列表隐藏新增按钮
---
WebTM/views/生产管理/生产订单变更单/Sc_ICMOChangeBill.html | 92 ++++++++++++++++++++++++++++++
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 14 ++--
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 35 +++++++++++
WebTM/views/生产管理/生产订单变更单/Sc_ICMOChangeBillList.html | 2
4 files changed, 134 insertions(+), 9 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 2e75d80..b75ab51 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -3582,7 +3582,7 @@
<publishTime>04/11/2023 16:34:43</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html">
- <publishTime>11/03/2023 21:45:51</publishTime>
+ <publishTime>11/07/2023 23:22:14</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇鍋滃伐鍗�/Sc_Add_MESStopWorkBillList - 澶嶅埗.html">
<publishTime>04/11/2023 16:34:43</publishTime>
@@ -3711,7 +3711,7 @@
<publishTime>10/16/2023 09:58:41</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇璁㈠崟鍙樻洿鍗�/Sc_ICMOChangeBill.html">
- <publishTime>10/30/2023 15:54:39</publishTime>
+ <publishTime>11/07/2023 23:25:59</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇璁㈠崟鍙樻洿鍗�/Sc_ICMOChangeBillList.html">
<publishTime>10/30/2023 15:23:27</publishTime>
@@ -4656,7 +4656,7 @@
<publishTime>10/26/2023 13:27:26</publishTime>
</File>
<File Include="views/閿�鍞鐞�/鐗规壒鐢宠鍗�/Xs_ExceptiveCheckRequestBill.html">
- <publishTime>10/27/2023 14:11:43</publishTime>
+ <publishTime>11/07/2023 22:34:28</publishTime>
</File>
<File Include="views/閿�鍞鐞�/鐗规壒鐢宠鍗�/Xs_ExceptiveCheckRequestBillList.html">
<publishTime>10/27/2023 13:46:03</publishTime>
@@ -4677,7 +4677,7 @@
<publishTime>04/11/2023 16:34:43</publishTime>
</File>
<File Include="views/閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBillList.html">
- <publishTime>11/07/2023 21:51:17</publishTime>
+ <publishTime>11/07/2023 22:40:00</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/濮斿璁㈠崟/WW_EntrustOrderBillList.html">
<publishTime>11/03/2023 21:45:51</publishTime>
@@ -4698,13 +4698,13 @@
<publishTime>11/03/2023 21:45:51</publishTime>
</File>
<File Include="views/閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBillList.html">
- <publishTime>11/07/2023 21:51:17</publishTime>
+ <publishTime>11/07/2023 22:40:00</publishTime>
</File>
<File Include="views/閿�鍞鐞�/閿�鍞鍗曞彉鏇村崟/Xs_SeOrderChangeBill.html">
- <publishTime>11/07/2023 22:23:11</publishTime>
+ <publishTime>11/07/2023 22:24:13</publishTime>
</File>
<File Include="views/閿�鍞鐞�/閿�鍞鍗曞彉鏇村崟/Xs_SeOrderChangeBillList.html">
- <publishTime>10/27/2023 20:17:34</publishTime>
+ <publishTime>11/07/2023 22:26:40</publishTime>
</File>
<File Include="views/閿�鍞鐞�/閿�鍞��璐у崟/Add_Edit_Kf_ICStockBillMainList.html">
<publishTime>04/11/2023 16:34:43</publishTime>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index cf0cecb..d016984 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -189,6 +189,7 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ShowBill_pl" id="ShowBill_pl"><i class="layui-icon layui-icon-form"></i>鎵归噺涓嬫帹</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ShowBill_dh"><i class="layui-icon layui-icon-form"></i>澶氳涓嬫帹</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushICMOChangeBill" id="btn-PushICMOChangeBill"><i class="layui-icon layui-icon-delete"></i>涓嬫帹(鐢熶骇璁㈠崟鍙樻洿鍗�)</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AddNew" id="AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Edit" id="Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_copy" id="copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
@@ -304,6 +305,9 @@
break;
//澶氳涓嬫帹
case 'set_ShowBill_dh': set_ShowBill_dh();
+ break;
+ //涓嬫帹(鐢熶骇璁㈠崟鍙樻洿鍗�)
+ case 'btn-PushICMOChangeBill': set_PushICMOChangeBill();
break;
//鏂板
case 'set_AddNew': set_AddNew();
@@ -854,6 +858,37 @@
}
}
+ //#region 涓嬫帹(鐢熶骇璁㈠崟鍙樻洿鍗�)
+ function set_PushICMOChangeBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var hID = data[0].hmainid.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '涓嬫帹-鐢熶骇璁㈠崟鍙樻洿鍗�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../鐢熶骇绠＄悊/鐢熶骇璁㈠崟鍙樻洿鍗�/Sc_ICMOChangeBill.html?OperationType=4&linterid=' + hID + '&HSouceBillType=3710&closeType=1'
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ $("#btnSearch").trigger('click');
+ }
+ , cancel: function () {
+
+ }
+ })
+
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+ //#endregion
+
//鏂板
function set_AddNew() {
layer.open({
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\242\345\215\225\345\217\230\346\233\264\345\215\225/Sc_ICMOChangeBill.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\242\345\215\225\345\217\230\346\233\264\345\215\225/Sc_ICMOChangeBill.html"
index a7d037e..5d157cc 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\242\345\215\225\345\217\230\346\233\264\345\215\225/Sc_ICMOChangeBill.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\242\345\215\225\345\217\230\346\233\264\345\215\225/Sc_ICMOChangeBill.html"
@@ -296,6 +296,9 @@
//鍔犺浇琛ㄤ綋鍜岃〃浣撴暟鎹�
RoadBillMain(linterid);
}
+ else if (OperationType == 4) { //涓嬫帹
+ setInit_PushBill(linterid);
+ }
//#endregion
//#region 鍒濆鍖栫粍缁�
@@ -689,6 +692,93 @@
}
//#endregion
+ //#region 涓嬫帹椤甸潰鍒濆鍖�
+ function setInit_PushBill(linterid) {
+ //鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
+ createBillNo();
+
+ //鐩稿叧鏂囨湰妗嗕俊鎭垵濮嬪寲
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+ //鍒濆鍖栧苟鍒楄缃細瀛愯〃1
+ set_InitGrid();
+ DisPlay_HideColumn();
+
+
+ //鏌ヨ鐢熶骇璁㈠崟鏄惁瀛樺湪
+ var ajaxLoad = layer.load();
+ var sWhere = " and HPRDORGID=" + sessionStorage["OrganizationID"] + " and hmainid='" + linterid + "'";
+ $.ajax({
+ url: GetWEBURL() + "/LEMS/MES_IF_ICMOBillList_Json",
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (d) {
+ var result = d;
+
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data[0];
+
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HEmpID": data.HEmpID
+ , "HEmpName": data.閿�鍞憳
+
+ //, "HDeptID": data.HDeptID
+ //, "HDeptName": data.鐢熶骇杞﹂棿
+ //, "HCusID": data.HCusID
+ //, "HCusName": data.瀹㈡埛
+
+ , "HMainSourceInterID": linterid
+ , "HMainSourceBillNo": data.鍗曟嵁鍙�
+ , "HMainSourceBillType": params[params[2]]
+ });
+
+ //缁勭粐鐨勫�糎OrgID鍙樺寲锛岄噸鏂版覆鏌�
+ HOrgIDBar = data.HOrgID;
+
+ //瀛愯〃 璧嬪��
+ var rowdata = [];
+ for (var i = 0; i < result.data.length; i++) {
+ rowdata.push(
+ {
+ "HMaterID": result.data[i]["HMaterID"],
+ "鐗╂枡浠ｇ爜": result.data[i]["浜у搧浠ｇ爜"],
+ "鐗╂枡鍚嶇О": result.data[i]["浜у搧鍚嶇О"],
+ "瑙勬牸鍨嬪彿": result.data[i]["瑙勬牸鍨嬪彿"],
+ "HUnitID": result.data[i]["HUnitID"],
+ "璁￠噺鍗曚綅": result.data[i]["璁￠噺鍗曚綅"],
+ "HQty_Old": result.data[i]["鐢熶骇浠诲姟鍗曟暟閲�"],
+ "HQty_New": result.data[i]["鐢熶骇浠诲姟鍗曟暟閲�"],
+ //"HDate_Old": formatDate(result.data[i]["鍘熶氦璐ф棩鏈�"]),
+ //"HDate_New": formatDate(result.data[i]["鏂颁氦璐ф棩鏈�"]),
+ "HRemark": "",
+ "HSourceInterID": result.data[i]["hmainid"],
+ "HSourceEntryID": result.data[i]["HEntryID"],
+ "HSourceBillNo": result.data[i]["鍗曟嵁鍙�"],
+ "HSourceBillType": result.data[i]["鍗曟嵁绫诲瀷"]
+ }
+ );
+ }
+ option.data = rowdata;
+
+ table.render(option);
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+
+
+
//#region 寮圭獥閫夋嫨鏂规硶
//#region 鐢熶骇杞﹂棿閫夋嫨椤甸潰
function get_checkDept() {
@@ -770,7 +860,7 @@
function set_SaveBill(data) {
//璁板綍鎿嶄綔绫诲瀷
var refSav = "";
- if (OperationType == 1 || OperationType == 2) {
+ if (OperationType == 1 || OperationType == 2 || OperationType==4) {
refSav = "Add";
data.field.HChangeDate = new Date();
}
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\242\345\215\225\345\217\230\346\233\264\345\215\225/Sc_ICMOChangeBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\242\345\215\225\345\217\230\346\233\264\345\215\225/Sc_ICMOChangeBillList.html"
index bbb1b64..2de6562 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\242\345\215\225\345\217\230\346\233\264\345\215\225/Sc_ICMOChangeBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\242\345\215\225\345\217\230\346\233\264\345\215\225/Sc_ICMOChangeBillList.html"
@@ -90,7 +90,7 @@
<table class="" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>-->
<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="get_view"><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>
--
Gitblit v1.9.1