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

yusijie

2023-09-25 45900455b491ca9282f8debaeef06b1e258928ee

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

@@ -129,7 +129,7 @@

        public json AddBillMain(string msg1)
        {
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string[] sArray = msg1.Split(new string[] { "&和" }, StringSplitOptions.RemoveEmptyEntries);
            string msg2 = sArray[0].ToString();
            string user = sArray[1].ToString();

@@ -144,6 +144,7 @@
                    return objJsonResult;
                }

                LogService.CustomWriteLog("1:"+msg2, DateTime.Now.ToString("yyyy-MM-dd"));
                //JSON序列化转换字典集合
                List<Dictionary<string, string>> list = new List<Dictionary<string, string>>();
                List<object> jb = JsonConvert.DeserializeObject<List<object>>(msg2);
@@ -157,6 +158,7 @@
                    list.Add(dic);
                }

                LogService.CustomWriteLog("2:", DateTime.Now.ToString("yyyy-MM-dd"));
                int TrueCount = 0, SumCount = 0;

                for (int i = 0; i < list.Count; i++)
@@ -729,7 +731,7 @@
                omdelMian = JsonConvert.DeserializeObject<Sc_WorkBillSortBillMain>(sWhere);
                string sql = $"exec JIT_qtfx {omdelMian.HProdORGID},{omdelMian.HWorkShopID},'{user}' ";
                ds = oCN.RunProcReturn(sql, "JIT_qtfx");
                LogService.Write("齐套分析sql:" + sql);
                //LogService.Write("齐套分析sql:" + sql);
                List<PRD_PPBOM> BomList = new List<PRD_PPBOM>();
                DataTable resulTable = ds.Tables[0];
                if (resulTable.Rows[0][0].ToString().Contains("失败"))
@@ -768,7 +770,7 @@
                    fDayPlanFids = string.Join(",", fidList);
                    fDayPlanFEntryids = string.Join(",", fentryidList);
                }
                LogService.Write("日计划工单ids" + fDayPlanFids);
                //LogService.Write("日计划工单ids" + fDayPlanFids);

                sw.Start();//开始计时

