From 94d0a02ef211f1579b9a3b2a410585c692d14ed8 Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期四, 16 三月 2023 20:01:10 +0800
Subject: [PATCH] 委外出库扫码模块，扫描物料条码、仓库方法修改
---
WebTM/views/领料发货/委外出库/Kf_EntrustOutBill_Fast.html | 109 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 95 insertions(+), 14 deletions(-)
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Fast.html"
index 39a2eac..45f4e1a 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Fast.html"
@@ -333,7 +333,7 @@
//琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇 榛樿浠撳簱銆侀儴闂ㄣ�侀獙鏀躲�佷繚绠°�侀噾铦剁敤鎴凤級 new
$("#HWHID").val(sessionStorage["HWHID"]);
$("#HWHNAME").val(sessionStorage["HWHName"]);
- $("#HSupID").val(sessionStorage["HSPID"]);
+ $("#HStockPlaceID").val(sessionStorage["HSPID"]);
$("#HStockPlaceName").val(sessionStorage["HSPName"]);
//$("#HSupID").val(sessionStorage["HSupID"]);
//$("#HSupName").val(sessionStorage["HSupName"]);
@@ -348,6 +348,7 @@
$("#HMakerID").hide();
$("#HBillerID").val(sessionStorage["HBillerID"]);
$("#HBillerID").hide();
+ var HSourceFlag = sessionStorage["SourceFlag"];
//榛樿甯﹀叆鐨勪粨搴擄紝濡傛灉鍚敤浠撲綅鍒欎粨浣嶆湁鏁堬紝濡傛灉娌℃湁鍚敤鍒欎粨浣嶇伆搴� new
@@ -412,7 +413,7 @@
$("#HSupName").val(result.data[0].HSupName);
$("#HDeptID").val(result.data[0].HDeptID);
$("#HDeptName").val(result.data[0].HDeptName);
- sessionStorage["SourceFlag"] = true;
+ HSourceFlag = true;
element.tabChange('tab-EntrustOutBill', '2');
layer.load(3);
}
@@ -485,8 +486,7 @@
- //閫夋嫨浠撳簱
- form.on('submit(HWHID-BT)', function () {
+ form.on('submit(HWHID-BT)', function () {//閫夋嫨浠撳簱
layer.open({
type: 2
, area: ['100%', '100%']
@@ -494,13 +494,28 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseListNew.html?Type=HWHID&HOrgID=' + sessionStorage["OrganizationID"] + '', 'yes']
, resize: false
, cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
}
})
});
+ ////閫夋嫨浠撳簱
+ //form.on('submit(HWHID-BT)', function () {
+ // layer.open({
+ // type: 2
+ // , area: ['100%', '100%']
+ // , title: '浠撳簱鍒楄〃'
+ // , shade: 0.6 //閬僵閫忔槑搴�
+ // , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ // , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ // , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID', 'yes']
+ // , resize: false
+ // , cancel: function () {
+ // //$(".layui-btn").removeClass("layui-btn-disabled");
+ // }
+ // })
+ //});
//閫夋嫨浠撲綅
form.on('submit(HSpID-BT)', function () {
@@ -637,7 +652,7 @@
//閫�鍑烘寜閽�
form.on('submit(Cancel)', function () {
- sessionStorage["SourceFlag"] = false;
+ HSourceFlag = false;
layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
parent.location.href = "../../../views/index_Mobile.html";
});
@@ -721,7 +736,7 @@
if (event.keyCode == 13) {
//鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁 new
$.ajax({
- url: GetWEBURL() + "/Web/GetSpName_Json",
+ url: GetWEBURL() + "/LookingFor/getSpName_Json",
type: "GET",
data: { "HBarCode": HBarCode },
success: function (result) {
@@ -729,6 +744,7 @@
$("#HStockPlaceName").val(result.data[0].HName);
$("#HWHID").val(result.data[0].HWHID);
$("#HWHNAME").val(result.data[0].HWhName);
+ $("#HStockPlaceID").val(result.data[0].HItemID);
element.tabChange('tab-POStockInBill', '2');
}
else {
@@ -826,10 +842,10 @@
var sBillNo = $("#HBillNo").val()
var sQty = $("#HQty").val()
var sWHID = $("#HWHID").val()
- var sSPID = $("#HSupID").val()
+ var sSPID = $("#HStockPlaceID").val()
var sHBillType = $("#HBillType").val()
var sSourceBillNo = $("#HSourceBillNo").val()
- var Flag = sessionStorage["SourceFlag"];
+ var Flag = HSourceFlag;
var sMouldManagerCtl = "N"; //鏄惁鍚敤鍣ㄥ叿绠＄悊
var sFIFOCtl = "N"; //鏄惁鍚敤鍏堣繘鍏堝嚭绠＄悊
var sQty = $("#HQty").val();
@@ -849,14 +865,79 @@
$('#HQty').val("");
}
$.ajax({
- url: GetWEBURL() + "/MateOutBill/get_CheckTypeByBarCode_Json",
+ url: GetWEBURL() + "/WEBSController/Get_BarCode_Json",
type: "GET",
- data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": '1211', "sBillNo": sBillNo, "sMaker": sessionStorage["HUserName"], "WhID": sWHID, "SPID": sSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": Flag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },
+ data: { "sBarCode": sBarCode, "HInterID": sInterID, "HBillType": '1211', "HBillNo": sBillNo, "HMaker": sessionStorage["HUserName"], "HWhID": sWHID, "HSPID": sSPID, "HQty": sQty, "HRedBlueFlag": false, "SourceFlag": Flag, "HSourceBillNo": sSourceBillNo, "HSourceBillType": sHBillType, "HStockOrgID": sessionStorage["OrganizationID"], "HScanStyle": "", "HCustom1": "", "HCustom2": "" },
+ //url: GetWEBURL() + "/MateOutBill/get_CheckTypeByBarCode_Json",
+ //type: "GET",
+ //data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": '1211', "sBillNo": sBillNo, "sMaker": sessionStorage["HUserName"], "WhID": sWHID, "SPID": sSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": Flag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },
success: function (result) {
if (result.count == 1) {
+ if (result.data.HBarType == '浠撳簱鏉＄爜') {
+ $("#HWHNAME").val(result.data.HWhName);
+ $("#HWHID").val(result.data.HWhID);
+ $("#HStockPlaceName").val("");
+ $("#HNote").val(";涓�閿壂鐮佷粨搴撴潯鐮�");
+ element.tabChange('tab-EntrustOutBill', '2'); //璺宠浆椤电
+ }
+ else if (result.data.HBarType == '浠撲綅鏉＄爜') {
+ $("#HStockPlaceName").val(result.data.HSPName);
+ $("#HStockPlaceID").val(result.data.HSPID);
+ $("#HWHNAME").val(result.data.HWhName);
+ $("#HWHID").val(result.data.HWhID);
+ $("#HNote").val(";涓�閿壂鐮佷粨浣嶆潯鐮�");
+ element.tabChange('tab-EntrustOutBill', '2');//璺宠浆椤电
+ }
+ else if (result.data.HBarType == '閮ㄩ棬鏉＄爜') {
+ $("#HDeptName").val(result.data.HDeptName);
+ $("#HDeptID").val(result.data.HDeptID);
+ $("#HNote").val(";涓�閿壂鐮侀儴闂ㄦ潯鐮�");
+ element.tabChange('tab-EntrustOutBill', '2');//璺宠浆椤电
+ }
+ else if (result.data.HBarType == '婧愬崟鏉＄爜') {
+ $("#HSupName").val(result.data.HSupName);
+ $("#HSupID").val(result.data.HSupID);
+ $("#HDeptName").val(result.data.HDeptName);
+ $("#HDeptID").val(result.data.HDeptID);
+ $("#HSourceBillNo").val(result.data.HSourceBillNo);
+ HSourceFlag = true;
+ //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+ $("#HBillType").val(result.data.hSourceBillTypeField == null ? "1604" : result.data.hSourceBillTypeField);
+ if (result.data.hSourceBillTypeField == "1604") {
+ $("#HBillType").empty();
+ $("#HBillType").val("1604");
+ var optionHtml = '';
+ optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '濮斿璁㈠崟-鎶曟枡' + "</option>";
+ $("#HBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HBillType").attr("readonly", "readonly");
+ }
+ else {
+ //$("#HBillType").empty();
+ $("#HBillType").val("-1");
+ var optionHtml = '';
+ optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '鎵嬪伐褰曞叆' + "</option>";
+ $("#HBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HBillType").attr("readonly", "readonly");
+ }
+ $("#HSourceBillNo").attr("readonly", "readonly");
+ $("#HNote").val(";涓�閿壂鐮佹簮鍗曟潯鐮�");
+ element.tabChange('tab-EntrustOutBill', '3');
+ }
+ else {
+ if (HSourceFlag == true) {
+ element.tabChange('tab-EntrustOutBill', '3');
+ }
+ else {
+ HSourceFlag = true;
+ $("#HNote").val(";鐗╂枡鏉＄爜");
+ element.tabChange('tab-EntrustOutBill', '3'); //璺宠浆椤电
+ }
+ }
playSound1();
$("#rizhi").val(RZ += Format(new Date(), "yyyy-MM-dd hh:mm:ss.S") + "鎵潯鐮侊紝鎴愬姛\n");
- element.tabChange('tab-EntrustOutBill', '3'); //璺宠浆椤电
+ //element.tabChange('tab-EntrustOutBill', '3'); //璺宠浆椤电
layer.load(3)
table.render({
elem: '#wl-table'
@@ -943,7 +1024,7 @@
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
playSound1();
$("#rizhi").val(RZ += Format(new Date(), "yyyy-MM-dd hh:mm:ss.S") + "鎵簮鍗曞彿锛屾垚鍔焅n");
- sessionStorage["SourceFlag"] = true;
+ HSourceFlag = true;
element.tabChange('tab-EntrustOutBill', '2'); //璺宠浆椤电
layer.load(3)
table.render({
--
Gitblit v1.9.1