王 垚
2021-02-28 d5ddf535c11458df512e62b504773401656ae74c
选单按钮
1个文件已修改
56 ■■■■ 已修改文件
src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs 56 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/BLL/Demo.BillView/PRD/Pro_WorkBillPlatform.cs
@@ -245,7 +245,7 @@
            else
            {
                var type = this.View.Model.GetValue("FQTTYPE");
                if(type =="标准Bom")
                if (type == "标准Bom")
                    formPa.CustomParams.Add("tempName", "JIT_MOMaterReadysBomBill");
                //齐套分析明细列表跳转
                formPa.FormId = "paez_CompleteAnalysisDetail";
@@ -452,6 +452,10 @@
                    jsonRoot.Add("IsVerifyBaseDataField", "");
                    JObject jsonModel = new JObject();
                    jsonModel.Add("FID", Convert.ToString(current["FDayPlanWorkID"]));
                    if (Convert.ToString(current["FResourcesId_Id"]) != "0")
                    {
                        jsonModel.Add("FHSourceID", new JObject() { ["Fnumber"] = (current["FResourcesId"] as DynamicObject)?["Number"].ToString() });//生产资源
                    }
                    jsonModel.Add("FOrderQuantity", Convert.ToString(current["FOrderQuantity"]));
                    jsonModel.Add("FDayPlanQuantity", Convert.ToDecimal(current["FDayPlanQuantity"]) + Convert.ToDecimal(current["FQTYLS"]));
                    jsonModel.Add("FNoScheduled", Convert.ToString(current["FNoScheduled"]));
@@ -535,7 +539,7 @@
                    jsonRoot.Add("SubSystemId", "");
                    jsonRoot.Add("IsVerifyBaseDataField", "");
                    JObject jsonModel = new JObject();
                    jsonModel.Add("FPreparatDate", date.ToString());//编制日期
                    jsonModel.Add("FPreparatDate", Convert.ToString(current["FBzDate"]));//编制日期(改为预计开工日期)
                    jsonModel.Add("FMoFBillType", FMoFBillType);//
                    jsonModel.Add("FSRCBILLENTRYSEQ", Convert.ToString(current["FSRCBILLENTRYSEQ"]));//生产订单明细行号
                    jsonModel.Add("FSCOrderNo", Convert.ToString(current["FSCOrderNo"])); //生产订单号FSCOrderNo
@@ -547,7 +551,7 @@
                    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", current["FBatch"].ToString());//批次
                    jsonModel.Add("FBatch", FLOT);//批次
                    jsonModel.Add("FHOrderNeedQty", FQTY);// 订单需求数量
                    jsonModel.Add("FPrdBillNo", FBILLNO); ;//源单编号
@@ -2193,7 +2197,7 @@
        /// </summary>
        public void SearchList()
        {
            string sqlwhere = " where 1=1";
            string sqlwhere = " and 1=1";
            if ((this.Model.GetValue("FProWorkShopId") as DynamicObject) != null)
            {
                string FProWorkShopId = (this.Model.GetValue("FProWorkShopId") as DynamicObject)["Id"].ToString();
@@ -2216,9 +2220,14 @@
                    sqlwhere += $" and t3.FNumber='{FMatralId}'";
            }
            //编制日期
            string FPreparatDate = Convert.ToString((this.Model.GetValue("FPreparatDate")));
            if (!string.IsNullOrEmpty(FPreparatDate))
                sqlwhere += $" and FPreparatDate='{FPreparatDate}'";
            string FBeginPreparatDate = Convert.ToString((this.Model.GetValue("FBrginPreparatDate")));
            if (!string.IsNullOrEmpty(FBeginPreparatDate))
                sqlwhere += $" and FPreparatDate>='{FBeginPreparatDate}'";
            //编制日期
            string FEndPreparatDate = Convert.ToString((this.Model.GetValue("FEndPreparatDate")));
            if (!string.IsNullOrEmpty(FEndPreparatDate))
                sqlwhere += $" and FPreparatDate<='{FEndPreparatDate}'";
            try
            {
                string sql = @"/*dialect*/ select t1.*,isnull((select SUM(isnull(FNotProductNum,0)) from SC_WORKBILLSORTBILLSub t2 where t2.FID = t1.FID and DATEDIFF(D,FHMASTERDATE,GETDATE())>0),0)FNotProductNum ,isnull((select SUM(isnull(FHQTY,0)) from SC_WORKBILLSORTBILLSub t2 where t2.FID = t1.FID and DATEDIFF(D,FHMASTERDATE,GETDATE())>0),0)FQTYLS 
@@ -2247,7 +2256,7 @@
                    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("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
@@ -2317,7 +2326,7 @@
        /// </summary>
        public void SearchListEdit()
        {
            string sqlwhere = " where 1=1";
            string sqlwhere = " and 1=1";
            if ((this.Model.GetValue("FProWorkShopId") as DynamicObject) != null)
            {
@@ -2333,7 +2342,6 @@
            string FScOrderMainNo = Convert.ToString((this.Model.GetValue("FScOrderMainNo")));
            if (!string.IsNullOrEmpty(FScOrderMainNo))
                sqlwhere += $" and FSCORDERNO like '%{FScOrderMainNo}%'";
            //物料
            if ((this.Model.GetValue("FMatralId") as DynamicObject) != null)
            {
@@ -2341,10 +2349,14 @@
                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}'";
            //编制日期开始
            string FBeginPreparatDate = Convert.ToString((this.Model.GetValue("FBrginPreparatDate")));
            if (!string.IsNullOrEmpty(FBeginPreparatDate))
                sqlwhere += $" and FPreparatDate>='{FBeginPreparatDate}'";
            //编制日期结束
            string FEndPreparatDate = Convert.ToString((this.Model.GetValue("FEndPreparatDate")));
            if (!string.IsNullOrEmpty(FEndPreparatDate))
                sqlwhere += $" and FPreparatDate<='{FEndPreparatDate}'";
            try
            {
                string sql = @"/*dialect*/  select t1.*,isnull((select SUM(isnull(FNotProductNum,0)) from SC_WORKBILLSORTBILLSub t2 where t2.FID = t1.FID and DATEDIFF(D,FHMASTERDATE,GETDATE())>0),0)FNotProductNum ,isnull((select SUM(isnull(FHQTY,0)) from SC_WORKBILLSORTBILLSub t2 where t2.FID = t1.FID and DATEDIFF(D,FHMASTERDATE,GETDATE())>0),0)FQTYLS 
@@ -2373,7 +2385,7 @@
                    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("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
@@ -2564,7 +2576,7 @@
-- select  FDayPlanFID FROM Sc_DayPlanPPBomBillMain WHERE FID IN ( select distinct FID from  Sc_DayPlanPPBomBillSub WHERE FTranslateQty >0 or FPickedQty >0)
-- )
",
sqlWhere, day);
        sqlWhere, day);
                LogHelper.Info("生成日计划用料清单准备数据sql:" + sql);
                DataSet ds = DBServiceHelper.ExecuteDataSet(Context, sql);
                DataTable dt = ds.Tables[0];
@@ -3371,6 +3383,7 @@
            }
        }
        //生产计划平台选单 生产订单数据
        public void SelectMenu()
        {
            //获取单据体信息
@@ -3378,6 +3391,14 @@
            //单据体信息转换为列表集合
            DynamicObjectCollection entityDataObjoct = this.View.Model.GetEntityDataObject(entity);
            int Fseq = entityDataObjoct.Count();
            if (Fseq == 0)
            {
                this.View.ShowErrMessage("请先加载数据");
                return;
            }
            //var isexists = entityDataObjoct.Where(x => x["FSRCBILLENTRYSEQ"].ToString() == "1");
            //var isexists1 = entityDataObjoct.ToList().FindAll(x => x["FSRCBILLENTRYSEQ"].ToString() == "1");
            string pageId = Guid.NewGuid().ToString();
            ListShowParameter showParameter = new ListShowParameter();
@@ -3397,6 +3418,8 @@
                    {
                        foreach (var listSelectedRow in listSelectedRowCollection)
                        {
                            if (entityDataObjoct.Where(x => x["FSRCBILLENTRYSEQ"].ToString() == listSelectedRow.DataRow["t1_FSeq"].ToString() && x["FSCOrderNo"].ToString() == listSelectedRow.DataRow["FBillNo"].ToString()).Count() > 0)
                                return;
                            //今天以前的数据是显示不出来的
                            string sql = $"select DATEDIFF(d,getdate(),FPlanStartDate)days from T_PRD_MOENTRY where FENTRYID = {listSelectedRow.DataRow["t1_FENTRYID"].ToString()}";
                            int day = DBServiceHelper.ExecuteScalar<int>(Context, sql, 0);
@@ -3409,6 +3432,7 @@
                            this.View.Model.SetValue("FOrderQuantity", listSelectedRow.DataRow["FQty"].ToString(), Fseq);
                            this.View.Model.SetValue("FProductWorkShopId", listSelectedRow.DataRow["FWorkShopID_Id"].ToString(), Fseq);
                            this.View.Model.SetValue("FOrderLevel", "3", Fseq);
                            this.View.Model.SetValue("FBzDate", DateTime.Now.AddDays(day).ToShortDateString(), Fseq);//预计开工日期
                            this.View.Model.SetValue("FT" + day.ToString(), listSelectedRow.DataRow["FQty"].ToString(), Fseq);
                            Fseq++;
                        }