3.5 15.30修改代码上传

王 垚

2021-03-05 c9c8ac9b6dd18ec40a52173924b2649b287b7aa6

3.5 15.30修改代码上传

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

@@ -202,15 +202,19 @@
            dynamicFormShowParameter.FormId = "SCP_PushParamFrom";
            dynamicFormShowParameter.ParentPageId = formView.PageId;
            dynamicFormShowParameter.OpenStyle.ShowType = ShowType.Modal;
            dynamicFormShowParameter.CustomComplexParams.Add("SrcFormId", "paez_PODemandPlan");
            //dynamicFormShowParameter.CustomComplexParams.Add("SrcFormId", "paez_PODemandPlan");
            //dynamicFormShowParameter.CustomComplexParams.Add("TargetFormId", "SCP_ReceiveBill");
            dynamicFormShowParameter.CustomComplexParams.Add("SrcFormId", "PUR_PurchaseOrder");
            dynamicFormShowParameter.CustomComplexParams.Add("TargetFormId", "PUR_ReceiveBill");

            formView.ShowForm(dynamicFormShowParameter, delegate (FormResult results)
            {
                if (results != null && results.ReturnData != null)
                {
                    DynamicObject dynamicObject = results.ReturnData as DynamicObject;
                    string CbConvertRule = Convert.ToString(dynamicObject["CbConvertRule"]);
                    List<ConvertRuleElement> convertRules = ConvertServiceHelper.GetConvertRules(formView.Context, "paez_PODemandPlan", "PUR_ReceiveBill");
                    List<ConvertRuleElement> convertRules = ConvertServiceHelper.GetConvertRules(formView.Context, "PUR_PurchaseOrder", "PUR_ReceiveBill");
                    //List<ConvertRuleElement> convertRules = ConvertServiceHelper.GetConvertRules(formView.Context, "paez_PODemandPlan", "SCP_ReceiveBill");
                    ConvertRuleElement rule = convertRules.FirstOrDefault((ConvertRuleElement t) => t.Id == CbConvertRule);
                    PushPurOrderToRec(formView, selEntryIds, rule);
                }

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

@@ -1520,7 +1520,7 @@
                string sql = string.Format(@"
/*dialect*/
 select t1.FID,t1.FEntryID,t3.FMATERIALID,T5.FNUMBER,t1.FHMASTERDATE,t1.FHQTY,t4.FMATERIALID FMATERIALID2,T6.FNUMBER FNUMBER2,T7.FNUMBER FUNITNUMBER,FNumerator,FDenominator,convert(decimal(18,2),(FNumerator/FDenominator) *t1.FHQTY) FHQtyMust,T4.FUnitID,t8.FNUMBER FUNITNUMBER2,T3.FID FPPBOM,T4.FENTRYID FPPBOMENTRYID,isnull(T9.FBillNo,'')FBillNo,t10.FNUMBER FORGNUMBER,t11.FNUMBER FHSOURCENUMBER,FSCRAPRATE,FFIXSCRAPQTY,T9.FID AS DayPlanFID,t2.FSCORDERNO,
t3.FMOENTRYID,t3.FBILLNO FPPBOMBILLNO,T4.FSEQ,tc.FOWNERTYPEID,tc.FOWNERID,tc.FEntrustPickOrgId,torg.FNUMBER as FORGNUMBER,t3.FMOID,FIssueType
t3.FMOENTRYID,t3.FBILLNO FPPBOMBILLNO,T4.FSEQ,tc.FOWNERTYPEID,tc.FOWNERID,tc.FEntrustPickOrgId,torg.FNUMBER as FORGNUMBER,t3.FMOID,FIssueType,FMaterialType
FROM Sc_WorkBillSortBillSub t1
JOIN Sc_WorkBillSortBillMAIN t2 on t1.FID = t2.FID
JOIN T_PRD_PPBOM T3 on T2.FPRDMOMAINID=t3.FMOID AND T2.FPRDMOENTYID=T3.FMOENTRYID
@@ -1575,7 +1575,8 @@
                            FOwnerID = dr["FORGNUMBER"].ToString(),
                            FEntrustPickOrgId = dr["FORGNUMBER"].ToString(),
                            FMOID = dr["FMOID"].ToString(),
                            FIssueType = dr["FIssueType"].ToString()
                            FIssueType = dr["FIssueType"].ToString(),
                            FMaterialType = dr["FMaterialType"].ToString()
                        });
                    }
                    LogHelper.Info($"日计划用料清单，数据准备完成，保存到Model实体，总行数：{DayPlanMaterial.Count}，耗时：" + sw.Elapsed);
