From 7bdfa90aaa1388399234fdd213f65fca26ee0c9f Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期五, 27 十月 2023 10:16:54 +0800
Subject: [PATCH] 新增删托单扫码调用方法，新增客户四维尔扫描托条码功能
---
CLOUDWEB/WebService1.asmx.cs | 210 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 210 insertions(+), 0 deletions(-)
diff --git a/CLOUDWEB/WebService1.asmx.cs b/CLOUDWEB/WebService1.asmx.cs
index 43c2dad..d8fe7cd 100644
--- a/CLOUDWEB/WebService1.asmx.cs
+++ b/CLOUDWEB/WebService1.asmx.cs
@@ -43719,7 +43719,24 @@
Int64 sHDeptID = 0;
string sHDeptName = "";
string sHBarType = "";
+ string sBarCode2 = "";
sBarCode = sBarCode.Trim();
+ if (sBarCode == "")
+ {
+ sErrMsg = "鏉＄爜涓嶈兘涓虹┖锛岃鎵弿鏉＄爜锛�";
+ return null;
+ }
+ else
+ {
+ //鍒ゆ柇鏉＄爜鏄惁鍚壒娈婄鍙� # 锛屽鏋滃惈鏈夊垯 鎷嗗垎锛�# 鍓嶄负鏉＄爜缂栧彿锛�# 鍚庡涓烘暟瀛楋紝鍒欓粯璁ら�掑叆鏁伴噺涓� #鍚庢樉绀虹殑鏁伴噺锛�
+ string[] NewBarCode;
+ if (sBarCode.Contains("#"))
+ {
+ NewBarCode = sBarCode.Split(Convert.ToChar("#"));
+ sBarCode2 = NewBarCode[0];
+ }
+ sBarCode2 = sBarCode;
+ }
string sBarCodePrefix = sBarCode.Substring(0, Math.Min(3, sBarCode.Length));//鎴彇鏉＄爜鍓嶄笁浣嶅瓧绗︿覆
//鑾峰彇绯荤粺鍙傛暟
@@ -44066,6 +44083,61 @@
}
}
}
+ else if(oSystemParameter.omodel.WMS_CampanyName == "鍥涚淮灏�")
+ {
+ DAL.ClsGy_BarCodeBill_View dal = new DAL.ClsGy_BarCodeBill_View();
+ if (dal.GetInfoByBarCode_View(sBarCode2))
+ {
+ if (dal.omodel_View.HStopflag)
+ {
+ sErrMsg = "鏉＄爜宸茶绂佺敤锛屼笉鍏佽鎵弿锛�";
+ return null;
+ }
+ else
+ {
+ //鍒ゆ柇鏉＄爜绫诲瀷鏄惁涓烘墭鐩樻潯鐮侊紝濡傛灉鏄墭鐩樻潯鐮佸垯鍒嗚В骞舵ā鎷熸壂鐮�
+ if (dal.omodel_View.HBarCodeType == "鎵樼洏鏉＄爜")
+ {
+ //灏嗘墭鏉＄爜淇℃伅鍐欏叆鏉＄爜鍑哄叆搴撲复鏃惰〃
+ oBar = get_SavePonderationBillMain_Temp_PackBarCode(dal.omodel_View, HBillID, HBillType, HBillNo, HMaker, HWhID, HSPID, 0, 0, SourceFlag, HSourceBillType, HOWNERID, HOWNERID, HExpressNumber, "", oSystemParameter.omodel, ref sErrMsg);
+ if (oBar == null)
+ {
+ sErrMsg = "鍗曟嵁鍙凤細" + HBillNo + "锛屽崟鎹甀D锛�" + HBillID + "锛涙壂鎻忓け璐ワ紒" + sErrMsg;
+ return null;
+ }
+ else
+ {
+ return oBar;
+ }
+ }
+ else
+ //鏉＄爜绫诲瀷涓嶄负鎵樼洏鏉＄爜
+ {
+ //灏嗙墿鏂欐潯鐮佷俊鎭啓鍏ュ嚭鍏ュ簱鏉＄爜涓存椂琛�
+ if (set_SavePonderationBillMain_Temp_BarCode(sBarCode, HBillID, HBillType, HBillNo, HMaker, HWhID, HSPID, HQty, HRedBlueFlag, SourceFlag, HSourceBillNo, HSourceBillType, HOWNERID, HExpressNumber, ref sHSourceBillNo, ref sHSourceBillType, ref sHSupID, ref sHSupName, ref sHDeptID, ref sHDeptName, ref sErrMsg))
+ {
+ oBar.HSourceBillType = sHSourceBillType;
+ oBar.HSourceBillNo = sHSourceBillNo;
+ oBar.HSupID = sHSupID;
+ oBar.HSupName = sHSupName;
+ oBar.HDeptID = sHDeptID;
+ oBar.HDeptName = sHDeptName;
+ }
+ else
+ {
+ sErrMsg = "鍗曟嵁鍙凤細" + HBillNo + "锛屽崟鎹甀D锛�" + HBillID + "锛涙壂鎻忓け璐ワ紒" + sErrMsg;
+ return null;
+ }
+ return oBar;
+ }
+ }
+ }
+ else
+ {
+ sErrMsg = "鏉＄爜妗ｆ涓笉瀛樺湪璇ユ潯鐮侊紝璇风‘璁ゆ潯鐮佹槸鍚︽纭垨鏄惁宸茶鍒犻櫎锛�";
+ return null;
+ }
+ }
else
{
//灏嗙墿鏂欐潯鐮佷俊鎭啓鍏ュ嚭鍏ュ簱鏉＄爜涓存椂琛�
@@ -44215,6 +44287,61 @@
sErrMsg = DBUtility.ClsPub.isStrNull(Mould.Tables[0].Rows[0]["HRemark"]);
return null;
}
+ }
+ }
+ else if (oSystemParameter.omodel.WMS_CampanyName == "鍥涚淮灏�")
+ {
+ DAL.ClsGy_BarCodeBill_View dal = new DAL.ClsGy_BarCodeBill_View();
+ if (dal.GetInfoByBarCode_View(sBarCode2))
+ {
+ if (dal.omodel_View.HStopflag)
+ {
+ sErrMsg = "鏉＄爜宸茶绂佺敤锛屼笉鍏佽鎵弿锛�";
+ return null;
+ }
+ else
+ {
+ //鍒ゆ柇鏉＄爜绫诲瀷鏄惁涓烘墭鐩樻潯鐮侊紝濡傛灉鏄墭鐩樻潯鐮佸垯鍒嗚В骞舵ā鎷熸壂鐮�
+ if (dal.omodel_View.HBarCodeType == "鎵樼洏鏉＄爜")
+ {
+ //灏嗘墭鏉＄爜淇℃伅鍐欏叆鏉＄爜鍑哄叆搴撲复鏃惰〃
+ oBar = get_SavePonderationBillMain_Temp_PackBarCode(dal.omodel_View, HBillID, HBillType, HBillNo, HMaker, HWhID, HSPID, 0, 0, SourceFlag, HSourceBillType, HOWNERID, HOWNERID, HExpressNumber, "", oSystemParameter.omodel, ref sErrMsg);
+ if (oBar == null)
+ {
+ sErrMsg = "鍗曟嵁鍙凤細" + HBillNo + "锛屽崟鎹甀D锛�" + HBillID + "锛涙壂鎻忓け璐ワ紒" + sErrMsg;
+ return null;
+ }
+ else
+ {
+ return oBar;
+ }
+ }
+ else
+ //鏉＄爜绫诲瀷涓嶄负鎵樼洏鏉＄爜
+ {
+ //灏嗙墿鏂欐潯鐮佷俊鎭啓鍏ュ嚭鍏ュ簱鏉＄爜涓存椂琛�
+ if (set_SavePonderationBillMain_Temp_BarCode(sBarCode, HBillID, HBillType, HBillNo, HMaker, HWhID, HSPID, HQty, HRedBlueFlag, SourceFlag, HSourceBillNo, HSourceBillType, HOWNERID, HExpressNumber, ref sHSourceBillNo, ref sHSourceBillType, ref sHSupID, ref sHSupName, ref sHDeptID, ref sHDeptName, ref sErrMsg))
+ {
+ oBar.HSourceBillType = sHSourceBillType;
+ oBar.HSourceBillNo = sHSourceBillNo;
+ oBar.HSupID = sHSupID;
+ oBar.HSupName = sHSupName;
+ oBar.HDeptID = sHDeptID;
+ oBar.HDeptName = sHDeptName;
+ }
+ else
+ {
+ sErrMsg = "鍗曟嵁鍙凤細" + HBillNo + "锛屽崟鎹甀D锛�" + HBillID + "锛涙壂鎻忓け璐ワ紒" + sErrMsg;
+ return null;
+ }
+ return oBar;
+ }
+ }
+ }
+ else
+ {
+ sErrMsg = "鏉＄爜妗ｆ涓笉瀛樺湪璇ユ潯鐮侊紝璇风‘璁ゆ潯鐮佹槸鍚︽纭垨鏄惁宸茶鍒犻櫎锛�";
+ return null;
}
}
else
@@ -52497,6 +52624,62 @@
#endregion
+ #region 鐢熶骇鍒犳墭鍗曟ā鍧楄皟鐢ㄦ柟娉� 20231025鏂板
+
+ #region 鐢熶骇鍒犳墭鍗曟ā鍧� 鎵弿鎵樻潯鐮�
+
+ [WebMethod]
+ public DataSet get_PackBarCode_DeletePackUnionBill(string HBarCode_Pack, string HHMaker, Int64 HStockOrgID, ref string sErrMsg)
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ DataSet ds = oCn.RunProcReturn("exec h_p_WMS_AddPackBarCode_DeletePackUnionBill '" + HBarCode_Pack + "','" + HHMaker + "'," + HStockOrgID.ToString(), "h_p_WMS_AddPackBarCode_DeletePackUnionBill");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ sErrMsg = "鎵弿鎵樻潯鐮佸垽鏂け璐ワ紒";
+ return null;
+ }
+ else
+ {
+ if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0][0]) == 0)
+ {
+ return ds;
+ }
+ else
+ {
+ sErrMsg = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
+ return null;
+ }
+ }
+ }
+
+ #endregion
+
+ #region 鐢熶骇鍒犳墭鍗曟ā鍧� 鎻愪氦
+
+ [WebMethod]
+ public bool set_DeletePackUnionBill(Int64 HInterID, string HBillNo, string HBarCode_Pack, string HMaker, string HComputerName, string HIPAddress,string HModCaption, ref string sErrMsg)
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ try
+ {
+ oCn.BeginTran();
+ DataSet ds = oCn.RunProcReturn("exec h_p_Sc_PackUnionBill_Delete " + HInterID.ToString() + ",'" + HBillNo + "','" + HBarCode_Pack + "','" + HMaker + "','" + HComputerName + "','" + HIPAddress + "','" + HModCaption + "'" , "h_p_Sc_PackUnionBill_Delete");
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sErrMsg = "鍒犳墭澶辫触锛�" + e.Message;
+ oCn.RollBack();
+ return false;
+ }
+ }
+
+ #endregion
+
+ #endregion
+
+
#region 鎹㈡墭璋冩嫧鍗曟ā鍧楄皟鐢ㄦ柟娉� 20230531鏂板
#region 鎹㈡墭璋冩嫧鍗曟ā鍧� 鎵弿璋冨叆鎵樻潯鐮�
@@ -53104,6 +53287,33 @@
#region 缂撳瓨鍒楄〃妯″潡璋冪敤鏂规硶
+ #region 缂栬緫缂撳瓨鍒楄〃鍗曟嵁璋冪敤
+
+ //缂撳瓨鍒楄〃鐣岄潰锛岄�夋嫨缂栬緫鏃讹紝鍒ゆ柇鎵�閫夊崟鎹槸鍚﹀瓨鍦ㄥ凡涓婁紶璁板綍
+ [WebMethod]
+ public bool TempList_Modify_Pack(Int64 sHInterID, string sHBillNo, string sHBillType, ref string sErrMsg)
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ DataSet Ds = oCn.RunProcReturn("exec h_p_WMS_TempList_Modify_Pack " + sHInterID + ",'" + sHBillNo + "','" + sHBillType + "'", "h_p_WMS_TempList_Modify_Pack");
+ if (Ds == null || Ds.Tables[0].Rows.Count == 0)
+ {
+ sErrMsg = "缂撳瓨鍒楄〃缂栬緫鍓嶅垽鏂け璐ワ紝鏁版嵁搴撹繛鎺ュけ璐ワ紒";
+ return false;
+ }
+ if (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0][0]) == 0)
+ {
+ return true;
+ }
+ else
+ {
+ sErrMsg = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]);
+ return false;
+ }
+ }
+
+
+ #endregion
+
#region 杩斿洖缂撳瓨鍒楄〃淇℃伅
[WebMethod]
--
Gitblit v1.9.1