3.5代码上传

王 垚

2021-03-05 bb599926f42370b2ffc5930140c45a50815a1217

 src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs

@@ -1622,7 +1622,7 @@
                            ModelEnty.Add("FEntrustPickOrgId", new JObject() { ["Fnumber"] = _item.FEntrustPickOrgId });// 
                            ModelEnty.Add("FMOID", _item.FMOID);//  
                            ModelEnty.Add("FISSUETYPE", _item.FIssueType);//  
                            ModelEnty.Add("FSEQ", FSEQ);//  
                           // ModelEnty.Add("FSEQ", FSEQ);//  
                            Entry.Add(ModelEnty);
                            FSEQ++;

@@ -1679,7 +1679,7 @@
                DataTable fidDt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
                string FDayPlanWorkID = "";
                foreach (DataRow dr in fidDt.Rows)
                {
                {   
                    FDayPlanWorkID += Convert.ToString(dr["FID"]) + ",";
                }
                FDayPlanWorkID = FDayPlanWorkID.Substring(0, FDayPlanWorkID.Length - 1);
@@ -1749,7 +1749,7 @@
                //sql集合 更新采购订单占用的提料计划数量
                List<string> sqlList = new List<string>();
                //MaterialIDList = new List<string> { "105773" };
                foreach (var item in _MaterialIDList)
                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();
@@ -1759,7 +1759,7 @@
                        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;//提前期
@@ -1831,7 +1831,7 @@
                                        FORGNumber = Purchase.FORGNumber
                                    });
                                    //扣除日计划明细已被分配的数量
                                    DayPlanPpbomls.NeedQty = 0;
                                    DayPlanPpbomls.NeedQty = 0; 
                                }
                                FEntryIdList.Clear();
                                //更新采购订单
@@ -2026,8 +2026,9 @@
                    string PurchseFNUMBER = item.PurchseFNUMBER;
                    JObject model = new JObject();
                    model.Add("FHDate", date);
                    model.Add("FHRemark", "生产订单号：" + "测试呢呢");
                    model.Add("FSettleCurrId", new JObject() { ["Fnumber"] = "PRE001" });
                    model.Add("FSupplierID", new JObject() { ["Fnumber"] = PurchseFNUMBER });

                    JArray Fentity = new JArray();
                    List<PODemandPlanTemp> _PODemandPlanList = PODemandPlanTemp.Where(x => x.FHMASTERDATE == date && x.PurchseFNUMBER == PurchseFNUMBER).ToList();
                    int FSEQ = 1;
@@ -2049,7 +2050,7 @@
                        FentityModel.Add("FHPOOrderEntryID", _item.PurchseFentryID); //采购订单子内码：FHPOOrderEntryID
                        FentityModel.Add("FHPOOrderBillNo", _item.PurchseFBillNo); //采购订单号：FHPOOrderBillNo
                        FentityModel.Add("FERPCLSID", _item.FErpClsID); //发料方式
                        FentityModel.Add("FSEQ", FSEQ); //发料方式
                        //FentityModel.Add("FSEQ", FSEQ); //发料方式
                        FentityModel.Add("FUnitID", new JObject() { ["Fnumber"] = "Pcs" }); //发料方式

                        Fentity.Add(FentityModel);