生产计划导入 平台 测试更改

王 垚

2020-11-23 ee97c386f74d12af74e39a08eae455f2e94288de

生产计划导入 平台  测试更改

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

@@ -236,7 +236,7 @@
                    jsonRoot.Add("Creator", "");
                    jsonRoot.Add("NeedUpDateFields", new JArray());
                    jsonRoot.Add("NeedReturnFields", new JArray());
                    jsonRoot.Add("IsDeleteEntry", "false");
                    jsonRoot.Add("IsDeleteEntry", "true");
                    jsonRoot.Add("SubSystemId", "");
                    jsonRoot.Add("IsVerifyBaseDataField", "");

@@ -266,17 +266,17 @@
                        jsonModel.Add("FHPRDORGID", jsonFHPRDORGID);//FHMaterID 生产组织

                    }
                    if (Convert.ToString(current["FProductWorkShopId_Id"]) != "0")
                    if (Convert.ToString(current["FResourcesId_Id"]) != "0")
                    {
                        JObject jsonFProductWorkShopId = new JObject();
                        jsonFProductWorkShopId.Add("FNumber", (current["FProductWorkShopId"] as DynamicObject)["Number"].ToString());
                        jsonFProductWorkShopId.Add("FNumber", (current["FResourcesId"] as DynamicObject)["Number"].ToString());
                        jsonModel.Add("FHSourceID", jsonFProductWorkShopId);//FHSourceID  生产车间
                    }

                    if (Convert.ToString(current["FResourcesId_Id"]) != "0")
                    if (Convert.ToString(current["FProductWorkShopId_Id"]) != "0")
                    {
                        JObject jsonFResourcesId = new JObject();
                        jsonFResourcesId.Add("FNumber", (current["FResourcesId"] as DynamicObject)["Number"].ToString());
                        jsonFResourcesId.Add("FNumber", (current["FProductWorkShopId"] as DynamicObject)["Number"].ToString());
                        jsonModel.Add("FHWorkShopID", jsonFResourcesId);//FHWorkShopID  生产资源
                    }
                    JArray Entry = new JArray();
@@ -308,12 +308,11 @@

                        if (saveIsSuc == "TRUE")
                        {
                            string FDayPlanBillNo = saveObj["Result"]["ResponseStatus"]["SuccessEntitys"]["Number"].ToString();
                            string FDayPlanID = saveObj["Result"]["ResponseStatus"]["SuccessEntitys"]["Id"].ToString();
                            string FDayPlanBillNo = saveObj["Result"]["Number"].ToString();
                            string FDayPlanID = saveObj["Result"]["Id"].ToString();

                            //this.Model.SetValue("FDayPlanBillNo", FDayPlanBillNo, Convert.ToString(current["SEQ"]));// 
                            // this.Model.SetValue("FDayPlanID", FDayPlanID, Convert.ToString(current["SEQ"]));// 

                            this.Model.SetValue("FDayPlanBillNo", FDayPlanBillNo, Convert.ToInt32(current["SEQ"]) - 1);// 
                            this.Model.SetValue("FDayPlanID", FDayPlanID, Convert.ToInt32(current["SEQ"]) - 1);// 

                            this.View.ShowMessage("导入成功");

@@ -337,8 +336,8 @@
                            string FDayPlanBillNo = saveObj["Result"]["Number"].ToString();
                            string FDayPlanID = saveObj["Result"]["Id"].ToString();

                            //this.Model.SetValue("FDayPlanBillNo", FDayPlanBillNo, Convert.ToString(current["SEQ"]));// 
                            // this.Model.SetValue("FDayPlanID", FDayPlanID, Convert.ToString(current["SEQ"]));// 
                            this.Model.SetValue("FDayPlanBillNo", FDayPlanBillNo, Convert.ToInt32(current["SEQ"])-1);// 
                             this.Model.SetValue("FDayPlanID", FDayPlanID, Convert.ToInt32(current["SEQ"]) - 1);// 


                            this.View.ShowMessage("导入成功");
@@ -351,7 +350,7 @@
                        }
                    }


                    this.View.UpdateView();


                }

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

@@ -406,7 +406,7 @@
                    }

                    double Sum = 100;
                    Sum = Convert.ToDouble(SumGetComplete(current["FMatrailId_Id"].ToString(), current["FHMainSourceInterID"].ToString(), current["FHMainSourceEntryID"].ToString(), current["FDayPlanWorkID"].ToString(), SumPlan));
                    Sum = Convert.ToDouble(SumGetComplete(current["FMatrailId_Id"].ToString(), current["FHMainSourceInterID"].ToString(), current["FHMainSourceEntryID"].ToString(), current["FDayPlanWorkID"].ToString(), SumPlan, current["FORGID"].ToString()));
                    this.View.Model.SetValue("FCompleteSetCount", Sum, m);
                    this.View.UpdateView("FCompleteSetCount");
                    //保存齐套数 
