Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

yusijie

2024-07-18 7fb870f53ccf134a4f3baef58ff98917d8c712bb

 WebAPI/Controllers/²Ö´æ¹ÜÀí/ÁìÁÏ·¢»õ/Kf_MateOutBillController.cs

@@ -1338,48 +1338,6 @@
                        oCn.RunProc("Delete b from Kf_ICStockBillMain a inner join Kf_ICStockBillSub b on a.HInterID=b.HInterID where a.HBillNo = '" + HBillNo + "' and a.HBillType='1204'", ref DBUtility.ClsPub.sExeReturnInfo);
                        oCn.RunProc("Delete from Kf_ICStockBillMain where HBillNo = '" + HBillNo + "' and HBillType='1204'", ref DBUtility.ClsPub.sExeReturnInfo);

                        ////主表数据赋值
                        //var MainData = new
                        //{
                        //    HInterID = HNewInterID,
                        //    HBillNo = DBUtility.ClsPub.isStrNull(_saveObj["Result"]["Result"]["BillNo"]),
                        //    HBillType = "1204",
                        //    HBillSubType = "1204",
                        //    HMainSourceBillType = "",
                        //    HDate = DBUtility.ClsPub.isDate(_saveObj["Result"]["Result"]["Date"]),
                        //    HSupID = 0,
                        //    HWHID = 0,
                        //    HSCWHID = 0,
                        //    HEmpID = 0,
                        //    HManagerID = 0,
                        //    HSecManagerID = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["PickerId_Id"]),
                        //    HKeeperID = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["FSTOCKERID_Id"]),
                        //    HDeptID = 0,
                        //    HCurID = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["CurrId_Id"]),
                        //    HSeOrderBillNo = "",
                        //    HExplanation = "CLD导入",
                        //    HRemark = "",
                        //    HInnerBillNo = "",
                        //    HRedBlueFlag = 0,
                        //    HBillStatus = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["ApproverId_Id"]) == 0 ? 1 : 2,
                        //    HMaker = DBUtility.ClsPub.isStrNull(_saveObj["Result"]["Result"]["CreatorId"]["Name"]),
                        //    HMakeDate = DBUtility.ClsPub.isDate(_saveObj["Result"]["Result"]["CreateDate"]),
                        //    //HChecker = DBUtility.ClsPub.isStrNull(_saveObj["Result"]["Result"]["ApproverId"]),
                        //    HChecker = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["ApproverId_Id"]) == 0 ? "" : DBUtility.ClsPub.isStrNull(_saveObj["Result"]["Result"]["ApproverId"]["Name"]),
                        //    HCheckDate = DBUtility.ClsPub.isDate(_saveObj["Result"]["Result"]["ApproveDate"]),
                        //    HUpDater = DBUtility.ClsPub.isStrNull(_saveObj["Result"]["Result"]["ModifierId_Id"]),
                        //    HUpDateDate = DBUtility.ClsPub.isDate(_saveObj["Result"]["Result"]["ModifyDate"]),
                        //    HDeleteMan = DBUtility.ClsPub.isStrNull(_saveObj["Result"]["Result"]["CANCELER_Id"]),
                        //    HDeleteDate = DBUtility.ClsPub.isDate(_saveObj["Result"]["Result"]["CancelDate"]),
                        //    HOWNERID = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["OwnerId_Id"]),
                        //    HOWNERTYPEID = DBUtility.ClsPub.isStrNull(_saveObj["Result"]["Result"]["OwnerTypeId"]),
                        //    HERPInterID = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["Id"]),
                        //    HERPBillType = DBUtility.ClsPub.isStrNull(_saveObj["Result"]["Result"]["BillType_Id"]),
                        //    HERPBillNo = DBUtility.ClsPub.isStrNull(_saveObj["Result"]["Result"]["BillNo"]),
                        //    HPRDORGID = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["PrdOrgId_Id"]),
                        //    HSTOCKORGID = DBUtility.ClsPub.isLong(_saveObj["Result"]["Result"]["StockOrgId_Id"]),
                        //};

                        //主表数据赋值
                        var MainData = new
                        {