From aa162e51afadd13e3be411e473f136991d1f2f8e Mon Sep 17 00:00:00 2001
From: jhz <jinghz@oceic.com>
Date: 星期四, 04 五月 2023 23:04:24 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/领料发货/销售出库/Kf_SellOutBill_Fast.html | 68 +++++++++++++++++++++++-----------
1 files changed, 46 insertions(+), 22 deletions(-)
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
index 8426f0b..266dbff 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
@@ -1426,9 +1426,12 @@
//}
//
$.ajax({
- url: GetWEBURL() + "/SellOut/get_CheckTypeByBarCode_Json",
+ url: GetWEBURL() + "/WEBSController/Get_BarCode_Json",
type: "GET",
- data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": sBillType, "sBillNo": sBillNo, "sMaker": sMaker, "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"], "HScanStyle": HScanStyle },
+ data: { "sBarCode": sBarCode, "HInterID": sInterID, "HBillType": sBillType, "HBillNo": sBillNo, "HMaker": sMaker, "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sQty, "HRedBlueFlag": false, "SourceFlag": HSourceFlag, "HSourceBillNo": sSourceBillNo, "HSourceBillType": sHBillType, "HStockOrgID": sessionStorage["OrganizationID"], "HScanStyle": HScanStyle, "HCustom1": "", "HCustom2": "" },
+ //url: GetWEBURL() + "/SellOut/get_CheckTypeByBarCode_Json",
+ //type: "GET",
+ //data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": sBillType, "sBillNo": sBillNo, "sMaker": sMaker, "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"], "HScanStyle": HScanStyle },
success: function (result) {
playSound1();
if (result.count == 1) {
@@ -1437,7 +1440,7 @@
$("#HWHID").val(result.data.hWhIDField);
$("#HStockPlaceName").val("");
$("#HNote").val(";涓�閿壂鐮佷粨搴撴潯鐮�");
- element.tabChange('tab-Kf_SellOutBill', '3'); //璺宠浆椤电
+ element.tabChange('tab-SellOutBill', '2'); //璺宠浆椤电
return;
}
else if (result.data.hBarTypeField == '浠撲綅鏉＄爜') {
@@ -1446,61 +1449,82 @@
$("#HWHNAME").val(result.data.hWhNameField);
$("#HWHID").val(result.data.hWhIDField);
$("#HNote").val(";涓�閿壂鐮佷粨浣嶆潯鐮�");
- element.tabChange('tab-Kf_SellOutBill', '3');//璺宠浆椤电
+ element.tabChange('tab-SellOutBill', '2');//璺宠浆椤电
return;
}
else if (result.data.hBarTypeField == '閮ㄩ棬鏉＄爜') {
$("#HDeptName").val(result.data.hDeptNameField);
$("#HDeptID").val(result.data.hDeptIDField);
$("#HNote").val(";涓�閿壂鐮侀儴闂ㄦ潯鐮�");
- element.tabChange('tab-Kf_SellOutBill', '3');//璺宠浆椤电
+ element.tabChange('tab-SellOutBill', '2');//璺宠浆椤电
return;
}
else if (result.data.hBarTypeField == '婧愬崟鏉＄爜') {
- //$("#HSupName").val(result.data.hSupName);
+ $("#HSupName").val(result.data.hSupNameField);
$("#HSupID").val(result.data.hSupIDField);
- //$("#HDeptName").val(result.data.hDeptName);
- $("#HDeptID").val(result.data.hDeptIDField);
+ if (result.data.hDeptIDField != 0) {
+ $("#HDeptID").val(result.data.hDeptIDField);
+ $("#HDeptName").val(result.data.hDeptNameField);
+ }
$("#HSourceBillNo").val(result.data.hSourceBillNoField);
HSourceFlag = true;
//鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+ $("#HBillType").val(result.data.hSourceBillTypeField == null ? "1402" : result.data.hSourceBillTypeField);
if (result.data.hSourceBillTypeField == "1402") {
+ $("#HBillType").empty();
$("#HBillType").val("1402");
-
+ var optionHtml = '';
+ optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '鍙戣揣閫氱煡鍗�' + "</option>";
+ $("#HBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HBillType").attr("readonly", "readonly");
}
else if (result.data.hSourceBillTypeField == "1401") {
+ $("#HBillType").empty();
$("#HBillType").val("1401");
+ var optionHtml = '';
+ optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '閿�鍞鍗�' + "</option>";
+ $("#HBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HBillType").attr("readonly", "readonly");
}
else {
- $("#HBillType").val("鎵嬪伐褰曞叆");
+ //$("#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-Kf_SellOutBill', '3');
+ element.tabChange('tab-SellOutBill', '3');
}
else {
if (HSourceFlag == "true") {
- element.tabChange('tab-Kf_SellOutBill', '3');
+ element.tabChange('tab-SellOutBill', '3');
}
else {
//$("#HSupName").val(result.data.HSupName);
- $("#HSupID").val(result.data.HSupID);
+ //$("#HSupID").val(result.data.HSupID);
//$("#HDeptName").val(result.data.HDeptName);
- $("#HDeptID").val(result.data.HDeptID);
- $("#HSourceBillNo").val(result.data.HSourceBillNo);
+ //$("#HDeptID").val(result.data.HDeptID);
+ //$("#HSourceBillNo").val(result.data.HSourceBillNo);
HSourceFlag = true;
//鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
- if (result.data.HSourceBillType == "1402") {
- $("#HBillType").val("1402");
+ //if (result.data.HSourceBillType == "1402") {
+ // $("#HBillType").val("1402");
- }
- else if (result.data.HSourceBillType == "1401") {
- $("#HBillType").val("1401");
- }
+ //}
+ //else if (result.data.HSourceBillType == "1401") {
+ // $("#HBillType").val("1401");
+ //}
//else if (result.data.HSourceBillType == "1601") {
// $("#HBillType").val("1601");
//}
$("#HNote").val(";鐗╂枡鏉＄爜");
- element.tabChange('tab-Kf_SellOutBill', '3');
+ element.tabChange('tab-SellOutBill', '3');
}
}
//$("#HSupID").val(result.data.HSupID);
--
Gitblit v1.9.1