日计划用料清单 增加 项次，用料比例

王 垚

2021-03-01 bc93df0c62be0e7c10417c490938135d0bad76dc

日计划用料清单 增加 项次，用料比例

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

@@ -149,16 +149,17 @@
                            string fDayPlanBillNo = "";
                            string fCloseCount = "";
                            string fQtyLS = "";
                            sql = string.Format(@"select a.FID,FBILLNO,FSCOrderNo,FHMaterID,FHSourceID,a.FCloseCount,isnull((select SUM(isnull(FHQTY,0)) from SC_WORKBILLSORTBILLSub t2 where t2.FID = t1.FID and DATEDIFF(D,FHMASTERDATE,GETDATE())>0),0)FQTYLS  from Sc_WorkBillSortBillMain a JOIN T_BD_MATERIAL b ON a.FHMaterID = b.FMATERIALID 
                            sql = string.Format(@"select a.FID,FBILLNO,FSCOrderNo,FHMaterID,FHSourceID,a.FCloseCount,isnull((select SUM(isnull(FHQTY,0)) from SC_WORKBILLSORTBILLSub t2 where t2.FID = a.FID and DATEDIFF(D,FHMASTERDATE,GETDATE())>0),0)FQTYLS  from Sc_WorkBillSortBillMain a JOIN T_BD_MATERIAL b ON a.FHMaterID = b.FMATERIALID 
left join T_ENG_WORKCENTER c on a.FHSourceID=c.fid 
 where FSCOrderNo ='{0}' and b.FNUMBER ='{1}' and a.FSRCBILLENTRYSEQ ='{3}' and (isnull(c.FNUMBER,'') ='{2}' or (select count(*) from T_ENG_WORKCENTER where isnull(c.FNUMBER,'') ='{2}')=0)", dt.Rows[i][1].ToString(), dt.Rows[i][5].ToString(), dt.Rows[i][4].ToString(), dt.Rows[i][2].ToString());
                            LogHelper.Error(sql);
                            DataTable dayPlanDt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
                            if (dayPlanDt.Rows.Count > 0)
                            {
                                fDayPlanID = dayPlanDt.Rows[0]["FID"].ToString();
                                fDayPlanBillNo = dayPlanDt.Rows[0]["FBILLNO"].ToString();
                                fCloseCount = dayPlanDt.Rows[0]["FCloseCount"].ToString();
                                fQtyLS = dayPlanDt.Rows[0]["FCloseCount"].ToString();
                                fQtyLS = dayPlanDt.Rows[0]["FQTYLS"].ToString();
                            }
                            //DynamicObject row = new DynamicObject(entity.DynamicObjectType);
                            this.Model.CreateNewEntryRow("FEntity");

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

@@ -1846,7 +1846,7 @@
                string sql = string.Format(@"
/*dialect*/
 select t1.FID,t1.FSEQ FDayPlanFSEQ,t1.FEntryID,T2.FBILLNO AS FDayPlanFBILLNO,t3.FMATERIALID,T5.FNUMBER,t1.FHMASTERDATE,t1.FHQTY,t4.FMATERIALID FMATERIALID2,T6.FNUMBER FNUMBER2,T7.FNUMBER FUNITNUMBER,FNumerator,FDenominator,convert(decimal(18,2),(t4.FMustQty/T3.FQTY) *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,FMaterialType,td.FNUMBER as FWORKSHOPID
t3.FMOENTRYID,t3.FBILLNO FPPBOMBILLNO,T4.FSEQ,tc.FOWNERTYPEID,tc.FOWNERID,tc.FEntrustPickOrgId,torg.FNUMBER as FORGNUMBER,t3.FMOID,FIssueType,FMaterialType,td.FNUMBER as FWORKSHOPID,t4.FReplaceGroup,t4.FUseRate
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
@@ -1866,7 +1866,7 @@
select distinct FDAYPLANFID from Sc_DayPlanPPBomBillMain where FID IN (
select distinct FDAYPLANFID from T_PRD_PICKMTRLDATA)
)
and T4.FMustQty>0
-- and T4.FMustQty>0
-- (
-- select  FDayPlanFID FROM Sc_DayPlanPPBomBillMain WHERE FID IN ( select distinct FID from  Sc_DayPlanPPBomBillSub WHERE FTranslateQty >0 or FPickedQty >0)
-- )
@@ -1914,7 +1914,9 @@
                            FMaterialType = dr["FMaterialType"].ToString(),
                            FDayPlanFSEQ = dr["FDayPlanFSEQ"].ToString(),
                            FDayPlanFBILLNO = dr["FDayPlanFBILLNO"].ToString(),
                            FWORKSHOPID = dr["FWORKSHOPID"].ToString()
                            FWORKSHOPID = dr["FWORKSHOPID"].ToString(),
                            FReplaceGroup = dr["FReplaceGroup"].ToString(),
                            FUseRate = dr["FUseRate"].ToString()
                        });
                    }
                    LogHelper.Info($"日计划用料清单，数据准备完成，保存到Model实体，总行数：{DayPlanMaterial.Count}，耗时：" + sw.Elapsed);
@@ -1965,10 +1967,10 @@
                            ModelEnty.Add("FISSUETYPE", _item.FIssueType);//  
                            ModelEnty.Add("FMaterialType", _item.FMaterialType);//  
                            ModelEnty.Add("FWORKSHOPID", new JObject() { ["Fnumber"] = _item.FWORKSHOPID });// 

                            ModelEnty.Add("FReplaceGroup", _item.FReplaceGroup);// 
                            ModelEnty.Add("FUseRate",_item.FUseRate);// 
                            Entry.Add(ModelEnty);
                            FSEQ++;

                        }
                        model.Add("FEntity", Entry);

@@ -2003,7 +2005,6 @@
                                var resultAA = String.Join(",", ls.ToArray());
                                string resSql = string.Format(@"/*dialect*/ update Sc_WorkBillSortBillSub set Sc_WorkBillSortBillSub.FDAYPLANPPBOMBILLNO = Sc_DayPlanPPBomBillMain.FBILLNO from Sc_WorkBillSortBillSub   join Sc_DayPlanPPBomBillMain   on Sc_WorkBillSortBillSub.FEntryID = Sc_DayPlanPPBomBillMain.FDayPlanFID where Sc_DayPlanPPBomBillMain.FID in ({0})", resultAA);
                                DBServiceHelper.Execute(Context, resSql);
                            
                            }
                            if (saveIsSuc != "TRUE")
                            {

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

@@ -51,7 +51,7 @@
        public string FDenominator { get; set; }
        public string FFIXSCRAPQTY { get; set; }
        public string FHQtyScrap { get; set; }
        

        /// <summary>
        /// 生产订单号
        /// </summary>
@@ -115,8 +115,19 @@
        /// 日计划用料清单FentryID
        /// </summary>
        public string FDayPlanPpbomFEntryId { get; set; }

        /// <summary>
        /// 生产车间
        /// </summary>
        public string FWORKSHOPID { get; set; }
        /// <summary>
        /// 项次
        /// </summary>
        public string FReplaceGroup { get; set; }
        /// <summary>
        /// 使用比例
        /// </summary>
        public string FUseRate { get; set; }


    }
}