MES研发
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
王 垚
2021-03-07 56d91ab8ec14b5ff4efe304437161e06bb080908 
 src/BLL/Demo.BillView/PRD/Pro_ScDayImport.cs


@@ -123,20 +123,26 @@


                        for (int i = 0; i < dt.Rows.Count; i++)


                        {


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


                            string sql = string.Format(@"/*dialect*/ SELECT T1.FBILLNO,T2.* FROM T_PRD_MO T1


                            string sql = string.Format(@"/*dialect*/ 


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


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


JOIN T_BD_MATERIAL T3 ON T2.FMATERIALID = T3.FMATERIALID


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


JOIN T_BAS_BILLTYPE_L B ON A.FBILLTYPEID =B.FBILLTYPEID


where FBILLFORMID='PRD_MO'  AND FNAME<>'生產訂單')t4 on t1.FBILLTYPE =t4.FBILLTYPEID


WHERE T1.FBILLNO = '{0}'  AND T3.FNUMBER = '{1}' and FSEQ='{2}' ", dt.Rows[i][1].ToString(), dt.Rows[i][5].ToString(), dt.Rows[i][2].ToString());


                            DataTable _dt = new DataTable();


                            _dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];


                            string FLOT = "";//FLOT  批次


                            string FQTY = "";//FQTY 生产订单数量


                            string FBILLNO = "";//FBILLNO 原单号 


                            string FMoFBillType = "";


                            if (_dt.Rows.Count > 0)


                            {


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


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


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


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


                            }


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


                            string fDayPlanID = "";


@@ -153,6 +159,7 @@


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


                            this.Model.CreateNewEntryRow("FEntity");


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


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


                            this.Model.SetValue("FSalOrderNo", dt.Rows[i][0].ToString(), i);


                            this.Model.SetValue("FSCOrderNo", dt.Rows[i][1].ToString(), i);


                            this.Model.SetItemValueByNumber("FORGID", "100", i);


@@ -163,7 +170,7 @@


                            this.Model.SetValue("FBatch", dt.Rows[i][9].ToString(), i);


                            this.Model.SetValue("FSalOrderCount", dt.Rows[i][10].ToString(), i);


                            this.Model.SetValue("FCompleteSetCount", dt.Rows[i][12].ToString(), i);


                            this.Model.SetValue("FDeliveryDate", ToDateTimeValue(dt.Rows[i][13].ToString()), i);


                            this.Model.SetValue("FDeliveryDate", dt.Rows[i][13].ToString(), i);


                            this.Model.SetValue("FOrderLevel", OrderType(dt.Rows[i][14].ToString()), i);


                            this.Model.SetValue("FOrderQuantity", FQTY, i);


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


@@ -270,6 +277,23 @@


                    this.View.ShowErrMessage(_result);


                    return;


                }


                //校验生产用料清单是否审核


                foreach (DynamicObject current in entityDataObjoct)


                {


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


                    sql = string.Format(@"/*dialect*/SELECT FBILLNO FROM T_PRD_PPBOM T1


WHERE T1.FMOBILLNO = '{0}'  AND T1.FMATERIALID = '{1}' AND T1.FMOENTRYSEQ = '{2}' and FDOCUMENTSTATUS <>'C'                          


", Convert.ToString(current["FSCOrderNo"]), Convert.ToString(current["FMatrailId_Id"]), Convert.ToString(current["FSRCBILLENTRYSEQ"]));


                    DataTable dt = new DataTable();


                    dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];


                    if (dt.Rows.Count > 0)


                        _result += "序号：" + Convert.ToString(current["SEQ"]) + ",生产订单号：" + Convert.ToString(current["FSCOrderNo"]) + ",生产订单明细行号：" + Convert.ToString(current["FSRCBILLENTRYSEQ"]) + "物料" + (current["FMatrailId"] as DynamicObject)["Number"] + "对应的生产用料清单：" + dt.Rows[0][0] + "未审核";


                }


                if (_result != "")


                {


                    this.View.ShowErrMessage(_result);


                    return;


                }


                foreach (DynamicObject current in entityDataObjoct)


                {


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


@@ -287,9 +311,12 @@


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


                    sql = string.Format(@"


/*dialect*/


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


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


 LEFT JOIN T_PRD_MOENTRY T2 ON T1.FID = T2.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


where FBILLFORMID='PRD_MO'  AND FNAME<>'生產訂單')t4 on t1.FBILLTYPE =t4.FBILLTYPEID


 WHERE T1.FBILLNO = '{0}'  AND T2.FMATERIALID = '{1}' AND T2.FSEQ = '{2}'", Convert.ToString(current["FSCOrderNo"]), Convert.ToString(current["FMatrailId_Id"]), Convert.ToString(current["FSRCBILLENTRYSEQ"]));


                    DataTable dt = new DataTable();


                    dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];


