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

ch

2022-08-04 056fc51881ec76dc1185d3c13e66e0b2d0f37541

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

 WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs

@@ -501,7 +501,7 @@
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                string sql = string.Format(@"select æµæ°´å· HProcNo,HProcID,工序代码 HProcNumber,工序名称 HProcName,加工说明 HWorkRemark,HCenterID,工作中心代码 HCenterNumber,
                                                å·¥ä½œä¸­å¿ƒ HCenterName,HSupID,供应商代码 HSupNumber,供应商 HSupName,isEntrust,计划数量 HQty,加工单价 HOutPrice, è¡¨ä½“备注 HRemark,
                                            è¿›ç«™æ•°é‡ HRelationQty_In,出站数量 HRelationQty_Out,委外工单数量 HRelationQty_WWOrder,不合格数量 HRelationQty_Bad,超额比例 HOverRate,
                                            è¿›ç«™å…³è”数量 HRelationQty_In,出站关联数量 HRelationQty_Out,委外工单数量 HRelationQty_WWOrder,不合格数量 HRelationQty_Bad,超额比例 HOverRate,
                                            è‰¯çŽ‡ HPassRate,累计良率 HSumPassRate,图纸编号 HPicNum,本工序确认记录 HProcCheckNote,工艺参数 HTechnologyParameter,HDeptID,
                                            åŠ å·¥è½¦é—´ä»£ç  HDeptNumber,加工车间 HDeptName
                                            from h_v_Sc_ProcessExchangeBillQuerySub");

 WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs

@@ -162,7 +162,7 @@
                double HStdSourceQty = mainList[0].HStdSourceQty;//标准资源数
                double HAddSourceRate = mainList[0].HAddSourceRate;//加资源增量
                double HDelSourceRate = mainList[0].HDelSourceRate;//减资源减量
                int HPRDORGID = mainList[0].HPRDORGID;  //生产组织
                int HPRDORGID = mainList[0].HOrgID;  //生产组织
                int HOrgID = mainList[0].HOrgID;  //组织
                string HPicNumVer = mainList[0].HPicNumVer;//图号版本
                string HPicNumAssemble = mainList[0].HPicNumAssemble;//总装图号

 WebAPI/Controllers/POStockInBillController.cs

@@ -15,6 +15,8 @@
using WebAPI;
using WebAPI.Code;
using WebAPI.Models;
using WebAPI.Utility;

namespace WebAPI.Controllers
{
    /**
@@ -109,11 +111,11 @@
            {
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = e.Message+";"+e.StackTrace;
                objJsonResult.Message = e.Message + ";" + e.StackTrace;
                objJsonResult.data = null;
                return objJsonResult;
            }
           

        }


@@ -766,7 +768,7 @@
                lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
                lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
                string sSourceBillType = lsmain[0].HBillType;
                

                WebAPI.WebS.ClsSc_ICMOReportBillMain websLsmain = new WebS.ClsSc_ICMOReportBillMain();

                websLsmain.HInterID = lsmain[0].HInterID;
@@ -991,18 +993,16 @@
        }


        #region åˆ°è´§ç‚¹æ•°
        [Route("POStockInBillList/get_InfoByBillNo")]
        #region åˆ°è´§ç¡®è®¤
        [Route("POStockInBillList/Get_ReciveBill")]
        [HttpGet]
        public object get_InfoByBillNo(string HBillno)
        {
            try
            {
                string sqlwhere = " where 1=1 ";
                if (!String.IsNullOrEmpty(HBillno))
                    sqlwhere += "and å•æ®å·='" + HBillno + "'";
                string sql = $"select * from h_v_Cg_POInStockBillList {sqlwhere} ";
                ds = oCn.RunProcReturn(sql, "h_v_Cg_POInStockBillList");
                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                string sql = $"select * from H_v_SRM_POInStockBillList where å•æ®å· ='{HBillno}'";
                ds = oCn.RunProcReturn(sql, "H_v_SRM_POInStockBillList");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
@@ -1013,141 +1013,11 @@
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess！";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
            }
            catch (Exception)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "失败 ï¼";
                objJsonResult.data = null;
                return objJsonResult;
            }

        }


        //[Route("POStockInBillList/confirm")]
        //public object confirm(string hmainid)
        //{
        //    try
        //    {
        //        JObject model = new JObject();
        //        model.Add("FBILLTYPEID", new JObject() { ["Fnumber"] = "SLD01_SYS" }); //单据类型
        //        model.Add("FDate", DateTime.Now.ToString("yyyy-MM-dd")); //通知日期
        //        model.Add("FStockOrgId", new JObject() { ["Fnumber"] = (this.Model.GetValue("FHPURCHASEORGID") as DynamicObject)?["Number"].ToString() ?? "" }); // æ”¶æ–™ç»„织 
        //        model.Add("FPurOrgId", new JObject() { ["Fnumber"] = (this.Model.GetValue("FHPURCHASEORGID") as DynamicObject)?["Number"].ToString() ?? "" }); //采购组织
        //        model.Add("FSupplierId", new JObject() { ["Fnumber"] = (this.Model.GetValue("FSupplierID") as DynamicObject)?["Number"].ToString() ?? "" }); //供应商
        //        model.Add("FOwnerTypeIdHead", "BD_OwnerOrg");//  è´§ä¸»ç±»åž‹
        //        model.Add("FOwnerIdHead", new JObject() { ["Fnumber"] = (this.Model.GetValue("FHPURCHASEORGID") as DynamicObject)?["Number"].ToString() ?? "" });//货主 
        //                                                                                                                                                     //子表 æ•°æ®æ¨¡åž‹
        //        JArray Fentity = new JArray();
        //        foreach (var item in entityRows)
        //        {
        //            if (Convert.ToBoolean(item["FCloseStatus"]))
        //                continue;
        //            JObject FentityModel = new JObject();
        //            FentityModel.Add("FMaterialId", new JObject() { ["Fnumber"] = (item["FHMaterID"] as DynamicObject)?["Number"].ToString() ?? "" }); // ç‰©æ–™ç¼–码   
        //            FentityModel.Add("FUnitID", new JObject() { ["Fnumber"] = (item["FUnitID"] as DynamicObject)?["Number"].ToString() ?? "" }); // å•ä½   
        //            FentityModel.Add("FPreDeliveryDate", this.Model.GetValue("FHDate").ToString()); //预计到货日期   
        //            FentityModel.Add("FPriceUnitId", new JObject() { ["Fnumber"] = (item["FUnitID"] as DynamicObject)?["Number"].ToString() ?? "" }); // è®¡ä»·å•ä½   
        //            FentityModel.Add("FStockUnitID", new JObject() { ["Fnumber"] = (item["FUnitID"] as DynamicObject)?["Number"].ToString() ?? "" }); //  åº“存单位   
        //            FentityModel.Add("FActReceiveQty", Convert.ToDecimal(item["FHQty"]) - Convert.ToDecimal(item["FReciveCount"])); // ä¾›åº”商送货数量（提料计划数量 - å·²ç”Ÿæˆé€è´§å•æ•°é‡ï¼‰
        //            FentityModel.Add("FOwnerTypeId", "BD_OwnerOrg");//货主类型
        //            FentityModel.Add("FOwnerID", new JObject() { ["Fnumber"] = (this.Model.GetValue("FHPURCHASEORGID") as DynamicObject)?["Number"].ToString() ?? "" });//货主 
        //            FentityModel.Add("FSrcId", item["FHPOOrderInterID"].ToString());//源单内码
        //            FentityModel.Add("FSRCFORMID", "PUR_PurchaseOrder");//源单类型
        //            FentityModel.Add("FSrcBillNo", item["FHPOOrderBillNo"].ToString());//源单单号
        //            FentityModel.Add("FSRCENTRYID", item["FHPOOrderEntryID"].ToString());//源单分录内码
        //            FentityModel.Add("FORDERBILLNO", item["FHPOOrderBillNo"].ToString());//源单单号
        //            FentityModel.Add("FPOORDERENTRYID", item["FHPOOrderEntryID"].ToString());//源单分录内码


        //            JArray Fentity2 = new JArray();
        //            JObject FentityModel2 = new JObject();
        //            FentityModel2.Add("FDetailEntity_Link_FRULEID", "a8c6b6e5-a8c0-4fc1-8592-6b76c2136cf9");
        //            FentityModel2.Add("FDetailEntity_Link_FSTableName", "t_PUR_POOrderEntry");
        //            FentityModel2.Add("FDetailEntity_Link_FSBillId", item["FHPOOrderInterID"].ToString());
        //            FentityModel2.Add("FDetailEntity_Link_FSId", item["FHPOOrderEntryID"].ToString());
        //            Fentity2.Add(FentityModel2);
        //            FentityModel.Add("FDetailEntity_Link", Fentity2);
        //            Fentity.Add(FentityModel);
        //        }
        //        model.Add("FDetailEntity", Fentity); //明细信息

        //        JObject _FentityModel = new JObject();
        //        _FentityModel.Add("FSettleOrgId", new JObject() { ["Fnumber"] = (this.Model.GetValue("FHPURCHASEORGID") as DynamicObject)?["Number"].ToString() ?? "" }); //  ç»“算组织  
        //        _FentityModel.Add("FSettleCurrId", new JObject() { ["Fnumber"] = (this.Model.GetValue("FSettleCurrId") as DynamicObject)?["Number"].ToString() ?? "" }); //  ç»“算币别
        //        _FentityModel.Add("FPricePoint", 0); //  å®šä»·æ—¶ç‚¹
        //        model.Add("FinanceEntity ", _FentityModel);//财务信息
        //        JObject jsonRoot = new JObject()
        //        {
        //            ["Creator"] = "",
        //            ["NeedUpDateFields"] = new JArray(),
        //            ["NeedReturnFields"] = new JArray(),
        //            ["IsDeleteEntry"] = "false",
        //            ["SubSystemId"] = "",
        //            ["IsVerifyBaseDataField"] = "false",
        //            //["IsAutoSubmitAndAudit"] = true,//自动调用提交和审核功能
        //            ["Model"] = model
        //        };
        //        var result = cloudClient.Save("PUR_ReceiveBill", jsonRoot.ToString());
        //        JObject saveObj = JObject.Parse(result);
        //        string saveIsSuc = saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper();
        //    }
        //    catch (Exception)
        //    {
        //        objJsonResult.code = "0";
        //        objJsonResult.count = 0;
        //        objJsonResult.Message = "失败 ï¼";
        //        objJsonResult.data = null;
        //        return objJsonResult;
        //    }

        //}
        #endregion

        #region [收料通知单审核]
        //收料通知单审核 æ‰«æ¡ç 
        [Route("POStockInBillList/Get_ReciveBillCheckDate")]
        [HttpGet]
        public object Get_ReciveBillCheckDate(string HBarCode)
        {
            try
            {
                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                DataSet Ds = oCn.RunProcReturn("exec h_p_KF_PonderationBillMain_Temp_Add_POInStockCheck2 '" + HBarCode + "'", "h_p_KF_PonderationBillMain_Temp_Add_POInStockCheck2");
                if (Ds == null || Ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有返回任何记录！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    if (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0][0]) == 0)
                    {
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "Sucess！";
                        objJsonResult.data = Ds.Tables[0];
                        return objJsonResult;
                    }
                    else
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]);
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }
            }
            catch (Exception e)
@@ -1158,7 +1028,432 @@
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        [Route("POStockInBillList/AuditPOInStockBill")]
        [HttpGet]
        public object AuditPOInStockBill(string HInterID, string CurUserName, string HBillNo)
        {
            Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
            json objjson = new json();
            try
            {
                SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
                //采购订单 ç”Ÿæˆé€è´§å•åˆ—表
                if (!String.IsNullOrEmpty(HBillNo))
                    HInterID = GetHinterIDByBillNo(HBillNo, "Aduit").ToString();
                if (HInterID == "0")
                {
                    objjson.code = "0";
                    objjson.count = 0;
                    objjson.Message = "操作失败,请先保存订单";
                    objjson.data = null;
                    return objjson;
                }
                string parameterSql = $"select HValue from Xt_SystemParameter where HKey ='Cg_POInStockBill_ErpAduit'";
                var HValue = oCn.RunProcReturn(parameterSql, "dt").Tables[0].Rows[0][0].ToString();
                string sql = string.Empty;
                if (HValue == "Y")
                {
                    var kdTbaleName = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "DataBaseName");
                    string FCusName = oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref DBUtility.ClsPub.sExeReturnInfo);
                    DataTable dt = new DataTable();
                    List<string> fidList = new List<string>();
                    if (FCusName == "瑞与祺")
                    {
                        sql = string.Format(@"
SELECT T3.FNAME AS FTYPENAME,M.HBILLNO,B.HINTERID,B.HENTRYID,C.FID,C.FENTRYID, D.FBILLNO,B.HQTY,CD.FRECEIVEORGID,CDOO.FNUMBER AS FRECEIVENUMBER
,D.FSUPPLIERID,DS.FNUMBER AS FSUPPLIERNUMBER,D.FPURCHASEORGID,DOO.FNUMBER AS FPURCHASEORGNUMBER,CROO.FNUMBER  AS FSETTLEORGNUMBER,
E.FPRICETIMEPOINT,E.FSETTLECURRID,EC.FNUMBER AS FSETTLECURRNUMBER,C.FMATERIALID,CM.FNUMBER AS FMATERIALNUMBER ,C.FUNITID 
,CU.FNUMBER AS FUNITNUMBER,CR.FPRICE,CR.FTAXPRICE,CR.FTAXRATE,D.FPURCHASERID,isnull(T4.FNUMBER,'') AS FPURCHASERNUMBER
FROM CG_POINSTOCKBILLSUB B  
JOIN CG_POINSTOCKBILLMAIN M ON B.HINTERID = M.HINTERID
JOIN {0}..T_PUR_POORDERENTRY C ON B.HSOURCEINTERID = C.FID AND B.HSOURCEENTRYID = C.FENTRYID
LEFT JOIN {0}..T_BD_MATERIAL CM ON C.FMATERIALID =CM.FMATERIALID
LEFT JOIN {0}..T_BD_UNIT CU ON C.FUNITID =CU.FUNITID
JOIN {0}..T_PUR_POORDERENTRY_D CD ON    C.FENTRYID = CD.FENTRYID
LEFT JOIN {0}..T_ORG_ORGANIZATIONS CDOO ON CD.FRECEIVEORGID = CDOO.FORGID
JOIN {0}..T_PUR_POORDERENTRY_F CR ON    C.FENTRYID = CR.FENTRYID
LEFT JOIN {0}..T_ORG_ORGANIZATIONS CROO ON CR.FSETTLEORGID = CROO.FORGID
LEFT JOIN {0}..T_PUR_POORDER D ON C.FID =D.FID
LEFT JOIN {0}..T_BAS_BILLTYPE T2 ON D.FBILLTYPEID = T2.FBILLTYPEID
LEFT JOIN {0}..T_BAS_BILLTYPE_L T3 ON T2.FBILLTYPEID = T3.FBILLTYPEID
LEFT JOIN  {0}..V_BD_BUYER T4 ON D.FPURCHASERID =T4.FID
LEFT JOIN {0}..T_BD_SUPPLIER DS ON D.FSUPPLIERID = DS.FSUPPLIERID
LEFT JOIN {0}..T_ORG_ORGANIZATIONS DOO ON D.FPURCHASEORGID = DOO.FORGID
JOIN {0}..T_PUR_POORDERFIN E ON C.FID =E.FID
LEFT JOIN {0}..T_BD_CURRENCY EC ON E. FSETTLECURRID =EC.FCURRENCYID  
 WHERE b.hinterid in ({1}) and M.HERPInterID = 0
", kdTbaleName, HInterID);
                        //LEFT JOIN  {0}..T_HR_EMPINFO T5 ON D.F_XBKF_BASE1 = T5.FID
                        dt = oCn.RunProcReturn(sql, "sltz").Tables[0];
                        if (dt.Rows.Count > 0)
                        {
                            foreach (DataRow dr in dt.Rows)
                            {
                                if (fidList.Contains(dr["FID"].ToString() + dr["HINTERID"].ToString()))
                                    continue;
                                else
                                    fidList.Add(dr["FID"].ToString() + dr["HINTERID"].ToString());

                                DataRow[] drs = dt.Select("FID = " + dr["FID"].ToString() + " and HINTERID = " + dr["HINTERID"].ToString());

                                JObject model = new JObject();
                                string fTypeName = "SLD01_SYS";//标准采购订单类型
                                string ywTypeName = "CG";//标准业务类型
                                if (dr["FTYPENAME"].ToString().Contains("委外"))
                                {
                                    fTypeName = "SLD03_SYS";
                                    ywTypeName = "WW";
                                }
                                if (dr["FTYPENAME"].ToString().Contains("资产"))
                                {
                                    fTypeName = "SLD04_SYS";
                                    ywTypeName = "ZCCG";
                                }
                                model.Add("FBILLTYPEID", new JObject() { ["Fnumber"] = fTypeName }); //单据类型
                                model.Add("FBusinessType", ywTypeName); //业务类型
                                model.Add("FBILLNO", dr["HBillNo"].ToString()); //单据编号
                                model.Add("FDate", DateTime.Now.ToString("yyyy-MM-dd")); //通知日期
                                model.Add("FStockOrgId", new JObject() { ["Fnumber"] = dr["FRECEIVENUMBER"].ToString() }); // æ”¶æ–™ç»„织 
                                model.Add("FPurOrgId", new JObject() { ["Fnumber"] = dr["FPURCHASEORGNUMBER"].ToString() }); //采购组织
                                model.Add("FSupplierId", new JObject() { ["Fnumber"] = dr["FSUPPLIERNUMBER"].ToString() }); //供应商
                                model.Add("FPURCHASERID", new JObject() { ["Fnumber"] = dr["FPURCHASERNUMBER"].ToString() }); //采购员
                                                                                                                              //model.Add("F_xbkf_Base", new JObject() { ["Fnumber"] = dr["FRECEIVEMENNUMBER"].ToString() }); //收料员
                                model.Add("FOwnerTypeIdHead", "BD_Supplier");//  è´§ä¸»ç±»åž‹
                                model.Add("FOwnerIdHead", new JObject() { ["Fnumber"] = dr["FSUPPLIERNUMBER"].ToString() });//货主 ä¾›åº”商 
                                                                                                                            //model.Add("F_XBKF_COMBO", dr["F_xbkf_Combo1"].ToString());//是否有票 
                                JArray Fentity = new JArray();
                                foreach (var item in drs)
                                {
                                    JObject FentityModel = new JObject();
                                    FentityModel.Add("FMaterialId", new JObject() { ["Fnumber"] = item["FMATERIALNUMBER"].ToString() }); // ç‰©æ–™ç¼–码   
                                    FentityModel.Add("FUnitID", new JObject() { ["Fnumber"] = item["FUNITNUMBER"].ToString() }); // å•ä½   
                                    FentityModel.Add("FPreDeliveryDate", DateTime.Now.ToString("yyyy-MM-dd")); //预计到货日期   
                                    FentityModel.Add("FPriceUnitId", new JObject() { ["Fnumber"] = item["FUNITNUMBER"].ToString() }); // è®¡ä»·å•ä½   
                                    FentityModel.Add("FStockUnitID", new JObject() { ["Fnumber"] = item["FUNITNUMBER"].ToString() }); //  åº“存单位   
                                    FentityModel.Add("FActReceiveQty", Convert.ToDecimal(item["HQTY"])); // ä¾›åº”商送货数量（提料计划数量 - å·²ç”Ÿæˆé€è´§å•æ•°é‡ï¼‰
                                    FentityModel.Add("FOwnerTypeId", "BD_OwnerOrg");//货主类型
                                    FentityModel.Add("FOwnerID", new JObject() { ["Fnumber"] = dr["FPURCHASEORGNUMBER"].ToString() });//货主 
                                    FentityModel.Add("FSrcId", item["FID"].ToString());//源单内码
                                    FentityModel.Add("FSRCFORMID", "PUR_PurchaseOrder");//源单类型
                                    FentityModel.Add("FSrcBillNo", item["FBILLNO"].ToString());//源单单号
                                    FentityModel.Add("FSRCENTRYID", item["FENTRYID"].ToString());//源单分录内码
                                    FentityModel.Add("FORDERBILLNO", item["FBILLNO"].ToString());//源单单号
                                    FentityModel.Add("FPOORDERENTRYID", item["FENTRYID"].ToString());//源单分录内码
                                    FentityModel.Add("FSRMENTRYID", item["HENTRYID"].ToString());//SRM hentryid
                                    FentityModel.Add("FPrice", item["FPRICE"].ToString());//单价
                                    FentityModel.Add("FTaxPrice", item["FTAXPRICE"].ToString());//含税单价
                                    FentityModel.Add("FEntryTaxRate", item["FTAXRATE"].ToString());//税率

                                    JArray Fentity2 = new JArray();
                                    JObject FentityModel2 = new JObject();
                                    FentityModel2.Add("FDetailEntity_Link_FRULEID", "PUR_PurchaseOrder-PUR_ReceiveBill");
                                    FentityModel2.Add("FDetailEntity_Link_FSTableName", "t_PUR_POOrderEntry");
                                    FentityModel2.Add("FDetailEntity_Link_FSBillId", item["FID"].ToString());
                                    FentityModel2.Add("FDetailEntity_Link_FSId", item["FEntryID"].ToString());
                                    Fentity2.Add(FentityModel2);
                                    FentityModel.Add("FDetailEntity_Link", Fentity2);
                                    Fentity.Add(FentityModel);
                                }
                                model.Add("FDetailEntity", Fentity); //明细信息

                                JObject _FentityModel = new JObject();
                                _FentityModel.Add("FSettleOrgId", new JObject() { ["Fnumber"] = dr["FSETTLEORGNUMBER"].ToString() }); //  ç»“算组织  
                                _FentityModel.Add("FSettleCurrId", new JObject() { ["Fnumber"] = dr["FSETTLECURRNUMBER"].ToString() }); //  ç»“算币别
                                _FentityModel.Add("FPricePoint", 0); //  å®šä»·æ—¶ç‚¹
                                model.Add("FinanceEntity ", _FentityModel);//财务信息
                                JObject jsonRoot = new JObject()
                                {
                                    ["Creator"] = "",
                                    ["NeedUpDateFields"] = new JArray(),
                                    ["NeedReturnFields"] = new JArray(),
                                    ["IsDeleteEntry"] = "false",
                                    ["SubSystemId"] = "",
                                    ["IsVerifyBaseDataField"] = "false",
                                    ["Model"] = model
                                };
                                var loginRet = InvokeHelper.Login();
                                var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
                                if (isSuccess == 0)
                                {
                                    objjson.code = "0";
                                    objjson.count = 0;
                                    objjson.Message = loginRet;
                                    objjson.data = null;
                                    return objjson;
                                }
                                //LogService.Write("jsonRoot:" + jsonRoot.ToString());
                                var result = InvokeHelper.Save("PUR_ReceiveBill", jsonRoot.ToString());
                                //LogService.Write(result);
                                if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() == "TRUE")
                                {
                                    //更新送货单 ä¸»è¡¨ ERP单据号 ä»¥åŠ ERP主内玛
                                    string FBillNo = JObject.Parse(result)["Result"]["Number"].ToString();
                                    string FID = JObject.Parse(result)["Result"]["Id"].ToString();

                                    string updateSql = string.Format(@"
                                                      update a set 
                                                      a.HERPInterID = {0} ,
                                                      a.HERPBillNO   ='{1}'
                                                      from Cg_POInStockBillMain a
                                                      join Cg_POInStockBillSub b on a.hinterid = b.hinterid
                                                      where b.HInterID = ({2})
                                                      and b. HSOURCEINTERID = {3}
                                                      and a.HERPInterID = 0
                                                     ", FID, FBillNo, dr["HINTERID"].ToString(), dr["FID"].ToString());
                                    oCn.RunProc(updateSql);
                                }
                                else
                                {
                                    objjson.code = "0";
                                    objjson.count = 0;
                                    objjson.Message = result;
                                    objjson.data = null;
                                    return objjson;
                                }
                            }
                        }
                    }
                    else if (FCusName == "夏宝电器")
                    {
                        sql = string.Format(@"
SELECT T3.FNAME AS FTYPENAME,M.HBILLNO,B.HINTERID,B.HENTRYID,C.FID,C.FENTRYID, D.FBILLNO,B.HQTY,CD.FRECEIVEORGID,CDOO.FNUMBER AS FRECEIVENUMBER
,D.FSUPPLIERID,DS.FNUMBER AS FSUPPLIERNUMBER,D.FPURCHASEORGID,DOO.FNUMBER AS FPURCHASEORGNUMBER,CROO.FNUMBER  AS FSETTLEORGNUMBER,
E.FPRICETIMEPOINT,E.FSETTLECURRID,EC.FNUMBER AS FSETTLECURRNUMBER,C.FMATERIALID,CM.FNUMBER AS FMATERIALNUMBER ,C.FUNITID 
,CU.FNUMBER AS FUNITNUMBER,D.F_XBKF_COMBO1,CR.FPRICE,CR.FTAXPRICE,CR.FTAXRATE,D.FPURCHASERID,isnull(T4.FNUMBER,'') AS FPURCHASERNUMBER,D.F_XBKF_BASE1,isnull(T5.FNUMBER,'') AS FRECEIVEMENNUMBER
FROM CG_POINSTOCKBILLSUB B  
JOIN CG_POINSTOCKBILLMAIN M ON B.HINTERID = M.HINTERID
JOIN {0}..T_PUR_POORDERENTRY C ON B.HSOURCEINTERID = C.FID AND B.HSOURCEENTRYID = C.FENTRYID
LEFT JOIN {0}..T_BD_MATERIAL CM ON C.FMATERIALID =CM.FMATERIALID
LEFT JOIN {0}..T_BD_UNIT CU ON C.FUNITID =CU.FUNITID
JOIN {0}..T_PUR_POORDERENTRY_D CD ON    C.FENTRYID = CD.FENTRYID
LEFT JOIN {0}..T_ORG_ORGANIZATIONS CDOO ON CD.FRECEIVEORGID = CDOO.FORGID
JOIN {0}..T_PUR_POORDERENTRY_F CR ON    C.FENTRYID = CR.FENTRYID
LEFT JOIN {0}..T_ORG_ORGANIZATIONS CROO ON CR.FSETTLEORGID = CROO.FORGID
LEFT JOIN {0}..T_PUR_POORDER D ON C.FID =D.FID
LEFT JOIN {0}..T_BAS_BILLTYPE T2 ON D.FBILLTYPEID = T2.FBILLTYPEID
LEFT JOIN {0}..T_BAS_BILLTYPE_L T3 ON T2.FBILLTYPEID = T3.FBILLTYPEID
LEFT JOIN  {0}..V_BD_BUYER T4 ON D.FPURCHASERID =T4.FID
LEFT JOIN  {0}..T_HR_EMPINFO T5 ON D.F_XBKF_BASE1 = T5.FID
LEFT JOIN {0}..T_BD_SUPPLIER DS ON D.FSUPPLIERID = DS.FSUPPLIERID
LEFT JOIN {0}..T_ORG_ORGANIZATIONS DOO ON D.FPURCHASEORGID = DOO.FORGID
JOIN {0}..T_PUR_POORDERFIN E ON C.FID =E.FID
LEFT JOIN {0}..T_BD_CURRENCY EC ON E. FSETTLECURRID =EC.FCURRENCYID  
 WHERE b.hinterid in ({1}) and M.HERPInterID = 0
", kdTbaleName, HInterID);
                        dt = oCn.RunProcReturn(sql, "sltz").Tables[0];
                        if (dt.Rows.Count > 0)
                        {
                            foreach (DataRow dr in dt.Rows)
                            {
                                if (fidList.Contains(dr["FID"].ToString() + dr["HINTERID"].ToString()))
                                    continue;
                                else
                                    fidList.Add(dr["FID"].ToString() + dr["HINTERID"].ToString());

                                DataRow[] drs = dt.Select("FID = " + dr["FID"].ToString() + " and HINTERID = " + dr["HINTERID"].ToString());

                                JObject model = new JObject();
                                string fTypeName = "SLD01_SYS";//标准采购订单类型
                                string ywTypeName = "CG";//标准业务类型
                                if (dr["FTYPENAME"].ToString().Contains("委外"))
                                {
                                    fTypeName = "SLD03_SYS";
                                    ywTypeName = "WW";
                                }
                                if (dr["FTYPENAME"].ToString().Contains("资产"))
                                {
                                    fTypeName = "SLD04_SYS";
                                    ywTypeName = "ZCCG";
                                }
                                model.Add("FBILLTYPEID", new JObject() { ["Fnumber"] = fTypeName }); //单据类型
                                model.Add("FBusinessType", ywTypeName); //业务类型
                                model.Add("FBILLNO", dr["HBillNo"].ToString()); //单据编号
                                model.Add("FDate", DateTime.Now.ToString("yyyy-MM-dd")); //通知日期
                                model.Add("FStockOrgId", new JObject() { ["Fnumber"] = dr["FRECEIVENUMBER"].ToString() }); // æ”¶æ–™ç»„织 
                                model.Add("FPurOrgId", new JObject() { ["Fnumber"] = dr["FPURCHASEORGNUMBER"].ToString() }); //采购组织
                                model.Add("FSupplierId", new JObject() { ["Fnumber"] = dr["FSUPPLIERNUMBER"].ToString() }); //供应商
                                model.Add("FPURCHASERID", new JObject() { ["Fnumber"] = dr["FPURCHASERNUMBER"].ToString() }); //采购员
                                model.Add("F_xbkf_Base", new JObject() { ["Fnumber"] = dr["FRECEIVEMENNUMBER"].ToString() }); //收料员
                                model.Add("FOwnerTypeIdHead", "BD_Supplier");//  è´§ä¸»ç±»åž‹
                                model.Add("FOwnerIdHead", new JObject() { ["Fnumber"] = dr["FSUPPLIERNUMBER"].ToString() });//货主 ä¾›åº”商 
                                model.Add("F_XBKF_COMBO", dr["F_xbkf_Combo1"].ToString());//是否有票 
                                JArray Fentity = new JArray();
                                foreach (var item in drs)
                                {
                                    JObject FentityModel = new JObject();
                                    FentityModel.Add("FMaterialId", new JObject() { ["Fnumber"] = item["FMATERIALNUMBER"].ToString() }); // ç‰©æ–™ç¼–码   
                                    FentityModel.Add("FUnitID", new JObject() { ["Fnumber"] = item["FUNITNUMBER"].ToString() }); // å•ä½   
                                    FentityModel.Add("FPreDeliveryDate", DateTime.Now.ToString("yyyy-MM-dd")); //预计到货日期   
                                    FentityModel.Add("FPriceUnitId", new JObject() { ["Fnumber"] = item["FUNITNUMBER"].ToString() }); // è®¡ä»·å•ä½   
                                    FentityModel.Add("FStockUnitID", new JObject() { ["Fnumber"] = item["FUNITNUMBER"].ToString() }); //  åº“存单位   
                                    FentityModel.Add("FActReceiveQty", Convert.ToDecimal(item["HQTY"])); // ä¾›åº”商送货数量（提料计划数量 - å·²ç”Ÿæˆé€è´§å•æ•°é‡ï¼‰
                                    FentityModel.Add("FOwnerTypeId", "BD_OwnerOrg");//货主类型
                                    FentityModel.Add("FOwnerID", new JObject() { ["Fnumber"] = dr["FPURCHASEORGNUMBER"].ToString() });//货主 
                                    FentityModel.Add("FSrcId", item["FID"].ToString());//源单内码
                                    FentityModel.Add("FSRCFORMID", "PUR_PurchaseOrder");//源单类型
                                    FentityModel.Add("FSrcBillNo", item["FBILLNO"].ToString());//源单单号
                                    FentityModel.Add("FSRCENTRYID", item["FENTRYID"].ToString());//源单分录内码
                                    FentityModel.Add("FORDERBILLNO", item["FBILLNO"].ToString());//源单单号
                                    FentityModel.Add("FPOORDERENTRYID", item["FENTRYID"].ToString());//源单分录内码
                                    FentityModel.Add("FSRMENTRYID", item["HENTRYID"].ToString());//SRM hentryid
                                    FentityModel.Add("FPrice", item["FPRICE"].ToString());//单价
                                    FentityModel.Add("FTaxPrice", item["FTAXPRICE"].ToString());//含税单价
                                    FentityModel.Add("FEntryTaxRate", item["FTAXRATE"].ToString());//税率

                                    JArray Fentity2 = new JArray();
                                    JObject FentityModel2 = new JObject();
                                    FentityModel2.Add("FDetailEntity_Link_FRULEID", "PUR_PurchaseOrder-PUR_ReceiveBill");
                                    FentityModel2.Add("FDetailEntity_Link_FSTableName", "t_PUR_POOrderEntry");
                                    FentityModel2.Add("FDetailEntity_Link_FSBillId", item["FID"].ToString());
                                    FentityModel2.Add("FDetailEntity_Link_FSId", item["FEntryID"].ToString());
                                    Fentity2.Add(FentityModel2);
                                    FentityModel.Add("FDetailEntity_Link", Fentity2);
                                    Fentity.Add(FentityModel);
                                }
                                model.Add("FDetailEntity", Fentity); //明细信息

                                JObject _FentityModel = new JObject();
                                _FentityModel.Add("FSettleOrgId", new JObject() { ["Fnumber"] = dr["FSETTLEORGNUMBER"].ToString() }); //  ç»“算组织  
                                _FentityModel.Add("FSettleCurrId", new JObject() { ["Fnumber"] = dr["FSETTLECURRNUMBER"].ToString() }); //  ç»“算币别
                                _FentityModel.Add("FPricePoint", 0); //  å®šä»·æ—¶ç‚¹
                                model.Add("FinanceEntity ", _FentityModel);//财务信息
                                JObject jsonRoot = new JObject()
                                {
                                    ["Creator"] = "",
                                    ["NeedUpDateFields"] = new JArray(),
                                    ["NeedReturnFields"] = new JArray(),
                                    ["IsDeleteEntry"] = "false",
                                    ["SubSystemId"] = "",
                                    ["IsVerifyBaseDataField"] = "false",
                                    ["Model"] = model
                                };
                                var loginRet = InvokeHelper.Login();
                                var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
                                if (isSuccess == 0)
                                {
                                    objjson.code = "0";
                                    objjson.count = 0;
                                    objjson.Message = loginRet;
                                    objjson.data = null;
                                    return objjson;
                                }
                                LogService.Write("jsonRoot:" + jsonRoot.ToString());
                                var result = InvokeHelper.Save("PUR_ReceiveBill", jsonRoot.ToString());
                                //LogService.Write(result);
                                if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() == "TRUE")
                                {
                                    //更新送货单 ä¸»è¡¨ ERP单据号 ä»¥åŠ ERP主内玛
                                    string FBillNo = JObject.Parse(result)["Result"]["Number"].ToString();
                                    string FID = JObject.Parse(result)["Result"]["Id"].ToString();

                                    string updateSql = string.Format(@"
                                                      update a set 
                                                      a.HERPInterID = {0} ,
                                                      a.HERPBillNO   ='{1}'
                                                      from Cg_POInStockBillMain a
                                                      join Cg_POInStockBillSub b on a.hinterid = b.hinterid
                                                      where b.HInterID = ({2})
                                                      and b. HSOURCEINTERID = {3}
                                                      and a.HERPInterID = 0
                                                     ", FID, FBillNo, dr["HINTERID"].ToString(), dr["FID"].ToString());
                                    oCn.RunProc(updateSql);
                                }
                                else
                                {
                                    objjson.code = "0";
                                    objjson.count = 0;
                                    objjson.Message = result;
                                    objjson.data = null;
                                    return objjson;
                                }
                            }
                        }
                    }
                }
                var check = Get_ReciveBillCheckDate(HBillNo);
                if (check.code == "0")
                    return check;
                //if(check)
                //更新主表状态 å®¡æ ¸
                sql = string.Format(@"update Cg_POInStockBillMain set 
HBillStatus = 2 ,
HChecker   ='{0}',
HCheckDate   = getdate()
where HInterID in ({1})", CurUserName, HInterID);
                oCn.RunProc(sql);
                objjson.code = "1";
                objjson.count = 1;
                objjson.Message = "操作成功";
                objjson.data = null;
                return objjson;
            }
            catch (Exception ex)
            {
                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "操作失败" + ex.Message.ToString();
                objjson.data = null;
                return objjson;
            }
        }
        public int GetHinterIDByBillNo(string HBillNo, string type)
        {
            SQLHelper.ClsCNSRM oCn = new SQLHelper.ClsCNSRM();
            int HInterID = 0;
            string sql = "select HInterID from CG_POINSTOCKBILLMAIN where HBILLNO = '" + HBillNo + "'";
            if (type == "Print")
                sql += " and HBillStatus = '2' ";//打印判断是否审核
            DataTable dt = oCn.RunProcReturn(sql, "HInterID").Tables[0];
            if (dt.Rows.Count > 0)
                HInterID = Convert.ToInt32(dt.Rows[0]["HInterID"]);
            return HInterID;
        }

        public json Get_ReciveBillCheckDate(string HBarCode)
        {
            json objjson = new json();
            try
            {
                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                DataSet Ds = oCn.RunProcReturn("exec h_p_KF_PonderationBillMain_Temp_Add_POInStockCheck2 '" + HBarCode + "'", "h_p_KF_PonderationBillMain_Temp_Add_POInStockCheck2");
                if (Ds == null || Ds.Tables[0].Rows.Count == 0)
                {
                    objjson.code = "0";
                    objjson.count = 0;
                    objjson.Message = "没有返回任何记录！";
                    objjson.data = null;
                    return objjson;
                }
                else
                {
                    if (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0][0]) == 0)
                    {
                        objjson.code = "1";
                        objjson.count = 1;
                        objjson.Message = "Sucess！";
                        objjson.data = Ds.Tables[0];
                        return objjson;
                    }
                    else
                    {
                        objjson.code = "0";
                        objjson.count = 0; 
                        objjson.Message = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]);
                        objjson.data = null;
                        return objjson;
                    }
                }
            }
            catch (Exception e)
            {
                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "没有返回任何记录！" + e.ToString();
                objjson.data = null;
                return objjson;
               
            }
        }

        //收料通知单审核 å®¡æ ¸æäº¤
@@ -1190,9 +1485,9 @@
                };
                string result1 = string.Empty;
                string result2 = string.Empty;
                DataSet Ds = oCn.RunProcReturn("select FDOCUMENTSTATUS,FID from  AIS20210811135644..T_PUR_RECEIVE where FBILLNO='" + HBarCode+"'", "AIS20210811135644..T_PUR_RECEIVE");
                DataSet Ds = oCn.RunProcReturn("select FDOCUMENTSTATUS,FID from  AIS20210811135644..T_PUR_RECEIVE where FBILLNO='" + HBarCode + "'", "AIS20210811135644..T_PUR_RECEIVE");
                //判断当前收料通知单状态——已创建则先提交再审核、以提交则只审核
                if (Ds.Tables[0].Rows[0][0].ToString() == "A"|| Ds.Tables[0].Rows[0][0].ToString() == "D")
                if (Ds.Tables[0].Rows[0][0].ToString() == "A" || Ds.Tables[0].Rows[0][0].ToString() == "D")
                {
                    result1 = InvokeHelper.Submit("PUR_ReceiveBill", JsonConvert.SerializeObject(json));
                    result2 = InvokeHelper.Audit("PUR_ReceiveBill", JsonConvert.SerializeObject(json));
@@ -1232,15 +1527,15 @@
        //PDA销售出库整托删除
        [Route("POStockInBillList/SellOutBillSDeleCode")]
        [HttpGet]
        public object SellOutBillSDeleCode(string HBarCode,string HInterID)
        public object SellOutBillSDeleCode(string HBarCode, string HInterID)
        {
            try
            {
                //根据条码在条码档案中找到对应的托条码，再在临时表中删除该托条码的全部记录
                string sql = string.Format(@"delete from KF_PonderationBillMain_Temp where HBillType=1205 and HInterID=" + HInterID + " and HBarCode" +
                    " in (select HBarCode from Gy_BarCodeBill where HBarCode_Pack = (select HBarCode_Pack from Gy_BarCodeBill where HBarCode = '"+ HBarCode + "'))");
                    " in (select HBarCode from Gy_BarCodeBill where HBarCode_Pack = (select HBarCode_Pack from Gy_BarCodeBill where HBarCode = '" + HBarCode + "'))");
                oCn.RunProc(sql);
                

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "整托删除成功！";

 WebAPI/Controllers/SBGL/Gy_EquipTypeController.cs

@@ -131,7 +131,7 @@
                string msg1 = _value.ToString();
                string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
                string msg2 = sArray[0].ToString();
                string msg4 = sArray[2].ToString();
                string msg4 = sArray[1].ToString();

                if (!DBUtility.ClsPub.Security_Log("Gy_EquipType_Edit", 1, false, msg4))
                {

 WebAPI/Controllers/SCGL/Èռƻ®¹ÜÀí/JIT_CompleteController..cs

@@ -1,4 +1,5 @@
using DBUtility;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
@@ -115,5 +116,47 @@
            }
        }
        #endregion

        #region é½å¥—分析报表
        public class ReportMOMaterReadysBill
        {
            public int? HORGID;//组织
            public int? HMATERIALID;//物料
            public int? HDeptID;//生产车间
            public int? HSCZYID;//生产资源
            public string HXQD;//需求单号
            public string HMOBILLNO;//生产订单号
        }
        /// <summary>
        /// 
        /// </summary>
        /// <returns></returns>
        [Route("JIT_Complete/ReportMOMaterReadysBillList")]
        [HttpGet]
        public object ReportMOMaterReadysBillList(string sWhere)
        {
            try
            {

                ReportMOMaterReadysBill Report = JsonConvert.DeserializeObject<ReportMOMaterReadysBill>(sWhere);

                ds = oCN.RunProcReturn($"exec  PR_Complete_Report '{Report.HXQD}','{Report.HMOBILLNO}',{Report.HORGID},{Report.HDeptID},{Report.HSCZYID},{Report.HMATERIALID}", "PR_Complete_Report");

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
    }
}

 WebAPI/Controllers/SCGL/Èռƻ®¹ÜÀí/JIT_DayPlanPlatFormBillController.cs

@@ -323,7 +323,10 @@
        #region æ¸…单配料方式
        public class PRD_PPBOM
        {

            /// <summary>
            /// æ—¥è®¡åˆ’工单号
            /// </summary>
            public string HMainICMOBillNo { get; set; }
            /// <summary>
            /// æ—¥è®¡åˆ’工单FID
            /// </summary>
@@ -537,6 +540,10 @@
            ///  ä¸»ç”Ÿäº§è®¢å•å­å†…码：FHMainICMOEntryID  
            /// </summary>
            public string FHMainICMOEntryID { get; set; }
            /// <summary>
            ///  æ—¥è®¡åˆ’订单单号：HMainICMOBillNo 
            /// </summary>
            public string HMainICMOBillNo { get; set; }
            /// <summary>
            ///  æ—¥è®¡åˆ’订单主内码：FHICMOInterID 
            /// </summary>
@@ -800,6 +807,7 @@
                                FHStockOrgID = _item.FStockOrgId,
                                FHPRDORGID = _item.FStockOrgId,
                                FPRDBillNo = _item.HICMOBillNo,
                                HMainICMOBillNo = _item.HMainICMOBillNo,
                                FOwnerTypeId = "",
                                FUnitDosage = _item.dwyl,//单位用量
                                FSumPlanCount = planNeed,//计划总数量
@@ -843,6 +851,7 @@
                                    FHStockOrgID = _item.FStockOrgId,
                                    FHPRDORGID = _item.FStockOrgId,
                                    FPRDBillNo = _item.HICMOBillNo,
                                    HMainICMOBillNo = _item.HMainICMOBillNo,
                                    FOwnerTypeId = "",
                                    FUnitDosage = _item.dwyl,//单位用量
                                    FSumPlanCount = planNeed,//计划总数量
@@ -894,6 +903,7 @@
                                            FHPRDORGID = _item.FStockOrgId,
                                            FErpClsID = _item.FErpClsID,
                                            FPRDBillNo = _item.HICMOBillNo,
                                            HMainICMOBillNo = _item.HMainICMOBillNo,
                                            FOwnerTypeId = Inventory.FOwnerTypeId,
                                            FOwnerId = Inventory.FOwnerId,
                                            FUnitDosage = _item.dwyl,//单位用量
@@ -937,6 +947,7 @@
                                FHStockOrgID = _item.FStockOrgId,
                                FHPRDORGID = _item.FStockOrgId,
                                FPRDBillNo = _item.HICMOBillNo,
                                HMainICMOBillNo = _item.HMainICMOBillNo,
                                FOwnerTypeId = "",
                                FUnitDosage = _item.dwyl,//单位用量
                                FSumPlanCount = planNeed,//计划总数量
@@ -973,6 +984,7 @@
                insertDT.Columns.Add("FUNITDOSAGE", typeof(decimal));
                insertDT.Columns.Add("FSUMPLANCOUNT", typeof(decimal));
                insertDT.Columns.Add("FPRDBILLNO", typeof(string));
                insertDT.Columns.Add("HMainICMOBillNo", typeof(string));
                insertDT.Columns.Add("FOWNERID", typeof(long));
                insertDT.Columns.Add("FOWNERTYPEID", typeof(string));
                insertDT.Columns.Add("FPLANDATE", typeof(DateTime));
@@ -1004,6 +1016,7 @@
                    dr["FUNITDOSAGE"] = item.FUnitDosage;
                    dr["FSUMPLANCOUNT"] = item.FSumPlanCount;
                    dr["FPRDBILLNO"] = item.FPRDBillNo;
                    dr["HMainICMOBillNo"] = item.HMainICMOBillNo;
                    dr["FOWNERID"] = item.FOwnerId == null ? "0" : item.FOwnerId;
                    dr["FOWNERTYPEID"] = item.FOwnerTypeId;
                    dr["FPLANDATE"] = item.FPlanDate.ToString("yyyy-MM-dd");
@@ -1030,12 +1043,12 @@
                            ", HICMOEntryID, HMaterID, HStockORGID, HStockQty, HLeftQty" +
                            ", HProdORGID, HUnitDosage, HSumPlanQty, HICMOBillNo, HOwnerID" +
                            ", HOwnerTypeID, HPlanDate, HComplete, HLackQty, HOccupyQty" +
                            ", HCompleteQty1, HErpClsID, HWorkShopID, HWHID, HOccupyPickedQTY)values" +
                            ", HCompleteQty1, HErpClsID, HWorkShopID, HWHID, HOccupyPickedQTY,HMainICMOBillNo)values" +
                             $"({item["FID"].ToString()}, 1, {item["FHMAINICMOINTERIDR"].ToString()}, {item["FHMAINICMOENTRYID"].ToString()}, {item["FHICMOINTERID"].ToString()}" +
                             $", {item["FHICMOENTRYID"].ToString()}, {item["FHMATERID"].ToString()}, {item["FHSTOCKORGID"].ToString()}, {item["FHSTOCKQTY"].ToString()}, {item["FHLEFTQTY"].ToString()}" +
                             $" , {item["FHPRDORGID"].ToString()}, {item["FUNITDOSAGE"].ToString()}, {item["FSUMPLANCOUNT"].ToString()}, '{item["FPRDBILLNO"].ToString()}', {item["FOWNERID"].ToString()}" +
                             $", '{item["FOWNERTYPEID"].ToString()}', '{item["FPLANDATE"].ToString()}','{item["FCOMPLETE"].ToString()}', {item["FLACKCOUNT"].ToString()}, {item["FOCCUPYCOUNT"].ToString()}" +
                             $", {item["FCOMPLETECOUNT1"].ToString()}, {item["FERPCLSID"].ToString()}, {item["FWORKSHOPID"].ToString()}, {item["FSTOCKID"].ToString()}, {item["FOCCUPYPICKEDCOUNT"].ToString()})");
                             $", {item["FCOMPLETECOUNT1"].ToString()}, {item["FERPCLSID"].ToString()}, {item["FWORKSHOPID"].ToString()}, {item["FSTOCKID"].ToString()}, {item["FOCCUPYPICKEDCOUNT"].ToString()}, '{item["HMainICMOBillNo"].ToString()}')");
                }
                LogService.Write("批量插入到数据库用时：" + sw.Elapsed);
                //执行完成后 æ›´æ–°æ—¥è®¡åˆ’工单状态

 WebAPI/Controllers/Sc_PckSplitBillController.cs

@@ -374,7 +374,7 @@
        {
            try
            {
                string sql1 = string.Format(@"select * from h_v_Kf_ICStockBillList where HBillType='1204' " + sWhere);
                string sql1 = string.Format(@"select * from h_v_Kf_ICStockBillList where 1=1 " + sWhere);
                 DataSet ds=oCn.RunProcReturn(sql1, "h_v_Kf_ICStockBillList");
                if (ds.Tables[0].Rows.Count == 0 || ds == null)
                {

 WebAPI/Controllers/²©ÈÕ×Ô¶¯É¨ÂëÏß/ScanlineAPIController.cs

@@ -160,10 +160,9 @@
                {
                    //判断条码是否存在
                    bool IsBarCode = oBill.IsBarCode(list.barcodes[i].barcode);
                    if (IsBarCodePack == false)
                    if (IsBarCode == false)
                    {
                        DataTable dt = oCN.RunProcReturn("Select HBarCode_Pack from Sc_PackUnionBillSub Where  HBarCode='" + list.barcodes[i].barcode + "'", "Sc_PackUnionBillSub").Tables[0];
                       LogService.Write($"条码：{list.barcodes[i].barcode}，已存在箱码：{dt.Rows[0]["HBarCode_Pack"]}中，本次绑定箱码为：{list.packagebarcode},绑定失败,不能重复绑定！");
                        objJsonResult.status = -1;
                        objJsonResult.msg = $"条码：{list.barcodes[i].barcode}，已存在箱码：{dt.Rows[0]["HBarCode_Pack"]}中，本次绑定箱码为：{list.packagebarcode},绑定失败,不能重复绑定！";
                        objJsonResult.data = null;

 WebAPI/WebAPI.csproj.user

@@ -9,7 +9,7 @@
    <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
    <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\智云MES\Lay-Api\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>false</UseIISExpress>
    <Use64BitIISExpress />