MES研发（BOS-JIT）
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
王 垚
2021-02-28 156e06ad46f0e4cb61c5f74553f6c2bc51e21a04 
 src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs


@@ -144,19 +144,23 @@


                                FBILLNO = _dt.Rows[0]["FBILLNO"].ToString();


                                FMoFBillType = _dt.Rows[0]["FMoFBillType"].ToString();


                            }


                            //物料编码 + 生产订单号 + 生产资源 + 生产订单行号 去判断是否导入过 带出日计划工单ID及编号


                            //物料编码 + 生产订单号 + 生产资源 + 生产订单行号 去判断是否导入过 带出日计划工单ID及编号 和 关闭数量（6.18更）


                            string fDayPlanID = "";


                            string fDayPlanBillNo = "";


                            sql = string.Format(@"select a.FID,FBILLNO,FSCOrderNo,FHMaterID,FHSourceID from Sc_WorkBillSortBillMain a JOIN T_BD_MATERIAL b ON a.FHMaterID = b.FMATERIALID 


                            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 = 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]["FQTYLS"].ToString();


                            }


                            //DynamicObject row = new DynamicObject(entity.DynamicObjectType);


                            this.Model.CreateNewEntryRow("FEntity");


                            this.Model.SetValue("FSEQ", i + 1, i);


                            this.Model.SetValue("FMoFBillType", FMoFBillType, i);


@@ -176,6 +180,9 @@


                            this.Model.SetValue("FDayPlanID", fDayPlanID, i);//日计划工单ID


                            this.Model.SetValue("FDayPlanBillNo", fDayPlanBillNo, i);//日工单编号


                            this.Model.SetValue("FSRCBILLENTRYSEQ", dt.Rows[i][2].ToString(), i);//生产订单明细行号


                            this.Model.SetValue("FCloseCount", fCloseCount, i);//关闭数量


                            this.Model.SetValue("FQTYLS", fQtyLS, i);//历史遗留




                            for (int j = 0; j <= 60; j++)


                            {


                                this.Model.SetValue("FT" + "" + j + "", dt.Rows[i][15 + j].ToString(), i);


@@ -296,7 +303,8 @@


                }


                foreach (DynamicObject current in entityDataObjoct)


                {


                    if (Convert.ToInt32(current["FNoScheduled"]) < 0)


                    //未排数量= 总数 - 日计划    超出日计划为负 - 历史数量 + 关闭数量 < 0 表示超出了总计划数量


                    if (Convert.ToInt32(current["FNoScheduled"]) - Convert.ToInt32(current["FQTYLS"]) + Convert.ToInt32(current["FCloseCount"]) < 0)


                        _result += "序号：" + Convert.ToString(current["SEQ"]) + ",日计划总数量超出生产订单数量";


                }


                if (_result != "")


@@ -311,8 +319,9 @@


                    //根据生产订单号和物料查询是否存在明细 +生产订单明细行号


                    sql = string.Format(@"


/*dialect*/


SELECT t4.FNAME as FMoFBillType,T1.FBILLNO,T2.*,t3.FNUMBER as FUnitNumber FROM T_PRD_MO T1


SELECT t4.FNAME as FMoFBillType,T1.FBILLNO,T2.*,t3.FNUMBER as FUnitNumber,tBom.FNUMBER as FBomNumber FROM T_PRD_MO T1


 LEFT JOIN T_PRD_MOENTRY T2 ON T1.FID = T2.FID


 LEFT JOIN T_ENG_BOM tBom on t2.FBOMID = tBom.FID


 join T_BD_UNIT t3 on t2.FUNITID=t3.FUNITID 


 join (  select A.FBILLTYPEID,B.FNAME  from T_BAS_BILLTYPE A 


JOIN T_BAS_BILLTYPE_L B ON A.FBILLTYPEID =B.FBILLTYPEID


@@ -331,6 +340,7 @@


                    string FPlanBeginDate = "";//开始日期


                    string FPlanEndDate = "";//结束日期


                    string FMoFBillType = "";//


                    string FBomNumber = "";//Bom 版本


                    if (dt.Rows.Count > 0)


                    {


                        FID = dt.Rows[0]["FID"].ToString();


@@ -342,6 +352,7 @@


                        FPlanBeginDate = dt.Rows[0]["FPlanStartDate"].ToString();


                        FPlanEndDate = dt.Rows[0]["FPlanFinishDate"].ToString();


                        FMoFBillType = dt.Rows[0]["FMoFBillType"].ToString();


                        FBomNumber = dt.Rows[0]["FBomNumber"].ToString();


                    }


                    JObject jsonRoot = new JObject();


                    jsonRoot.Add("Creator", "");


@@ -351,7 +362,7 @@


                    jsonRoot.Add("SubSystemId", "");


                    jsonRoot.Add("IsVerifyBaseDataField", "");


                    JObject jsonModel = new JObject();


                    jsonModel.Add("FPreparatDate", date.ToString());//编制日期


                    jsonModel.Add("FPreparatDate", FPlanBeginDate);//编制日期(改为计划开始日期)


                    jsonModel.Add("FMoFBillType", FMoFBillType);//


                    jsonModel.Add("FSRCBILLENTRYSEQ", Convert.ToString(current["FSRCBILLENTRYSEQ"]));//生产订单明细行号


                    jsonModel.Add("FSCOrderNo", Convert.ToString(current["FSCOrderNo"])); //生产订单号FSCOrderNo


@@ -360,10 +371,9 @@


                    jsonModel.Add("FHOrderQty", Convert.ToString(current["FSalOrderCount"]));//销售订单数量


                    jsonModel.Add("FHOrderCommitDate", Convert.ToString(current["FDeliveryDate"]));//交货期HOrderCommitDate


                    jsonModel.Add("FHUnitID", new JObject() { ["Fnumber"] = FHUnitID });//单位




                    jsonModel.Add("FBOMID", new JObject() { ["Fnumber"] = FBomNumber });//BOM版本


                    jsonModel.Add("FHPlanBeginDate", FPlanBeginDate);//计划开始日期


                    jsonModel.Add("FHPlanEndDate", FPlanEndDate);//计划完工日期




                    //jsonModel.Add("FBatch", current["FBatch"].ToString());//批次


                    jsonModel.Add("FBatch", FLOT);//批次


                    jsonModel.Add("FHOrderNeedQty", FQTY);// 订单需求数量