更改代码上传

王 垚

2020-12-14 82eb3f2600467ec9281b17d7ef97cf85f51e1e8e

更改代码上传

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

@@ -109,17 +109,14 @@
                if (!string.IsNullOrEmpty(FMateralId))
                    sqlwhere += $" and FHMATERID='{FMateralId}'";
            }

            //齐套
            string FCompleteStatus = Convert.ToString(this.Model.GetValue("FCompleteStatus"));
            if (!string.IsNullOrEmpty(FCompleteStatus))
                sqlwhere += $" and CompleteStatus='{FCompleteStatus}'";

            //生产订单号
            string PRDBillNo = Convert.ToString(this.Model.GetValue("FScOrderNo"));
            if (!string.IsNullOrEmpty(PRDBillNo))
                sqlwhere += $" and PRDBillNo='{PRDBillNo}'";

            sql += sqlwhere;
            DataTable dt = DBServiceHelper.ExecuteDataSet(this.Context, sql).Tables[0];
            this.Model.DeleteEntryData("FEntity");

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

@@ -42,7 +42,7 @@
                                        where FHMainICMOInterIDr ='{0}' and FIDENTIFICAT=2 and FHMATERID ='{1}'", FHMainICMOInterIDr, FMatrailId);
                sql = string.Format(@"/*dialect*/select a.*,b.FBILLNO FBILLNOs from JIT_MOMaterReadysBill a  
                                        left join T_PRD_MO b on a.FHMainICMOInterIDr=b.FID
                                        where   FHMATERID ='{0}'", FMatrailId);
                                        where  FCompleteCount>0 and    FHMATERID ='{0}'", FMatrailId);
                DataTable dt = DBServiceHelper.ExecuteDataSet(this.Context, sql).Tables[0];
                if (dt.Rows.Count > 0)
                {
@@ -69,7 +69,7 @@
        /// </summary>
        public void SearchList()
        {
            string sqlwhere = " where 1=1";
            string sqlwhere = " where FCompleteCount>0 and  1=1";
            string sql = string.Format(@"/*dialect*/select a.*,b.FBILLNO FBILLNOs from JIT_MOMaterReadysBill a  
                                        left join T_PRD_MO b on a.FHMainICMOInterIDr=b.FID   
                                         ");

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

@@ -48,7 +48,6 @@
        string PathName = "日计划导入模板.xlsx";
        List<PRD_Inventory> ListInventory;//库存明细
        List<PRD_Inventory> ListInventoryByStockOrgId;//物料总库存

        public override void BarItemClick(BarItemClickEventArgs e)
        {
            base.BarItemClick(e);
@@ -118,7 +117,7 @@

            if (e.BarItemKey.ToUpper() == "TBEDIT")
            {
                SearchList222();
                SearchListEdit();
            }
        }
        /// <summary>
@@ -146,7 +145,6 @@
            formPa.CustomParams.Add("FMatrailId_Id", Convert.ToString((this.View.Model.GetValue("FMatrailId", e.Row) as DynamicObject)["Id"].ToString()));
            this.View.ShowForm(formPa);
        }

        /// <summary>
        /// 导出数据到Excel
        /// </summary>
@@ -230,8 +228,6 @@
            }

        }


        private string _fileId = string.Empty;
        /// <summary>
        /// 弹出下载提示窗，下载文件至客户端本地。
@@ -252,7 +248,6 @@
            jObject.Put("urltitle", "这是文件名");
            this.View.AddAction(JSAction.openUrlWindow, new JSONArray { jObject });
        }

        /// <summary>
        /// 锁定
        /// </summary>
@@ -293,7 +288,6 @@
            else
                this.View.ShowMessage("操作失败，联系管理员！");
        }

        /// <summary>
        /// 解锁
        /// </summary>
@@ -334,7 +328,6 @@
            else
                this.View.ShowMessage("操作失败，联系管理员！");
        }

        /// <summary>
        /// 保存功能
        /// </summary>  
@@ -393,7 +386,6 @@
                this.View.ShowMessage("操作失败，联系管理员！");

        }

        /// <summary>
        /// 齐套分析
        /// </summary>
