From 9db0428a82c67a5a381487c6ff26a601f0a47a30 Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期四, 04 五月 2023 17:07:40 +0800
Subject: [PATCH] 生产入库、采购入库、销售出库、生产领料扫物料条码方法修改
---
WebTM/views/验收入库/外购入库/Kf_POStockInBill_Fast.html | 28 +++++++--
WebTM/WebTM.csproj.user | 2
WebTM/views/验收入库/产品入库/Kf_ProductInBill_Fast.html | 42 ++++++++++---
WebTM/views/领料发货/销售出库/Kf_SellOutBill_Fast.html | 68 +++++++++++++++-------
WebTM/layuiadmin/Scripts/webConfig.js | 4
WebTM/views/领料发货/领料出库/Kf_MateOutBill_Fast.html | 14 ++--
6 files changed, 110 insertions(+), 48 deletions(-)
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index ebfee46..06468a2 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <NameOfLastUsedPublishProfile>D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>JFTM</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index cbc0be3..758c1b3 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -3,11 +3,11 @@
//var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒
//var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴*/
//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
- //var WEBURL = "http://localhost:8080/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
+ var WEBURL = "http://localhost:8080/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost/WEBAPI/"; //棰滃鍙板紡鏈烘湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/lubao"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
- var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
+ //var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
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);
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
index 6f82bf0..100ea47 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
@@ -1085,7 +1085,7 @@
$("#HWHID").val(result.data.hWhIDField);
$("#HStockPlaceName").val("");
$("#HNote").val(";涓�閿壂鐮佷粨搴撴潯鐮�");
- element.tabChange('tab-MateOutBill', '3'); //璺宠浆椤电
+ element.tabChange('tab-MateOutBill', '2'); //璺宠浆椤电
return;
}
else if (result.data.hBarTypeField == '浠撲綅鏉＄爜') {
@@ -1094,22 +1094,24 @@
$("#HWHNAME").val(result.data.hWhNameField);
$("#HWHID").val(result.data.hWhIDField);
$("#HNote").val(";涓�閿壂鐮佷粨浣嶆潯鐮�");
- element.tabChange('tab-MateOutBill', '3');//璺宠浆椤电
+ element.tabChange('tab-MateOutBill', '2');//璺宠浆椤电
return;
}
else if (result.data.hBarTypeField == '閮ㄩ棬鏉＄爜') {
$("#HDeptName").val(result.data.hDeptNameField);
$("#HDeptID").val(result.data.hDeptIDField);
$("#HNote").val(";涓�閿壂鐮侀儴闂ㄦ潯鐮�");
- element.tabChange('tab-MateOutBill', '3');//璺宠浆椤电
+ element.tabChange('tab-MateOutBill', '2');//璺宠浆椤电
return;
}
else if (result.data.hBarTypeField == '婧愬崟鏉＄爜') {
$("#HSupName").val(result.data.hSupNameField);
$("#HSupID").val(result.data.hSupIDField);
- $("#HDeptName").val(result.data.hDeptNameField);
- $("#HDeptID").val(result.data.hDeptIDField);
- $("#HSourceBillNo").val(result.data.hSourceBillNoFieldField);
+ 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 ? "3720" : result.data.hSourceBillTypeField);
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
index 70370e5..3fc9623 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html"
@@ -1332,23 +1332,45 @@
return;
}
else if (result.data.hBarTypeField == '婧愬崟鏉＄爜') {
- //$("#HSupName").val(result.data.hSupName);
- //$("#HSupID").val(result.data.hSupID);
- //$("#HDeptName").val(result.data.hDeptName);
- //$("#HDeptID").val(result.data.hDeptID);
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 ? "3714" : result.data.hSourceBillTypeField);
//鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
- //if (result.data.HSourceBillType == "3711") {
- // $("#HBillType").val("3711");
- //}
- //else {
- // $("#HBillType").val("-1");
- //}
+ if (result.data.hSourceBillTypeField == "3711") {
+ $("#HBillType").empty();
+ $("#HBillType").val("3711");
+ 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 == "3710") {
+ $("#HBillType").empty();
+ $("#HBillType").val("3710");
+ 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 == "3714") {
+ $("#HBillType").empty();
+ $("#HBillType").val("3714");
+ var optionHtml = '';
+ optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '宸ュ簭姹囨姤鍗�' + "</option>";
+ $("#HBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HBillType").attr("readonly", "readonly");
+ }
+ else {
+ //$("#HBillType").val("-1");
+ }
+ $("#HSourceBillNo").attr("readonly", "readonly");
$("#HNote").val(";涓�閿壂鐮佹簮鍗曟潯鐮�");
element.tabChange('tab-ProductlnBill', '3');
}
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
index 3c8780c..b7ef7f3 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
@@ -1064,22 +1064,35 @@
else if (result.data.hBarTypeField == '婧愬崟鏉＄爜') {
$("#HSupName").val(result.data.hSupNameField);
$("#HSupID").val(result.data.hSupIDField);
- $("#HDeptName").val(result.data.hDeptNameField);
- $("#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);
- $("#HBillType").val(result.data.hSourceBillTypeField)
- sessionStorage["SourceFlag"] = true;
+ HSourceFlag = true;
//鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
if (result.data.hSourceBillTypeField == "1102") {
+ $("#HBillType").empty();
$("#HBillType").val("1102");
-
+ 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 == "1103") {
+ if (result.data.hSourceBillTypeField == "1103") {
+ $("#HBillType").empty();
$("#HBillType").val("1103");
+ var optionHtml = '';
+ optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '鏀舵枡閫氱煡鍗�' + "</option>";
+ $("#HBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HBillType").attr("readonly", "readonly");
}
else {
- $("#HBillType").val("鎵嬪伐褰曞叆");
+ //$("#HBillType").val("-1");
}
+ $("#HSourceBillNo").attr("readonly", "readonly");
$("#HNote").val(";涓�閿壂鐮佹簮鍗曟潯鐮�");
element.tabChange('tab-POStockInBill', '3');
}
@@ -1094,6 +1107,7 @@
//$("#HDeptID").val(result.data.HDeptID);
//$("#HSourceBillNo").val(result.data.hSourceBillNoField);
//$("#HBillType").val(result.data.hSourceBillTypeField)
+ $("#HSourceBillNo").val(result.data.hSourceBillNoField);
HSourceFlag = true;
//鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
if (result.data.hSourceBillTypeField == "1102") {
--
Gitblit v1.9.1