@@ -789,24 +791,24 @@
                //取应发数量 FMustQty ä¸è¦å–值需求数量FNeedQty é¢†æ–™æ•°æ®
                string LLsql = string.Format(@"exec h_p_jit_PPBOMList '{0}'", fDayPlanFids);
                List<DayPlanPickedModel> DayPlanPickedModel = new List<DayPlanPickedModel>();
                LogService.Write("LLsql:" + LLsql);
                //LogService.Write("LLsql:" + LLsql);
                ds = oCN.RunProcReturn(LLsql, "SC_WORKBILLSORTBILLMAIN");
                LogService.Write(JsonConvert.SerializeObject(ds));
                //LogService.Write(JsonConvert.SerializeObject(ds));
                DayPlanPickedModel = ds.ToModelList<DayPlanPickedModel>();
                LogService.Write(JsonConvert.SerializeObject(DayPlanPickedModel));
                //LogService.Write(JsonConvert.SerializeObject(DayPlanPickedModel));
                //CompleteAnalysisTempModel ç”¨äºŽå­˜å‚¨ä¸´æ—¶éœ€è¦æ’入数据
                List<CompleteAnalysisTempModel> completeAnalysisTempModel = new List<CompleteAnalysisTempModel>();
                //创建字典 ç”¨äºŽå‚¨å­˜ç‰©æ–™ + å ç”¨æ•°é‡
                Dictionary<string, decimal> occupyDic = new Dictionary<string, decimal>();
                LogService.Write($"齐套分析，数据准备阶段，用时" + sw.Elapsed + "总行数：" + BomList.Count);
                LogService.Write($"齐套分析，数据准备阶段，用时" + sw.Elapsed + "总需要循环的bom数量：" + DatePlanList.Count);
                //LogService.Write($"齐套分析，数据准备阶段，用时" + sw.Elapsed + "总行数：" + BomList.Count);
                //LogService.Write($"齐套分析，数据准备阶段，用时" + sw.Elapsed + "总需要循环的bom数量：" + DatePlanList.Count);

                //第一个循环 æ—¥è®¡åˆ’工单明细 ä¸€å¤©+一个工单 ä¸€ä¸ªå¾ªçŽ¯
                int o = 0;
                foreach (var item in DatePlanList)
                {
                    o++;
                    LogService.Write("循环:" + o);
                    //LogService.Write("循环:" + o);
                    //日计划用料清单明细 æ¯ä¸€å¤©çš„实际用料情况
                    var _BomList = BomList.Where(x => x.HMasterDate == item.HMasterDate && x.HICMOEntryID_Sec == item.HICMOEntryID_Sec).ToList();
                    //每一个物料进行库存计算
@@ -875,24 +877,24 @@
                            });
                            //扣除剩余可用领料数量
                            _DayPlanPickedModel.FRemainPickedQty -= need;
                            LogService.Write($"h" + need);
                            //LogService.Write($"h" + need);
                            //循环下一个物料
                            continue;
                        }
                        else
                        {
                            LogService.Write($"kxs" + need);
                            //LogService.Write($"kxs" + need);
                            need -= _DayPlanPickedModel.FRemainPickedQty; //剩余需求数量
                            LogService.Write($"i1" + need);
                            //LogService.Write($"i1" + need);
                            FOccupyPickedCount = _DayPlanPickedModel.FRemainPickedQty;
                            _DayPlanPickedModel.FRemainPickedQty = 0;
                            LogService.Write($"i" + need);
                            //LogService.Write($"i" + need);
                        }
                        if (_pRD_WorkHouseCompar.Count > 0)
                        {
                            //缺料数量 éœ€æ±‚数量 - å®žé™…库存  >0 ? ä¸€ä¸ªç‰©æ–™ä¸ç®¡å ç”¨å¤šå°‘条 åº“å­˜+货主 æ•°æ® ç¼ºæ–™æ•°é‡æ˜¯åŒä¸€ä¸ªæ•°é‡
                            decimal _fLackCount = need > jskcQty ? (need - jskcQty) : 0;
                            LogService.Write($"j" + _fLackCount);
                            //LogService.Write($"j" + _fLackCount);
                            //LogHelper.Info("组织：" + _item.FStockOrgId + " ,及时库存" + jskcQty);
                            //总库存为0了 ç›´æŽ¥ç»™å‡º ç¼ºæ–™æ•°é‡
                            if (jskcQty == 0)
@@ -926,7 +928,7 @@
                                continue;
                            }

                            LogService.Write($"k" + 2);
                            //LogService.Write($"k" + 2);
                            foreach (var WorkHouse in _pRD_WorkHouseCompar)
                            {
                                //库存数据匹配
@@ -1027,7 +1029,7 @@
                    //Thread.Sleep(6000);
                    i++;
                }
                LogService.Write($"齐套分析，数据准备完成，保存到Model实体，总行数：{completeAnalysisTempModel.Count}，耗时：" + sw.Elapsed);
                //LogService.Write($"齐套分析，数据准备完成，保存到Model实体，总行数：{completeAnalysisTempModel.Count}，耗时：" + sw.Elapsed);
                List<string> sqlList = new List<string>();
                DataTable insertDT = new DataTable();
                insertDT.TableName = "JIT_MOMaterReadysBill";