@@ -301,6 +328,9 @@


                    string FQTY = "";//FQTY 生产订单数量


                    string FBILLNO = "";//FBILLNO 原单号 


                    string FHUnitID = "";//单位


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


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


                    string FMoFBillType = "";//


                    if (dt.Rows.Count > 0)


                    {


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


@@ -309,6 +339,9 @@


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


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


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


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


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


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


                    }


                    JObject jsonRoot = new JObject();


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


@@ -319,6 +352,7 @@


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


                    JObject jsonModel = new JObject();


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


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


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


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


                    jsonModel.Add("FHSeOrderBillNo", Convert.ToString(current["FSalOrderNo"]));//销售订单号


@@ -327,12 +361,17 @@


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


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




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


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




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


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


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


                    jsonModel.Add("FPrdBillNo", FBILLNO); ;//源单编号


                    jsonModel.Add("FPRDMOMAINID", FID); ;//源单主内码


                    jsonModel.Add("FPRDMOENTYID", FENTRYID); ;//源单子内码


                    jsonModel.Add("FMoFID", FID); ;//源单主内码


                    jsonModel.Add("FMoFentryId", FENTRYID); ;//源单子内码


                    jsonModel.Add("FOrderQuantity", Convert.ToString(current["FOrderQuantity"])); ;//生产订单数量


                    jsonModel.Add("FDayPlanQuantity", Convert.ToString(current["FDayPlanQuantity"])); ;//日计划数量


                    jsonModel.Add("FNoScheduled", Convert.ToString(current["FNoScheduled"])); ;//未排数量


@@ -485,7 +524,6 @@


            }


            return string.Empty;


        }




        public void WriteImportLog()


        {


            try


@@ -518,6 +556,8 @@


                    string FQTY = "";//FQTY 生产订单数量


                    string FBILLNO = "";//FBILLNO 原单号 


                    string FHUnitID = "";//单位


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


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


                    if (dt.Rows.Count > 0)


                    {


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


@@ -526,6 +566,8 @@


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


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


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


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


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


                    }


                    JObject jsonRoot = new JObject();


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


@@ -543,13 +585,16 @@


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


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


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




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


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


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


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


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


                    jsonModel.Add("FPrdBillNo", FBILLNO); ;//源单编号


                    jsonModel.Add("FPRDMOMAINID", FID); ;//源单主内码


                    jsonModel.Add("FPRDMOENTYID", FENTRYID); ;//源单子内码


                    jsonModel.Add("FMoFID", FID); ;//源单主内码


                    jsonModel.Add("FMoFentryId", FENTRYID); ;//源单子内码


                    jsonModel.Add("FOrderQuantity", Convert.ToString(current["FOrderQuantity"])); ;//生产订单数量


                    jsonModel.Add("FDayPlanQuantity", Convert.ToString(current["FDayPlanQuantity"])); ;//日计划数量


                    jsonModel.Add("FNoScheduled", Convert.ToString(current["FNoScheduled"])); ;//未排数量