@@ -537,7 +529,6 @@
            }

        }

        /// <summary>
        /// 计算最大齐套数量
        /// </summary>
@@ -753,15 +744,17 @@
            }
            return SumGetComplete.ToString();
        }



        /// <summary>
        ///齐套分析

        /// </summary>
        public void CompleteSetAnalysis()
        {
            try
        {
            Stopwatch sw = new Stopwatch();
            sw.Start();//开始计时
                //清空齐套临时表
                DBServiceHelper.Execute(Context, "/*dialect*/  delete JIT_MOMaterReadysBill ");
            //获取当前即时库存 按照物料+库存组织+货主+库存数量  
            DataSet ds = DBServiceHelper.ExecuteDataSet(Context, @" 
/*dialect*/ 
@@ -777,10 +770,10 @@
LEFT JOIN T_STK_Inventory a on T1.FStockOrgId = a.FStockOrgId and T1.FMATERIALID =a.FMATERIALID 
LEFT JOIN JIT_MOMaterReadysBill B ON T1.FStockOrgId = b.FHSTOCKORGID and T1.FMATERIALID =b.FHMATERID and a.FOwnerId = b.FOwnerId 
LEFT join T_ORG_Organizations c on a.FOWNERID = c.FORGID
where isnull(a.FBASEQTY,0)-ISNULL(b.FHUseQty,0)>0
--where isnull(a.FBASEQTY,0)-ISNULL(b.FHUseQty,0)>0 and  T1.FMATERIALID in (105842,
--105843)
");
            ListInventory = ds.ToModelList<PRD_Inventory>();

            //总库存 物料+库存组织+库存数量
            ds = DBServiceHelper.ExecuteDataSet(Context, @" 
/*dialect*/ 
@@ -795,12 +788,12 @@
) T1 
LEFT JOIN T_STK_Inventory a on T1.FStockOrgId = a.FStockOrgId and T1.FMATERIALID =a.FMATERIALID 
LEFT JOIN JIT_MOMaterReadysBill B ON T1.FStockOrgId = b.FHSTOCKORGID and T1.FMATERIALID =b.FHMATERID 
--where T1.FMATERIALID in (105842,
--105843)
group by T1.FStockOrgId,T1.FMATERIALID

");
            ListInventoryByStockOrgId = ds.ToModelList<PRD_Inventory>();


            //需要齐套分析的数据
            string sql = @"
/*dialect*/
@@ -814,13 +807,13 @@
JOIN T_BD_MATERIAL T4 on T2.FMATERIALID = T4.FMATERIALID
JOIN T_ORG_Organizations t5 on a.FHPRDORGID = t5.FORGID
--where FPRDMOMAINID = 100010
--where  t4.FMATERIALID in (105842,
--105843)
ORDER BY b.FHMASTERDATE,a.FHOrderLev  ";
            ds = DBServiceHelper.ExecuteDataSet(Context, sql);
            List<PRD_PPBOM> BomList = ds.ToModelList<PRD_PPBOM>();

            //日计划+生产订单子表编码ID
            var DatePlanList = BomList.GroupBy(p => new { p.FHMASTERDATE, p.FPRDMOENTYID }).Select(x => new PRD_PPBOM { FHMASTERDATE = x.Key.FHMASTERDATE, FPRDMOENTYID = x.Key.FPRDMOENTYID }).ToList();

            //CompleteAnalysisTempModel 用于存储临时需要插入数据
            List<CompleteAnalysisTempModel> completeAnalysisTempModel = new List<CompleteAnalysisTempModel>();
            foreach (var item in DatePlanList)
@@ -845,7 +838,7 @@
                            if (need == 0)
                                break;
                            decimal fCompleteCount = need >= Inventory.FBASEQTY ? Inventory.FBASEQTY : need;//齐套数量
                            decimal fLackCount = _item.PlanCount - fCompleteCount;//缺料数量
                                decimal _fLackCount = _item.PlanCount - fCompleteCount;//缺料数量
                            completeAnalysisTempModel.Add(new Demo.Model.Model.CompleteAnalysisTempModel
                            {
                                FHMainICMOInterIDr = _item.FPRDMOMAINID,
@@ -861,15 +854,17 @@
                                FUnitDosage = _item.dwyl.ToString(),//单位用量
                                FSumPlanCount = _item.PlanCount.ToString(),//计划总数量
                                FCompleteCount = fCompleteCount, //齐套数量
                                FLackCount = fLackCount,//缺料数量
                                    FLackCount = _fLackCount,//缺料数量
                                FHStockQty = sjkcList.FBASEQTY,//即时库存
                                FHLeftQty = sjkcList.FBASEQTY,//可用数量
                                FComPlete = fLackCount > 0 ? "未齐套" : "齐套",
                                    FComPlete = _fLackCount > 0 ? "未齐套" : "齐套",
                                FPlanDate = item.FHMASTERDATE // 日计划日期
                            });

                            //扣减总库存数量
                            sjkcList.FBASEQTY = sjkc - fCompleteCount > 0 ? sjkc - fCompleteCount : 0;
                                sjkcList.FBASEQTY = sjkc >= fCompleteCount ? sjkc - fCompleteCount : 0;
                                //扣减消耗库存
                                Inventory.FBASEQTY = Inventory.FBASEQTY - fCompleteCount;
                                //剩余日计划需求数量
                            need = need >= Inventory.FBASEQTY ? need - Inventory.FBASEQTY : 0;
                        }
                    }
@@ -900,7 +895,6 @@
            }
            foreach (var item in completeAnalysisTempModel)
            {

                JObject jsonRoot = new JObject();
                jsonRoot.Add("Creator", "");
                jsonRoot.Add("NeedUpDateFields", new JArray());
@@ -908,7 +902,6 @@
                jsonRoot.Add("IsDeleteEntry", "true");
                jsonRoot.Add("SubSystemId", "");
                jsonRoot.Add("IsVerifyBaseDataField", "");

                JObject jsonModel = new JObject();
                jsonModel.Add("FHMainICMOInterIDr", item.FHMainICMOInterIDr);
                jsonModel.Add("FHMainICMOEntryID", item.FHMainICMOEntryID);
@@ -926,18 +919,15 @@
                jsonModel.Add("FPRDBillNo", item.FPRDBillNo);
                jsonModel.Add("FOwnerTypeId", item.FOwnerTypeId);
                jsonModel.Add("FComPlete", item.FComPlete);
                    jsonModel.Add("FLackCount", item.FLackCount);
                jsonModel.Add("FPlanDate", item.FPlanDate);
                if (item.FOwnerId != null)
                    jsonModel.Add("FOwnerId", new JObject() { ["FNUMBER"] = item.FOwnerId });


                jsonRoot.Add("Model", jsonModel);

                CloudClient cloudClient = new CloudClient("http://localhost/K3Cloud/");
                var result = cloudClient.Save("paez_CompleteAnalysisTemp", jsonRoot.ToString());
                JObject saveObj = JObject.Parse(result);
                string saveIsSuc = saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper();

                if (saveIsSuc != "TRUE")
                {
                    LogHelper.Error(jsonRoot.ToString());
@@ -945,15 +935,16 @@
            }
            //执行完成后 更新日计划工单状态
            DBServiceHelper.Execute(Context, @"
/*dialect*/update Sc_WorkBillSortBillSub set FComplete = '不齐套' where FEntryID IN (select distinct FHICMOEntryID from JIT_MOMaterReadysBill where isnull(FCOMPLETE,'未齐套') ='未齐套')
/*dialect*/update Sc_WorkBillSortBillSub set FComplete = '未齐套' where FEntryID IN (select distinct FHICMOEntryID from JIT_MOMaterReadysBill where isnull(FCOMPLETE,'未齐套') ='未齐套')
");
            sw.Stop();//结束计时
            LogHelper.Info("运行总时长：" + sw.Elapsed);

        }



            catch (Exception ex)
            {
                LogHelper.Error(ex.Message.ToString());
            }
        }
        /// <summary>
        /// 查询
        /// </summary>