@@ -1117,7 +1119,7 @@
                             $", {item["FCOMPLETECOUNT1"].ToString()}, {item["FERPCLSID"].ToString()}, {item["FWORKSHOPID"].ToString()}, {item["FSTOCKID"].ToString()}, {item["FOCCUPYPICKEDCOUNT"].ToString()}, '{item["HMainICMOBillNo"].ToString()}'" +
                             $",{item["HLOT"].ToString()},'{item["HInventoryFID"].ToString()}')");
                }
                LogService.Write("批量插入到数据库用时：" + sw.Elapsed);
                //LogService.Write("批量插入到数据库用时：" + sw.Elapsed);
                //执行完成后 æ›´æ–°æ—¥è®¡åˆ’工单状态
                string updatesql = string.Format(@"
update Sc_WorkBillSortBillSub set HComplete = '未齐套' where HEntryID IN 
@@ -1136,7 +1138,7 @@
                //释放齐套操作 é¿å…å¤šäººåŒæ—¶è¿›è¡Œé½å¥—分析
                oCN.RunProc($"update T_PRD_QTFX set FSTATUS = 0 where FPRDORGID ={omdelMian.HProdORGID} and FSTATUS = 1 ");
                sw.Stop();//结束计时
                LogService.Write("齐套分析运行总时长：" + sw.Elapsed);
                //LogService.Write("齐套分析运行总时长：" + sw.Elapsed);

                objJsonResult.code = "1";
                objJsonResult.count = 1;
@@ -1602,7 +1604,7 @@
                //sql集合 æ›´æ–°é‡‡è´­è®¢å•å ç”¨çš„提料计划数量
                List<string> sqlList = new List<string>();

                LogService.Write("1");
                //LogService.Write("1");
                string Error = "";
                foreach (var item in MaterialIDList)
                {
@@ -1614,7 +1616,7 @@
                        continue;
                    }

                    LogService.Write("1.1");
                    //LogService.Write("1.1");

                    ////LogHelper.Info(item.FMATERIALID.ToString());
                    //当前物料和库存组织对应的需进行提料计划的数据    
@@ -1630,7 +1632,7 @@
                    int i = 0;
                    //记录在最小采购量需求下的日计划明细FentyrID

                    LogService.Write("1.2");
                    //LogService.Write("1.2");

                    List<int> FEntryIdList = new List<int>();
                    foreach (var _item in _DayPlanPpbom)
@@ -1642,7 +1644,7 @@
                            break;
                        }

                        LogService.Write("1.2.1");
                        //LogService.Write("1.2.1");

                        if (NeedQty == 0)
                        {
@@ -1660,7 +1662,7 @@
                            continue;
                        }

                        LogService.Write("1.2.2");
                        //LogService.Write("1.2.2");

                        foreach (var Purchase in _PurchaseInventory)
                        {
@@ -1699,13 +1701,14 @@
                                        F_QIMB_NOTE = Purchase.F_QIMB_NOTE,
                                        FNOTE = Purchase.FNOTE,
                                        FPURCHASEQTY = Purchase.FPURCHASEQTY,
                                        FJOINQTY = Purchase.FJOINQTY
                                        FJOINQTY = Purchase.FJOINQTY,
                                        FDAYPLANBILLNO = _item.FDAYPLANBILLNO
                                    });
                                    //扣除日计划明细已被分配的数量
                                    DayPlanPpbomls.NeedQty = 0;
                                }

                                LogService.Write("1.2.3");
                                //LogService.Write("1.2.3");

                                FEntryIdList.Clear();
                                //更新采购订单
@@ -1762,7 +1765,8 @@
                                        F_QIMB_NOTE = Purchase.F_QIMB_NOTE,
                                        FNOTE = Purchase.FNOTE,
                                        FPURCHASEQTY = Purchase.FPURCHASEQTY,
                                        FJOINQTY = Purchase.FJOINQTY
                                        FJOINQTY = Purchase.FJOINQTY,
                                        FDAYPLANBILLNO = _item.FDAYPLANBILLNO
                                    });
                                    //更新计划数量（剩余需要排的） ç»§ç»­åŽ»è®¡ç®—下一个采购订单
                                    DayPlanPpbomls.NeedQty -= Qty;
@@ -1784,7 +1788,7 @@
                            }
                        }

                        LogService.Write("1.2.4");
                        //LogService.Write("1.2.4");

                        NeedQty = 0;

@@ -1797,7 +1801,7 @@
                int tlmmm = 0;
                JArray FinalyResult = new JArray();

                LogService.Write("2");
                //LogService.Write("2");

                foreach (var item in PODemandPlanList)
                {
@@ -1970,7 +1974,7 @@
                    //    tlmmm++;
                }

                LogService.Write("3");
                //LogService.Write("3");
                if (Error != "")
                {
                    oCN.Commit();