From aa4943aed872a007f5775cbc5a31d531f5c53533 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 26 九月 2024 21:09:42 +0800
Subject: [PATCH] 送货单ID改为前端生成；送货单生成条码时，物料、批次一致，合并数量生成条码
---
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html
index d894293..f5c1c3a 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html
@@ -28,7 +28,9 @@
<button type="button" id="aduit-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Aduit">瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Print">鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Print_Convenient">涓�閿墦鍗�</button>
- <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="ChooseSource">閫夋簮鍗�</button>
+ <button type="button" id="ChooseSource-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="ChooseSource">閫夋簮鍗�</button>
+ <!--<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="BuildBarcode">鐢熸垚鏉＄爜</button>-->
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="MergeBuildBarcode">鍚堝苟鐢熸垚鏉＄爜</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
</div>
</div>
@@ -47,6 +49,7 @@
<label class="layui-form-label">鍗� 鎹� 鍙凤細</label>
<div class="layui-input-inline">
<input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" readonly="readonly" autocomplete="off">
+ <input class="layui-input" name="HInterID" lay-verify="HInterID" id="HInterID" readonly="readonly" autocomplete="off" style="display:none;">
</div>
</div>
<div class="layui-col-xs3">
@@ -267,8 +270,10 @@
url: GetWEBURL() + "GetNewPOInStockBillNo",
type: "GET",
data: { "sMsg": linterid, "sMsg3": lSourceBillType },
+ async: false,
success: function (d) {
//console.log(d.data);
+ $("#HInterID").val(d.data[0].HInterID);
$("#HBillNo").val(d.data[0].HBillNo);
$("#HInnerBillNo").val(d.data[0].HInnerBillNo);
$("#HDate").val(d.data[0].HDate);
@@ -281,7 +286,7 @@
success: function (d) {
//console.log(d.data);
//$("#HDate").val(d.)
- $("#HInterID").val(d.data[0].HInterID);
+ //$("#HInterID").val(d.data[0].HInterID);
//$("#HBillNo").val(d.data[0].HBillNo);
$("#HRemark").val(d.data[0].HRemark);
//$("#HDate").val(d.data[0].HDateForWeb);
@@ -670,6 +675,7 @@
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.msg(data.Message, { icon: 1 });
$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#ChooseSource-btn').addClass("layui-btn-disabled").attr("disabled", true);
}
else {
f_alert(data.Message);
@@ -800,6 +806,26 @@
, resize: false
//, cancel: function () {
// $(".layui-btn").removeClass("layui-btn-disabled");
+ //}
+ })
+ });
+
+ form.on('submit(MergeBuildBarcode)', function (data) {
+ if (HIsAduit == false) {
+ layer.msg("璇峰鏍搁�佽揣鍗曞悗鍦ㄧ敓鎴愭潯鐮�( 麓鈼旓笌 鈥糕棓锔巂)", { icon: 5 });
+ return;
+ }
+ layer.open({
+ type: 2
+ , area: ['95%', '95%']
+ , title: '鏉＄爜鐢熸垚'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../views/SRM/SRM_BarCodeBill.html?linterid=' + $("#HInterID").val() + '&lentryid=0' + '&type=0' + '&mergeTags=1', 'yes']
+ , resize: false
+ //, done: function () {
+ // layer.closeAll("loading");
//}
})
});
@@ -1039,8 +1065,8 @@
"sorderid": HSubLen, "HPOOrderInterID": obj[i].hmainid, "HPOOrderEntryID": obj[i].hsubid, "HPOOrderBillNo": obj[i].璁㈠崟鍗曞彿, "HWWOrderInterID": 0,
"HWWOrderEntryID": 0, "HWWOrderDetaiLID": 0., "HWWOrderBillNo": '', "HBillType": "1102", "HBatchNo": Batchno, "HMaterID": obj[i].hmaterid,
"HMaterNumber": obj[i].鐗╂枡浠ｇ爜, "HOldMaterNumber": obj[i].鏃х墿鏂欑紪鐮�, "HMaterShortNumber": obj[i].鐗╂枡缂栫爜, "HMaterName": obj[i].鐗╂枡鍚嶇О,
- "HMaterModel": obj[i].瑙勬牸鍨嬪彿, "HUnitID": obj[i].hunitid, "HUnitNumber": obj[i].璁￠噺鍗曚綅浠ｇ爜, "HUnitName": obj[i].閲囪喘鍗曚綅, "HQty": obj[i].鏈叧鑱旀暟閲�,
- "HRQty": obj[i].鏈叧鑱旀暟閲�, "HSQty": obj[i].閲囪喘鏁伴噺, "HPrice": obj[i].鍗曚环, "HMoney": obj[i].閲戦, "HDate": Format(new Date(), "yyyy-MM-dd"), "HKFDate": '',
+ "HMaterModel": obj[i].瑙勬牸鍨嬪彿, "HUnitID": obj[i].hunitid, "HUnitName": obj[i].璁￠噺鍗曚綅, "HUnitNumber": obj[i].璁￠噺鍗曚綅浠ｇ爜, "HUnitName": obj[i].閲囪喘鍗曚綅, "HQty": obj[i].鏈叧鑱旀暟閲�,
+ "HRQty": obj[i].鏈叧鑱旀暟閲�, "HSQty": obj[i].閲囪喘鏁伴噺, "HPrice": obj[i].鍗曚环, "HMoney": obj[i].閲戦, "HDate": Format(new Date(), "yyyy-MM-dd"), "HKFDate": new Date().toISOString().slice(0, 10),
"HKFPeriod": 0, "HSourceInterID": obj[i].hmainid, "HSourceEntryID": obj[i].hsubid, "HSourceBillType": "1102", "HSourceBillNo": obj[i].璁㈠崟鍗曞彿,
"HMTONO": obj[i].HBatchNo, "F_xbkf_Combo": '', "FSHDD": '', "FPrintCount": obj[i].鎵撳嵃鏉＄爜鏁伴噺, "HPlanArrivalDate": new Date(),
"HTAXPRICE_T": obj[i].鍚◣閲嶉噺鍗曚环鍚�
--
Gitblit v1.9.1