更改后上传代码

王 垚

2021-02-28 3b20371767cd7617c359042e42deaf8df56ef578

更改后上传代码

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

@@ -159,13 +159,12 @@
                return;
            string FentryId = string.Join(",", FentryIdList.ToArray());
            List<string> sqlList = new List<string>();
            //          string sql = string.Format(@"/*dialect*/
            //update a set FBASEACTUALQTY = b.FBASEACTUALQTY
            // from T_PRD_PICKMTRLDATA_LK a
            // join T_PRD_PICKMTRLDATA b on a.FENTRYID = b.FENTRYID
            // where a.FSTABLENAME = 'T_PRD_PPBOMENTRY' and a.FENTRYID in ({0})", FentryId);
            //          sqlList.Add(sql);
            string sql = string.Format(@"/*dialect*/
            update a set FSTOCKAPPQTY = FAPPQTY,FSTOCKACTUALQTY=FACTUALQTY
             from T_PRD_PICKMTRLDATA a
             where  a.FENTRYID in ({0})", FentryId);
            sqlList.Add(sql);
            sql = string.Format(@"/*dialect*/
update a set
FSrcBillType='PRD_PPBOM',
FSrcBillNo = b.FPPBOMBILLNO,

 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);
@@ -287,9 +294,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];
@@ -303,6 +313,7 @@
                    string FHUnitID = "";//单位
                    string FPlanBeginDate = "";//开始日期
                    string FPlanEndDate = "";//结束日期
                    string FMoFBillType = "";//
                    if (dt.Rows.Count > 0)
                    {
                        FID = dt.Rows[0]["FID"].ToString();
@@ -313,6 +324,7 @@
                        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", "");
@@ -323,6 +335,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"]));//销售订单号

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

@@ -1462,6 +1462,7 @@
                {
                    this.Model.CreateNewEntryRow("FEntity");
                    this.Model.SetValue("FSEQ", i + 1, i);//序号
                    this.Model.SetValue("FMOFBILLTYPE",Convert.ToString(dt.Rows[i]["FMOFBILLTYPE"]), i);//生产订单单据类型
                    this.Model.SetValue("FCompleteSetCount", "", i);//总齐套数量
                    this.Model.SetValue("FProOrderCount", dt.Rows[i]["FHOrderNeedQty"].ToString(), i);//生产订单数量 
                    this.Model.SetValue("FSRCBILLENTRYSEQ", dt.Rows[i]["FSRCBILLENTRYSEQ"].ToString(), i);//  
@@ -1586,6 +1587,7 @@
                {
                    this.Model.CreateNewEntryRow("FEntity");
                    this.Model.SetValue("FSEQ", i + 1, i);//序号
                    this.Model.SetValue("FMOFBILLTYPE", Convert.ToString(dt.Rows[i]["FMOFBILLTYPE"]), i);//生产订单单据类型
                    this.Model.SetValue("FCompleteSetCount", "", i);//总齐套数量
                    this.Model.SetValue("FProOrderCount", dt.Rows[i]["FHOrderNeedQty"].ToString(), i);//生产订单数量 
                    this.Model.SetValue("FSRCBILLENTRYSEQ", dt.Rows[i]["FSRCBILLENTRYSEQ"].ToString(), i);//