@@ -454,7 +454,7 @@
        /// <param name="FDayPlanWorkID"> 日计划工单FID</param>
        /// <param name="FDayPlanWorkID"> 计划总数量</param>
        /// <returns></returns>
        public string SumGetComplete(string FMATERIALID, string FMainInterID, string FMainEntryID, string FDayPlanWorkID, decimal SumPlan)
        public string SumGetComplete(string FMATERIALID, string FMainInterID, string FMainEntryID, string FDayPlanWorkID, decimal SumPlan, string sc)
        {
            //FDayPlanWorkID日计划工单ID去删除现有的齐套分析数据
            DBServiceHelper.Execute(Context, "/*dialect*/delete JIT_MOMaterReadysBill where FHICMOInterID = '" + FDayPlanWorkID + "'");
@@ -577,7 +577,7 @@
            {
                string FProWorkShopId = (this.Model.GetValue("FProWorkShopId") as DynamicObject)["Id"].ToString();
                if (!string.IsNullOrEmpty(FProWorkShopId))
                    sqlwhere += $" and FProductWorkShopId='{FProWorkShopId}'";
                    sqlwhere += $" and FHWorkShopID='{FProWorkShopId}'";
            }
            //销售订单号
            string FSalOrder = Convert.ToString((this.Model.GetValue("FSalOrder")));
@@ -640,8 +640,8 @@
                    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("FProductWorkShopId", dt.Rows[i]["FHSourceID"].ToString(), i);//生产车间
                    this.Model.SetValue("FResourcesId", dt.Rows[i]["FHWorkShopID"].ToString(), i);//生产资源
                    this.Model.SetValue("FResourcesId", dt.Rows[i]["FHSourceID"].ToString(), i);//生产资源
                    this.Model.SetValue("FProductWorkShopId", dt.Rows[i]["FHWorkShopID"].ToString(), i);//生产车间


                    sql = @"/*dialect*/SELECT * FROM Sc_WorkBillSortBillSub WHERE DATEDIFF(D,GETDATE(),FHMASTERDATE)>=0 and FID=" + dt.Rows[i]["FID"].ToString();
@@ -906,6 +906,9 @@
JOIN SC_WORKBILLSORTBILLSUB T2 ON T1.FID=T2.FID WHERE  DATEDIFF(D,GETDATE(),FHMASTERDATE) >=0 AND FPLANCOUNT>FCOMPLETECOUNT AND T1.FID in (" + FDayPlanWorkID + ")";
            DataSet Complete = DBServiceHelper.ExecuteDataSet(Context, sql);
            List<DayPlanPpbom> CompleteList = ds.ToModelList<DayPlanPpbom>();

            #region
            /*
            //FID集合
            var FIDList = CompleteList.Select(x => x.FID).Distinct().ToList();
            foreach (var item in FIDList)
@@ -935,6 +938,12 @@
                }

            }
            */
            #endregion
            //获取当前即时库存
            DataSet JSKCds = DBServiceHelper.ExecuteDataSet(Context, " /*dialect*/ select DISTINCT FBASEQTY,FMATERIALID,FStockOrgId,FOwnerId from T_STK_Inventory");
            var InventoryList = ds.ToModelList<PRD_Inventory>();


            //物料集合 由物料去分组
            List<string> MaterialIDList = DayPlanPpbom.Select(x => x.FMATERIALID).Distinct().ToList();

 src/Model/Demo.Model/Model/PODemandPlan/DayPlanPpbom.cs

@@ -66,5 +66,10 @@
        /// 实际需求
        /// </summary>
        public decimal NeedQty { get; set; }

        /// <summary>
        /// 库存组织
        /// </summary>
        public double FStockOrgId { get; set; }
    }
}

 src/Model/Demo.Model/Model/PODemandPlan/PODemandPlanTemp.cs

@@ -84,5 +84,10 @@
        /// </summary>
        public double FFIXLEADTIME { get; set; }

        /// <summary>
        /// 库存组织
        /// </summary>
        public double FStockOrgId { get; set; }

    }
}

 src/Model/Demo.Model/Model/PODemandPlan/PurchaseInventory.cs

@@ -38,5 +38,10 @@
        /// </summary>
        public decimal FQTY { get; set; }

        /// <summary>
        /// 库存组织
        /// </summary>
        public double FStockOrgId { get; set; }

    }
}

 src/Model/Demo.Model/Model/PRD_Inventory.cs

@@ -20,6 +20,14 @@
        /// </summary>
        public decimal FBASEQTY { get; set; }

        /// <summary>
        /// 库存组织
        /// </summary>
        public string FStockOrgId { get; set; }

        /// <summary>
        /// 库存货主
        /// </summary>
        public string FOwnerId { get; set; }
    }
}