From f6b75c26d24b58dac7212cb8106a2f9195251fc9 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期一, 20 十月 2025 10:11:47 +0800
Subject: [PATCH] 委外出库扫描源单调用方法修改，增加通过WEBAPI同步金蝶云委外用料清单至本地数据库功能
---
CLOUDWEB/WebService1.asmx.cs | 270 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 253 insertions(+), 17 deletions(-)
diff --git a/CLOUDWEB/WebService1.asmx.cs b/CLOUDWEB/WebService1.asmx.cs
index 5474a85..73a086a 100644
--- a/CLOUDWEB/WebService1.asmx.cs
+++ b/CLOUDWEB/WebService1.asmx.cs
@@ -950,6 +950,9 @@
HQtyMust = oSub.SelectToken("NeedQty")?.ToString() ?? "0",
HWHID = oSub.SelectToken("StockID_Id")?.ToString() ?? "0",
HSCWhID = oSub.SelectToken("SrcTransStockId_Id")?.ToString() ?? "0",
+ HAuxPropID = oSub.SelectToken("AuxPropID_Id")?.ToString() ?? "0",
+ HBatchNO = oSub.SelectToken("Lot_Text")?.ToString() ?? "",
+ HMTONo = oSub.SelectToken("MTONO")?.ToString() ?? "",
HRemark = "",
HSourceInterID = oSub.SelectToken("MoId")?.ToString() ?? "0",
HSourceEntryID = oSub.SelectToken("MoEntryId")?.ToString() ?? "0",
@@ -958,6 +961,20 @@
HICMOInterID = oSub.SelectToken("MoId")?.ToString() ?? "0",
HICMOEntryID = oSub.SelectToken("MoEntryId")?.ToString() ?? "0",
HICMOBillNo = oSub.SelectToken("MoBillNo")?.ToString() ?? "",
+ //HRelationQty = HRelationQty1-HRelationQty2
+ HRelationQty1 = decimal.TryParse(oSub.SelectToken("SelPickedQty")?.ToString(), out var p) ? p : 0,
+ HRelationQty2 = decimal.TryParse(oSub.SelectToken("SelPrcdReturnQty")?.ToString(), out var r) ? r : 0,
+ HMoveStockQty = oSub.SelectToken("SelTranslateQty")?.ToString() ?? "0",
+ HBackRelationQty = oSub.SelectToken("WipQty")?.ToString() ?? "0",
+ //HQtyScrap = HQtyScrap1/HQtyScrap2
+ HQtyScrap1 = decimal.TryParse(oSub.SelectToken("BaseNumerator")?.ToString(), out var n) ? n : 0,
+ HQtyScrap2 = decimal.TryParse(oSub.SelectToken("BaseDenominator")?.ToString(), out var d) ? d : 0,
+ HBOMID = oSub.SelectToken("BOMID_Id")?.ToString() ?? "0",
+ HBomNumber = oSub.SelectToken("BOMID.Number")?.ToString() ?? "",
+ HNumerator = oSub.SelectToken("Numerator")?.ToString() ?? "0",
+ HDenominator = oSub.SelectToken("Denominator")?.ToString() ?? "0",
+ HERPInterID = _saveObj.SelectToken("Result.Result.Id")?.ToString() ?? "0",
+ HERPEntryID = oSub.SelectToken("Id")?.ToString() ?? "0",
HCHILDSUPPLYORGID = oSub.SelectToken("ChildSupplyOrgId_Id")?.ToString() ?? "0",
HSUPPLYORGID = oSub.SelectToken("SupplyOrg_Id")?.ToString() ?? "0",
HENTRUSTPICKORGID = oSub.SelectToken("EntrustPickOrgId_Id")?.ToString() ?? "0",
@@ -965,21 +982,6 @@
HGROUPBYOWNERID = oSub.SelectToken("GroupByOwnerId_Id")?.ToString() ?? "0",
HOWNERID = oSub.SelectToken("OwnerID_Id")?.ToString() ?? "0",
HOWNERTYPEID = oSub.SelectToken("OwnerTypeId")?.ToString() ?? "",
- //HRelationQty = HRelationQty1-HRelationQty2
- HRelationQty1 = decimal.TryParse(oSub.SelectToken("SelPickedQty")?.ToString(), out var p) ? p : 0,
- HRelationQty2 = decimal.TryParse(oSub.SelectToken("SelPrcdReturnQty")?.ToString(), out var r) ? r : 0,
- HMoveStockQty = oSub.SelectToken("SelTranslateQty")?.ToString() ?? "0",
- HAuxPropID = oSub.SelectToken("AuxPropID_Id")?.ToString() ?? "0",
- HBatchNO = oSub.SelectToken("Lot_Text")?.ToString() ?? "",
- HMTONo = oSub.SelectToken("MTONO")?.ToString() ?? "",
- //HQtyScrap = HQtyScrap1/HQtyScrap2
- HQtyScrap1 = decimal.TryParse(oSub.SelectToken("BaseNumerator")?.ToString(), out var n) ? n : 0,
- HQtyScrap2 = decimal.TryParse(oSub.SelectToken("BaseDenominator")?.ToString(), out var d) ? d : 0,
- HERPInterID = _saveObj.SelectToken("Result.Result.Id")?.ToString() ?? "0",
- HERPEntryID = oSub.SelectToken("Id")?.ToString() ?? "0",
- HBackRelationQty = oSub.SelectToken("WipQty")?.ToString() ?? "0",
- HNumerator = oSub.SelectToken("Numerator")?.ToString() ?? "0",
- HDenominator = oSub.SelectToken("Denominator")?.ToString() ?? "0",
HBASEUNITID = oSub.SelectToken("BaseUnitID_Id")?.ToString() ?? "0",
HProcessID = oSub.SelectToken("ProcessID_Id")?.ToString() ?? "0",
HPROCESSNumber = oSub.SelectToken("ProcessID.Number")?.ToString() ?? "",
@@ -995,8 +997,6 @@
HSelPickedQty = oSub.SelectToken("SelPickedQty")?.ToString() ?? "0",
HSELPRCDRETURNQTY = oSub.SelectToken("SelPrcdReturnQty")?.ToString() ?? "0",
HKeyMaterID_Line = oSub.SelectToken("IsKeyComponent")?.ToString().ToUpper() == "TRUE" ? 1 : 0,
- HBOMID = oSub.SelectToken("BOMID_Id")?.ToString() ?? "0",
- HBomNumber = oSub.SelectToken("BOMID.Number")?.ToString() ?? "",
};
//鎻掑叆瀛愯〃
@@ -1020,6 +1020,212 @@
", " + SubData.HOWNERID.ToString() + ",'" + SubData.HOWNERTYPEID + "'," + SubData.HBASEUNITID.ToString() + "," + SubData.HProcessID.ToString() + ",'" + SubData.HPROCESSNumber + "'," + SubData.HICMOENTRYSEQ.ToString() +
",'" + SubData.HPROJECTNO + "'," + SubData.HOPERID.ToString() + "," + SubData.HSEQ.ToString() + "," + SubData.HSTOCKSTATUSID.ToString() + ",'" + SubData.HSTOCKSTATUSNumber + "'," + SubData.HLOT.ToString() +
", " + SubData.HOPTQUEUE.ToString() + "," + DBUtility.ClsPub.BoolToString(SubData.HRESERVETYPE) + "," + SubData.HSelPickedQty.ToString() + "," + SubData.HSELPRCDRETURNQTY.ToString() + "," + DBUtility.ClsPub.BoolToString(SubData.HKeyMaterID_Line) +
+ ") ");
+ }
+ }
+ return true;
+ }
+ }
+ else
+ {
+ sErrMsg = "鍚屾鍗曟嵁澶辫触锛侀噾铦朵簯鐧诲綍澶辫触锛�";
+ return false;
+ }
+ }
+
+ #endregion
+
+ #region 濮斿鐢ㄦ枡娓呭崟鍚屾 鏍规嵁鍗曟嵁鍙峰悓姝�
+
+ [WebMethod]
+ public bool GetWebAPIToLocal_WWPPBom(string HBillNo, string HBillType, string HMaker, ref string sErrMsg)
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+
+ //浠庨厤缃枃浠惰幏鍙� CLOUD缃戝潃銆佽处濂椾俊鎭�佺櫥褰曠敤鎴枫�佺櫥褰曞瘑鐮�
+ if (!Pub_Class.ClsPub.GetCLOUDLoginInfo(ref Pub_Class.ClsPub.sExeReturnInfo))
+ {
+ sErrMsg = Pub_Class.ClsPub.sExeReturnInfo;
+ return false;
+ }
+
+ //鑾峰彇CLOUD璐﹀彿瀵嗙爜
+ string HReturn;
+ string sCLOUDUseName = Pub_Class.ClsPub.sCLOUDUseName;
+ string sCLOUDPsd = Pub_Class.ClsPub.sCLOUDPsd;
+ string dbId = Pub_Class.ClsPub.sCLOUDAcc;
+ ApiClient client = new ApiClient(Pub_Class.ClsPub.sCLOUDUrl);
+ bool bLogin = client.Login(dbId, sCLOUDUseName, sCLOUDPsd, 2052);
+
+ if (bLogin)
+ {
+ //鏌ョ湅鍗曟嵁
+ string sJson = "{\"CreateOrgId\":0,\"Number\":\"" + HBillNo + "\"}";
+ var result = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.View",
+ new object[] { "SUB_PPBOM", sJson });
+ var _saveObj = JObject.Parse(result);
+
+ //鍒ゆ柇鏁版嵁鏄惁鑾峰彇鎴愬姛
+ if (_saveObj.SelectToken("Result.ResponseStatus.IsSuccess")?.ToString().ToUpper() != "TRUE")
+ {
+ HReturn = result.ToString();
+ //鍙嶅簭鍒楀寲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;
+ return false;
+ }
+ else
+ {
+ //涓昏〃鏁版嵁璧嬪��
+ var MainData = new
+ {
+ HInterID = _saveObj.SelectToken("Result.Result.Id")?.ToString() ?? "0",
+ HYear = DateTime.Now.Year,
+ HPeriod = DateTime.Now.Month,
+ HBillType = HBillType,
+ HBillSubType = HBillType,
+ HDate = _saveObj.SelectToken("Result.Result.CreateDate")?.ToString(),
+ HBillNo = _saveObj.SelectToken("Result.Result.BillNo")?.ToString() ?? "",
+ HBillStatus = _saveObj.SelectToken("Result.Result.ApproverId_Id")?.ToString() == "0" ? 1 : 2,
+ HICMOInterID = _saveObj.SelectToken("Result.Result.SubReqId")?.ToString() ?? "0",
+ HICMOEntryID = _saveObj.SelectToken("Result.Result.SubReqEntryId")?.ToString() ?? "0",
+ HSUBBILLNO = _saveObj.SelectToken("Result.Result.SubReqBillNO")?.ToString() ?? "",
+ HSUBREQENTRYSEQ = _saveObj.SelectToken("Result.Result.SubReqEntrySeq")?.ToString() ?? "0",
+ HMaterID = _saveObj.SelectToken("Result.Result.MaterialID_Id")?.ToString() ?? "0",
+ HUnitID = _saveObj.SelectToken("Result.Result.UnitID_Id")?.ToString() ?? "0",
+ HQty = _saveObj.SelectToken("Result.Result.Qty")?.ToString() ?? "0",
+ HSupID = _saveObj.SelectToken("Result.Result.SupplierId_Id")?.ToString() ?? "0",
+ HDeptID = 0,
+ HRemark = "WebAPI瀵煎叆",
+ HMaker = _saveObj.SelectToken("Result.Result.CreatorId.Name")?.ToString() ?? "",
+ HMakeDate = _saveObj.SelectToken("Result.Result.CreateDate")?.ToString(),
+ HChecker = _saveObj.SelectToken("Result.Result.ApproverId.Name")?.ToString() ?? "",
+ HCheckDate = _saveObj.SelectToken("Result.Result.ApproveDate")?.ToString(),
+ HUpDater = _saveObj.SelectToken("Result.Result.ModifierId.Name")?.ToString() ?? "",
+ HUpDateDate = _saveObj.SelectToken("Result.Result.ModifyDate")?.ToString(),
+ HPOOrderBillNo = _saveObj.SelectToken("Result.Result.PurOrderNo")?.ToString() ?? "",
+ HPOOrderSeq = _saveObj.SelectToken("Result.Result.PurOrderEntrySeq")?.ToString() ?? "0",
+ HSeOrderBillNo = _saveObj.SelectToken("Result.Result.SALEORDERNO")?.ToString() ?? "",
+ HSeOrderInterID = _saveObj.SelectToken("Result.Result.SaleOrderId")?.ToString() ?? "0",
+ HSeOrderEntryID = _saveObj.SelectToken("Result.Result.SaleOrderEntryId")?.ToString() ?? "0",
+ HSeOrderSEQ = _saveObj.SelectToken("Result.Result.SaleOrderEntrySeq")?.ToString() ?? "0",
+ HPRDORGID = _saveObj.SelectToken("Result.Result.SubOrgId_Id")?.ToString() ?? "0",
+ HENTRUSTORGID = _saveObj.SelectToken("Result.Result.SubOrgId_Id")?.ToString() ?? "0",
+ HPARENTOWNERID = _saveObj.SelectToken("Result.Result.ParentOwnerId_Id")?.ToString() ?? "0",
+ HPARENTOWNERTYPEID = _saveObj.SelectToken("Result.Result.ParentOwnerTypeId")?.ToString() ?? "",
+ HERPInterID = _saveObj.SelectToken("Result.Result.Id")?.ToString() ?? "0",
+ HERPBillType = "WWPPBOM",
+ HSETTLEORGID = _saveObj.SelectToken("Result.Result.SettleOrgId_Id")?.ToString() ?? "0",
+ HREQSRC = _saveObj.SelectToken("Result.Result.ReqSrc")?.ToString() ?? "",
+ };
+
+ //鏍规嵁鍗曟嵁ID锛屽垹闄ゆ湰鍦版暟鎹�
+ oCn.RunProc("Delete from WW_PPBomBillMain where HInterID=" + MainData.HInterID.ToString(), ref DBUtility.ClsPub.sExeReturnInfo);
+ oCn.RunProc("Delete from WW_PPBomBillSub where HInterID=" + MainData.HInterID.ToString(), ref DBUtility.ClsPub.sExeReturnInfo);
+
+ //鎻掑叆涓昏〃
+ oCn.RunProc("Insert Into WW_PPBomBillMain " +
+ "(HInterID,HYear,HPeriod,HBillType,HBillSubType,HDate" +
+ ",HBillNo,HBillStatus,HICMOInterID,HICMOEntryID,HSUBBILLNO,HSUBREQENTRYSEQ" +
+ ",HMaterID,HUnitID,HQty,HSupID,HDeptID,HRemark" +
+ ",HMaker,HMakeDate,HChecker,HCheckDate" +
+ ",HUpDater,HUpDateDate,HPOOrderBillNo,HPOOrderSeq" +
+ ",HSeOrderBillNo,HSeOrderInterID,HSeOrderEntryID,HSeOrderSEQ" +
+ ",HPRDORGID,HENTRUSTORGID,HPARENTOWNERID,HPARENTOWNERTYPEID" +
+ ",HERPInterID,HERPBillType,HSETTLEORGID,HREQSRC" +
+ ") " +
+ " values(" + MainData.HInterID.ToString() + "," + MainData.HYear.ToString() + "," + MainData.HPeriod.ToString() + ",'" + MainData.HBillType + "','" + MainData.HBillSubType + "','" + MainData.HDate + "'" +
+ ",'" + MainData.HBillNo + "'," + MainData.HBillStatus.ToString() + "," + MainData.HICMOInterID.ToString() + "," + MainData.HICMOEntryID.ToString() + ",'" + MainData.HSUBBILLNO + "'," + MainData.HSUBREQENTRYSEQ.ToString() +
+ ", " + MainData.HMaterID.ToString() + "," + MainData.HUnitID.ToString() + "," + MainData.HQty.ToString() + "," + MainData.HSupID.ToString() + "," + MainData.HDeptID.ToString() + ",'" + MainData.HRemark + "'" +
+ ",'" + MainData.HMaker + "','" + MainData.HMakeDate + "','" + MainData.HChecker + "'," + (MainData.HCheckDate == "" ? "NULL" : "'" + MainData.HCheckDate + "'") +
+ ",'" + MainData.HUpDater + "'," + (MainData.HUpDateDate == "" ? "NULL" : "'" + MainData.HUpDateDate + "'") + ",'" + MainData.HPOOrderBillNo + "'," + MainData.HPOOrderSeq.ToString() +
+ ",'" + MainData.HSeOrderBillNo + "'," + MainData.HSeOrderInterID.ToString() + "," + MainData.HSeOrderEntryID.ToString() + "," + MainData.HSeOrderSEQ.ToString() +
+ ", " + MainData.HPRDORGID.ToString() + "," + MainData.HENTRUSTORGID.ToString() + "," + MainData.HPARENTOWNERID.ToString() + ",'" + MainData.HPARENTOWNERTYPEID + "'" +
+ ", " + MainData.HERPInterID.ToString() + ",'" + MainData.HERPBillType + "'," + MainData.HSETTLEORGID.ToString() + ",'" + MainData.HREQSRC + "'" +
+ ") ");
+
+ //瀛愯〃鏁版嵁璧嬪��
+ var dataArr = _saveObj.SelectToken("Result.Result.PPBomEntry") as JArray;
+
+ if (dataArr != null)
+ {
+ foreach (var oSub in dataArr)
+ {
+ var SubData = new
+ {
+ HInterID = _saveObj.SelectToken("Result.Result.Id")?.ToString() ?? "0",
+ HEntryID = oSub.SelectToken("Id")?.ToString() ?? "0",
+ HMaterID = oSub.SelectToken("MaterialID_Id")?.ToString() ?? "0",
+ HUnitID = oSub.SelectToken("UnitID_Id")?.ToString() ?? "0",
+ HQty = oSub.SelectToken("NeedQty")?.ToString() ?? "0",
+ HQtyMust = oSub.SelectToken("NeedQty")?.ToString() ?? "0",
+ HWHID = oSub.SelectToken("StockID_Id")?.ToString() ?? "0",
+ HSCWhID = oSub.SelectToken("SrcTransStockId_Id")?.ToString() ?? "0",
+ HAuxPropID = oSub.SelectToken("AuxPropID_Id")?.ToString() ?? "0",
+ HBatchNO = oSub.SelectToken("Lot_Text")?.ToString() ?? "",
+ HMTONo = oSub.SelectToken("MTONO")?.ToString() ?? "",
+ HRemark = "",
+ HSourceInterID = oSub.SelectToken("SubReqId")?.ToString() ?? "0",
+ HSourceEntryID = oSub.SelectToken("SubReqEntryId")?.ToString() ?? "0",
+ HSourceBillNo = oSub.SelectToken("SubReqBillNO")?.ToString() ?? "",
+ HSourceBillType = "",
+ HICMOInterID = 0,
+ HICMOEntryID = 0,
+ HICMOBillNo = "",
+ //HRelationQty = HRelationQty1-HRelationQty2
+ HRelationQty1 = decimal.TryParse(oSub.SelectToken("SelPickedQty")?.ToString(), out var p) ? p : 0,
+ HRelationQty2 = decimal.TryParse(oSub.SelectToken("SelPrcdReturnQty")?.ToString(), out var r) ? r : 0,
+ HMoveStockQty = oSub.SelectToken("SelTranslateQty")?.ToString() ?? "0",
+ HBackRelationQty = oSub.SelectToken("WipQty")?.ToString() ?? "0",
+ HQtyScrap = 0,
+ HBOMID = oSub.SelectToken("BOMID_Id")?.ToString() ?? "0",
+ HBomNumber = oSub.SelectToken("BOMID.Number")?.ToString() ?? "",
+ HERPInterID = _saveObj.SelectToken("Result.Result.Id")?.ToString() ?? "0",
+ HERPEntryID = oSub.SelectToken("Id")?.ToString() ?? "0",
+ HCHILDSUPPLYORGID = oSub.SelectToken("ChildSupplyOrgId_Id")?.ToString() ?? "0",
+ HSUPPLYORGID = oSub.SelectToken("SupplyOrg_Id")?.ToString() ?? "0",
+ HENTRUSTPICKORGID = oSub.SelectToken("GroupByOwnerId_Id")?.ToString() ?? "0",
+ HSRCTRANSORGID = oSub.SelectToken("SrcTransOrgId_Id")?.ToString() ?? "0",
+ HGROUPBYOWNERID = oSub.SelectToken("GroupByOwnerId_Id")?.ToString() ?? "0",
+ HOWNERID = oSub.SelectToken("OwnerID_Id")?.ToString() ?? "0",
+ HOWNERTYPEID = oSub.SelectToken("OwnerTypeId")?.ToString() ?? "",
+ HBASEUNITID = oSub.SelectToken("BaseUnitID_Id")?.ToString() ?? "0",
+ HProcessID = oSub.SelectToken("ProcessID_Id")?.ToString() ?? "0",
+ HPROCESSNumber = oSub.SelectToken("ProcessID.Number")?.ToString() ?? "",
+ HPROJECTNO = oSub.SelectToken("ProjectNO")?.ToString() ?? "",
+ HOPERID = oSub.SelectToken("OperID")?.ToString() ?? "0",
+ HSEQ = oSub.SelectToken("Seq")?.ToString() ?? "0",
+ HSTOCKSTATUSID = oSub.SelectToken("StockStatusId_Id")?.ToString() ?? "0",
+ HSTOCKSTATUSNumber = oSub.SelectToken("StockStatusId.Number")?.ToString() ?? "",
+ HRESERVETYPE = oSub.SelectToken("ReserveType")?.ToString().ToUpper() == "1" ? 1 : 0,
+ };
+
+ //鎻掑叆瀛愯〃
+ oCn.RunProc("Insert Into WW_PPBomBillSub " +
+ "(HInterID,HEntryID,HMaterID,HUnitID,HQty,HQtyMust" +
+ ",HWHID,HSCWhID,HAuxPropID,HBatchNO,HMTONo,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HICMOInterID,HICMOEntryID,HICMOBillNo" +
+ ",HRelationQty,HMoveStockQty,HBackRelationQty,HQtyScrap" +
+ ",HBOMID,HBomNumber,HERPInterID,HERPEntryID" +
+ ",HCHILDSUPPLYORGID,HSUPPLYORGID,HENTRUSTPICKORGID,HSRCTRANSORGID,HGROUPBYOWNERID" +
+ ",HOWNERID,HOWNERTYPEID,HBASEUNITID,HProcessID,HPROCESSNumber" +
+ ",HPROJECTNO,HOPERID,HSEQ,HSTOCKSTATUSID,HSTOCKSTATUSNumber,HRESERVETYPE" +
+ ") " +
+ " values(" + SubData.HInterID.ToString() + "," + SubData.HEntryID.ToString() + "," + SubData.HMaterID.ToString() + "," + SubData.HUnitID.ToString() + "," + SubData.HQty.ToString() + "," + SubData.HQtyMust.ToString() +
+ ", " + SubData.HWHID.ToString() + "," + SubData.HSCWhID.ToString() + "," + SubData.HAuxPropID.ToString() + ",'" + SubData.HBatchNO + "','" + SubData.HMTONo + "','" + SubData.HRemark + "'" +
+ ", " + SubData.HSourceInterID.ToString() + "," + SubData.HSourceEntryID.ToString() + ",'" + SubData.HSourceBillNo + "','" + SubData.HSourceBillType + "'," + SubData.HICMOInterID.ToString() + "," + SubData.HICMOEntryID.ToString() + ",'" + SubData.HICMOBillNo.ToString() + "'" +
+ ", " + (SubData.HRelationQty1 - SubData.HRelationQty2).ToString() + "," + SubData.HMoveStockQty.ToString() + "," + SubData.HBackRelationQty.ToString() + "," + SubData.HQtyScrap.ToString() +
+ ", " + SubData.HBOMID.ToString() + ",'" + SubData.HBomNumber + "'," + SubData.HERPInterID.ToString() + "," + SubData.HERPEntryID.ToString() +
+ ", " + SubData.HCHILDSUPPLYORGID.ToString() + "," + SubData.HSUPPLYORGID.ToString() + "," + SubData.HENTRUSTPICKORGID.ToString() + "," + SubData.HSRCTRANSORGID.ToString() + "," + SubData.HGROUPBYOWNERID.ToString() +
+ ", " + SubData.HOWNERID.ToString() + ",'" + SubData.HOWNERTYPEID + "'," + SubData.HBASEUNITID.ToString() + "," + SubData.HProcessID.ToString() + ",'" + SubData.HPROCESSNumber + "'" +
+ ",'" + SubData.HPROJECTNO + "'," + SubData.HOPERID.ToString() + "," + SubData.HSEQ.ToString() + "," + SubData.HSTOCKSTATUSID.ToString() + ",'" + SubData.HSTOCKSTATUSNumber + "'," + DBUtility.ClsPub.BoolToString(SubData.HRESERVETYPE) +
") ");
}
}
@@ -56828,6 +57034,7 @@
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
Model.ClsKf_ICStockBill_WMS oBar = new Model.ClsKf_ICStockBill_WMS();
Int64 sMulSourceFlag = 0; //澶氭簮鍗曟爣蹇楋紙0涓洪潪澶氭簮鍗曟ā寮忥紝1涓哄婧愬崟妯″紡锛�
+ Int64 sHSourceFlag = 1; //鏄惁閲嶆柊鍚屾婧愬崟淇℃伅锛�1涓哄悓姝ワ紝0涓轰笉鍚屾锛�
//鑾峰彇绯荤粺鍙傛暟
Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
@@ -56840,6 +57047,35 @@
if (oSystemParameter.omodel.Kf_EntrustOutBill_MulSourceBill.ToUpper() == "Y") //绯荤粺鍙傛暟 濮斿鍑哄簱鍗�-澶氭簮鍗曟ā寮�
{
sMulSourceFlag = 1;
+
+ //鍒ゆ柇婧愬崟鏄惁宸插瓨鍦ㄧ紦瀛樺垪琛ㄤ腑
+ DataSet dsSource = oCn.RunProcReturn(" select 1 from KF_PonderationBillMain_Temp with(nolock) where HInterID= " + HInterID.ToString() + " and HBillType= '" + HBillType + "' and HSourceBillNo= '" + HSourceBillNo + "' and HQtyMust<>0 ", "KF_PonderationBillMain_Temp");
+ if (dsSource == null || dsSource.Tables[0].Rows.Count == 0)
+ {
+ sHSourceFlag = 1;
+ }
+ else
+ {
+ sHSourceFlag = 0;
+ }
+ }
+
+ //閲嶆柊鍚屾婧愬崟淇℃伅
+ if (sHSourceFlag == 1)
+ {
+ if (oSystemParameter.omodel.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)
+ {
+ if (HSourceBillType == "1604")
+ {
+ //濮斿鐢ㄦ枡娓呭崟
+ GetWebAPIToLocal_WWPPBom(HSourceBillNo, HSourceBillType, HMaker, ref sErrMsg);
+ }
+ }
+ else
+ {
+ //绉佹湁浜戞ā寮�
+ oCn.RunProc("exec h_p_WMS_ERPSourceBillToLocal '" + HSourceBillNo + "','" + HSourceBillType + "'");
+ }
}
//灏嗘簮鍗曚俊鎭瓨鍏ユ潯鐮佸嚭鍏ュ簱涓存椂琛�
--
Gitblit v1.9.1