@@ -1622,7 +1623,8 @@
                            ModelEnty.Add("FEntrustPickOrgId", new JObject() { ["Fnumber"] = _item.FEntrustPickOrgId });// 
                            ModelEnty.Add("FMOID", _item.FMOID);//  
                            ModelEnty.Add("FISSUETYPE", _item.FIssueType);//  
                           // ModelEnty.Add("FSEQ", FSEQ);//  
                            ModelEnty.Add("FMaterialType", _item.FMaterialType);//  
                                                                          // ModelEnty.Add("FSEQ", FSEQ);//  
                            Entry.Add(ModelEnty);
                            FSEQ++;

@@ -1638,7 +1640,7 @@
                                ["Creator"] = "",
                                ["NeedUpDateFields"] = new JArray(),
                                ["NeedReturnFields"] = new JArray(),
                                ["IsDeleteEntry"] = "false",
                                ["IsDeleteEntry"] = "true",
                                ["SubSystemId"] = "",
                                ["IsVerifyBaseDataField"] = "false",
                                ["Model"] = Fentity
@@ -1679,7 +1681,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);
@@ -1693,13 +1695,14 @@
                //采购订单数据
                sql = @"
 /*dialect*/
select t1.FID,t1.FBillNo,t2.FENTRYID,t1.FSUPPLIERID,t3.fnumber,t2.FMATERIALID,(t2.FQTY-t2.FPODemandPlanCount)FQTY,FPurchaseOrgId FStockOrgId,t5.FNUMBER FORGNumber,FSTOCKINQTY,FReceiveQty,FCloseStatus,FMRPCLOSESTATUS from t_PUR_POOrder t1
 select t1.FID,t1.FBillNo,t2.FENTRYID,t1.FSUPPLIERID,t3.fnumber,t2.FMATERIALID,(t2.FQTY-t2.FPODemandPlanCount)FQTY,FPurchaseOrgId FStockOrgId,t5.FNUMBER FORGNumber,FSTOCKINQTY,FReceiveQty,FCloseStatus,FMRPCLOSESTATUS from t_PUR_POOrder t1
join t_PUR_POOrderEntry t2 on t1.FID = t2.FID
join t_BD_Supplier t3 on t1.FSUPPLIERID = t3.FSUPPLIERID
join  T_PUR_POORDERENTRY_R t4 on t2.FENTRYID = t4.FENTRYID
join T_ORG_Organizations t5 on t1.FPurchaseOrgId = t5.FORGID
where t2.FQTY-t2.FPODemandPlanCount>0
 and FCloseStatus in('A') and FMRPCLOSESTATUS in('A')
 and t1.FBillTypeID in('83d822ca3e374b4ab01e5dd46a0062bd','6d01d059713d42a28bb976c90a121142')
";
                List<PurchaseInventory> PurchaseInventory = DBServiceHelper.ExecuteDataSet(Context, sql).ToModelList<PurchaseInventory>();
                LogHelper.Info("[提料计划准备阶段]可用采购订单数据sql：" + sql);
@@ -1752,7 +1755,7 @@
                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();
                    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)
                    {
                        LogHelper.Info("[提料计划开始]当前物料无采购信息：" + item.FMATERIALID + " 库存组织：" + item.FStockOrgId);
@@ -1831,7 +1834,7 @@
                                        FORGNumber = Purchase.FORGNumber
                                    });
                                    //扣除日计划明细已被分配的数量
                                    DayPlanPpbomls.NeedQty = 0; 
                                    DayPlanPpbomls.NeedQty = 0;
                                }
                                FEntryIdList.Clear();
                                //更新采购订单

 src/Model/Demo.Model/Model/DayPlanMaterial.cs

@@ -96,5 +96,11 @@
        /// 发料方式
        /// </summary>
        public string FIssueType { get; set; }

        /// <summary>
        /// 子项类型
        /// </summary>
        public string FMaterialType { get; set; }

    }
}