From b3d657ca8d32bc56846732753a9def205ee53b2e Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 03 十一月 2025 16:25:33 +0800
Subject: [PATCH] 单品过站批次绑定，彩盒生成校验开发
---
WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_checkSN.html | 301 ++++++++++++----------
WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_batch.html | 155 +++++++++--
WebTM/views/grf/物料条码_海诚 (2).grf | 56 +++
WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_generateSNCode.html | 253 +++++++++---------
4 files changed, 470 insertions(+), 295 deletions(-)
diff --git "a/WebTM/views/grf/\347\211\251\346\226\231\346\235\241\347\240\201_\346\265\267\350\257\232 \0502\051.grf" "b/WebTM/views/grf/\347\211\251\346\226\231\346\235\241\347\240\201_\346\265\267\350\257\232 \0502\051.grf"
index 430f0f8..9d298c9 100644
--- "a/WebTM/views/grf/\347\211\251\346\226\231\346\235\241\347\240\201_\346\265\267\350\257\232 \0502\051.grf"
+++ "b/WebTM/views/grf/\347\211\251\346\226\231\346\235\241\347\240\201_\346\265\267\350\257\232 \0502\051.grf"
@@ -63,6 +63,12 @@
Item
Name='閲囪喘鍗曞彿'
End
+ Item
+ Name='渚涘簲鍟嗙畝绉�'
+ End
+ Item
+ Name='渚涘簲鍟嗙墿鏂欑紪鐮�'
+ End
End
End
Items Column
@@ -72,7 +78,7 @@
End
End
Object ColumnContent
- Height=4.9
+ Height=4.78896
RowsPerPage=1
Items ColumnContentCell
Item
@@ -154,6 +160,15 @@
End
Text='渚涘簲鍟�:'
End
+ Item[1,2]
+ Object Font
+ Name='瀹嬩綋'
+ Size=90000,0
+ Weight=400
+ Charset=134
+ End
+ Text='瀹㈡埛缂栧彿:'
+ End
Item[2,1]
Object Font
Name='Arial'
@@ -161,6 +176,14 @@
Weight=400
End
Text='(Supplier)'
+ End
+ Item[2,2]
+ Object Font
+ Name='Arial Narrow'
+ Size=52500,0
+ Weight=400
+ End
+ Text='(Consumer No.)'
End
Item[3,1]
Object Font
@@ -314,7 +337,7 @@
Weight=400
Charset=134
End
- Text='瀹㈡埛缂栧彿:'
+ Text='渚涘簲鍟嗘枡鍙�:'
End
Item[14,1]
Object Font
@@ -330,7 +353,7 @@
Size=52500,0
Weight=400
End
- Text='(Consumer No.)'
+ Text='(Supplier Sku No.)'
End
Item[15,1]
Object Font
@@ -367,7 +390,7 @@
Name='FieldBox9'
Left=1.5875
Top=0.15875
- Width=4.20688
+ Width=1.61396
Height=0.45
Object Font
Name='瀹嬩綋'
@@ -376,7 +399,7 @@
Charset=134
End
ShrinkFontToFit=T
- DataField='渚涘簲鍟�'
+ DataField='渚涘簲鍟嗙畝绉�'
End
Item
Type=StaticBox
@@ -522,9 +545,9 @@
Item
Type=FieldBox
Name='FieldBox17'
- Left=4.78896
+ Left=5.00063
Top=3.62479
- Width=2.80458
+ Width=2.59292
Height=0.45
Object Font
Name='瀹嬩綋'
@@ -533,7 +556,7 @@
Charset=134
End
ShrinkFontToFit=T
- DataField='瀹㈡埛缂栧彿'
+ DataField='渚涘簲鍟嗙墿鏂欑紪鐮�'
End
Item
Type=MemoBox
@@ -550,6 +573,23 @@
End
Text='[#鏁伴噺#]'
End
+ Item
+ Type=FieldBox
+ Name='FieldBox18'
+ Anchor=[Top]
+ Left=4.78896
+ Top=0.16
+ Width=1.21708
+ Height=0.45
+ Object Font
+ Name='瀹嬩綋'
+ Size=105000,0
+ Weight=400
+ Charset=134
+ End
+ ShrinkFontToFit=T
+ DataField='瀹㈡埛缂栧彿'
+ End
End
End
End
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_batch.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_batch.html"
index f775c17..1138f26 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_batch.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_batch.html"
@@ -83,7 +83,7 @@
<label class="layui-form-label" style="width: 85px;" id="BT_HMaterNumber">鐗╂枡缂栫爜</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;" readonly>
- <input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID">
+ <input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0">
</div>
</div>
<div class="layui-inline">
@@ -207,6 +207,7 @@
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>瑙ｇ粦</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="refresh" id="refresh"><i class="layui-icon layui-icon-form"></i>鍒锋柊</button>
</div>
</script>
</form>
@@ -251,10 +252,13 @@
table.on('toolbar(mainTable)', function (obj) {
switch (obj.event) {
//鍒犻櫎鎸夐挳
- case 'btn-Delete': set_DeleteBill();
+ case 'btn-Delete': btn_Delete();
break;
//鍒楄缃�
case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_Display);
+ break;
+ //鍒锋柊
+ case 'refresh': get_Display();
break;
};
});
@@ -262,30 +266,27 @@
$('#HBarCode_Batch').on('keydown', function (event) {
var HBarCode = $('#HBarCode_Batch').val();
if (event.keyCode == 13) {
- txtHBarCode_KeyDown(HBarCode);
+ //濡傛灉闀洉鐮佷笉涓虹┖
+ if (HBarCode) {
+ txtHBarCode_KeyDown(HBarCode);
+ }
+
}
});
//闀洉鐮佸洖杞︽柟娉�
$('#HBarCode_SN').on('keydown', function (event) {
- var HBarCode = $('#HBardCodeProcExchBillNo').val();
+ var HBarCode_SN = $('#HBarCode_SN').val();
if (event.keyCode == 13) {
- if (!HBarCode) {
- layer.msg(get_MessageError("[0000-1-057]娴佽浆鍗′笉鑳戒负绌猴紒", sessionStorage["HTranSlate"]))
- return;
+ if ($("#HBarCode_Batch").val() == "" || $("#HBarCode_Batch").val() == null) {
+ layer.msg("鏈壂鎵规鐮佽鍏堟壂鐮�");
+ $("#HBarCode_Batch").focus();
+ return
}
- setIntervalIndex = setInterval(setIntervalList, 30000);
- get_BomList(HBarCode);
- //if (option.data != 0) {
- // //淇濆瓨鍒颁复鏃惰〃
- // get_AddBomTempList();
- //}
- //鏌ヨ涓嶈壇璁板綍
- get_BadRecords();
- //鏌ヨ鍚堟牸璁板綍
- get_HGRecords();
-
-
+ if (HBarCode_SN) {
+ txtHBarCodeSN_KeyDown(HBarCode_SN);
+ }
+
}
});
@@ -346,7 +347,7 @@
//鍒濆鍖栫晫闈�
function set_ClearBill() {
//杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ祦杞崱涓�
- $("#HBardCodeProcExchBillNo").focus();
+ $("#HBarCode_Batch").focus();
//鍒跺崟浜�
$("#HMaker").val(sessionStorage["HUserName"]);
$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
@@ -355,7 +356,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//
- //get_Display();
+ get_Display();
}
//#region 閫氳繃鐧诲綍鐢ㄦ埛鑾峰彇榛樿鍊�
@@ -425,7 +426,10 @@
table.render(option);
}
-
+ /**
+ * 鎵壒娆＄爜
+ * @param HBarCode
+ */
//鏉＄爜鍥炶溅鏌ヨ
function txtHBarCode_KeyDown(HBarCode) {
@@ -442,16 +446,20 @@
$("#HBarCode_BatchSec").val(HBarCode);
const parts = HBarCode.split('@');
$("#HBatchNo").val(parts[2]);
+
$("#HMaterNumber").val(data1.data[0]["HMaterNumber"])
$("#HMaterName").val(data1.data[0]["HMaterName"])
$("#HMaterModel").val(data1.data[0]["HMaterModel"])
$("#HSupID").val(data1.data[0]["HSupID"])
$("#HSupName").val(data1.data[0]["HSupName"])
$("#HBarCode_Batch").prop("readonly", true);
+
+ //鍏夋爣鍦ㄩ暛闆曠爜涓�
+ $("#HBarCode_SN").focus();
}
else {
layer.close(indexs);
- layer.msg(get_MessageError(data1.Message, sessionStorage["HTranSlate"]));
+ layer.msg(data1.Message);
}
},
@@ -461,15 +469,110 @@
}
});
}
+ /**
+ * 鎵暛闆曠爜
+ * @param HBarCode
+ */
+ //闀洉鐮佸洖杞︽煡璇�
+ function txtHBarCodeSN_KeyDown(HBarCode) {
+
+ //var data = {
+ // "field": {
+ // "HMaterID": $("#HMaterID").val(), "HProcID": $("#HProcID").val(), "HBatchNo": $("#HBarCode_Batch").val(),
+ // "HGroupID": $("#HGroupID").val(), "HSourceID": $("#HSourceID").val(),
+ // "HICMOInterID": $("#HICMOInterID").val(), "HICMOEntryID": $("#HICMOEntryID").val(),
+ // "HICMOBillNo": $("#HICMOBillNo").val(),
+ // "HProdOrgID": sessionStorage["OrganizationID"],
+ // "HEmpID": $("#HEmpID").val(), "HProcExchBillNo": $("#HProcExchBillNo").val(),
+ // "HProcExchInterID": $("#HProcExchInterID").val(), "HProcExchEntryID": $("#HProcExchEntryID").val(),
+ // "HDeptID": $("#HDeptID").val()
+ // }
+ //};
+ var data = {
+ "field": {
+ "HProcID": $("#HProcID").val(), "HBatchNo": $("#HBarCode_Batch").val(),
+ "HGroupID": $("#HGroupID").val(), "HSourceID": $("#HSourceID").val(),
+ "HProdOrgID": sessionStorage["OrganizationID"],
+ "HEmpID": $("#HEmpID").val(), "HDeptID": $("#HDeptID").val()
+ }
+ };
+ var sMainStr = JSON.stringify(data.field);
+ var sSubStr = HBarCode;
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"] ;
+ var indexs = layer.load();
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Cj_SingleStation/AddStationOutBillList",
+ async: false,
+ data: { "sMainSub": sMainSub },
+ dataType: "json",
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.close(indexs);
+ //鍏夋爣鍦ㄩ暛闆曠爜涓�
+ $("#HBarCode_SN").val("");
+ $("#HBarCode_SN").focus();
+ $("#HReturnMessage").text("鎴愬姛鎵爜涓�涓�:" + HBarCode);
+ get_Display();
+ }
+ else {
+ $("#HBarCode_SN").val("");
+ layer.close(indexs);
+ layer.msg(data1.Message, { icon: 5, btn: ["纭"], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "鍑虹幇閿欒" });
+ }
+
+ },
+ error: function (err) {
+ $("#HBarCode_SN").val("");
+ layer.close(indexs);
+ layer.msg(get_MessageError("閿欒:" + err, sessionStorage["HTranSlate"]), { icon: 5, btn: [get_MessageError('[0000-2-008]纭', sessionStorage["HTranSlate"])], time: 100000, offset: 't', skin: 'layui-layer-lan', title: get_MessageError("[0000-2-009]娓╅Θ鎻愮ず", sessionStorage["HTranSlate"]) });
+ }
+ });
+ }
+
+ //鍒犻櫎鍗曟嵁
+ function btn_Delete() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ layer.confirm(get_MessageError('[0000-1-003]纭畾鍒犻櫎' + data[0].鍗曟嵁鍙� + '鍚楋紵', sessionStorage["HTranSlate"]), function (index) {
+ var ajaxLoad = layer.load();
+ //閫昏緫鍒犻櫎鏂规硶
+ $.ajax({
+ url: GetWEBURL() + '/Cj_StationOutBill/del_StationOutBill',
+ type: "GET",
+ data: { "HInterID": data[0].hmainid, "HDeleteMan": sessionStorage["HUserName"], "HBillSubType": "3791" },
+ success: function (result) {
+ if (result.count == 1) {
+ get_Display();
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(get_MessageError(result.Message, sessionStorage["HTranSlate"]) + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert(get_MessageError("[0000-1-002]鎺ュ彛璇锋眰澶辫触!", sessionStorage["HTranSlate"]), { icon: 5 });
+ }
+ });
+ layer.close(index);
+ });
+ } else {
+ layer.msg(get_MessageError('[0000-1-001]璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒', sessionStorage["HTranSlate"]));
+ }
+ }
//鍔犺浇缃戞牸
- function get_Display() {
+ function get_Display(sWhere='') {
var ajaxLoad = layer.load();
+ var HProcID = $("#HProcID").val();
+ var HSourceID = $("#HSourceID").val();
+ sWhere += ` and HProcID = ${HProcID} and HSourceID = ${HSourceID}`
$.ajax({
- url: GetWEBURL() + '/Cg_POOrderBill/list',
+ url: GetWEBURL() + '/Cj_SingleStation/SingleStationOutBillList',
async: false,
type: "GET",
- data: { "sWhere": '', "user": sessionStorage["HUserName"] },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
var data = [];//鍒楀瓧娈垫暟鎹�
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_checkSN.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_checkSN.html"
index 9ce4d77..c35666c 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_checkSN.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_checkSN.html"
@@ -33,7 +33,7 @@
<label class="layui-form-label" style="padding-left:0px" id="">闀洉鐮�:</label>
<input type="text" class="layui-input" name="HBarCode_SN" lay-verify="HBarCode_SN" autocomplete="off" placeholder="璇烽敭鍏ュ悗鍥炶溅" id="HBarCode_SN" style="width: 500px;">
</div>
-
+ <button class="layui-btn layui-btn-normal" style="" type="button" lay-submit="" lay-filter="btnChange" id="btnChange">鍙樻洿</button>
<button class="layui-btn layui-btn-normal" style="float:right" type="button" lay-submit="" lay-filter="btnExit" id="btnExit">閫�鍑�</button>
<div class="layui-input-block" style="display: inline-block; margin-left: 0px; float: right">
@@ -127,7 +127,7 @@
<label class="layui-form-label" style="width: 85px;" id="BT_HMaterNumber">浜у搧缂栫爜</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;" readonly>
- <input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID">
+ <input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID"value="0">
</div>
</div>
<div class="layui-inline">
@@ -241,6 +241,7 @@
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>瑙ｇ粦</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="refresh" id="refresh"><i class="layui-icon layui-icon-form"></i>鍒锋柊</button>
</div>
</script>
@@ -269,10 +270,10 @@
//瀹氫箟鍏ㄥ眬鍙橀噺
- var HModName = "Cj_ProcessItemStationPlatform_batch";
- var HModName2 = "Cj_ProcessItemStationPlatform_batch2";
+ var HModName = "Cj_ProcessItemStationPlatform_checkSN";
+ //var HModName2 = "Cj_ProcessItemStationPlatform_batch2";
var option = [];
- var option2 = [];
+ //var option2 = [];
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -288,78 +289,41 @@
table.on('toolbar(mainTable)', function (obj) {
switch (obj.event) {
//鍒犻櫎鎸夐挳
- case 'btn-Delete': set_DeleteBill();
+ case 'btn-Delete': btn_Delete();
break;
//鍒楄缃�
case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_Display);
break;
- };
- });
- table.on('toolbar(mainTable2)', function (obj) {
- switch (obj.event) {
- //鍒犻櫎鎸夐挳
- case 'btn-Delete2': set_DeleteBill2();
- break;
- //鍒楄缃�
- case 'set_HideColumn2': get_HideColumnNoPage(HModName2, sessionStorage["HUserName"], option2, get_Display);
+ //鍒锋柊
+ case 'refresh': get_Display();
break;
};
});
- //鎵规鐮佸洖杞︽柟娉�
- $('#HBarCode_Batch').on('keydown', function (event) {
- var HBarCode = $('#HBarCodeSN').val();
- var HBardCodeProcExchBillNo = $('#HBardCodeProcExchBillNo').val();
+
+ //闀洉鐮佸洖杞︽柟娉�
+ $('#HBarCode_SN').on('keydown', function (event) {
+ var HBarCode = $('#HBarCode_SN').val();
if (event.keyCode == 13) {
- if (!HBardCodeProcExchBillNo) {
- layer.msg(get_MessageError("[0000-2-034]璇峰厛鎵祦杞崱锛�", sessionStorage["HTranSlate"]))
- return;
- } else {
- HBarCode = HBarCode.toUpperCase();
- if (!HBarCode) {
- layer.msg(get_MessageError("[0000-2-019]鏉″舰鐮佷笉鑳戒负绌猴紒", sessionStorage["HTranSlate"]))
- return;
- } else {
- if (HBarCode.length != 29 && HBarCode.length != 50) {
- layer.alert(get_MessageError("[3791-2-012]瀛愪欢鏉＄爜闀垮害涓嶄负29浣嶆垨50浣�!", sessionStorage["HTranSlate"]), { icon: 5, btn: [get_MessageError('[0000-2-035]閫�鍑�', sessionStorage["HTranSlate"])], time: 100000, offset: 't' });
- return;
- }
-
- if (HBarCode.match(/[^\x00-\xff]/g) != null) {
- layer.alert(get_MessageError("[3791-2-013]蹇呴』鏄崐瑙掑瓧绗�!", sessionStorage["HTranSlate"]), { icon: 5, btn: [get_MessageError('[0000-2-035]閫�鍑�', sessionStorage["HTranSlate"])], time: 100000, offset: 't' });
- return;
- }
- }
+ //濡傛灉闀洉鐮佷笉涓虹┖
+ if (HBarCode) {
+ txtHBarCode_KeyDown(HBarCode);
}
- for (var i = 0; i < option.data.length; i++) {
- if (option.data[i]["HBatchNo"] == "") {
- layer.msg(get_MessageError("[3791-2-014]褰撳墠宸ュ簭鎵规涓嶈兘涓虹┖锛�", sessionStorage["HTranSlate"]))
- return;
- }
- }
- txtHBarCode_KeyDown(HBarCode);
+
}
});
- //闀洉鐮佸洖杞︽柟娉�
- $('#HBarCode_SN').on('keydown', function (event) {
- var HBarCode = $('#HBardCodeProcExchBillNo').val();
+ //褰╃洅鐮佸洖杞︽柟娉�
+ $('#HBarCode_SN2').on('keydown', function (event) {
+ var HBarCode = $('#HBarCode_SN2').val();
if (event.keyCode == 13) {
- if (!HBarCode) {
- layer.msg(get_MessageError("[0000-1-057]娴佽浆鍗′笉鑳戒负绌猴紒", sessionStorage["HTranSlate"]))
- return;
+ if ($("#HBarCode_SN").val() == "" || $("#HBarCode_SN").val() == null) {
+ layer.msg("鏈壂闀洉鐮佽鍏堟壂鐮�");
+ $("#HBarCode_SN").focus();
+ return
}
- setIntervalIndex = setInterval(setIntervalList, 30000);
- get_BomList(HBarCode);
- //if (option.data != 0) {
- // //淇濆瓨鍒颁复鏃惰〃
- // get_AddBomTempList();
- //}
- //鏌ヨ涓嶈壇璁板綍
- get_BadRecords();
- //鏌ヨ鍚堟牸璁板綍
- get_HGRecords();
-
-
+ if (HBarCode) {
+ txtHBarCodeSN_KeyDown(HBarCode);
+ }
}
});
@@ -388,7 +352,20 @@
form.on('submit(btnHProc)', function () {
btnHProc();
});
-
+ //鍙樻洿
+ form.on('submit(btnChange)', function (data) {
+ $("#HBarCode_SN").val("");
+ $("#HSNNo").val("");
+ $("#HMaterNumber").val("")
+ $("#HMaterName").val("")
+ $("#HMaterModel").val("")
+ $("#HSupID").val(0)
+ $("#HSupName").val("")
+ $("#HICMOBillNo").val("")
+ //鍏夋爣鍦ㄩ暛闆曠爜涓�
+ $("#HBarCode_SN").prop("readonly", false);
+ $("#HBarCode_SN").focus();
+ });
//閫�鍑�
form.on('submit(btnExit)', function (data) {
@@ -407,7 +384,7 @@
//鍒濆鍖栫晫闈�
function set_ClearBill() {
//杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ祦杞崱涓�
- $("#HBardCodeProcExchBillNo").focus();
+ $("#HBarCode_SN").focus();
//鍒跺崟浜�
$("#HMaker").val(sessionStorage["HUserName"]);
$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
@@ -416,7 +393,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//
- //get_Display();
+ get_Display();
}
//#region 閫氳繃鐧诲綍鐢ㄦ埛鑾峰彇榛樿鍊�
@@ -462,7 +439,7 @@
, totalRow: true
, cellMinWidth: 120
, data: []
- , height: 285
+ , height: 450
, limit: 10
, cols: [[
{ type: 'numbers', title: '搴忓彿' }
@@ -482,87 +459,44 @@
, { field: 'HBarCode', title: 'HBarCode', hide: true }
]]
}
- option2 = {
- elem: '#mainTable2'
- , toolbar: '#toolbarDemo2'
- , page: false
- , totalRow: true
- , cellMinWidth: 120
- , data: []
- , height: 385
- , limit: 10
- , cols: [[
- { type: 'numbers', title: '搴忓彿' }
- , { field: '鏃ユ湡', title: '鏃ユ湡' }
- , { field: '閰嶄欢浠ｇ爜', title: '閰嶄欢浠ｇ爜' }
- , { field: '閰嶄欢鍚嶇О', title: '閰嶄欢鍚嶇О' }
- , { field: '閰嶄欢瑙勬牸', title: '閰嶄欢瑙勬牸' }
- , { field: '閰嶄欢鏁伴噺', title: '閰嶄欢鏁伴噺', totalRow: true }
- , { field: 'HBatchNo', title: '褰撳墠鎵规' }
- , { field: 'HICMOInterID', title: 'HICMOInterID', hide: true }
- , { field: 'HICMOEntryID', title: 'HICMOEntryID', hide: true }
- , { field: 'HICMOBillNo', title: 'HICMOBillNo', hide: true }
- , { field: 'HProcExchInterID', title: 'HProcExchInterID', hide: true }
- , { field: 'HProcExchEntryID', title: 'HProcExchEntryID', hide: true }
- , { field: 'HProcExchBillNo', title: 'HProcExchBillNo', hide: true }
- , { field: 'HMaterID', title: 'HMaterID', hide: true }
- , { field: 'HBarCode', title: 'HBarCode', hide: true }
- ]]
- }
+
table.render(option);
- table.render(option2);
}
//鏉＄爜鍥炶溅鏌ヨ
function txtHBarCode_KeyDown(HBarCode) {
- var HProcExchBillNo = $("#HProcExchBillNo").val();
var indexs = layer.load();
$.ajax({
type: "GET",
- url: GetWEBURL() + "/Cj_SingleStation/SNHBardCodeList",
+ url: GetWEBURL() + "/Cj_SingleStation/checkHBarCode_Batch",
async: false,
- data: { "HBarCode": HBarCode, "HProcExchBillNo": HProcExchBillNo, "user": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"] },
+ data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"] },
dataType: "json",
success: function (data1) {
if (data1.count == 1) {
layer.close(indexs);
- var index = layer.load();
-
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "/Cj_SingleStation/HBardCodeSNList",
- async: false,
- data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
- dataType: "json",
- success: function (data1) {
- if (data1.count == 1) {
- layer.close(index);
- $("#HBarCode_P").val(HBarCode);
- if (AllowLoadData()) {
- //淇濆瓨鏁版嵁
- set_AddAssemblyBill();
- }
- }
- else {
- layer.close(index);
- layer.msg(get_MessageError(data1.Message, sessionStorage["HTranSlate"]), { icon: 5, btn: [get_MessageError('[0000-2-008]纭', sessionStorage["HTranSlate"])], time: 100000, offset: 't', skin: 'layui-layer-lan', title: get_MessageError("[0000-2-009]娓╅Θ鎻愮ず", sessionStorage["HTranSlate"]) });
- }
- $("#HBarCodeSN").val("");
- },
- error: function (err) {
- layer.close(index);
- layer.msg(get_MessageError("閿欒:" + err, sessionStorage["HTranSlate"]), { icon: 5, btn: [get_MessageError('[0000-2-008]纭', sessionStorage["HTranSlate"])], time: 100000, offset: 't', skin: 'layui-layer-lan', title: get_MessageError("[0000-2-009]娓╅Θ鎻愮ず", sessionStorage["HTranSlate"]) });
- }
- });
+ $("#HBarCode_SN").val(HBarCode);
+ $("#HSNNo").val(HBarCode);
+
+ $("#HMaterNumber").val(data1.data[0]["HMaterNumber"])
+ $("#HMaterName").val(data1.data[0]["HMaterName"])
+ $("#HMaterModel").val(data1.data[0]["HMaterModel"])
+ $("#HSupID").val(data1.data[0]["HSupID"])
+ $("#HSupName").val(data1.data[0]["HSupName"])
+ $("#HBarCode_SN").prop("readonly", true);
+ $("#HICMOBillNo").val(data1.data[0]["HSourceBillNo"])
+
+ //鍏夋爣鍦ㄩ暛闆曠爜涓�
+ $("#HBarCode_SN2").focus();
}
else {
layer.close(indexs);
- layer.msg(get_MessageError(data1.Message, sessionStorage["HTranSlate"]));
+ $("#HBarCode_SN").val("");
+ $("#HBarCode_SN").focus();
+ layer.msg(data1.Message);
}
- //鍏夋爣璺宠浆鍒癝N鏉＄爜鏂囨湰妗嗕笂
- //$("#HBarCodeSN").focus();
- $("#HBarCodeSN").val("");
+
},
error: function (err) {
layer.close(indexs);
@@ -570,20 +504,82 @@
}
});
}
-
- //鍔犺浇缃戞牸
- function get_Display() {
- var ajaxLoad = layer.load();
+ /**
+ * 鎵僵鐩扴N鐮�
+ * @param HBarCode
+ */
+ //闀洉鐮佸洖杞︽煡璇�
+ function txtHBarCodeSN_KeyDown(HBarCode) {
+ if ($("#HBarCode_SN").val() != HBarCode) {
+ layer.confirm("褰╃洅SN鐮佹牎楠屽け璐ヨ妫�鏌�,褰╃洅SN鐮�:" + HBarCode,{
+ btn: ['纭畾'] //鎸夐挳
+ });
+ $("#HBarCode_SN2").val("");
+ $("#HBarCode_SN2").focus();
+ return
+ }
+ var data = {
+ "field": {
+ "HProcID": $("#HProcID").val(), "HBatchNo": "",
+ "HGroupID": $("#HGroupID").val(), "HSourceID": $("#HSourceID").val(),
+ "HProdOrgID": sessionStorage["OrganizationID"],
+ "HEmpID": $("#HEmpID").val(), "HDeptID": $("#HDeptID").val()
+ }
+ };
+ var sMainStr = JSON.stringify(data.field);
+ var sSubStr = HBarCode;
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];
+ var indexs = layer.load();
$.ajax({
- url: GetWEBURL() + '/Cg_POOrderBill/list',
+ type: "POST",
+ url: GetWEBURL() + "/Cj_SingleStation/AddStationOutBillList",
+ async: false,
+ data: { "sMainSub": sMainSub },
+ dataType: "json",
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.close(indexs);
+ //鍏夋爣鍦ㄩ暛闆曠爜涓婂僵鐩掓壂鐮佹垚鍔熷悗杩斿洖闀洉鐮�
+ $("#HBarCode_SN").prop("readonly", false);
+ $("#HBarCode_SN").val("");
+ $("#HBarCode_SN2").val("");
+ $("#HBarCode_SN").focus();
+
+ $("#HReturnMessage").text("鎴愬姛鎵爜涓�涓�:" + HBarCode);
+ get_Display();
+ }
+ else {
+ $("#HBarCode_SN2").val("");
+ layer.close(indexs);
+ layer.msg(data1.Message, { icon: 5, btn: ["纭"], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "鍑虹幇閿欒" });
+ }
+
+ },
+ error: function (err) {
+ $("#HBarCode_SN2").val("");
+ layer.close(indexs);
+ layer.msg(get_MessageError("閿欒:" + err, sessionStorage["HTranSlate"]), { icon: 5, btn: [get_MessageError('[0000-2-008]纭', sessionStorage["HTranSlate"])], time: 100000, offset: 't', skin: 'layui-layer-lan', title: get_MessageError("[0000-2-009]娓╅Θ鎻愮ず", sessionStorage["HTranSlate"]) });
+ }
+ });
+ }
+
+
+ //鍔犺浇缃戞牸鏍规嵁缁戝畾宸ュ簭鍜岀敓浜ц祫婧�
+ function get_Display(sWhere = '') {
+ var ajaxLoad = layer.load();
+ var HProcID = $("#HProcID").val();
+ var HSourceID = $("#HSourceID").val();
+ sWhere += ` and HProcID = ${HProcID} and HSourceID = ${HSourceID}`
+ $.ajax({
+ url: GetWEBURL() + '/Cj_SingleStation/SingleStationOutBillList',
async: false,
type: "GET",
- data: { "sWhere": '', "user": sessionStorage["HUserName"] },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
var data = [];//鍒楀瓧娈垫暟鎹�
var col = [];
- var titleData=[]
+ var titleData = []
var totalArray = ["鏁伴噺", "鍏宠仈鏁伴噺", "鏈叧鑱旀暟閲�", "鎵撳嵃鏉＄爜鏁伴噺", "鏈墦鍗版潯鐮佹暟閲�", "瀹炴敹鏁伴噺", "閲戦"];
//缁欑┖鐨勬暟缁勮祴鍊�
for (var key in data1.list) {
@@ -668,6 +664,37 @@
})
}
+ //鍒犻櫎鍗曟嵁
+ function btn_Delete() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ layer.confirm(get_MessageError('[0000-1-003]纭畾鍒犻櫎' + data[0].鍗曟嵁鍙� + '鍚楋紵', sessionStorage["HTranSlate"]), function (index) {
+ var ajaxLoad = layer.load();
+ //閫昏緫鍒犻櫎鏂规硶
+ $.ajax({
+ url: GetWEBURL() + '/Cj_StationOutBill/del_StationOutBill',
+ type: "GET",
+ data: { "HInterID": data[0].hmainid, "HDeleteMan": sessionStorage["HUserName"], "HBillSubType": "3791" },
+ success: function (result) {
+ if (result.count == 1) {
+ get_Display();
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(get_MessageError(result.Message, sessionStorage["HTranSlate"]) + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert(get_MessageError("[0000-1-002]鎺ュ彛璇锋眰澶辫触!", sessionStorage["HTranSlate"]), { icon: 5 });
+ }
+ });
+ layer.close(index);
+ });
+ } else {
+ layer.msg(get_MessageError('[0000-1-001]璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒', sessionStorage["HTranSlate"]));
+ }
+ }
//鐢熶骇璧勬簮閫夋嫨椤甸潰
function btnHSource() {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_generateSNCode.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_generateSNCode.html"
index e2c31a6..0f44f76 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_generateSNCode.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_generateSNCode.html"
@@ -237,6 +237,7 @@
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>瑙ｇ粦</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="refresh" id="refresh"><i class="layui-icon layui-icon-form"></i>鍒锋柊</button>
</div>
</script>
@@ -265,10 +266,10 @@
//瀹氫箟鍏ㄥ眬鍙橀噺
- var HModName = "Cj_ProcessItemStationPlatform_batch";
- var HModName2 = "Cj_ProcessItemStationPlatform_batch2";
+ var HModName = "Cj_ProcessItemStationPlatform_generateSN";
+ //var HModName2 = "Cj_ProcessItemStationPlatform_batch2";
var option = [];
- var option2 = [];
+ //var option2 = [];
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -284,10 +285,13 @@
table.on('toolbar(mainTable)', function (obj) {
switch (obj.event) {
//鍒犻櫎鎸夐挳
- case 'btn-Delete': set_DeleteBill();
+ case 'btn-Delete': btn_Delete();
break;
//鍒楄缃�
case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_Display);
+ break;
+ //鍒锋柊
+ case 'refresh': get_Display();
break;
};
});
@@ -301,59 +305,20 @@
break;
};
});
- //鎵规鐮佸洖杞︽柟娉�
- $('#HBarCode_Batch').on('keydown', function (event) {
- var HBarCode = $('#HBarCodeSN').val();
- var HBardCodeProcExchBillNo = $('#HBardCodeProcExchBillNo').val();
- if (event.keyCode == 13) {
- if (!HBardCodeProcExchBillNo) {
- layer.msg(get_MessageError("[0000-2-034]璇峰厛鎵祦杞崱锛�", sessionStorage["HTranSlate"]))
- return;
- } else {
- HBarCode = HBarCode.toUpperCase();
- if (!HBarCode) {
- layer.msg(get_MessageError("[0000-2-019]鏉″舰鐮佷笉鑳戒负绌猴紒", sessionStorage["HTranSlate"]))
- return;
- } else {
- if (HBarCode.length != 29 && HBarCode.length != 50) {
- layer.alert(get_MessageError("[3791-2-012]瀛愪欢鏉＄爜闀垮害涓嶄负29浣嶆垨50浣�!", sessionStorage["HTranSlate"]), { icon: 5, btn: [get_MessageError('[0000-2-035]閫�鍑�', sessionStorage["HTranSlate"])], time: 100000, offset: 't' });
- return;
- }
-
- if (HBarCode.match(/[^\x00-\xff]/g) != null) {
- layer.alert(get_MessageError("[3791-2-013]蹇呴』鏄崐瑙掑瓧绗�!", sessionStorage["HTranSlate"]), { icon: 5, btn: [get_MessageError('[0000-2-035]閫�鍑�', sessionStorage["HTranSlate"])], time: 100000, offset: 't' });
- return;
- }
- }
- }
- for (var i = 0; i < option.data.length; i++) {
- if (option.data[i]["HBatchNo"] == "") {
- layer.msg(get_MessageError("[3791-2-014]褰撳墠宸ュ簭鎵规涓嶈兘涓虹┖锛�", sessionStorage["HTranSlate"]))
- return;
- }
- }
- txtHBarCode_KeyDown(HBarCode);
- }
- });
-
+
//闀洉鐮佸洖杞︽柟娉�
$('#HBarCode_SN').on('keydown', function (event) {
var HBarCode = $('#HBardCodeProcExchBillNo').val();
if (event.keyCode == 13) {
- if (!HBarCode) {
- layer.msg(get_MessageError("[0000-1-057]娴佽浆鍗′笉鑳戒负绌猴紒", sessionStorage["HTranSlate"]))
- return;
+ var HBarCode = $('#HBarCode_SN').val();
+ if (event.keyCode == 13) {
+ //濡傛灉闀洉鐮佷笉涓虹┖
+ if (HBarCode) {
+ txtHBarCode_KeyDown(HBarCode);
+ //txtHBarCodeSN_KeyDown(HBarCode);
+ }
+
}
- setIntervalIndex = setInterval(setIntervalList, 30000);
- get_BomList(HBarCode);
- //if (option.data != 0) {
- // //淇濆瓨鍒颁复鏃惰〃
- // get_AddBomTempList();
- //}
- //鏌ヨ涓嶈壇璁板綍
- get_BadRecords();
- //鏌ヨ鍚堟牸璁板綍
- get_HGRecords();
}
@@ -403,7 +368,7 @@
//鍒濆鍖栫晫闈�
function set_ClearBill() {
//杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ祦杞崱涓�
- $("#HBardCodeProcExchBillNo").focus();
+ $("#HBarCode_SN").focus();
//鍒跺崟浜�
$("#HMaker").val(sessionStorage["HUserName"]);
$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
@@ -412,7 +377,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//
- //get_Display();
+ get_Display();
}
//#region 閫氳繃鐧诲綍鐢ㄦ埛鑾峰彇榛樿鍊�
@@ -478,87 +443,43 @@
, { field: 'HBarCode', title: 'HBarCode', hide: true }
]]
}
- option2 = {
- elem: '#mainTable2'
- , toolbar: '#toolbarDemo2'
- , page: false
- , totalRow: true
- , cellMinWidth: 120
- , data: []
- , height: 385
- , limit: 10
- , cols: [[
- { type: 'numbers', title: '搴忓彿' }
- , { field: '鏃ユ湡', title: '鏃ユ湡' }
- , { field: '閰嶄欢浠ｇ爜', title: '閰嶄欢浠ｇ爜' }
- , { field: '閰嶄欢鍚嶇О', title: '閰嶄欢鍚嶇О' }
- , { field: '閰嶄欢瑙勬牸', title: '閰嶄欢瑙勬牸' }
- , { field: '閰嶄欢鏁伴噺', title: '閰嶄欢鏁伴噺', totalRow: true }
- , { field: 'HBatchNo', title: '褰撳墠鎵规' }
- , { field: 'HICMOInterID', title: 'HICMOInterID', hide: true }
- , { field: 'HICMOEntryID', title: 'HICMOEntryID', hide: true }
- , { field: 'HICMOBillNo', title: 'HICMOBillNo', hide: true }
- , { field: 'HProcExchInterID', title: 'HProcExchInterID', hide: true }
- , { field: 'HProcExchEntryID', title: 'HProcExchEntryID', hide: true }
- , { field: 'HProcExchBillNo', title: 'HProcExchBillNo', hide: true }
- , { field: 'HMaterID', title: 'HMaterID', hide: true }
- , { field: 'HBarCode', title: 'HBarCode', hide: true }
- ]]
- }
+
table.render(option);
- table.render(option2);
+
}
//鏉＄爜鍥炶溅鏌ヨ
function txtHBarCode_KeyDown(HBarCode) {
- var HProcExchBillNo = $("#HProcExchBillNo").val();
var indexs = layer.load();
$.ajax({
type: "GET",
- url: GetWEBURL() + "/Cj_SingleStation/SNHBardCodeList",
+ url: GetWEBURL() + "/Cj_SingleStation/checkHBarCode_Batch",
async: false,
- data: { "HBarCode": HBarCode, "HProcExchBillNo": HProcExchBillNo, "user": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"] },
+ data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"] },
dataType: "json",
success: function (data1) {
if (data1.count == 1) {
layer.close(indexs);
- var index = layer.load();
+ $("#HBarCode_SN").val(HBarCode);
+ $("#HSNNo").val(HBarCode);
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "/Cj_SingleStation/HBardCodeSNList",
- async: false,
- data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
- dataType: "json",
- success: function (data1) {
- if (data1.count == 1) {
- layer.close(index);
- $("#HBarCode_P").val(HBarCode);
- if (AllowLoadData()) {
- //淇濆瓨鏁版嵁
- set_AddAssemblyBill();
- }
- }
- else {
- layer.close(index);
- layer.msg(get_MessageError(data1.Message, sessionStorage["HTranSlate"]), { icon: 5, btn: [get_MessageError('[0000-2-008]纭', sessionStorage["HTranSlate"])], time: 100000, offset: 't', skin: 'layui-layer-lan', title: get_MessageError("[0000-2-009]娓╅Θ鎻愮ず", sessionStorage["HTranSlate"]) });
- }
- $("#HBarCodeSN").val("");
- },
- error: function (err) {
- layer.close(index);
- layer.msg(get_MessageError("閿欒:" + err, sessionStorage["HTranSlate"]), { icon: 5, btn: [get_MessageError('[0000-2-008]纭', sessionStorage["HTranSlate"])], time: 100000, offset: 't', skin: 'layui-layer-lan', title: get_MessageError("[0000-2-009]娓╅Θ鎻愮ず", sessionStorage["HTranSlate"]) });
- }
- });
+ $("#HMaterNumber").val(data1.data[0]["HMaterNumber"])
+ $("#HMaterName").val(data1.data[0]["HMaterName"])
+ $("#HMaterModel").val(data1.data[0]["HMaterModel"])
+ $("#HSupID").val(data1.data[0]["HSupID"])
+ $("#HSupName").val(data1.data[0]["HSupName"])
+ $("#HICMOBillNo").val(data1.data[0]["HSourceBillNo"])
+
+ txtHBarCodeSN_KeyDown(HBarCode);
}
else {
layer.close(indexs);
- layer.msg(get_MessageError(data1.Message, sessionStorage["HTranSlate"]));
+ $("#HBarCode_SN").val("");
+ $("#HBarCode_SN").focus();
+ layer.msg(data1.Message);
}
- //鍏夋爣璺宠浆鍒癝N鏉＄爜鏂囨湰妗嗕笂
- //$("#HBarCodeSN").focus();
- $("#HBarCodeSN").val("");
+
},
error: function (err) {
layer.close(indexs);
@@ -566,20 +487,72 @@
}
});
}
-
- //鍔犺浇缃戞牸
- function get_Display() {
- var ajaxLoad = layer.load();
+ /**
+ * 鎵僵鐩扴N鐮�
+ * @param HBarCode
+ */
+ //闀洉鐮佸洖杞︽煡璇�
+ function txtHBarCodeSN_KeyDown(HBarCode) {
+
+ var data = {
+ "field": {
+ "HProcID": $("#HProcID").val(), "HBatchNo": "",
+ "HGroupID": $("#HGroupID").val(), "HSourceID": $("#HSourceID").val(),
+ "HProdOrgID": sessionStorage["OrganizationID"],
+ "HEmpID": $("#HEmpID").val(), "HDeptID": $("#HDeptID").val()
+ }
+ };
+ var sMainStr = JSON.stringify(data.field);
+ var sSubStr = HBarCode;
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];
+ var indexs = layer.load();
$.ajax({
- url: GetWEBURL() + '/Cg_POOrderBill/list',
+ type: "POST",
+ url: GetWEBURL() + "/Cj_SingleStation/AddStationOutBillList",
+ async: false,
+ data: { "sMainSub": sMainSub },
+ dataType: "json",
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.close(indexs);
+ //鍏夋爣鍦ㄩ暛闆曠爜涓�
+ $("#HBarCode_SN").val("");
+ $("#HBarCode_SN").focus();
+
+ $("#HReturnMessage").text("鎴愬姛鎵爜涓�涓�:" + HBarCode);
+ get_Display();
+ }
+ else {
+ $("#HBarCode_SN").val("");
+ layer.close(indexs);
+ layer.msg(data1.Message, { icon: 5, btn: ["纭"], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "鍑虹幇閿欒" });
+ }
+
+ },
+ error: function (err) {
+ $("#HBarCode_SN").val("");
+ layer.close(indexs);
+ layer.msg(get_MessageError("閿欒:" + err, sessionStorage["HTranSlate"]), { icon: 5, btn: [get_MessageError('[0000-2-008]纭', sessionStorage["HTranSlate"])], time: 100000, offset: 't', skin: 'layui-layer-lan', title: get_MessageError("[0000-2-009]娓╅Θ鎻愮ず", sessionStorage["HTranSlate"]) });
+ }
+ });
+ }
+
+ //鍔犺浇缃戞牸鏍规嵁缁戝畾宸ュ簭鍜岀敓浜ц祫婧�
+ function get_Display(sWhere = '') {
+ var ajaxLoad = layer.load();
+ var HProcID = $("#HProcID").val();
+ var HSourceID = $("#HSourceID").val();
+ sWhere += ` and HProcID = ${HProcID} and HSourceID = ${HSourceID}`
+ $.ajax({
+ url: GetWEBURL() + '/Cj_SingleStation/SingleStationOutBillList',
async: false,
type: "GET",
- data: { "sWhere": '', "user": sessionStorage["HUserName"] },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
var data = [];//鍒楀瓧娈垫暟鎹�
var col = [];
- var titleData=[]
+ var titleData = []
var totalArray = ["鏁伴噺", "鍏宠仈鏁伴噺", "鏈叧鑱旀暟閲�", "鎵撳嵃鏉＄爜鏁伴噺", "鏈墦鍗版潯鐮佹暟閲�", "瀹炴敹鏁伴噺", "閲戦"];
//缁欑┖鐨勬暟缁勮祴鍊�
for (var key in data1.list) {
@@ -620,7 +593,7 @@
option.cols = [col]
option.data = data1.data;
-
+
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, []);
@@ -639,6 +612,38 @@
});
}
+ //鍒犻櫎鍗曟嵁
+ function btn_Delete() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ layer.confirm(get_MessageError('[0000-1-003]纭畾鍒犻櫎' + data[0].鍗曟嵁鍙� + '鍚楋紵', sessionStorage["HTranSlate"]), function (index) {
+ var ajaxLoad = layer.load();
+ //閫昏緫鍒犻櫎鏂规硶
+ $.ajax({
+ url: GetWEBURL() + '/Cj_StationOutBill/del_StationOutBill',
+ type: "GET",
+ data: { "HInterID": data[0].hmainid, "HDeleteMan": sessionStorage["HUserName"], "HBillSubType": "3791" },
+ success: function (result) {
+ if (result.count == 1) {
+ get_Display();
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(get_MessageError(result.Message, sessionStorage["HTranSlate"]) + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert(get_MessageError("[0000-1-002]鎺ュ彛璇锋眰澶辫触!", sessionStorage["HTranSlate"]), { icon: 5 });
+ }
+ });
+ layer.close(index);
+ });
+ } else {
+ layer.msg(get_MessageError('[0000-1-001]璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒', sessionStorage["HTranSlate"]));
+ }
+ }
+
//鍛樺伐閫夋嫨椤甸潰
function btnHEmp() {
layer.open({
--
Gitblit v1.9.1