From b28c9a27dfefb67600192dcd587efdf0cf64cc98 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 24 九月 2024 10:00:38 +0800
Subject: [PATCH] 不同订单类型不能合并下推送货单；设置默认打印模板；一键打印
---
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html | 244 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 239 insertions(+), 5 deletions(-)
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html
index 7dc1473..9f112df 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html
@@ -25,7 +25,11 @@
<!--<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="HBarcodeSaverPZ">鐢熸垚鍝佺鐮�</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="HBarcodeSaverWY">鐢熸垚鍞竴鐮�</button>-->
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="HBarcodeSaverBox" id="HBarcodeSaverBox">鐢熸垚鍐呭绠辨潯鐮�</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">鍐呭绠辨潯鐮佹墦鍗�</button>
+ <!--<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Print_nx">鍐呯鏉＄爜鎵撳嵃</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Print_wx">澶栫鏉＄爜鎵撳嵃</button>-->
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_Print_NX_Convenient">鍐呯鏉＄爜鎵撳嵃</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_Print_WX_Convenient">澶栫鏉＄爜鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
</div>
@@ -458,6 +462,10 @@
layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐢熶骇鏃ユ湡涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
+ if (_sSubStr[i].HBatchManager == "鏄�" && _sSubStr[i].HBatchNo == "") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐗╂枡鍚敤鎵规绠＄悊锛屾壒娆′负绌猴紝璇峰～鍐欐壒娆′俊鎭�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
//鑾峰彇涓嬫爣
index = findIndex(_sSubStr[i].HMaterNumber, _sSubStr[i].HMaterModel, newArray);
if (index === -1 || _sSubStr[i].HIsSplit == 0) {
@@ -579,7 +587,9 @@
});
return false;
});
- form.on('submit(Print)', function (data) {//鎵撳嵃
+
+ //鍐呭绠辨墦鍗�
+ form.on('submit(Print)', function (data) {
var data1 = layui.table.cache["subTable"]
, data2 = layui.table.cache["subTable2"];
var rows = '';
@@ -591,6 +601,58 @@
for (var i = 0; i < data1.length; i++) {
rows += data1[i].HItemID.toString() + ',';
rows2 += data1[i].HBarCode.toString() + ',';
+ }
+ for (var j = 0; j < data2.length; j++) {
+ rows += data2[j].HItemID.toString() + ',';
+ rows2 += data2[j].HBarCode.toString() + ',';
+ }
+ rows = rows.substring(rows.length - 1, 0);
+ rows2 = rows2.substring(rows2.length - 1, 0);
+ if (rows == "") {
+ layer.msg("娌℃湁闇�瑕佹墦鍗扮殑鏁版嵁锛�")
+ return;
+ }
+ else {
+ var url = "linteridSession";
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + url, //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "linterid": rows.toString(), "HUserName": sessionStorage["HUserName"] },
+ dataType: "json",
+ success: function (data) {
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.alert("閿欒:" + err, { icon: 5 });
+ }
+ });
+ sessionStorage["linterid"] = rows.toString();
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../views/BaseSet/SRM_OpenTmpList.html?linterid=' + sessionStorage["linterid"] + '&HBarcode=&Type=SRM_POOrderBillList', 'yes']
+ , resize: false
+ //, cancel: function () {
+ // $(".layui-btn").removeClass("layui-btn-disabled");
+ //}
+ })
+ }
+ });
+
+ //鍐呯鎵撳嵃
+ form.on('submit(Print_nx)', function (data) {
+ var data2 = layui.table.cache["subTable2"];//鍐呯鏉＄爜
+
+ var rows = '';
+ var rows2 = '';
+ if (data2 == undefined) {
+ layer.msg("璇峰厛鐢熸垚鍐呯鏉＄爜锛�")
+ return;
}
for (var j = 0; j < data2.length; j++) {
rows += data2[j].HItemID.toString() + ',';
@@ -633,6 +695,176 @@
})
}
});
+
+ //澶栫鎵撳嵃
+ form.on('submit(Print_wx)', function (data) {
+ var data1 = layui.table.cache["subTable"]//澶栫鏉＄爜
+ var rows = '';
+ var rows2 = '';
+ if (data1 == undefined) {
+ layer.msg("璇峰厛鐢熸垚澶栫鏉＄爜锛�")
+ return;
+ }
+ for (var i = 0; i < data1.length; i++) {
+ rows += data1[i].HItemID.toString() + ',';
+ rows2 += data1[i].HBarCode.toString() + ',';
+ }
+
+ rows = rows.substring(rows.length - 1, 0);
+ rows2 = rows2.substring(rows2.length - 1, 0);
+ if (rows == "") {
+ layer.msg("娌℃湁闇�瑕佹墦鍗扮殑鏁版嵁锛�")
+ return;
+ }
+ else {
+ var url = "linteridSession";
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + url, //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "linterid": rows.toString(), "HUserName": sessionStorage["HUserName"] },
+ dataType: "json",
+ success: function (data) {
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.alert("閿欒:" + err, { icon: 5 });
+ }
+ });
+ sessionStorage["linterid"] = rows.toString();
+
+ layer.open({
+ type: 2
+ , area: ['50%', '50%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../views/BaseSet/SRM_OpenTmpList.html?linterid=' + sessionStorage["linterid"] + '&HBarcode=&Type=SRM_POOrderBillList', 'yes']
+ , resize: false
+ //, cancel: function () {
+ // $(".layui-btn").removeClass("layui-btn-disabled");
+ //}
+ })
+ }
+ });
+
+ //涓�閿墦鍗板唴绠�
+ form.on('submit(set_Print_NX_Convenient)', function (data) {
+ var data2 = layui.table.cache["subTable2"];//鍐呯鏉＄爜
+
+ var rows = '';
+ var rows2 = '';
+ if (data2 == undefined) {
+ layer.msg("璇峰厛鐢熸垚鍐呯鏉＄爜锛�")
+ return;
+ }
+ for (var j = 0; j < data2.length; j++) {
+ rows += data2[j].HItemID.toString() + ',';
+ rows2 += data2[j].HBarCode.toString() + ',';
+ }
+ rows = rows.substring(rows.length - 1, 0);
+ rows2 = rows2.substring(rows2.length - 1, 0);
+ if (rows == "") {
+ layer.msg("娌℃湁闇�瑕佹墦鍗扮殑鏁版嵁锛�")
+ return;
+ }
+ else {
+ var url = "linteridSession";
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + url, //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "linterid": rows.toString(), "HUserName": sessionStorage["HUserName"] },
+ dataType: "json",
+ success: function (data) {
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.alert("閿欒:" + err, { icon: 5 });
+ }
+ });
+ sessionStorage["linterid"] = rows.toString();
+
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Open_PrintTem/GetDefaultOpenTmp_Json",
+ async: true,
+ data: { "HNumber": 'SRM_POOrderBillList' },
+ //data: { "Value": Value },
+ success: function (result) {
+ if (result.count == 1) {
+ var OpenTmp = result.data[0].妯℃澘鍚嶇О
+ window.open("../../views/SRM/HBarPlanPrint.html?linterid=" + sessionStorage["linterid"].toString() + "&Type=SRM_POOrderBillList" + "&OpenTmp=" + OpenTmp.toString());
+ } else {
+ layer.msg(result.Message);
+ }
+ },
+ error: function (result) {
+ console.log(result);
+ }
+ });
+ }
+ });
+
+ //涓�閿墦鍗板绠�
+ form.on('submit(set_Print_WX_Convenient)', function (data) {
+ var data1 = layui.table.cache["subTable"]//澶栫鏉＄爜
+ var rows = '';
+ var rows2 = '';
+ if (data1 == undefined) {
+ layer.msg("璇峰厛鐢熸垚澶栫鏉＄爜锛�")
+ return;
+ }
+ for (var i = 0; i < data1.length; i++) {
+ rows += data1[i].HItemID.toString() + ',';
+ rows2 += data1[i].HBarCode.toString() + ',';
+ }
+
+ rows = rows.substring(rows.length - 1, 0);
+ rows2 = rows2.substring(rows2.length - 1, 0);
+ if (rows == "") {
+ layer.msg("娌℃湁闇�瑕佹墦鍗扮殑鏁版嵁锛�")
+ return;
+ }
+ else {
+ var url = "linteridSession";
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + url, //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "linterid": rows.toString(), "HUserName": sessionStorage["HUserName"] },
+ dataType: "json",
+ success: function (data) {
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.alert("閿欒:" + err, { icon: 5 });
+ }
+ });
+ sessionStorage["linterid"] = rows.toString();
+
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Open_PrintTem/GetDefaultOpenTmp_Json",
+ async: true,
+ data: { "HNumber": 'SRM_POOrderBillList' },
+ //data: { "Value": Value },
+ success: function (result) {
+ if (result.count == 1) {
+ var OpenTmp = result.data[0].妯℃澘鍚嶇О
+ window.open("../../views/SRM/HBarPlanPrint.html?linterid=" + sessionStorage["linterid"].toString() + "&Type=SRM_POOrderBillList" + "&OpenTmp=" + OpenTmp.toString());
+ } else {
+ layer.msg(result.Message);
+ }
+ },
+ error: function (result) {
+ console.log(result);
+ }
+ });
+ }
+ });
+
form.on('submit(Exit)', function (data) {//閫�鍑�
var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
parent.layer.close(index); //鍐嶆墽琛屽叧闂�
@@ -647,6 +879,7 @@
//}
}
});
+ //杩涘叆椤甸潰鏌ヨ琛ㄤ綋鐗╂枡淇℃伅
layer.load(3)
table.render({
elem: '#mainTable'
@@ -658,16 +891,16 @@
{ type: 'checkbox', fixed: 'left' }
, { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
, { field: 'HMaterNumber', title: '鐗╂枡缂栫爜', width: 120 }
- , { field: 'HOldMaterNumber', title: '鏃х墿鏂欑紪鐮�', width: 120, hide: true }
+ , { field: 'HOldMaterNumber', title: '鏃х墿鏂欑紪鐮�', width: 120, hide: true }
, { field: 'HMaterShortNumber', title: '鐗╂枡浠ｇ爜', width: 120, hide: true }
- , { field: 'HSubjoin', title: '鐗╂枡浠ｇ爜', width: 120, hide: true }
+ , { field: 'HSubjoin', title: '鐗╂枡浠ｇ爜', width: 120, hide: true }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 120 }
, { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 120 }
, { field: 'HUnitName', title: '璁￠噺鍗曚綅', width: 100 }
, { field: 'HUnitNumber', title: '璁￠噺鍗曚綅浠ｇ爜', width: 100, hide: true }
, { field: 'HUnitID', title: '璁￠噺鍗曚綅ID', width: 100, hide: true }
, { field: 'HDDQty', title: '璁㈠崟鏁伴噺', width: 100 }
- , { field: 'HMrbQty', title: '閫�鏂欐暟閲�', width: 100, hide: true}
+ , { field: 'HMrbQty', title: '閫�鏂欐暟閲�', width: 100, hide: true }
, { field: 'HBarcodeCount', title: '宸茬敓鎴愭潯鐮佹暟閲�', width: 135 }
, { field: 'HNotBarcodeCount', title: '鍙敓鎴愭潯鐮佹暟閲�', width: 135 }
, { field: 'HQty', title: '鏈鐢熸垚鏉＄爜鏁伴噺', width: 135, edit: 'text', event: "inputHQty" }
@@ -679,6 +912,7 @@
, { field: 'HMoney', title: '閲戦', width: 100, hide: true }
, { field: 'HMTONO', title: '璁″垝璺熻釜鍗曞彿', width: 100, hide: true }
, { field: 'HBatchNo', title: '鎵瑰彿', width: 100, edit: 'text' }
+ , { field: 'HBatchManager', title: '鍚敤鎵瑰彿', width: 100, hide: true }
, { field: 'HISKFPERIOD', title: '鏄惁鍚敤淇濊川鏈�', width: 100, edit: 'text', hide: true }
, { field: 'HEXPUNIT', title: '淇濊川鏈熷崟浣�', width: 100, edit: 'text', hide: true }
, { field: 'HKFDate', title: '鐢熶骇鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDate', event: "chooseHKFDate" }//, event: "chooseHKFDate"
--
Gitblit v1.9.1