From 8a6a87b93e0a25401b659c7940ca94646ff6dadf Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 21 一月 2026 16:50:10 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/仓存管理/验收入库/Kf_ProductInBillController.cs | 168 +++++++++++++++++++++++++++++++------------------------
1 files changed, 94 insertions(+), 74 deletions(-)
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\252\214\346\224\266\345\205\245\345\272\223/Kf_ProductInBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\252\214\346\224\266\345\205\245\345\272\223/Kf_ProductInBillController.cs"
index 45c2c7a..121eaa5 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\252\214\346\224\266\345\205\245\345\272\223/Kf_ProductInBillController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\252\214\346\224\266\345\205\245\345\272\223/Kf_ProductInBillController.cs"
@@ -1662,10 +1662,10 @@
{
oCn.BeginTran();
LogService.Write("鐢熶骇鍏ュ簱鍗曞悓姝�,淇濆瓨鏂规硶鎵ц锛�" + sMainSub.ToString());
+ sMainSub["model"]["hredblueflag"] = string.Equals(sMainSub["model"]["hredblueflag"].ToString(), "0") ? false : true;
var model = sMainSub["model"].ToString();
var entry = sMainSub["model"]["HENTRY"].ToString();
-
model = "[" + model.ToString() + "]";
List<ClsKf_ProductInBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsKf_ProductInBillMain>>(model);
List<ClsKf_ProductInBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsKf_ProductInBillSub>>(entry);
@@ -1675,7 +1675,7 @@
var ds1 = oCn.RunProcReturn($@"
select hmainid HInterID, 鍗曟嵁鍙� HBillNO from h_v_Kf_ProductInBillList where hmainid = {mainList[0].HInterID}
", "h_v_Kf_ProductInBillList");
-
+ var HInterID_Old = mainList[0].HInterID;
if (ds1.Tables[0].Rows.Count > 0 && ds1.Tables[0].Rows[0]["HInterID"] != null)
{
if (string.Equals(ds1.Tables[0].Rows[0]["HBillNo"].ToString(), mainList[0].HBillNo, StringComparison.OrdinalIgnoreCase))
@@ -1691,93 +1691,113 @@
// 閲嶆柊鐢宠HInterID
var HInterID_Exch = DBUtility.ClsPub.CreateBillID("1202", ref DBUtility.ClsPub.sExeReturnInfo);
mainList[0].HInterID = HInterID_Exch;
-
+
foreach (var oSub in subList)
{
oSub.HInterID = HInterID_Exch;
}
-
+
}
}
-
-
+ // string sql = string.Empty;
+ // sql = $"delete Kf_ICStockBillMain where HinterID = {mainList[0].HInterID}";
+ // oCn.RunProc(sql);
+ // sql = $"delete Kf_ICStockBillSub where HinterID = {mainList[0].HInterID}";
+ // oCn.RunProc(sql);
// 涓昏〃
- oCn.RunProc($@"Insert Into Kf_ICStockBillMain
- (HInterID,HYear,HPeriod,HBillType,HBillSubType,HDate
- ,HBillNo,HBillStatus,HSupID,HManagerID,HEmpID,HDeptID,HSecManagerID,HKeeperID,HRemark,HMaker,HMakeDate,HCurID,HExRate,HWHID,HInnerBillNo,HExplanation
- ,HChecker, HCheckDate, HSTOCKORGID)
- values(
- '{mainList[0].HInterID}',
- '{mainList[0].HYear}',
- '{mainList[0].HPeriod}',
- '{mainList[0].HBillType}',
- '{mainList[0].HBillSubType}',
- '{mainList[0].HDate}',
- '{mainList[0].HBillNo}',
- {mainList[0].HBillStatus},
- '{mainList[0].HSupID}',
- '{mainList[0].HManagerID}',
- '{mainList[0].HEmpID}',
- '{mainList[0].HDeptID}',
- '{mainList[0].HSecManagerID}',
- '{mainList[0].HKeeperID}',
- '{mainList[0].HRemark}',
- '{mainList[0].HMaker}',
- '{mainList[0].HMakeDate}',
- '{mainList[0].HCurID}',
- '{mainList[0].HExRate}',
- '{mainList[0].HWHID}',
- '{mainList[0].HInnerBillNo}',
- '{mainList[0].HExplanation}',
- '{mainList[0].HChecker}',
- '{mainList[0].HCheckDate}',
- {mainList[0].HSTOCKORGID}
- )
- ");
- // 瀛愯〃
+ oCn.RunProc($@"Insert Into Kf_ICStockBillMain
+ (
+ HInterID, HYear, HPeriod, HBillNo, HBillType, HBillSubType, HMainSourceBillType, HDate,
+ HSupID, HWHID, HSCWHID, HEmpID, HManagerID, HSecManagerID, HKeeperID, HDeptID, HCurID,
+ HSeOrderBillNo, HExplanation, HRemark, HInnerBillNo, HRedBlueFlag, HBillStatus,
+ HMaker, HMakeDate, HChecker, HCheckDate,
+ HUpDater, HUpDateDate, HDeleteMan, HDeleteDate,
+ HOWNERID, HOWNERTYPEID, HERPInterID, HERPBillType, HERPBillNo,
+ HPRDORGID, HSTOCKORGID, HSTOCKERGROUPID, HPURCHASERGROUPID, HDEMANDORGID, HCORRESPONDORGID,
+ HPROVIDERCONTACTID, HSUPPLYID, HSETTLEID, HCHARGEID, HPURCHASEDEPTID, HBUSINESSTYPE,
+ HSUPPLYADDRESS, HPAYORGID, HSETTLEORGID, HSETTLETYPEID, HPAYCONDITIONID, HSETTLECURRID,
+ HEXCHANGETYPEID, HDISCOUNTLISTID, HEXCHANGERATE, HPRICETIMEPOINT, HLOCALCURRID, HISINCLUDEDTAX,
+ HISPRICEEXCLUDETAX
+ )
+ values(
+ '{mainList[0].HInterID}','{mainList[0].HYear}','{mainList[0].HPeriod}','{mainList[0].HBillNo}',
+ '{mainList[0].HBillType}','{mainList[0].HBillSubType}','{mainList[0].HMainSourceBillType}','{mainList[0].HDate}',
+ '{mainList[0].HSupID}','{mainList[0].HWHID}','{mainList[0].HSCWHID}','{mainList[0].HEmpID}','{mainList[0].HManagerID}',
+ '{mainList[0].HSecManagerID}','{mainList[0].HKeeperID}','{mainList[0].HDeptID}','{mainList[0].HCurID}',
+ '{mainList[0].HSeOrderBillNo}','{mainList[0].HExplanation}','{mainList[0].HRemark}','{mainList[0].HInnerBillNo}',
+ '{mainList[0].HRedBlueFlag}',{mainList[0].HBillStatus},'{mainList[0].HMaker}','{mainList[0].HMakeDate}',
+ '{mainList[0].HChecker}','{mainList[0].HCheckDate}','{mainList[0].HUpDater}','{mainList[0].HUpDateDate}',
+ '{mainList[0].HDeleteMan}','{mainList[0].HDeleteDate}','{mainList[0].HOWNERID}','{mainList[0].HOWNERTYPEID}',
+ '{mainList[0].HERPInterID}','{mainList[0].HERPBillType}','{mainList[0].HERPBillNo}','{mainList[0].HPRDORGID}',
+ '{mainList[0].HSTOCKORGID}','{mainList[0].HSTOCKERGROUPID}','{mainList[0].HPURCHASERGROUPID}','{mainList[0].HDEMANDORGID}',
+ '{mainList[0].HCORRESPONDORGID}','{mainList[0].HPROVIDERCONTACTID}','{mainList[0].HSUPPLYID}','{mainList[0].HSETTLEID}',
+ '{mainList[0].HCHARGEID}','{mainList[0].HPURCHASEDEPTID}','{mainList[0].HBUSINESSTYPE}','{mainList[0].HSUPPLYADDRESS}',
+ '{mainList[0].HPAYORGID}','{mainList[0].HSETTLEORGID}','{mainList[0].HSETTLETYPEID}','{mainList[0].HPAYCONDITIONID}',
+ '{mainList[0].HSETTLECURRID}','{mainList[0].HEXCHANGETYPEID}','{mainList[0].HDISCOUNTLISTID}','{mainList[0].HEXCHANGERATE}',
+ '{mainList[0].HPRICETIMEPOINT}','{mainList[0].HLOCALCURRID}','{mainList[0].HISINCLUDEDTAX}','{mainList[0].HISPRICEEXCLUDETAX}'
+ )");
+
foreach (var osub in subList)
{
+ // var syncSorceBillRes = oCN.RunProcReturn($@"
+ // exec h_p_IFCLD_ERPSourceBillToLocal_POStockInBill_GetSourceInfo
+ // '{osub.HSourceBillType}', '{osub.HSourceBillNo}', {osub.HSourceSEQ}
+ // ", "h_p_IFCLD_ERPSourceBillToLocal_POStockInBill_GetSourceInfo");
+ // ", "h_p_IFCLD_ERPSourceBillToLocal_POStockInBill_GetSourceInfo");
+ // string HERPInterID = "0";
+ // string HERPEntryID = "0";
+ // if (syncSorceBillRes != null && syncSorceBillRes.Tables.Count > 0)
+ // {
+ // osub.HSourceEntryID = (long)syncSorceBillRes.Tables[0].Rows[0]["HEntryID"];
+ // osub.HSourceInterID = (long)syncSorceBillRes.Tables[0].Rows[0]["HInterID"];
+ // HERPInterID = syncSorceBillRes.Tables[0].Rows[0]["HERPInterID"].ToString();
+ // HERPEntryID = syncSorceBillRes.Tables[0].Rows[0]["HERPInterID"].ToString();
+ // }
+
+
oCn.RunProc($@"Insert into Kf_ICStockBillSub
- (HInterID,HEntryID,HMaterID,HUnitID,HQtyMust,HQty,HPrice
- ,HMoney,HWHID,HSPID,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HPOOrderInterID
- ,HPOOrderEntryID,HPOORderBillNo,HSecUnitID,HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo,HRelationQty,HSecUnitRate,HPropertyID)
+ (
+ HInterID, HEntryID, HMTONo, HPlanMode, HRemark, HExpressNumber,
+ HMaterID, HUnitID, HBatchNo, HPropertyID, HWHID, HSPID, HSCWHID, HSCSPID,
+ HQtyMust, HQty, HPrice, HMoney, HTaxPrice, HTaxRate, HTaxMoney, HRelationQty, HRelationMoney,
+ HSourceInterID, HSourceEntryID, HSourceBillNo, HSourceBillType, HERPInterID, HERPEntryID, HERPBillNo_Sub,
+ HPOOrderInterID, HPOOrderEntryID, HPOOrderBillNo, HSeOrderInterID, HSeOrderEntryID, HSeOrderBillNo,
+ HICMOInterID, HICMOEntryID, HICMOBillNo, HWWOrderInterID, HWWOrderEntryID, HWWOrderBillNo,
+ HProduceDate, HExpiryDate, HOWNERID, HOWNERTYPEID, HKEEPERID, HKEEPERTYPEID,
+ HSUPPLIERLOT, HREQTRACENO, HPROJECTNO, HGIVEAWAY, HSYSPRICE, HPRICECOEFFICIENT,
+ HDISCOUNTRATE, HBASEUNITPRICE, HTAXCOMBINATION, HPRICELISTENTRY, HCOSTPRICE, HSEQ,
+ HROWTYPE, HPARENTMATID, HPRILSTENTRYID, HPURBASENUM, HSTOCKBASEDEN, HBFLOWID,
+ HSTOCKSTATUSID, HPRICEUNITID, HBASEUNITID, HSNUNITID, HREMAININSTOCKUNITID, HEXTAUXUNITID,
+ HTAXRATEID, HTAXRATE_TAX, HTAXAMOUNT, HCOSTPERCENT, HCOSTAMOUNT, HVAT,
+ HSELLERWITHHOLDING, HBUYERWITHHOLDING
+ )
values (
- '{osub.HInterID}',
- '{osub.HEntryID}',
- '{osub.HMaterID}',
- '{osub.HUnitID}',
- '{osub.HQtyMust}',
- '{osub.HQty}',
- '{osub.HPrice}',
- '{osub.HMoney}',
- '{osub.HWHID}',
- '{osub.HSPID}',
- '{osub.HRemark}',
- '{osub.HSourceInterID}',
- '{osub.HSourceEntryID}',
- '{osub.HSourceBillNo}',
- '{osub.HSourceBillType}',
- '{osub.HPOOrderInterID}',
- '{osub.HPOOrderEntryID}',
- '{osub.HPOOrderBillNo}',
- '{osub.HSecUnitID}',
- '{osub.HSeOrderInterID}',
- '{osub.HSeOrderEntryID}',
- '{osub.HSeOrderBillNo}',
- '{osub.HRelationQty}',
- '{osub.HSecUnitRate}',
- '{osub.HPropertyID}'
- )
- ");
+ '{osub.HInterID}','{osub.HEntryID}','{osub.HMTONo}',{osub.HPlanMode},'{osub.HRemark}','{osub.HExpressNumber}',
+ '{osub.HMaterID}','{osub.HUnitID}','{osub.HBatchNo}','{osub.HPropertyID}','{osub.HWHID}',
+ '{osub.HSPID}','{osub.HSCWHID}','{osub.HSCSPID}', '{osub.HQtyMust}','{osub.HQty}','{osub.HPrice}',
+ '{osub.HMoney}', '{osub.HTaxPrice}', '{osub.HTaxRate}', '{osub.HTaxMoney}', '{osub.HRelationQty}',
+ '{osub.HRelationMoney}','{osub.HSourceInterID}','{osub.HSourceEntryID}','{osub.HSourceBillNo}',
+ '{osub.HSourceBillType}','{osub.HERPInterID}','{osub.HERPEntryID}','{osub.HERPBillNo_Sub}',
+ '{osub.HPOOrderInterID}','{osub.HPOOrderEntryID}','{osub.HPOOrderBillNo}','{osub.HSeOrderInterID}',
+ '{osub.HSeOrderEntryID}','{osub.HSeOrderBillNo}','{osub.HICMOInterID}','{osub.HICMOEntryID}',
+ '{osub.HICMOBillNo}','{osub.HWWOrderInterID}','{osub.HWWOrderEntryID}', '{osub.HWWOrderBillNo}',
+ '{osub.HProduceDate}','{osub.HExpiryDate}', '{osub.HOWNERID}','{osub.HOWNERTYPEID}','{osub.HKEEPERID}',
+ '{osub.HKEEPERTYPEID}', '{osub.HSUPPLIERLOT}', '{osub.HREQTRACENO}', '{osub.HPROJECTNO}','{osub.HGIVEAWAY}',
+ '{osub.HSYSPRICE}', '{osub.HPRICECOEFFICIENT}','{osub.HDISCOUNTRATE}','{osub.HBASEUNITPRICE}', '{osub.HTAXCOMBINATION}',
+ '{osub.HPRICELISTENTRY}','{osub.HCOSTPRICE}', '{osub.HSEQ}','{osub.HROWTYPE}','{osub.HPARENTMATID}', '{osub.HPRILSTENTRYID}',
+ '{osub.HPURBASENUM}','{osub.HSTOCKBASEDEN}', '{osub.HBFLOWID}','{osub.HSTOCKSTATUSID}','{osub.HPRICEUNITID}', '{osub.HBASEUNITID}',
+ '{osub.HSNUNITID}', '{osub.HREMAININSTOCKUNITID}','{osub.HEXTAUXUNITID}','{osub.HTAXRATEID}','{osub.HTAXRATE_TAX}','{osub.HTAXAMOUNT}',
+ '{osub.HCOSTPERCENT}','{osub.HCOSTAMOUNT}','{osub.HVAT}','{osub.HSELLERWITHHOLDING}','{osub.HBUYERWITHHOLDING}'
+ )");
}
- // //鐢熶骇鍏ュ簱鍗曟柊澧炲洖濉敓浜ц鍗曞叧鑱旀暟閲�
- // oCn.RunProc("exec h_p_Kf_UpDateRelation_ProductInToICMO_Add " + mainList[0].HInterID);
- //
- // //鐢熶骇鍏ュ簱鍗曟柊澧炲洖濉敓浜ф眹鎶ュ崟鍏宠仈鏁伴噺
- // oCn.RunProc("exec h_p_Kf_UpDateRelation_ProductInToICMOReport_Add " + mainList[0].HInterID);
+ //鐢熶骇鍏ュ簱鍗曟柊澧炲洖濉敓浜ц鍗曞叧鑱旀暟閲�
+ oCn.RunProc("exec h_p_Kf_UpDateRelation_ProductInToICMO_Add " + mainList[0].HInterID);
+
+ //鐢熶骇鍏ュ簱鍗曟柊澧炲洖濉敓浜ф眹鎶ュ崟鍏宠仈鏁伴噺
+ oCn.RunProc("exec h_p_Kf_UpDateRelation_ProductInToICMOReport_Add " + mainList[0].HInterID);
oCn.Commit();
objJsonResult.code = "1";
--
Gitblit v1.9.1