From 90e19e843f7f0c74236da62a815423030e89415b Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期四, 09 一月 2025 16:36:17 +0800
Subject: [PATCH] 校验模块扫描物料条码完善修改，直接调拨校验上传方法完善修改
---
CLOUDWEB/WebService1.asmx.cs | 231 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 188 insertions(+), 43 deletions(-)
diff --git a/CLOUDWEB/WebService1.asmx.cs b/CLOUDWEB/WebService1.asmx.cs
index 7f8cc34..75638f0 100644
--- a/CLOUDWEB/WebService1.asmx.cs
+++ b/CLOUDWEB/WebService1.asmx.cs
@@ -11952,32 +11952,83 @@
[WebMethod]
public bool set_SaveMoveStockBill_BillCheck(Model.ClsKf_MoveStockBillMain oMain, ref string sErrMsg)
{
- if (set_SaveMoveStockBill_CLD_BillCheck(oMain, ref sErrMsg) == true)
- {
- //涓婁紶鎴愬姛
- return true;
- }
- else
- {
- //涓婁紶澶辫触
- sErrMsg = "鍗曟嵁鍙凤細" + oMain.HBillNo + "锛屽崟鎹甀D锛�" + oMain.HInterID + "锛涗笂浼犲崟鎹け璐ワ紒" + sErrMsg;
- return false;
- }
- }
-
- [WebMethod]
- public bool set_SaveMoveStockBill_CLD_BillCheck(Model.ClsKf_MoveStockBillMain oMain, ref string sErrMsg)
- {
- SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
//鑾峰彇绯荤粺鍙傛暟
Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
- if (oSystemParameter.ShowBill(ref sErrMsg) == false)
+ if (oSystemParameter.ShowBillByOrgID(oMain.HSTOCKORGID, ref sErrMsg) == false)
{
sErrMsg = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
return false;
}
+ //WMS绯荤粺鍚屾鑷矱RP鐨勭被鍨嬶紙WISE銆丆LOUD銆丮ES锛�
+ if (oSystemParameter.omodel.Kf_MoveStockBillCheck_ERPMode.ToUpper() == "WISE")
+ {
+ sErrMsg = "鏆傛棤姝ゅ姛鑳斤紒";
+ return false;
+ }
+ else if (oSystemParameter.omodel.Kf_MoveStockBillCheck_ERPMode.ToUpper() == "CLOUD")
+ {
+ //鍘熷崟鎹负鎵爜鐢熸垚锛屽鍘熸壂鎻忕殑鏉＄爜杩涜鏍稿
+ if (oSystemParameter.omodel.Kf_MoveStockBillCheck_SourceBarCodeCtl == "Y")
+ {
+ sErrMsg = "鏆備笉鏀寔鎵爜鐢熸垚鍗曟嵁鐨勬牎楠屽姛鑳斤紒";
+ return false;
+ }
+ //鍘熷崟鎹潪鎵爜鐢熸垚
+ else
+ {
+ if (set_SaveMoveStockBill_CLD_BillCheck(oMain, oSystemParameter.omodel, ref sErrMsg) == true)
+ {
+ //涓婁紶鎴愬姛
+ return true;
+ }
+ else
+ {
+ //涓婁紶澶辫触
+ sErrMsg = "鍗曟嵁鍙凤細" + oMain.HBillNo + "锛屽崟鎹甀D锛�" + oMain.HInterID + "锛涗笂浼犲崟鎹け璐ワ紒" + sErrMsg;
+ return false;
+ }
+ }
+ }
+ else if (oSystemParameter.omodel.Kf_MoveStockBillCheck_ERPMode.ToUpper() == "WMS") //鍙敓鎴怶MS鍗曟嵁
+ {
+ //鍘熷崟鎹负鎵爜鐢熸垚锛屽鍘熸壂鎻忕殑鏉＄爜杩涜鏍稿
+ if (oSystemParameter.omodel.Kf_MoveStockBillCheck_SourceBarCodeCtl == "Y")
+ {
+ sErrMsg = "鏆備笉鏀寔鎵爜鐢熸垚鍗曟嵁鐨勬牎楠屽姛鑳斤紒";
+ return false;
+ }
+ //鍘熷崟鎹潪鎵爜鐢熸垚
+ else
+ {
+ if (set_SaveMoveStockBill_WMS_BillCheck(oMain, oSystemParameter.omodel, ref sErrMsg) == true)
+ {
+ //涓婁紶鎴愬姛
+ return true;
+ }
+ else
+ {
+ //涓婁紶澶辫触
+ sErrMsg = "鍗曟嵁鍙凤細" + oMain.HBillNo + "锛屽崟鎹甀D锛�" + oMain.HInterID + "锛涗笂浼犲崟鎹け璐ワ紒" + sErrMsg;
+ return false;
+ }
+ }
+ }
+ else
+ {
+ sErrMsg = "WMS绯荤粺鍚屾鑷矱RP鐨勭被鍨嬪搴旂郴缁熷弬鏁拌缃敊璇紒";
+ return false;
+ }
+ }
+
+ //CLOUD 鍘熷崟鎹潪鎵爜鐢熸垚
+
+ [WebMethod]
+ private bool set_SaveMoveStockBill_CLD_BillCheck(Model.ClsKf_MoveStockBillMain oMain, Pub_Class.ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg)
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+
//涓婁紶鍓嶅垽鏂�
- DataSet Ds = oCn.RunProcReturn("exec h_p_WMS_BeforeUpload_MoveStockBillCheck " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "','" + oMain.HBillType + "','" + oSystemParameter.omodel.Kf_MoveStockBillCheck_MustQtyCtl + "'", "h_p_WMS_BeforeUpload_MoveStockBillCheck");
+ DataSet Ds = oCn.RunProcReturn("exec h_p_WMS_BeforeUpload_MoveStockBillCheck " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "','" + oMain.HBillType + "','" + oSystemParameterMain.Kf_MoveStockBillCheck_MustQtyCtl + "'", "h_p_WMS_BeforeUpload_MoveStockBillCheck");
if (Ds == null || Ds.Tables[0].Rows.Count == 0)
{
sErrMsg = "鏍￠獙涓婁紶鍓嶅垽鏂紝鍙戠敓閿欒锛�";
@@ -12018,7 +12069,7 @@
sCLOUDPsd = DBUtility.ClsPub.isStrNull(ds11.Tables[0].Rows[0]["HCloudUserPsd"]);
}
- if (oSystemParameter.omodel.Kf_MoveStockBillCheck_MustQtyCtl == "瀹屽叏绛変簬搴旀敹")
+ if (oSystemParameterMain.Kf_MoveStockBillCheck_MustQtyCtl == "瀹屽叏绛変簬搴旀敹")
{
string HReturn;
ApiClient client = new ApiClient(Pub_Class.ClsPub.sCLOUDUrl);
@@ -12039,12 +12090,24 @@
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- sErrMsg = "瀹℃牳鐩存帴璋冩嫧鍗曞け璐ワ紒" + HReturn;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鏍￠獙瀹℃牳鐩存帴璋冩嫧鍗曞け璐ワ紒" + strErrorMsg;
+ LogService.Write("鏍￠獙瀹℃牳鐩存帴璋冩嫧鍗曞け璐ワ紒" + HReturn); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
}
else
{
+ sErrMsg = "瀹℃牳鐩存帴璋冩嫧鍗曟垚鍔燂紒鍗曟嵁鍙蜂负锛�" + oMain.HBillNo;
+ LogService.Write("鏍￠獙瀹℃牳鐩存帴璋冩嫧鍗曟垚鍔燂紒鍗曟嵁鍙蜂负锛�" + oMain.HBillNo); //鍐欏叆txt鏂囨湰
oCn.Commit();
return true;
}
@@ -12105,7 +12168,17 @@
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- sErrMsg = "淇敼鐩存帴璋冩嫧鍗曞け璐ワ紒" + HReturn + sJson;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鏍￠獙淇敼鐩存帴璋冩嫧鍗曞け璐ワ紒" + strErrorMsg;
+ LogService.Write("鏍￠獙淇敼鐩存帴璋冩嫧鍗曞け璐ワ紒" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
}
@@ -12125,7 +12198,17 @@
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
- sErrMsg = "鏍￠獙瀹℃牳鐩存帴璋冩嫧鍗曞け璐ワ紒" + HReturn + sJson;
+ //鍙嶅簭鍒楀寲json鏁版嵁
+ var retModel = JsonConvert.DeserializeObject<KingdeeResponse>(HReturn);
+ //鎺ユ敹閲戣澏鎶ラ敊淇℃伅
+ var strErrorMsg = string.Empty;
+ //閬嶅巻鑾峰彇鎶ラ敊淇℃伅
+ foreach (var item in retModel.Result.ResponseStatus.Errors)
+ {
+ strErrorMsg += item.Message + "\r\n";
+ };
+ sErrMsg = "鏍￠獙瀹℃牳鐩存帴璋冩嫧鍗曞け璐ワ紒" + strErrorMsg;
+ LogService.Write("鏍￠獙瀹℃牳鐩存帴璋冩嫧鍗曞け璐ワ紒" + HReturn + sJson); //鍐欏叆txt鏂囨湰
oCn.RollBack();
return false;
}
@@ -12133,6 +12216,8 @@
{
//閲嶆柊鍚屾鐩存帴璋冩嫧鍗�
oCn.RunProc("exec h_p_IFCLD_ERPSourceBillToLocal_MoveStock '" + oMain.HBillNo + "'");
+ sErrMsg = "淇敼骞跺鏍哥洿鎺ヨ皟鎷ㄥ崟鎴愬姛锛佸崟鎹彿涓猴細" + oMain.HBillNo;
+ LogService.Write("鏍￠獙淇敼骞跺鏍哥洿鎺ヨ皟鎷ㄥ崟鎴愬姛锛佸崟鎹彿涓猴細" + oMain.HBillNo); //鍐欏叆txt鏂囨湰
oCn.Commit();
return true;
}
@@ -12150,6 +12235,46 @@
catch (Exception e)
{
sErrMsg = "鏍￠獙瀹℃牳鐩存帴璋冩嫧鍗曞け璐ワ紒" + e.Message;
+ oCn.RollBack();
+ return false;
+ }
+ }
+
+ //WMS 鍘熷崟鎹潪鎵爜鐢熸垚 鍙敓鎴怶MS鍗曟嵁
+ private bool set_SaveMoveStockBill_WMS_BillCheck(Model.ClsKf_MoveStockBillMain oMain, Pub_Class.ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg)
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+
+ //涓婁紶鍓嶅垽鏂�
+ DataSet Ds = oCn.RunProcReturn("exec h_p_WMS_BeforeUpload_MoveStockBillCheck_WMS " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "','" + oMain.HBillType + "','" + oSystemParameterMain.WMS_WMSStockCtl_ERPMode + "'", "h_p_WMS_BeforeUpload_MoveStockBillCheck_WMS");
+ if (Ds == null || Ds.Tables[0].Rows.Count == 0)
+ {
+ sErrMsg = "鏍￠獙涓婁紶鍓嶅垽鏂紝鍙戠敓閿欒锛�";
+ return false;
+ }
+ else
+ {
+ if (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0][0]) == 1)
+ {
+ sErrMsg = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]);
+ return false;
+ }
+ }
+
+ try
+ {
+ oCn.BeginTran();
+ //鍐欏叆鏉＄爜鍑哄叆搴撹〃
+ oCn.RunProc("EXEC h_p_Kf_ICStockBillSub_WMS_Insert_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillType + "','" + oMain.HBillNo + "'");
+
+ sErrMsg = "鏍￠獙鐩存帴璋冩嫧鍗曟垚鍔燂紒鍗曟嵁鍙蜂负锛�" + oMain.HBillNo;
+ LogService.Write("鏍￠獙鐩存帴璋冩嫧鍗曟垚鍔燂紒鍗曟嵁鍙蜂负锛�" + oMain.HBillNo); //鍐欏叆txt鏂囨湰
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sErrMsg = "鏍￠獙鐩存帴璋冩嫧鍗曞け璐ワ紒" + e.Message;
oCn.RollBack();
return false;
}
@@ -21959,7 +22084,7 @@
}
//CLOUD 鍘熷崟鎹潪鎵爜鐢熸垚
- public bool set_SaveMateOutBill_CLD_BillCheck(Model.ClsKf_MateOutBillMain oMain, Pub_Class.ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg)
+ private bool set_SaveMateOutBill_CLD_BillCheck(Model.ClsKf_MateOutBillMain oMain, Pub_Class.ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg)
{
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
@@ -27717,7 +27842,7 @@
}
}
- //鍘熷崟鎹潪鎵爜鐢熸垚
+ //CLOUD 鍘熷崟鎹潪鎵爜鐢熸垚
public bool set_SaveOtherOutBill_CLD_BillCheck(Model.ClsKf_OtherOutBillMain oMain, Pub_Class.ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg)
{
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
@@ -32202,8 +32327,8 @@
}
}
- //鍘熷崟鎹潪鎵爜鐢熸垚
- public bool set_SavePOStockInBill_CLD_BillCheck(Model.ClsKf_POStockInBillMain oMain, Pub_Class.ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg)
+ //CLOUD 鍘熷崟鎹潪鎵爜鐢熸垚
+ private bool set_SavePOStockInBill_CLD_BillCheck(Model.ClsKf_POStockInBillMain oMain, Pub_Class.ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg)
{
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
@@ -35277,8 +35402,8 @@
}
}
- //鍘熷崟鎹潪鎵爜鐢熸垚
- public bool set_SaveProductInBill_CLD_BillCheck(Model.ClsKf_ProductInBillMain oMain, Pub_Class.ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg)
+ //CLOUD 鍘熷崟鎹潪鎵爜鐢熸垚
+ private bool set_SaveProductInBill_CLD_BillCheck(Model.ClsKf_ProductInBillMain oMain, Pub_Class.ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg)
{
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
@@ -39051,7 +39176,7 @@
}
//CLOUD 鍘熷崟鎹潪鎵爜鐢熸垚
- public bool set_SaveOtherInBill_CLD_BillCheck(Model.ClsKf_OtherInBillMain oMain, Pub_Class.ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg)
+ private bool set_SaveOtherInBill_CLD_BillCheck(Model.ClsKf_OtherInBillMain oMain, Pub_Class.ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg)
{
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
@@ -39269,7 +39394,7 @@
}
//CLOUD 鍘熷崟鎹负鎵爜鐢熸垚锛屽鍘熸壂鎻忕殑鏉＄爜杩涜鏍稿
- public bool set_SaveOtherInBill_CLD_BillCheck_Verify(Model.ClsKf_OtherInBillMain oMain, ref string sErrMsg)
+ private bool set_SaveOtherInBill_CLD_BillCheck_Verify(Model.ClsKf_OtherInBillMain oMain, ref string sErrMsg)
{
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
//涓婁紶鍓嶅垽鏂�
@@ -57633,7 +57758,7 @@
}
#endregion
- string HMaterNumber; //鐗╂枡浠ｇ爜
+ string HMaterNumber; //鐗╂枡浠ｇ爜
//鍒ゆ柇鏄惁瀛樺湪鐩稿悓鏉＄爜锛屽垽鏂墍鎵潯鐮佹槸鍚﹀湪鍗曟嵁涓�
DataSet ds1 = oCn.RunProcReturn("exec h_p_WMS_AddBarCode_BillCheck_New '" + omodel_View.HBarCode + "'," + HBillID.ToString() + ",'" + HBillNo + "','" + HBillType + "'," + HWhID + "," + HSPID + ",'" + sWHSPCtl + "','" + sMultilineCtl + "'", "h_p_WMS_AddBarCode_BillCheck_New");
if (ds1 == null || ds1.Tables[0].Rows.Count == 0)
@@ -57647,8 +57772,8 @@
{
omodel_View.HMaterID = DBUtility.ClsPub.isLong(ds1.Tables[0].Rows[0]["HMaterID"]);
omodel_View.HSourceQty = DBUtility.ClsPub.isDoule(ds1.Tables[0].Rows[0]["HSumQtyMust"]); //HSumQtyMust涓烘簮鍗曠浉鍚岀墿鏂欏墿浣欏彲鎵暟閲�
- HWhID = DBUtility.ClsPub.isLong(ds1.Tables[0].Rows[0]["HWhID"]);
- HSPID = DBUtility.ClsPub.isLong(ds1.Tables[0].Rows[0]["HSPID"]);
+ HWhID = DBUtility.ClsPub.isLong(ds1.Tables[0].Rows[0]["sHWhID"]);
+ HSPID = DBUtility.ClsPub.isLong(ds1.Tables[0].Rows[0]["sHSPID"]);
HMaterNumber = DBUtility.ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HMaterNumber"]);
}
else
@@ -57703,7 +57828,7 @@
//鐢熶骇棰嗘枡锛�1204锛夈�侀攢鍞嚭搴擄紙1205锛夈�佸叾浠栧嚭搴撹摑瀛楋紙1206锛夈�佸澶栧嚭搴擄紙1211锛�
//澶栬喘閫�鏂欙紙1239锛夈�佷骇鍝侀��搴擄紙1245锛夈�佸叾浠栧叆搴撶孩瀛楋紙1248锛夈�佸澶栭��搴擄紙1246锛�
- //鐢熶骇琛ユ枡锛�1254锛夈�佸澶栬ˉ鏂欙紙1255锛�
+ //鐢熶骇琛ユ枡锛�1254锛夈�佸澶栬ˉ鏂欙紙1255锛夈�佺洿鎺ヨ皟鎷ㄥ崟锛�1207锛夈�佸垎姝ュ紡璋冨嚭鍗曪紙1250锛�
//鍑哄簱銆佺孩瀛楀叆搴擄紝鍒ゆ柇鏉＄爜搴撳瓨銆丒RP搴撳瓨
double sWMSQty = 0; //鏉＄爜搴撳瓨鏁伴噺
double sERPQty = 0; //ERP搴撳瓨鏁伴噺
@@ -57711,12 +57836,12 @@
string sSPName = ""; //浠撲綅鍚嶇О
if (HBillType == "1204" || HBillType == "1205" || HBillType == "1206" || HBillType == "1211"
|| HBillType == "1239" || HBillType == "1245" || HBillType == "1248" || HBillType == "1246"
- || HBillType == "1254" || HBillType == "1255")
+ || HBillType == "1254" || HBillType == "1255" || HBillType == "1207" || HBillType == "1250")
{
//搴撳瓨鎺у埗-WMS璐熷簱瀛樻帶鍒�
if (omodel_View.HBarCodeType == "鍞竴鏉＄爜" && oSystemParameterMain.WMS_WMSStockCtl.ToUpper() == "Y")
{
- //鍒ゆ柇ERP搴撳瓨 杩斿洖ERP搴撳瓨鏁伴噺
+ //鍒ゆ柇WMS搴撳瓨 杩斿洖WMS搴撳瓨鏁伴噺
DataSet DsWMS = oCn.RunProcReturn("exec h_p_WMS_AddBarCode_GetWMSICInventory " + HBillID.ToString() + ",'" + HBillType + "','" + omodel_View.HBarCode + "'," + HWhID.ToString() + "," + HSPID.ToString() + "," + HOWNERID.ToString(), "h_p_WMS_AddBarCode_GetWMSICInventory");
if (DsWMS == null || DsWMS.Tables[0].Rows.Count == 0)
{
@@ -57819,7 +57944,17 @@
//鍞竴鏉＄爜锛屼竴娆℃壂鐮佹帶鍒讹紝鍚屼竴鏉＄爜銆佸悓涓�鍗曟嵁绫诲瀷锛屽湪WMS琛ㄥ拰TEMP琛ㄩ噷锛屽彧鍏佽杩涜涓�娆℃壂鐮�
if (omodel_View.HBarCodeType == "鍞竴鏉＄爜" && sOneScanCtl == "Y")
{
- DataSet dsOneScan = oCn.RunProcReturn("exec h_p_WMS_AddBarCode_OneScan '" + omodel_View.HBarCode + "'," + HBillID.ToString() + ",'" + HBillNo + "','" + HBillType + "'," + HWhID + "," + HSPID + ",0,0,'" + HMaker + "'", "h_p_WMS_AddBarCode_OneScan");
+ Int64 HSCWHID = 0; //璋冨嚭浠撳簱ID
+ Int64 HSCSPID = 0; //璋冨嚭浠撲綅ID
+ //鐩存帴璋冩嫧鍗曪紙1207锛夈�佸垎姝ュ紡璋冨嚭鍗曪紙1250锛夈�佸垎姝ュ紡璋冨叆鍗曪紙1251锛�
+ if (HBillType == "1207" || HBillType == "1250" || HBillType == "1251")
+ {
+ HSCWHID = HWhID;
+ HSCSPID = HSPID;
+ HWhID = DBUtility.ClsPub.isLong(ds1.Tables[0].Rows[0]["HWhID"]);
+ HSPID = DBUtility.ClsPub.isLong(ds1.Tables[0].Rows[0]["HSPID"]);
+ }
+ DataSet dsOneScan = oCn.RunProcReturn("exec h_p_WMS_AddBarCode_OneScan '" + omodel_View.HBarCode + "'," + HBillID.ToString() + ",'" + HBillNo + "','" + HBillType + "'," + HWhID + "," + HSPID + "," + HSCWHID + "," + HSCSPID + ",'" + HMaker + "'", "h_p_WMS_AddBarCode_OneScan");
if (dsOneScan == null || dsOneScan.Tables[0].Rows.Count == 0)
{
}
@@ -57897,10 +58032,20 @@
oMain.HBarCode = omodel_View.HBarCode;
oMain.HBatchNo = omodel_View.HBatchNo;
oMain.HMTONo = omodel_View.HMTONo;
- oMain.HWhID = HWhID;
- oMain.HStockPlaceID = HSPID;
- oMain.HSCWHID = 0;
- oMain.HOutStockPlaceID = 0;
+ if (HBillType == "1207" || HBillType == "1250" || HBillType == "1251")
+ {
+ oMain.HWhID = DBUtility.ClsPub.isLong(ds1.Tables[0].Rows[i]["HWhID"]);
+ oMain.HStockPlaceID = DBUtility.ClsPub.isLong(ds1.Tables[0].Rows[i]["HSPID"]);
+ oMain.HSCWHID = HWhID;
+ oMain.HOutStockPlaceID = HSPID;
+ }
+ else
+ {
+ oMain.HWhID = HWhID;
+ oMain.HStockPlaceID = HSPID;
+ oMain.HSCWHID = 0;
+ oMain.HOutStockPlaceID = 0;
+ }
oMain.HSourceInterID = DBUtility.ClsPub.isLong(ds1.Tables[0].Rows[i]["HSourceInterID"]);
oMain.HSourceEntryID = DBUtility.ClsPub.isLong(ds1.Tables[0].Rows[i]["HSourceEntryID"]);
oMain.HSourceBillNo = DBUtility.ClsPub.isStrNull(ds1.Tables[0].Rows[i]["HSourceBillNo"]);
@@ -57924,7 +58069,7 @@
oMain.HEndDate = omodel_View.HExpiryDate.ToShortDateString();
}
oMain.HSTOCKORGID = HOWNERID;
- oMain.HOWNERID = HOWNERID;
+ oMain.HOWNERID = DBUtility.ClsPub.isLong(ds1.Tables[0].Rows[i]["HOtherOrgID"]);
oCn.RunProc("Insert into KF_PonderationBillMain_Temp " +
"(HInterID,HBillNo,HBillType,HMaterID,HUnitID,HAuxPropID,HProcID" +
--
Gitblit v1.9.1