@@ -1056,13 +1047,8 @@
                        this.Model.SetValue("FT" + getDay.Days.ToString(), dr["FHQTY"].ToString(), i);//日计划工单FID
                        if (dr["FHLockedSub"].ToString() == "1")
                            this.View.GetFieldEditor("FT" + getDay.Days.ToString(), i).Enabled = false; //单据体行锁定字段

                        

                    }

                    this.View.InvokeFieldUpdateService("FMatrailId", i);//调用数量值更新

                }
                this.View.UpdateView();
                for (int j = 0; j < dt.Rows.Count; j++)
@@ -1103,13 +1089,130 @@
            }



        }
        /// <summary>
        /// 编辑
        /// </summary>
        public void SearchListEdit()
        {
            string sqlwhere = " where 1=1";

            if ((this.Model.GetValue("FProWorkShopId") as DynamicObject) != null)
            {
                string FProWorkShopId = (this.Model.GetValue("FProWorkShopId") as DynamicObject)["Id"].ToString();
                if (!string.IsNullOrEmpty(FProWorkShopId))
                    sqlwhere += $" and FHWorkShopID='{FProWorkShopId}'";
            }
            //销售订单号
            string FSalOrder = Convert.ToString((this.Model.GetValue("FSalOrder")));
            if (string.IsNullOrEmpty(FSalOrder))
            {

            }
            else
                sqlwhere += $" and FHSeOrderBillNo='{FSalOrder}'";
            //生产订单号
            string FScOrderMainNo = Convert.ToString((this.Model.GetValue("FScOrderMainNo")));
            if (string.IsNullOrEmpty(FScOrderMainNo))
            {

            }
            else
                sqlwhere += $" and FSCORDERNO='{FScOrderMainNo}'";

            //物料
            if ((this.Model.GetValue("FMatralId") as DynamicObject) != null)
            {
                string FMatralId = (this.Model.GetValue("FMatralId") as DynamicObject)["Number"].ToString();
                if (!string.IsNullOrEmpty(FMatralId))
                    sqlwhere += $" and t3.FNumber='{FMatralId}'";
            }
            //编制日期
            string FPreparatDate = Convert.ToString((this.Model.GetValue("FPreparatDate")));
            if (!string.IsNullOrEmpty(FPreparatDate))
                sqlwhere += $" and FPreparatDate='{FPreparatDate}'";
            try
            {
                string sql = @"/*dialect*/select t1.* from  Sc_WorkBillSortBillMain t1
   left join T_BD_MATERIAL t3 on t1.FHMaterID=t3.FMATERIALID
" + sqlwhere;
                DataTable dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
                DateTime DateNow = DateTime.Now;//获取当前日期
                this.Model.DeleteEntryData("FEntity");
                EntryGrid grid = this.View.GetControl<EntryGrid>("FEntity");
                for (int i = 0; i < dt.Rows.Count; i++)
                {
                    this.Model.CreateNewEntryRow("FEntity");
                    this.Model.SetValue("FSEQ", i + 1, i);//序号
                    this.Model.SetValue("FCompleteSetCount", "", i);//总齐套数量
                    this.Model.SetValue("FProOrderCount", dt.Rows[i]["FHOrderNeedQty"].ToString(), i);//生产订单数量 
                    this.Model.SetValue("FSalOrderCount", dt.Rows[i]["FHSeOrderBillNo"].ToString(), i);//销售订单数量
                    this.Model.SetValue("FBatch", dt.Rows[i]["FBatch"].ToString(), i);//批次号
                    this.Model.SetValue("FUnit", dt.Rows[i]["FHUnitID"].ToString(), i);//计量单位
                    this.Model.SetValue("FORGID", dt.Rows[i]["FHPRDORGID"].ToString(), i);//生产组织
                    this.Model.SetValue("FMatrailId", dt.Rows[i]["FHMaterID"].ToString(), i);//产品代码
                    this.Model.SetValue("FDeliverydate", dt.Rows[i]["FHOrderCommitDate"].ToString(), i);//交货日期
                    this.Model.SetValue("FOrderLevel", dt.Rows[i]["FHOrderLev"].ToString(), i);//订单等级
                    this.Model.SetValue("FSCOrderNo", dt.Rows[i]["FSCOrderNo"].ToString(), i);//生产订单号
                    this.Model.SetValue("FSalOrderNo", dt.Rows[i]["FHSEORDERBILLNO"].ToString(), i);//销售订单号
                    this.Model.SetValue("FBzDate", dt.Rows[i]["FPreparatDate"].ToString(), i);//编制日期
                    this.Model.SetValue("FProOrderCount", dt.Rows[i]["FHOrderNeedQty"].ToString(), i);//生产订单数量
                    this.Model.SetValue("FHMainSourceInterID", dt.Rows[i]["FPRDMOMAINID"].ToString(), i);//源单主内码FHMainSourceInterID
                    this.Model.SetValue("FHMainSourceEntryID", dt.Rows[i]["FPRDMOENTYID"].ToString(), i);//源单子内码FHMainSourceEntryID
                    this.Model.SetValue("FDayPlanWorkID", dt.Rows[i]["FID"].ToString(), i);//日计划工单FID
                    this.Model.SetValue("FResourcesId", dt.Rows[i]["FHSourceID"].ToString(), i);//生产资源
                    this.Model.SetValue("FProductWorkShopId", dt.Rows[i]["FHWorkShopID"].ToString(), i);//生产车间
                    this.Model.SetValue("FCompleteSetCount", dt.Rows[i]["FCompleteCount"].ToString(), i);//齐套数量
                    this.Model.SetValue("FOrderQuantity", dt.Rows[i]["FOrderQuantity"].ToString(), i);//生产订单数量
                    this.Model.SetValue("FDayPlanQuantity", dt.Rows[i]["FDayPlanQuantity"].ToString(), i);//日计划数量
                    this.Model.SetValue("FNoScheduled", dt.Rows[i]["FNoScheduled"].ToString(), i);//未排数量
                    sql = @"/*dialect*/SELECT * FROM Sc_WorkBillSortBillSub WHERE DATEDIFF(D,GETDATE(),FHMASTERDATE)>=0 and FID=" + dt.Rows[i]["FID"].ToString();
                    DataTable _dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
                    foreach (DataRow dr in _dt.Rows)
                    {
                        DateTime start = Convert.ToDateTime(DateNow.ToShortDateString());
                        DateTime end = Convert.ToDateTime(Convert.ToDateTime(dr["FHMASTERDATE"]).ToShortDateString());
                        TimeSpan getDay = end.Subtract(start);
                        if (getDay.Days > 60)
                            continue;
                        this.Model.SetValue("FT" + getDay.Days.ToString(), dr["FHQTY"].ToString(), i);//日计划工单FID
                        if (dr["FHLockedSub"].ToString() == "1")
                            this.View.GetFieldEditor("FT" + getDay.Days.ToString(), i).Enabled = false; //单据体行锁定字段
                    }
                    this.View.InvokeFieldUpdateService("FMatrailId", i);//调用数量值更新
                }
                this.View.UpdateView();
                for (int j = 0; j < dt.Rows.Count; j++)
                {
                    sql = @"/*dialect*/SELECT * FROM Sc_WorkBillSortBillSub WHERE DATEDIFF(D,GETDATE(),FHMASTERDATE)>=0 and FID=" + dt.Rows[j]["FID"].ToString();
                    DataTable _dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
                    foreach (DataRow dr in _dt.Rows)
                    {
                        DateTime start = Convert.ToDateTime(DateNow.ToShortDateString());
                        DateTime end = Convert.ToDateTime(Convert.ToDateTime(dr["FHMASTERDATE"]).ToShortDateString());
                        TimeSpan getDay = end.Subtract(start);
                        if (getDay.Days > 60)
                            continue;
                        if (dr["FHLockedSub"].ToString() == "1")
                            this.View.GetFieldEditor("FT" + getDay.Days.ToString(), j).Enabled = false; //单据体行锁定字段
                    }
                }
                for (int m = 0; m <= 60; m++)
                {
                    this.View.GetControl("FT" + "" + m + "").Text = DateNow.AddDays(m).ToShortDateString();
                }
            }
            catch (Exception ex)
            {
                this.View.ShowErrMessage(ex.Message.ToString());
            }

        }

        /// <summary>
        /// 提料计划
        /// </summary>


        public void Extraction3()
        {