提料计划运算(缺料) 日志添加自定义名称方法

yangle

2023-06-29 2d3fc93b131c7aa771e8f7d08a82d5e9b4946eff

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

@@ -20,6 +20,7 @@
        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
        Sc_WorkBillSortBillMain omdelMian = new Sc_WorkBillSortBillMain();
        public static string BillType = "4610";
        Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();

        #region ç”Ÿäº§æ—¥è®¡åˆ’平台 æŸ¥è¯¢
        [Route("JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillList")]
@@ -760,21 +761,8 @@

                //获取当前即时库存 åº“存数量+库存组织+物料+货主+仓库   
                ds = oCN.RunProcReturn(@" 
select distinct isnull(a.FBASEQTY,0) FBASEQTY,b.FNumber,a.FOwnerTypeId,a.FOwnerId,c.FNUMBER as FOwnerNumber,a.FSTOCKID,d.FNUMBER as FStockNumber ,a.FLOT HLOT,a.FID HInventoryFID 
from 
(
select distinct a.HProdORGID FStockOrgId,T2.FMATERIALID,FNumber from Sc_WorkBillSortBillMain a
join Sc_WorkBillSortBillSub b on a.HInterID = b.HInterID
join AIS20230129011339..T_PRD_PPBOM T1 on a.HICMOInterID_Sec = t1.FMoId and a.HICMOEntryID_Sec = t1.FMOENTRYID
LEFT JOIN  AIS20230129011339..T_PRD_PPBOMENTRY T2 on T1.FID = t2.FID
join  AIS20230129011339..T_BD_MATERIAL T3 on T2.FMATERIALID = T3.FMATERIALID
) T1 
JOIN  AIS20230129011339..T_BD_MATERIAL b on  t1.FNUMBER = b.FNUMBER
LEFT JOIN  AIS20230129011339..T_STK_Inventory a on b.FMATERIALID = a.FMATERIALID
LEFT join (select distinct fitemid,fformid,FNUMBER from  AIS20230129011339..V_ITEMCLASS_OWNER) c on a.FOwnerTypeId = c.fformid and a.FOWNERID = c.fitemid
join  AIS20230129011339..t_BD_Stock d on a.FSTOCKID =d.FSTOCKID
where a.FBASEQTY>0 
", "SC_WORKBILLSORTBILLMAIN");
select * from h_v_jit_InventoryList
", "h_v_jit_InventoryList");
                ListInventory = ds.ToModelList<PRD_Inventory>();
                //车间 ä»“库对照列表 
                ds = oCN.RunProcReturn(@" 
@@ -786,25 +774,7 @@
                //日计划+生产订单子表编码ID
                var DatePlanList = BomList.GroupBy(p => new { p.HMasterDate, p.HICMOEntryID_Sec }).Select(x => new PRD_PPBOM { HMasterDate = x.Key.HMasterDate, HICMOEntryID_Sec = x.Key.HICMOEntryID_Sec }).ToList();
                //取应发数量 FMustQty ä¸è¦å–值需求数量FNeedQty é¢†æ–™æ•°æ®
                string LLsql = string.Format(@"
select max(t1.FCXStockInQty)FCXStockInQty,FPRDMOENTYID,max(dwyl)dwyl,sum(FPickedQty)FPickedQty,sum(FRemainPickedQty)FRemainPickedQty,FMATERIALID from 
(
select a.FCXStockInQty, FPRDMOENTYID,convert( decimal(18,2),FMustQty/FQty ) as dwyl,FPickedQty,T2.FMATERIALID,
case when convert( decimal(18,2),(FPickedQty - a.FCXStockInQty * FMustQty/FQty))< 0 then 0 
else convert( decimal(18,2),(FPickedQty - a.FCXStockInQty * FMustQty/FQty)) end as FRemainPickedQty 
 from 
(
select sum(HSourceStockInQty)FCXStockInQty,HICMOEntryID_Sec FPRDMOENTYID from SC_WORKBILLSORTBILLMAIN a
where a.HInterID IN ({0})
group by HICMOEntryID_Sec 
) a
join  AIS20230129011339..T_PRD_PPBOM T1  on a.FPRDMOENTYID = t1.FMOENTRYID
LEFT JOIN AIS20230129011339..T_PRD_PPBOMENTRY t2 on T1.FID = T2.FID 
LEFT JOIN AIS20230129011339..T_PRD_PPBOMENTRY_Q t3 on t2.FENTRYID = T3.FENTRYID 
LEFT JOIN AIS20230129011339..T_BD_MATERIAL T4 ON T2.FMATERIALID = T4.FMATERIALID 
) t1
group by FPRDMOENTYID,FMATERIALID
", fDayPlanFids);
                string LLsql = string.Format(@"exec h_p_jit_PPBOMList '{0}'", fDayPlanFids);
                List<DayPlanPickedModel> DayPlanPickedModel = new List<DayPlanPickedModel>();
                ds = oCN.RunProcReturn(LLsql, "SC_WORKBILLSORTBILLMAIN");
                DayPlanPickedModel = ds.ToModelList<DayPlanPickedModel>();
@@ -1226,6 +1196,8 @@
            /// åº“存组织
            /// </summary>
            public long FStockOrgId { get; set; }
            //库存组织名称
            public string FStockOrgName { get; set; }
            /// <summary>
            /// jit物料分类
            /// </summary>
@@ -1299,6 +1271,10 @@
            /// é‡‡è´­ç»„织
            /// </summary>
            public long FStockOrgId { get; set; }
            /// <summary>
            /// é‡‡è´­ç»„织名称
            /// </summary>
            public string FStockOrgName { get; set; }
            /// <summary>
            /// ç»„织编码
            /// </summary>
@@ -1440,6 +1416,10 @@
            /// </summary>
            public long FStockOrgId { get; set; }
            /// <summary>
            /// é‡‡è´­ç»„织名称
            /// </summary>
            public string FStockOrgName { get; set; }
            /// <summary>
            /// ç»„织编码
            /// </summary>
            public string FORGNumber { get; set; }
@@ -1503,15 +1483,65 @@

        [Route("JIT_DayPlanPlatFormBill/JIT_TLYS")]
        [HttpGet]
        public object JIT_TLYS(string sWhere, string user)
        public object JIT_TLYS(string sWhere, string user,string HTLType)
        {
            try
            {
                omdelMian = JsonConvert.DeserializeObject<Sc_WorkBillSortBillMain>(sWhere);

                DataSet DaSet = oCN.RunProcReturn($"select * from JIT_MOMaterReadysBill where HWorkShopID={omdelMian.HWorkShopID} and HProdORGID={omdelMian.HProdORGID}", "JIT_MOMaterReadysBill");
                string fProWorkShopId = omdelMian.HWorkShopID.ToString();
                var fPrdOrgId = omdelMian.HProdORGID;
                string sqlName = "";//AIS20210811135644
                //客户制定
                string sErr = "";
                if (oSystemParameter.ShowBill(ref sErr))
                {
                    if (oSystemParameter.omodel.WMS_CampanyName == "帅威")
                    {
                        sqlName = "AIS20230129011339";
                    }
                    else
                    {
                        sqlName = "AIS20210811135644";
                    }
                }

                if (DaSet.Tables[0].Rows.Count == 0)
                if (HTLType == "缺料")
                {
                    objJsonResult = (json)JIT_QL(fProWorkShopId, fPrdOrgId, user, sqlName);
                }
                else if (HTLType == "生产用料清单")
                {
                 objJsonResult=(json)JIT_PPBOM(fProWorkShopId, fPrdOrgId, user, sqlName);
                }

                return objJsonResult;
            }
            catch (Exception e)
            {
                LogService.Write("操作失败：" + e.Message.ToString());
                oCN.RollBack();//事务回滚
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.Message.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        /// <summary>
        /// é€šè¿‡ç¼ºæ–™æƒ…况算提料
        /// </summary>
        /// <returns></returns>
        public object JIT_QL(string HWorkShopID,int? HProdORGID,string user,string sqlName) {
            try
            {

                oCN.BeginTran();

                DataSet DaSet = oCN.RunProcReturn($"exec h_p_JIT_MOMaterReady {HWorkShopID},{HProdORGID},1", "JIT_MOMaterReadysBill");

                if (DaSet.Tables[0].Rows[0][0].ToString() != "1")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -1520,12 +1550,422 @@
                    return objJsonResult;
                }

                string fProWorkShopId = omdelMian.HWorkShopID.ToString();
                var fPrdOrgId = omdelMian.HProdORGID;
                //Stopwatch sw = new Stopwatch();
                //sw.Start();//开始计时
                //提料计划预处理 æ¸…理提料计划单数据 æ›´æ–°é‡‡è´­è®¢å•ææ–™è®¡åˆ’数量
                //               string sql = string.Format(@"
                // /*dialect*/
                //exec [提料计划预处理] 
                //");
                //               DBServiceHelper.Execute(Context, sql);
                ////LogHelper.Info("[提料计划准备阶段]提料计划预处理sql：" + sql);
                //采购订单数据
                string sql = $@"exec h_p_JIT_MOMaterReady {HWorkShopID},{HProdORGID},2";
                DataSet ds = oCN.RunProcReturn(sql, "t_PUR_POOrderEntry");
                List<PurchaseInventory> PurchaseInventory = ds.ToModelList<PurchaseInventory>();
                ////LogHelper.Info("[提料计划准备阶段]可用采购订单数据sql：" + sql);
                sql = string.Format($@"exec h_p_JIT_MOMaterReady {HWorkShopID},{HProdORGID},3");
                ////LogHelper.Info("[提料计划准备阶段]需要提料数据sql：" + sql);
                ds = oCN.RunProcReturn( sql, "JIT_MOMaterReadysBill");
                List<DayPlanPpbom> DayPlanPpbom = ds.ToModelList<DayPlanPpbom>();
                //物料+库存组织分类
                var MaterialIDList = DayPlanPpbom.GroupBy(p => new { p.FMATERIALID, p.FNumber,p.FStockOrgName, p.FStockOrgId }).Select(x => new PODemandPlanTemp { FMATERIALID = x.Key.FMATERIALID, FNumber=x.Key.FNumber, FStockOrgId = x.Key.FStockOrgId , FStockOrgName =x.Key.FStockOrgName }).ToList();
                //提料计划数据集临时存储集合
                List<PODemandPlanTemp> PODemandPlanTemp = new List<PODemandPlanTemp>();
                //sql集合 æ›´æ–°é‡‡è´­è®¢å•å ç”¨çš„提料计划数量
                List<string> sqlList = new List<string>();
                string Error = "运算失败!";
                foreach (var item in MaterialIDList)
                {
                    //当前物料没有采购订单时 ç›´æŽ¥è·³å‡º
                    List<PurchaseInventory> _PurchaseInventory = PurchaseInventory.Where(x => x.FMATERIALID == item.FMATERIALID && x.FStockOrgId == item.FStockOrgId && x.FQTY > 0).OrderBy(x => x.FENTRYID).ToList();
                    if (_PurchaseInventory.Count == 0)
                    {
                        Error+="[提料计划开始]当前物料无采购信息：" + item.FNumber + " åº“存组织：" + item.FStockOrgName + "      ";
                        continue;
                    }
                    ////LogHelper.Info(item.FMATERIALID.ToString());
                    //当前物料和库存组织对应的需进行提料计划的数据    
                    List<DayPlanPpbom> _DayPlanPpbom = DayPlanPpbom.Where(x => x.FMATERIALID == item.FMATERIALID && x.FStockOrgId == item.FStockOrgId).ToList();
                    decimal FMINPOQTY = _DayPlanPpbom.FirstOrDefault().FMINPOQTY;//最小起订量
                    double FFIXLEADTIME = _DayPlanPpbom.FirstOrDefault().FFIXLEADTIME;//提前期
                    //double FFIXLEADTIME = 3;//提前期(2022-1-26 æå‰æœŸæ”¹ä¸º3天 ä¹ƒæ°¸åˆšåé¦ˆ)
                    string FJITmaterialGroup = _DayPlanPpbom.FirstOrDefault().FJITmaterialGroup;//jit物料分类
                    string FJITMaterielDemand = _DayPlanPpbom.FirstOrDefault().FJITMaterielDemand; //JIT物料需求供货周期
                    string FJITSafeStock = _DayPlanPpbom.FirstOrDefault().FJITSafeStock; //JIT安全库存
                    decimal NeedQty = 0;
                    DateTime DATE = _DayPlanPpbom.FirstOrDefault().FHMASTERDATE;//第一个订货起始日期
                    int i = 0;
                    //记录在最小采购量需求下的日计划明细FentyrID
                    List<int> FEntryIdList = new List<int>();
                    foreach (var _item in _DayPlanPpbom)
                    {
                        i++;
                        _PurchaseInventory = PurchaseInventory.Where(x => x.FMATERIALID == item.FMATERIALID && x.FStockOrgId == item.FStockOrgId && x.FQTY > 0).OrderBy(x => x.FENTRYID).ToList();
                        if (_PurchaseInventory.Count == 0)
                        {
                            break;
                        }

                LogService.Write($"提料计划重算 è½¦é—´ï¼š{fProWorkShopId}，组织：{fPrdOrgId}");
                        if (NeedQty == 0)
                            DATE = Convert.ToDateTime(_item.FHMASTERDATE).AddDays(-FFIXLEADTIME);
                        FEntryIdList.Add(_item.FENTRYID);
                        NeedQty += _item.NeedQty;

                        if ((FJITmaterialGroup == "总量控制规格类" || FJITmaterialGroup == "订单专用个性类") && FEntryIdList.Count < Convert.ToInt32(FJITMaterielDemand) && i < _DayPlanPpbom.Count) //订单专用个性类
                            continue;

                        foreach (var Purchase in _PurchaseInventory)
                        {
                            if (Purchase.FQTY >= NeedQty)
                            {
                                foreach (int id in FEntryIdList)
                                {
                                    var DayPlanPpbomls = DayPlanPpbom.Where(c => c.FENTRYID == id && c.FMATERIALID == _item.FMATERIALID).FirstOrDefault();
                                    PODemandPlanTemp.Add(new PODemandPlanTemp
                                    {
                                        FID = DayPlanPpbomls.FID,
                                        FHMASTERDATE = DATE,
                                        FQty = DayPlanPpbomls.NeedQty,
                                        FBILLNO = DayPlanPpbomls.FBILLNO,
                                        FENTRYID = DayPlanPpbomls.FENTRYID,
                                        FMATERIALID = DayPlanPpbomls.FMATERIALID,
                                        FNumber = DayPlanPpbomls.FNumber,
                                        OLDDATE = DayPlanPpbomls.FHMASTERDATE,
                                        FFIXLEADTIME = FFIXLEADTIME,
                                        FErpClsID = DayPlanPpbomls.FErpClsID,

                                        PurchseFID = Purchase.FID,
                                        PurchseFentryID = Purchase.FENTRYID,
                                        FSUPPLIERID = Purchase.FSUPPLIERID,
                                        PurchseFNUMBER = Purchase.FNUMBER,
                                        PurchseFBillNo = Purchase.FBillNo,
                                        PurchseFqty = Purchase.FQTY,
                                        FStockOrgId = Purchase.FStockOrgId, //采购组织
                                        FORGNumber = Purchase.FORGNumber,

                                        FXQD = _item.FXQD,
                                        FCREATORID = Purchase.FCREATORID,
                                        FName = Purchase.FName,
                                        FDate = Purchase.FDate,
                                        FDeliveryDate = Purchase.FDeliveryDate,
                                        F_QIMB_NOTE = Purchase.F_QIMB_NOTE,
                                        FNOTE = Purchase.FNOTE,
                                        FPURCHASEQTY = Purchase.FPURCHASEQTY,
                                        FJOINQTY = Purchase.FJOINQTY
                                    });
                                    //扣除日计划明细已被分配的数量
                                    DayPlanPpbomls.NeedQty = 0;
                                }
                                FEntryIdList.Clear();
                                //更新采购订单
                                //sqlList.Add($"/*dialect*/ update t_PUR_POOrderEntry set FPODemandPlanCount  =isnull(FPODemandPlanCount,0)+  '{NeedQty}' where FENTRYID = {Purchase.FENTRYID}");
                                //扣除当前行对应采购订单数量
                                var ls = PurchaseInventory.Where(c => c.FENTRYID == Purchase.FENTRYID).FirstOrDefault();
                                ls.FQTY -= NeedQty;
                                break;
                            }
                            else
                            {
                                //更新总需求数量
                                NeedQty = NeedQty - Purchase.FQTY;
                                //采购订单数量
                                decimal _NeedQty = Purchase.FQTY;
                                List<int> mmm = new List<int>();
                                foreach (int id in FEntryIdList)
                                {
                                    var DayPlanPpbomls = DayPlanPpbom.Where(c => c.FENTRYID == id && c.FMATERIALID == _item.FMATERIALID).FirstOrDefault();
                                    decimal Qty = DayPlanPpbomls.NeedQty;//订单数量
                                  
                                    if (Qty > _NeedQty)
                                        Qty = _NeedQty; //订单数量>采购订单数量 å–采购订单

                                    _NeedQty = _NeedQty - Qty;
                                    PODemandPlanTemp.Add(new PODemandPlanTemp
                                    {
                                        FID = DayPlanPpbomls.FID,
                                        FHMASTERDATE = DATE,
                                        FQty = Qty,
                                        FBILLNO = DayPlanPpbomls.FBILLNO,
                                        FENTRYID = DayPlanPpbomls.FENTRYID,
                                        FMATERIALID = DayPlanPpbomls.FMATERIALID,
                                        FNumber = DayPlanPpbomls.FNumber,
                                        OLDDATE = DayPlanPpbomls.FHMASTERDATE,
                                        FFIXLEADTIME = FFIXLEADTIME,
                                        FErpClsID = DayPlanPpbomls.FErpClsID,

                                        PurchseFID = Purchase.FID,
                                        PurchseFentryID = Purchase.FENTRYID,
                                        FSUPPLIERID = Purchase.FSUPPLIERID,
                                        PurchseFNUMBER = Purchase.FNUMBER,
                                        PurchseFBillNo = Purchase.FBillNo,
                                        PurchseFqty = Purchase.FQTY,
                                        FStockOrgId = Purchase.FStockOrgId, //采购组织
                                        FORGNumber = Purchase.FORGNumber,

                                        FPURCHASEDEPTNUMBER = Purchase.FPURCHASEDEPTNUMBER,
                                        FXQD = _item.FXQD,
                                        FCREATORID = Purchase.FCREATORID,
                                        FName = Purchase.FName,
                                        FDate = Purchase.FDate,
                                        FDeliveryDate = Purchase.FDeliveryDate,
                                        F_QIMB_NOTE = Purchase.F_QIMB_NOTE,
                                        FNOTE = Purchase.FNOTE,
                                        FPURCHASEQTY = Purchase.FPURCHASEQTY,
                                        FJOINQTY = Purchase.FJOINQTY
                                    });
                                    //更新计划数量（剩余需要排的） ç»§ç»­åŽ»è®¡ç®—下一个采购订单
                                    DayPlanPpbomls.NeedQty -= Qty;
                                    //更新采购订单
                                    //sqlList.Add($"/*dialect*/ update t_PUR_POOrderEntry set FPODemandPlanCount = isnull(FPODemandPlanCount,0)+ '{Qty}' where FENTRYID = {Purchase.FENTRYID}");
                                    //更新Model
                                    var ls = PurchaseInventory.Where(c => c.FENTRYID == Purchase.FENTRYID).FirstOrDefault();
                                    ls.FQTY -= Qty;
                                    if (_NeedQty <= 0)
                                    {
                                        foreach (var mm in mmm)
                                        {
                                            FEntryIdList.Remove(mm);
                                        }
                                        break;
                                    }
                                    mmm.Add(id);
                                }
                            }
                        }
                        NeedQty = 0;

                    }
                }
                //var PODemandPlanList222 = PODemandPlanTemp.GroupBy(p => new PODemandPlanTemp { PurchseFNUMBER = p.PurchseFNUMBER, FHMASTERDATE = p.FHMASTERDATE }).Select(x => new PODemandPlanTemp { PurchseFNUMBER = x.Key.PurchseFNUMBER, FHMASTERDATE = x.Key.FHMASTERDATE }).ToList();
                var PODemandPlanList = PODemandPlanTemp.GroupBy(p => new { p.PurchseFNUMBER, p.FHMASTERDATE }).Select(x => new PODemandPlanTemp { PurchseFNUMBER = x.Key.PurchseFNUMBER, FHMASTERDATE = x.Key.FHMASTERDATE }).ToList();
                //LogHelper.Info($"提料计划，数据准备完成，保存到Model实体，总行数：{PODemandPlanTemp.Count}");
                int tlmmm = 0;
                JArray FinalyResult = new JArray();

             
                foreach (var item in PODemandPlanList)
                {
                    tlmmm++;

                    DateTime date = item.FHMASTERDATE;
                    string PurchseFNUMBER = item.PurchseFNUMBER;
                    //JObject model = new JObject();
                    //model.Add("FHDate", date);
                    //model.Add("FDeliveryDate", date.AddDays(-3));//供应商预计发货日期
                    //model.Add("FSettleCurrId", new JObject() { ["Fnumber"] = "PRE001" });
                    //model.Add("FSupplierID", new JObject() { ["Fnumber"] = PurchseFNUMBER });

                    var HInterID = DBUtility.ClsPub.CreateBillID("4608", ref DBUtility.ClsPub.sExeReturnInfo);
                    var HBillNo = DBUtility.ClsPub.CreateBillCode("4608", ref DBUtility.ClsPub.sExeReturnInfo, true);

                    var dataUser = oCN.RunProcReturn("select Czymc from gy_czygl where Czybm = '" + user + "'", "gy_czygl");
                    string HMaker = dataUser.Tables[0].Rows.Count == 0 ? "" : dataUser.Tables[0].Rows[0][0].ToString();//制单人
                    string HUpDater = dataUser.Tables[0].Rows.Count == 0 ? "" : dataUser.Tables[0].Rows[0][0].ToString();//修改人
                   

                    var dataOrg = oCN.RunProcReturn(@"select HItemID from Xt_ORGANIZATIONS o
                    inner join  "+ sqlName + @"..T_ORG_ORGANIZATIONS fo on o.HNumber=fo.FNUMBER
                    where FNUMBER='" + PODemandPlanTemp[0].FORGNumber + "'  and HItemID ='" + HProdORGID + "'", "Xt_ORGANIZATIONS");
                    long HPURCHASEORGID = dataOrg.Tables[0].Rows.Count == 0 ? 0 : long.Parse(dataOrg.Tables[0].Rows[0]["HItemID"].ToString()); //采购组织

                    var dataSup = oCN.RunProcReturn(@"select * from Gy_Supplier p
                    inner join  " + sqlName + @"..t_BD_Supplier fp on p.HNumber=fp.FNUMBER and p.HUSEORGID=fp.FUSEORGID
                    where FNUMBER='" + item.PurchseFNUMBER + "' and HUSEORGID ='" + HProdORGID + "'", "Gy_Supplier");
                    long HSupplierID = dataSup.Tables[0].Rows.Count == 0 ? 0 : long.Parse(dataSup.Tables[0].Rows[0]["HItemID"].ToString()); //供应商

                    long HSettleCurrId = 1;//货币 é»˜è®¤æœ¬åœ°äººæ°‘币

                    //主表
                    oCN.RunProc("insert into JIT_Cg_PODemandPlanBillMain(HInterID,HBillNo,HYear,HPeriod,HBillType" +
                                ",HBillSubType,HDate,HBillStatus,HMaker,HMakeDate" +
                                ",HSubORGID ,HAddress,HPURCHASEORGID,HSupplierID ,HSettleCurrId" +
                                ",HRemark,HExplanation,HUpDater,HUpDateDate)" +
                               $"values({HInterID}, '{HBillNo}', {DateTime.Now.Year}, {DateTime.Now.Month}, '4608'" +
                               $", '4608','{date}',1, '{HMaker}',GETDATE()," +
                               $"{HPURCHASEORGID},'',{HPURCHASEORGID}, {HSupplierID}, {HSettleCurrId}" +
                               $",'','','{HUpDater}',getdate())");

                    JArray Fentity = new JArray();
                    List<PODemandPlanTemp> _PODemandPlanList = PODemandPlanTemp.Where(x => x.FHMASTERDATE == date && x.PurchseFNUMBER == PurchseFNUMBER).ToList();
                    //LogService.Write("测试listmodel：" + _PODemandPlanList[0].FORGNumber.ToString());
                    int i = 0;
                    foreach (var _item in _PODemandPlanList)
                    {
                        i++;
                        //if (!model.ToString().Contains("FHPURCHASEORGID"))
                        //    model.Add("FHPURCHASEORGID", new JObject() { ["Fnumber"] = _item.FORGNumber });
                        //JObject FentityModel = new JObject();
                        //FentityModel.Add("FHPURCHASEORGID", new JObject() { ["Fnumber"] = _item.FORGNumber });//采购组织
                        //FentityModel.Add("FHMaterID", new JObject() { ["Fnumber"] = _item.FNumber });//物料
                        //FentityModel.Add("FHQty", _item.FQty);//数量
                        //FentityModel.Add("FHSourceInterID", _item.FID);//日计划工单FID
                        //FentityModel.Add("FHSourceEntryID", _item.FENTRYID);//日计划工单FENTRYID
                        //FentityModel.Add("FHSourceBillNo", _item.FBILLNO);//日计划工单单号
                        //FentityModel.Add("FHSourceBillType", "");//日计划工单类型
                        //FentityModel.Add("FDayPlanDate", _item.OLDDATE);//日计划工单类型
                        //FentityModel.Add("FHRelationQty", _item.PurchseFqty);//关联数量
                        //FentityModel.Add("FFIXLEADTIME", _item.FFIXLEADTIME);//提前期
                        //FentityModel.Add("FPURCHASEORGID", new JObject() { ["Fnumber"] = _item.FORGNumber });//采购组织
                        //FentityModel.Add("FHPOOrderInterID", _item.PurchseFID);// é‡‡è´­è®¢å•å†…码：FHPOOrderInterID
                        //FentityModel.Add("FHPOOrderEntryID", _item.PurchseFentryID); //采购订单子内码：FHPOOrderEntryID
                        //FentityModel.Add("FHPOOrderBillNo", _item.PurchseFBillNo); //采购订单号：FHPOOrderBillNo
                        //FentityModel.Add("FERPCLSID", _item.FErpClsID); //发料方式
                        //FentityModel.Add("FUnitID", new JObject() { ["Fnumber"] = "Pcs" }); //发料方式
                        //Fentity.Add(FentityModel);


                        var dataSet = oCN.RunProcReturn(@"select m.* from Gy_Material m
                        inner join  " + sqlName + @"..T_BD_MATERIAL fm on m.HNumber = fm.FNUMBER and m.HUSEORGID=fm.FUSEORGID
                        where FNUMBER='" + _item.FNumber + "'  and HUSEORGID ='" + HProdORGID + "'", "Gy_Material");
                        string HMaterID = "0"; //物料
                        string HMaterModel = ""; //物料代码
                        string HMaterName = ""; //物料名称
                        if (dataSet.Tables[0].Rows.Count != 0)
                        {
                            HMaterID = dataSet.Tables[0].Rows[0]["HItemID"].ToString(); //物料
                            HMaterModel = dataSet.Tables[0].Rows[0]["HNumber"].ToString(); //物料代码
                            HMaterName = dataSet.Tables[0].Rows[0]["HName"].ToString(); //物料名称
                        }

                        decimal HQty = _item.FQty; //数量
                        long HSourceInterID = _item.FID; //日计划工单FID
                        long HSourceEntryID = _item.FENTRYID;//日计划工单FENTRYID
                        string HSourceBillNo = _item.FBILLNO; //生产订单号
                        string HSourceBillType = ""; //日计划工单类型
                        DateTime HDayPlanDate = _item.OLDDATE; // å·¥å•ç”Ÿäº§æ—¥æœŸ
                        decimal HRelationQty = _item.PurchseFqty; // å…³è”数量
                        double HFixleadTime = _item.FFIXLEADTIME; // æå‰æœŸ

                        dataOrg = oCN.RunProcReturn(@"select HItemID from Xt_ORGANIZATIONS o
                    inner join  " + sqlName + @"..T_ORG_ORGANIZATIONS fo on o.HNumber=fo.FNUMBER
                    where FNUMBER='" + _item.FORGNumber + "'  and HItemID ='" + HProdORGID + "'", "Xt_ORGANIZATIONS");
                        long HPURCHASEORGIDSub = dataOrg.Tables[0].Rows.Count == 0 ? 0 : long.Parse(dataOrg.Tables[0].Rows[0]["HItemID"].ToString()); // é‡‡è´­ç»„织
                        long HPOOrderInterID = _item.PurchseFID; // é‡‡è´­è®¢å•å†…码
                        long HPOOrderEntryID = _item.PurchseFentryID; // é‡‡è´­è®¢å•å­å†…码
                        string HPOOrderBillNo = _item.PurchseFBillNo; // é‡‡è´­è®¢å•å·
                        string HErpClsID = _item.FErpClsID; // ç‰©æ–™å±žæ€§
                        long HUnitID = 10101; // è®¡é‡å•ä½  å…ˆæŒ‰ç…§æœ¬åœ°æ¥  é»˜è®¤ Pcs
                        string HSeOrderBillNo = _item.FXQD; // é”€å”®è®¢å•å·   éœ€æ±‚单号
                        string HOrderEmpID = _item.FCREATORID; // é‡‡è´­å‘˜  
                        DateTime HPOOrderBillDate = _item.FDate; // é‡‡è´­è®¢å•å•æ®æ—¥æœŸ  
                        DateTime HPOOrderBillDeliveryDate = _item.FDeliveryDate; // é‡‡è´­è®¢å•äº¤è´§æ—¥æœŸ  
                        string HPOOrderBillRemark = _item.F_QIMB_NOTE; // é‡‡è´­è®¢å•æ‘˜è¦  
                        string HPOOrderBillNote = _item.FNOTE; // é‡‡è´­è®¢å•è¡¨ä½“备注  
                        string HDayPlanBillNo = _item.FDAYPLANBILLNO; // æ—¥è®¡åˆ’工单号  

                        dataSet = oCN.RunProcReturn(@"select HItemID from Gy_Department d
                        inner join  " + sqlName + @"..T_BD_DEPARTMENT fd on d.HNumber = fd.FNUMBER
                        where FNUMBER='" + _item.FWORKSHOPNUMBER + "'  and HUSEORGID ='" + HProdORGID + "'", "Gy_Department");
                        HWorkShopID = dataSet.Tables[0].Rows.Count == 0 ? "0" : dataSet.Tables[0].Rows[0][0].ToString(); // ç”Ÿäº§è½¦é—´  

                        dataSet = oCN.RunProcReturn(@"select HItemID from Gy_Department d
                        inner join  " + sqlName + @"..T_BD_DEPARTMENT fd on d.HNumber = fd.FNUMBER
                        where FNUMBER='" + _item.FPURCHASEDEPTNUMBER + "'  and HUSEORGID ='" + HProdORGID + "'", "Gy_Department");
                        string HPurchaseDeptID = dataSet.Tables[0].Rows.Count == 0 ? "0" : dataSet.Tables[0].Rows[0][0].ToString(); // é‡‡è´­éƒ¨é—¨  

                        decimal HPURCHASEQTY = _item.FPURCHASEQTY; // é‡‡è´­è®¢å•æ•°é‡  
                        decimal HJoinQty = _item.FJOINQTY; // é‡‡è´­è®¢å•å…³è”数量  

                        oCN.RunProc("insert into JIT_Cg_PODemandPlanBillSub(HInterID,HEntryID,HLaterReason,HMaterID,HMaterName" +
                          ", HMaterModel, HUnitID, HErpClsID, HQty, HRemark" +
                          ", HPURCHASEORGID, HStatus, HFixleadTime, HDayPlanBillNo, HSourceInterID" +
                          ", HSourceEntryID, HSourceBillNo, HSourceBillType, HWorkShopID, HDayPlanDate" +
                          ", HRelationQty1, HPOOrderInterID, HPOOrderEntryID, HPOOrderBillNo, HPOOrderBillSEQ" +
                          ", HWWOrderInterID, HWWOrderEntryID, HWWOrderBillNo, HPurchaseDeptID, HCloseTypeSub" +
                          ", HCloseMan, HEntryCloseDate, HSendQty, HReciveQty, HCloseStatus" +
                          ", HRemoveQty, HSeOrderBillNo, HUnReciveQty, HPOOrderBillDate, HPOOrderBillDeliveryDate" +
                          ", HPOOrderBillRemark, HPOOrderBillNote)" +
                          $"values({HInterID}, {i}, '', {(HMaterID == null ? "0" : HMaterID)}, '{HMaterName}'" +
                          $", '{HMaterModel}', {HUnitID}, '{HErpClsID}', {HQty}, ''" +
                          $", {HPURCHASEORGIDSub}, '', {HFixleadTime}, '{HDayPlanBillNo}', {HSourceInterID}" +
                          $", {HSourceEntryID}, '{HSourceBillNo}', '{HSourceBillType}', {HWorkShopID}, '{HDayPlanDate}'" +
                          $", {HRelationQty}, {HPOOrderInterID},{HPOOrderEntryID}, '{HPOOrderBillNo}',0" +
                          $",0,0, '',{HPurchaseDeptID}, '0'" +
                          $", '','',0,0, '0'" +
                          $",0, '{HSeOrderBillNo}',0, '{HPOOrderBillDate}', '{HPOOrderBillDeliveryDate}'" +
                          $", '{HPOOrderBillRemark}', '{HPOOrderBillNote}')");

                    }
                    //model.Add("FEntity", Fentity);
                    //FinalyResult.Add(model);
                    //    if ((tlmmm >= 20 || tlmmm == PODemandPlanList.Count) && (tlmmm % 20 == 0 || tlmmm == PODemandPlanList.Count))
                    //    {
                    //        //LogHelper.Info("提料计划新增批量执行，记录循环的当前条数" + tlmmm);
                    //        JObject jsonRoot = new JObject()
                    //        {
                    //            ["Creator"] = "",
                    //            ["NeedUpDateFields"] = new JArray(),
                    //            ["NeedReturnFields"] = new JArray(),
                    //            ["IsDeleteEntry"] = "false",
                    //            ["SubSystemId"] = "",
                    //            ["IsVerifyBaseDataField"] = "false",
                    //            ["Model"] = FinalyResult
                    //        };
                    //        CloudClient cloudClient = new CloudClient("http://localhost//k3cloud/");
                    //        var result = cloudClient.BatchSave("paez_PODemandPlan", jsonRoot.ToString());
                    //        JObject saveObj = JObject.Parse(result);
                    //        string saveIsSuc = saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper();
                    //        if (saveIsSuc != "TRUE")
                    //        {
                    //            //LogHelper.Error(jsonRoot.ToString());
                    //        }
                    //        FinalyResult = new JArray();
                    //    }
                    //    tlmmm++;
                }

                if (tlmmm == PODemandPlanList.Count && tlmmm != 0)
                {
                    oCN.Commit();
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "运算成功!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    oCN.RollBack();//事务回滚
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = Error;
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                ////sw.Stop();//结束计时
                //////LogHelper.Info("提料计划执行完成，运行总时长：" + sw.Elapsed);
                //DBServiceHelper.ExecuteBatch(Context, sqlList);

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "提料运算成功！";
                objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                LogService.Write("操作失败：" + e.Message.ToString());
                oCN.RollBack();//事务回滚
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.Message.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }

        }

        /// <summary>
        /// é€šè¿‡ç”Ÿäº§ç”¨æ–™æ¸…单 ç®—缺料情况
        /// </summary>
        /// <returns></returns>
        public object JIT_PPBOM(string fProWorkShopId,int? fPrdOrgId,string user,string sqlName) {

            try
            {
                Stopwatch sw = new Stopwatch();

                sw.Start();//开始计时
                           //提料计划预处理 æ¸…理提料计划单数据 æ›´æ–°é‡‡è´­è®¢å•ææ–™è®¡åˆ’数量 å¹¶ä¸”查询出需要进行运算的数据

@@ -1548,32 +1988,13 @@

                //t2.FXQD  t2.FSTOCKINQTY,t2.FReceiveQty æœ¬åœ°æ²¡æœ‰è¿™äº›å­—段
                string sql = string.Format(@"
 /*dialect*/
select t4.FSTOCKINQTY,t4.FReceiveQty,t1.FID,t1.FBillNo,t2.FENTRYID,t1.FSUPPLIERID,t3.fnumber,t2.FMATERIALID,(t4.FREMAINRECEIVEQTY-t2.FPODemandPlanCount)FQTY
,FPurchaseOrgId FStockOrgId,t5.FNUMBER FORGNumber,FCloseStatus,FMRPCLOSESTATUS,FPURCHASEDEPTID,t7.FNUMBER as FPURCHASEDEPTNUMBER
,t1.FCREATORID,t8.FName ,t1.FDate,tD.FDeliveryDate,t2.FNOTE,(t4.FReceiveQty - t4.FSTOCKINQTY) as  FReceiveNotInQty,'' FXQD,T2.FQTY AS FPURCHASEQTY,FJOINQTY,
isnull((select top 1 HLeadTime +  HLeadTime_Sec from Cg_PODemandPlanConfigBillMain a 
join Cg_PODemandPlanConfigBillSub b on a.HInterID =b.HInterID
left join Xt_ORGANIZATIONS o on a.HOrgID=o.HItemID
left join Gy_Supplier s on b.HSupplierID=s.HItemID
 where o.HNumber = t5.FNUMBER and s.HNumber = t3.FNUMBER), 0)FFIXLEADTIME
from AIS20230129011339..t_PUR_POOrder t1 
join AIS20230129011339..t_PUR_POOrderEntry t2 on t1.FID = t2.FID
join AIS20230129011339..t_BD_Supplier t3 on t1.FSUPPLIERID = t3.FSUPPLIERID
join  AIS20230129011339..T_PUR_POORDERENTRY_R t4 on t2.FENTRYID = t4.FENTRYID
join  AIS20230129011339..T_PUR_POORDERENTRY_D tD on t2.FENTRYID = tD.FENTRYID
join AIS20230129011339..T_ORG_Organizations t5 on t1.FPurchaseOrgId = t5.FORGID
join AIS20230129011339..T_SEC_user t8 on t1.FCREATORID = t8.FuserId
join AIS20230129011339..T_BD_DEPARTMENT T7 ON t1.FPURCHASEDEPTID = T7.FDEPTID
where t4.FREMAINRECEIVEQTY-t2.FPODemandPlanCount>0
and FCloseStatus in('A') and FMRPCLOSESTATUS in('A')
and t1.FBillTypeID in('83d822ca3e374b4ab01e5dd46a0062bd','6d01d059713d42a28bb976c90a121142')
and FPurchaseOrgId = '{0}'
", fPrdOrgId);
select * from h_v_jit_POOrderList where FQTY>0 and FCloseStatus in('A') 
and FMRPCLOSESTATUS in('A') and FBillTypeID in('83d822ca3e374b4ab01e5dd46a0062bd','6d01d059713d42a28bb976c90a121142') and FStockOrgId = '{0}'", fPrdOrgId);

                ds = oCN.RunProcReturn(sql, "PurchaseInventoryList");
                ds = oCN.RunProcReturn(sql, "h_v_jit_POOrderList");

                if (ds.Tables[0].Rows.Count == 0) {
                if (ds.Tables[0].Rows.Count == 0)
                {
                    oCN.RollBack();//回滚事务
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -1833,29 +2254,29 @@
                foreach (var item in PODemandPlanList)
                {
                    tlmmm++;
                  

                    DateTime date = item.FHMASTERDATE;
                    long HSettleCurrId = 1;//货币 é»˜è®¤æœ¬åœ°äººæ°‘币

                    var dataSup= oCN.RunProcReturn(@"select * from Gy_Supplier p
                    inner join  AIS20230129011339..t_BD_Supplier fp on p.HNumber=fp.FNUMBER and p.HUSEORGID=fp.FUSEORGID
                    where FNUMBER='" + item.PurchseFNUMBER + "' and HUSEORGID ='"+ fPrdOrgId + "'", "Gy_Supplier");
                    var dataSup = oCN.RunProcReturn(@"select * from Gy_Supplier p
                    inner join  " + sqlName + @"..t_BD_Supplier fp on p.HNumber=fp.FNUMBER and p.HUSEORGID=fp.FUSEORGID
                    where FNUMBER='" + item.PurchseFNUMBER + "' and HUSEORGID ='" + fPrdOrgId + "'", "Gy_Supplier");
                    long HSupplierID = dataSup.Tables[0].Rows.Count == 0 ? 0 : long.Parse(dataSup.Tables[0].Rows[0]["HItemID"].ToString()); //供应商

                    var dataUser = oCN.RunProcReturn("select Czymc from gy_czygl where Czybm = '" + user + "'", "gy_czygl");
                    string HMaker = dataUser.Tables[0].Rows.Count == 0 ? "" : dataUser.Tables[0].Rows[0][0].ToString();//制单人
                    string HUpDater = dataUser.Tables[0].Rows.Count == 0 ? "" : dataUser.Tables[0].Rows[0][0].ToString();//修改人

                    var dataOrg= oCN.RunProcReturn(@"select HItemID from Xt_ORGANIZATIONS o
                    inner join  AIS20230129011339..T_ORG_ORGANIZATIONS fo on o.HNumber=fo.FNUMBER
                    var dataOrg = oCN.RunProcReturn(@"select HItemID from Xt_ORGANIZATIONS o
                    inner join  " + sqlName + @"..T_ORG_ORGANIZATIONS fo on o.HNumber=fo.FNUMBER
                    where FNUMBER='" + PODemandPlanTemp[0].FORGNumber + "'  and HItemID ='" + fPrdOrgId + "'", "Xt_ORGANIZATIONS");
                    long HPURCHASEORGID = dataOrg.Tables[0].Rows.Count == 0 ? 0 : long.Parse(dataOrg.Tables[0].Rows[0]["HItemID"].ToString()); //采购组织

                    string PurchseFNUMBER = item.PurchseFNUMBER;
                    string FWorkshopNumber = item.FWORKSHOPNUMBER; 
                    string FWorkshopNumber = item.FWORKSHOPNUMBER;
                    string FCreatorID = item.FCREATORID;

                    var HInterID= DBUtility.ClsPub.CreateBillID("4608", ref DBUtility.ClsPub.sExeReturnInfo);
                    var HInterID = DBUtility.ClsPub.CreateBillID("4608", ref DBUtility.ClsPub.sExeReturnInfo);
                    var HBillNo = DBUtility.ClsPub.CreateBillCode("4608", ref DBUtility.ClsPub.sExeReturnInfo, true);
                    //主表
                    oCN.RunProc("insert into JIT_Cg_PODemandPlanBillMain(HInterID,HBillNo,HYear,HPeriod,HBillType" +
@@ -1867,7 +2288,6 @@
                               $"{HPURCHASEORGID},'',{HPURCHASEORGID}, {HSupplierID}, {HSettleCurrId}" +
                               $",'','','{HUpDater}',getdate())");

                    JArray Fentity = new JArray();
                    List<PODemandPlanTemp> _PODemandPlanList = PODemandPlanTemp.Where(x => x.FHMASTERDATE == date && x.PurchseFNUMBER == PurchseFNUMBER && x.FWORKSHOPNUMBER == FWorkshopNumber && x.FCREATORID == FCreatorID).ToList();
                    int i = 0;
                    foreach (var _item in _PODemandPlanList)
@@ -1875,7 +2295,7 @@
                        i++;

                        var dataSet = oCN.RunProcReturn(@"select m.* from Gy_Material m
                        inner join  AIS20230129011339..T_BD_MATERIAL fm on m.HNumber = fm.FNUMBER and m.HUSEORGID=fm.FUSEORGID
                        inner join  " + sqlName + @"..T_BD_MATERIAL fm on m.HNumber = fm.FNUMBER and m.HUSEORGID=fm.FUSEORGID
                        where FNUMBER='" + _item.FNumber + "'  and HUSEORGID ='" + fPrdOrgId + "'", "Gy_Material");
                        string HMaterID = "0"; //物料
                        string HMaterModel = ""; //物料代码
@@ -1897,7 +2317,7 @@
                        double HFixleadTime = _item.FFIXLEADTIME; // æå‰æœŸ

                        dataOrg = oCN.RunProcReturn(@"select HItemID from Xt_ORGANIZATIONS o
                    inner join  AIS20230129011339..T_ORG_ORGANIZATIONS fo on o.HNumber=fo.FNUMBER
                    inner join  " + sqlName + @"..T_ORG_ORGANIZATIONS fo on o.HNumber=fo.FNUMBER
                    where FNUMBER='" + _item.FORGNumber + "'  and HItemID ='" + fPrdOrgId + "'", "Xt_ORGANIZATIONS");
                        long HPURCHASEORGIDSub = dataOrg.Tables[0].Rows.Count == 0 ? 0 : long.Parse(dataOrg.Tables[0].Rows[0]["HItemID"].ToString()); // é‡‡è´­ç»„织
                        long HPOOrderInterID = _item.PurchseFID; // é‡‡è´­è®¢å•å†…码
@@ -1913,13 +2333,13 @@
                        string HPOOrderBillNote = _item.FNOTE; // é‡‡è´­è®¢å•è¡¨ä½“备注  
                        string HDayPlanBillNo = _item.FDAYPLANBILLNO; // æ—¥è®¡åˆ’工单号  

                         dataSet = oCN.RunProcReturn(@"select HItemID from Gy_Department d
                        inner join  AIS20230129011339..T_BD_DEPARTMENT fd on d.HNumber = fd.FNUMBER
                        dataSet = oCN.RunProcReturn(@"select HItemID from Gy_Department d
                        inner join  " + sqlName + @"..T_BD_DEPARTMENT fd on d.HNumber = fd.FNUMBER
                        where FNUMBER='" + _item.FWORKSHOPNUMBER + "'  and HUSEORGID ='" + fPrdOrgId + "'", "Gy_Department");
                        string HWorkShopID = dataSet.Tables[0].Rows.Count == 0 ? "0" : dataSet.Tables[0].Rows[0][0].ToString(); // ç”Ÿäº§è½¦é—´  

                        dataSet = oCN.RunProcReturn(@"select HItemID from Gy_Department d
                        inner join  AIS20230129011339..T_BD_DEPARTMENT fd on d.HNumber = fd.FNUMBER
                        inner join  " + sqlName + @"..T_BD_DEPARTMENT fd on d.HNumber = fd.FNUMBER
                        where FNUMBER='" + _item.FPURCHASEDEPTNUMBER + "'  and HUSEORGID ='" + fPrdOrgId + "'", "Gy_Department");
                        string HPurchaseDeptID = dataSet.Tables[0].Rows.Count == 0 ? "0" : dataSet.Tables[0].Rows[0][0].ToString(); // é‡‡è´­éƒ¨é—¨  

@@ -1965,7 +2385,6 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
              
            }
            catch (Exception e)
            {