From 6986e5ab85c5d457fb0d15d5a73950b03dc756dd Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期三, 15 一月 2025 10:48:05 +0800
Subject: [PATCH] 扫描物料条码判断条码是否存在调用方法修改（如条码档案里未查询到数据则查询历史条码档案数据）
---
DLL/DAL.dll | 0
CLOUDWEB/WebService1.asmx.cs | 31 ++++++++++++++++---------------
2 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/CLOUDWEB/WebService1.asmx.cs b/CLOUDWEB/WebService1.asmx.cs
index 0c4cacd..bf8adab 100644
--- a/CLOUDWEB/WebService1.asmx.cs
+++ b/CLOUDWEB/WebService1.asmx.cs
@@ -46429,7 +46429,7 @@
}
//鏍规嵁鏉＄爜鑾峰彇鏉＄爜淇℃伅锛屽瓨鍦ㄧ浉鍚岀墿鏂欐椂鑷姩鑾峰彇涓�琛屾簮鍗曚俊鎭�
DAL.ClsGy_BarCodeBill_View dal = new DAL.ClsGy_BarCodeBill_View();
- if (dal.GetInfoByNumber_View(sBarCode))
+ if (dal.GetInfoByBarCode(sBarCode, HBillType, HOWNERID))
{
//褰撳崟鎹弬鏁版槸 澶氬師鍗曟ā寮忔椂锛� 鍒� 涓嶈繘琛� 鏉＄爜鐗╂枡鏄惁鍦� 鍘熷崟鍒楄〃 鍐呯殑鍒ゆ柇
if (HBillType == "3711" && oSystemParameter.omodel.Sc_ICMOReportBill_MulSourceBill == "Y")
@@ -46817,9 +46817,9 @@
#endregion
- #region 涓�閿壂鐮�
+ #region 涓�閿壂鐮� 鎵弿鐗╂枡鏉＄爜 鍗撳姏銆佸紑灞遍噸宸ャ�佸洓缁村皵銆佸湥榫欍�侀泤鐞銆佸ゥ閭︺�佸崥鏃ョ鎶�銆佸瀹濈數鍣ㄣ�佹．妤峰鎴峰湪浣跨敤
- //涓�閿壂鐮佹ā寮忥紝鏍规嵁鏉＄爜鍓嶇紑璧� 涓嶅悓鏂规硶锛堜粨搴撱�佷粨浣嶃�侀儴闂級锛堟簮鍗曘�佺墿鏂欐潯鐮侊級
+ //涓�閿壂鐮佹ā寮忥紝鏍规嵁鏉＄爜鍓嶇紑璧� 涓嶅悓鏂规硶锛堜粨搴撱�佷粨浣嶃�侀儴闂級锛堟簮鍗曘�佺墿鏂欐潯鐮侊級
[WebMethod]
public Model.ClsKf_ICStockBill_WMS get_CheckTypeByBarCode_All(string sBarCode, Int64 HBillID, string HBillType, string HBillNo, string HMaker, Int64 HWhID, Int64 HSPID, Double HQty, bool HRedBlueFlag, bool SourceFlag, string HSourceBillNo, string HSourceBillType, Int64 HOWNERID, string HExpressNumber, ref string sErrMsg)
{
@@ -47860,7 +47860,7 @@
#endregion
- #region 涓�閿壂鐮� 澧炲姞閫掑叆鍙傛暟 鎵弿绫诲瀷
+ #region 涓�閿壂鐮� 澧炲姞閫掑叆鍙傛暟 鎵弿绫诲瀷 妫シ閿�鍞嚭搴撱�佸叾浠栧嚭搴撳湪浣跨敤
//涓�閿壂鐮佹ā寮忥紝鏍规嵁鏉＄爜鍓嶇紑璧� 涓嶅悓鏂规硶锛堜粨搴撱�佷粨浣嶃�侀儴闂級锛堟簮鍗曘�佺墿鏂欐潯鐮侊級
[WebMethod]
@@ -51598,7 +51598,7 @@
#region 鐗╂枡鏉＄爜璋冪敤鏂规硶
- #region 鏉＄爜鏂囨湰妗� 鎵弿鏉＄爜璋冪敤鏂规硶
+ #region 鏉＄爜鏂囨湰妗� 鎵弿鐗╂枡鏉＄爜璋冪敤鏂规硶 鍦ㄤ娇鐢�
//涓�閿壂鐮佹ā寮忥紝鏍规嵁鏉＄爜鍓嶇紑璧� 涓嶅悓鏂规硶锛堜粨搴撴潯鐮併�佷粨浣嶆潯鐮併�佸崟鎹彿鏉＄爜銆佺墿鏂欐潯鐮侊級
[WebMethod]
@@ -52724,7 +52724,7 @@
#endregion
- #region 涓�閿壂鐮� 鍑哄叆搴撴ā鍧楋紝鐣岄潰鏉＄爜妗� 鎵弿鏉＄爜璋冪敤鏂规硶
+ #region 涓�閿壂鐮� 鍑哄叆搴撴ā鍧楋紝鐣岄潰鏉＄爜妗� 鎵弿鏉＄爜璋冪敤鏂规硶 鏈�鏂拌皟鐢ㄦ柟娉� 鍦ㄤ娇鐢�
//涓�閿壂鐮佹ā寮忥紝鏍规嵁鏉＄爜鍓嶇紑璧� 涓嶅悓鏂规硶锛堜粨搴撴潯鐮併�佷粨浣嶆潯鐮併�佸崟鎹彿鏉＄爜銆佺墿鏂欐潯鐮侊級
[WebMethod]
@@ -52798,7 +52798,7 @@
}
else
{
- if (dal.GetInfoByBarCode_View(sBarCode))
+ if (dal.GetInfoByBarCode(sBarCode, HBillType, HStockOrgID))
{
if (dal.omodel_View.HStopflag)
{
@@ -53019,7 +53019,7 @@
}
else
{
- if (dal.GetInfoByBarCode_View(sBarCode))
+ if (dal.GetInfoByBarCode(sBarCode, HBillType, HStockOrgID))
{
if (dal.omodel_View.HStopflag)
{
@@ -53256,7 +53256,7 @@
#endregion
- #region 涓�閿壂鐮� 鎵弿鐗╂枡鏉＄爜
+ #region 涓�閿壂鐮� 鎵弿鐗╂枡鏉＄爜 鍑哄叆搴撴ā鍧� 闈炴墭鐩樻潯鐮佽皟鐢� 鍦ㄤ娇鐢�
//鎵弿鐗╂枡鏉＄爜 瀛樺叆鏉＄爜鍑哄叆搴撲复鏃惰〃
[WebMethod]
@@ -53790,7 +53790,7 @@
#endregion
- #region 涓�閿壂鐮� 鎵弿鐗╂枡鏉＄爜锛堟潯鐮佺被鍨� = "鎵樼洏鏉＄爜"锛�
+ #region 涓�閿壂鐮� 鎵弿鐗╂枡鏉＄爜锛堟潯鐮佺被鍨� = "鎵樼洏鏉＄爜"锛� 鍦ㄤ娇鐢�
//鎵弿鐗╂枡鏉＄爜 瀛樺叆鏉＄爜鍑哄叆搴撲复鏃惰〃
[WebMethod]
@@ -54280,6 +54280,7 @@
#region 鎵弿鐗╂枡鏉＄爜 璋冩嫧
+ //鎵弿鐗╂枡鏉＄爜 瀛樺叆鏉＄爜鍑哄叆搴撲复鏃惰〃 璋冩嫧 鍦ㄤ娇鐢�
[WebMethod]
public Model.ClsKf_ICStockBill_WMS get_BarCode_MoveStock(string sBarCode, Int64 HBillID, string HBillType, string HBillNo, string HMaker, Int64 HWhID, Int64 HSPID, Int64 HSCWHID, Int64 HSCSPID, Double HQty, bool SourceFlag, string HSourceBillNo, string HSourceBillType, Int64 HStockInOrgID, Int64 HStockOutOrgID, string HScanStyle, ref string sErrMsg, string HCustom1 = "", string HCustom2 = "")
{
@@ -54349,7 +54350,7 @@
}
else
{
- if (dal.GetInfoByBarCode_View(sBarCode))
+ if (dal.GetInfoByBarCode(sBarCode, HBillType, HStockOutOrgID))
{
if (dal.omodel_View.HStopflag)
{
@@ -54510,7 +54511,7 @@
}
else
{
- if (dal.GetInfoByBarCode_View(sBarCode))
+ if (dal.GetInfoByBarCode(sBarCode, HBillType, HStockOutOrgID))
{
if (dal.omodel_View.HStopflag)
{
@@ -54687,7 +54688,7 @@
}
}
- //鎵弿鐗╂枡鏉＄爜 瀛樺叆鏉＄爜鍑哄叆搴撲复鏃惰〃 璋冩嫧
+ //鎵弿鐗╂枡鏉＄爜 瀛樺叆鏉＄爜鍑哄叆搴撲复鏃惰〃 璋冩嫧 闈炴墭鐩樻潯鐮佽皟鐢� 鍦ㄤ娇鐢�
[WebMethod]
public bool set_SavePonderationBillMain_Temp_BarCode_MoveStock(Model.ClsGy_BarCodeBill_WMS_Model_View omodel_View, Int64 HBillID, string HBillType, string HBillNo, string HMaker, Int64 HWhID, Int64 HSPID, Int64 HSCWHID, Int64 HSCSPID, Double HQty, bool SourceFlag, string HSourceBillType, Int64 HStockInOrgID, Int64 HStockOutOrgID, string HCustom1, string HCustom2, Pub_Class.ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg)
{
@@ -59215,7 +59216,7 @@
if (oSystemParameter.omodel.WMS_OneKeyMode.ToUpper() == "N")
{
DAL.ClsGy_BarCodeBill_View dal = new DAL.ClsGy_BarCodeBill_View();
- if (dal.GetInfoByBarCode_View(sBarCode))
+ if (dal.GetInfoByBarCode(sBarCode, HBillType, HOWNERID))
{
if (dal.omodel_View.HStopflag)
{
@@ -59314,7 +59315,7 @@
if (Dss == null || Dss.Tables[0].Rows.Count == 0)
{
DAL.ClsGy_BarCodeBill_View dal = new DAL.ClsGy_BarCodeBill_View();
- if (dal.GetInfoByBarCode_View(sBarCode))
+ if (dal.GetInfoByBarCode(sBarCode, HBillType, HOWNERID))
{
if (dal.omodel_View.HStopflag)
{
diff --git a/DLL/DAL.dll b/DLL/DAL.dll
index 27e136a..399e182 100644
--- a/DLL/DAL.dll
+++ b/DLL/DAL.dll
Binary files differ
--
Gitblit v1.9.1