From 750ed27a2ba043a8c8b944d04a5aba37d2759719 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期二, 14 十一月 2023 18:31:24 +0800
Subject: [PATCH] 销售订单：下推生产订单，保存后反写销售订单关联数量
---
WebTM/views/销售管理/销售订单/Xs_SeOrderBillList.html | 36 ++++++++++++++++++
WebTM/views/生产管理/生产任务单/Sc_ICMOBillEdit_NoTable.html | 63 +++++++++++++++++++++++++++++++
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 8 ++--
3 files changed, 103 insertions(+), 4 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 80cdf76..f858c9b 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -882,7 +882,7 @@
<publishTime>10/15/2023 20:35:49</publishTime>
</File>
<File Include="views/Baseset/鍩虹璧勬枡/Gy_CustomerList.html">
- <publishTime>07/21/2023 16:28:59</publishTime>
+ <publishTime>11/14/2023 16:01:59</publishTime>
</File>
<File Include="views/Baseset/鍩虹璧勬枡/Gy_CustomerListNew.html">
<publishTime>09/14/2023 13:59:10</publishTime>
@@ -3624,7 +3624,7 @@
<publishTime>04/26/2023 13:31:31</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillEdit_NoTable.html">
- <publishTime>11/13/2023 11:07:47</publishTime>
+ <publishTime>11/14/2023 18:20:35</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillImport.html">
<publishTime>04/11/2023 16:34:43</publishTime>
@@ -4758,7 +4758,7 @@
<publishTime>04/11/2023 16:34:43</publishTime>
</File>
<File Include="views/閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBillList.html">
- <publishTime>11/14/2023 15:34:06</publishTime>
+ <publishTime>11/14/2023 16:13:13</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/濮斿璁㈠崟/WW_EntrustOrderBillList.html">
<publishTime>11/03/2023 21:45:51</publishTime>
@@ -4779,7 +4779,7 @@
<publishTime>11/03/2023 21:45:51</publishTime>
</File>
<File Include="views/閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBillList.html">
- <publishTime>11/14/2023 15:34:06</publishTime>
+ <publishTime>11/14/2023 16:13:13</publishTime>
</File>
<File Include="views/閿�鍞鐞�/閿�鍞鍗曞彉鏇村崟/Xs_SeOrderChangeBill.html">
<publishTime>11/14/2023 11:09:11</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_ICMOBillEdit_NoTable.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_ICMOBillEdit_NoTable.html"
index 09f6b7d..bdd62aa 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_ICMOBillEdit_NoTable.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_ICMOBillEdit_NoTable.html"
@@ -487,6 +487,9 @@
$("#HDate").attr("disabled", true);
RoadBillMain(linterid);
}
+ else if (OperationType == 4) { //閿�鍞鍗曚笅鎺ㄧ敓浜ц鍗�-椤甸潰鍒濆鍖�
+ setInit_PushBill();
+ }
HfBtn();
//#endregion
@@ -905,6 +908,66 @@
})
}
+ //#region 涓嬫帹椤甸潰鍒濆鍖�
+ function setInit_PushBill() {
+ //鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '3710' },
+ success: function (d) {
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ }
+ });
+
+ //鏌ヨ 閿�鍞鍗� 鏄惁瀛樺湪
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/Xs_SeOrderBill/loadXs_SeOrderBill_InitICMO",
+ async: false,
+ type: "GET",
+ data: {
+ "HInterID": linterid
+ , "HEntryID": HEntryID
+ },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data[0];
+
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HSeOrderBillNo": data.鍗曟嵁鍙�
+ , "HSeOrderInterID": data.hmainid
+ , "HSeOrderEntryID": data.hsubid
+ , "HEmpID": data.HEmpID
+ , "HEmpName": data.涓氬姟鍛�
+ , "HCusID": data.HCusID
+ , "HCusName": data.瀹㈡埛
+ , "HQty": data.鏁伴噺
+ , "HMaterID": data.HMaterID
+ , "HMaterNumber": data.鐗╂枡浠ｇ爜
+ , "HMaterName": data.鐗╂枡鍚嶇О
+ , "HModel": data.瑙勬牸鍨嬪彿
+ , "HUnitID": data.HUnitID
+ , "HUnitName": data.璁￠噺鍗曚綅
+ , "HWidth": data.骞呭
+ , "HWeight": data.鍏嬮噸
+ , "HRemark": data.琛ㄥご澶囨敞
+ });
+
+ 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
+
//淇濆瓨HMaker
function set_AddNew(data) {
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
index 46a7d63..fd07400 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillList.html"
@@ -130,6 +130,7 @@
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushSeOrderChangeBill" id="btn-PushSeOrderChangeBill"><i class="layui-icon layui-icon-delete"></i>涓嬫帹(閿�鍞鍗曞彉鏇村崟)</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushExceptiveCheckRequestBill" id="btn-PushExceptiveCheckRequestBill"><i class="layui-icon layui-icon-delete"></i>涓嬫帹(鐗规壒鐢宠鍗�)</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushICMOBill" id="btn-PushICMOBill"><i class="layui-icon layui-icon-delete"></i>涓嬫帹(鐢熶骇璁㈠崟)</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-print" id="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>-->
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>瀹℃牳</button>
@@ -230,6 +231,10 @@
//涓嬫帹(鐗规壒鐢宠鍗�)
case 'btn-PushExceptiveCheckRequestBill':
set_PushExceptiveCheckRequestBill();
+ break;
+ //涓嬫帹(鐢熶骇璁㈠崟)
+ case 'btn-PushICMOBill':
+ set_PushICMOBill();
break;
//鍒锋柊
case 'get_Refresh': get_Refresh();
@@ -749,6 +754,37 @@
}
//#endregion
+ //#region 涓嬫帹(鐢熶骇璁㈠崟-鏃犲垪琛�)
+ function set_PushICMOBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var hID = data[0].hmainid.toString();
+ var hsubid = data[0].hsubid.toString();
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '涓嬫帹-鐢熶骇璁㈠崟(鏃犲垪琛�)'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillEdit_NoTable.html?OperationType=4&linterid=' + hID + '&hsubid=' + hsubid
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ $("#btnSearch").trigger('click');
+ }
+ , cancel: function () {
+
+ }
+ })
+
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+ //#endregion
//#region 鍒锋柊
function get_Refresh() {
--
Gitblit v1.9.1