测试上传

王 垚

2020-12-15 7f4fe08938f69b3c1f6e9253c300915ccef2588c

测试上传

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

@@ -112,7 +112,13 @@
            //齐套
            string FCompleteStatus = Convert.ToString(this.Model.GetValue("FCompleteStatus"));
            if (!string.IsNullOrEmpty(FCompleteStatus))
                sqlwhere += $" and CompleteStatus='{FCompleteStatus}'";
                sqlwhere += $" and FComPlete='{FCompleteStatus}'";

            //日计划日期
            string FPlanDate = Convert.ToString(this.Model.GetValue("FPlanDate2"));
            if (!string.IsNullOrEmpty(FPlanDate))
                sqlwhere += $" and FPlanDate='{FPlanDate}'";

            //生产订单号
            string PRDBillNo = Convert.ToString(this.Model.GetValue("FScOrderNo"));
            if (!string.IsNullOrEmpty(PRDBillNo))

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

@@ -32,6 +32,8 @@
            }
            else
            {
                DateTime begin_time = DateTime.Now.ToLocalTime()
                var date =DateTime.Now.ToLocalTime();
                if (did)
                    return;
                string FHMainICMOInterIDr = this.View.OpenParameter.GetCustomParameter("FHMainICMOInterIDr").ToString();//主生产订单主内码

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

@@ -1209,7 +1209,6 @@
            }

        }

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

 src/BLL/Demo.TimedTaskPlugIn/PRD/DayPlanPPBomBillTimeTask.cs

@@ -17,7 +17,6 @@
    [HotUpdate]
    public class DayPlanPPBomBillTimeTask : Kingdee.BOS.Contracts.IScheduleService
    {

        public void Run(Context ctx, Schedule schedule)
        {
            CloudClient cloudClient = new CloudClient("http://localhost/K3Cloud/");
@@ -25,7 +24,7 @@
            {
                string sql = string.Format(@"
/*dialect*/
select t1.FID,t3.FMATERIALID,T5.FNUMBER,t1.FHMASTERDATE,t1.FHQTY,t4.FMATERIALID FMATERIALID2,T6.FNUMBER FNUMBER2,T7.FNUMBER FUNITNUMBER,FNumerator,FDenominator,convert(decimal(18,2),(FNumerator/FDenominator) *t1.FHQTY) FHQtyMust,T4.FUnitID,t8.FNUMBER FUNITNUMBER2,T3.FID FPPBOM,T4.FENTRYID,isnull(T9.FBillNo,'')FBillNo,t10.FNUMBER FORGNUMBER,t11.FNUMBER FHSOURCENUMBER
select t1.FID,t3.FMATERIALID,T5.FNUMBER,t1.FHMASTERDATE,t1.FHQTY,t4.FMATERIALID FMATERIALID2,T6.FNUMBER FNUMBER2,T7.FNUMBER FUNITNUMBER,FNumerator,FDenominator,convert(decimal(18,2),(FNumerator/FDenominator) *t1.FHQTY) FHQtyMust,T4.FUnitID,t8.FNUMBER FUNITNUMBER2,T3.FID FPPBOM,T4.FENTRYID,isnull(T9.FBillNo,'')FBillNo,t10.FNUMBER FORGNUMBER,t11.FNUMBER FHSOURCENUMBER,FSCRAPRATE,FFIXSCRAPQTY
FROM Sc_WorkBillSortBillSub t1
JOIN Sc_WorkBillSortBillMAIN t2 on t1.FID = t2.FID
JOIN T_PRD_PPBOM T3 on T2.FPRDMOMAINID=t3.FMOID AND T2.FPRDMOENTYID=T3.FMOENTRYID
@@ -54,18 +53,11 @@
                            //删除原有日计划用料清单
                            JObject deletemodel = new JObject();
                            deletemodel.Add("Numbers", DataRow[0]["FBillNo"].ToString());

                            JObject _saveObj = JObject.Parse(cloudClient.Delete("Paez_Sc_DayPlanPPBomBill", deletemodel.ToString()));
                            string _saveIsSuc = _saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper();

                            if (_saveIsSuc == "TRUE")
                            {

                            }
                            else
                            {
                            if (_saveIsSuc != "TRUE")
                                LogHelper.Error(_saveIsSuc);
                            }

                        }
                        JObject model = new JObject();
                        model.Add("FHDate", DateTime.Now);
@@ -86,8 +78,10 @@
                            ModelEnty.Add("FHPPBomInterID", DataRow[i]["FPPBOM"].ToString());//用料清单主内码FHPPBomInterID
                            ModelEnty.Add("FHPPBomEntryID", DataRow[i]["FENTRYID"].ToString());//用料清单子内码FHPPBomEntryID
                            ModelEnty.Add("FHSourceID", new JObject() { ["Fnumber"] = DataRow[i]["FHSOURCENUMBER"].ToString() });//生产资源FHSourceID

                            //model.Add("FHMaterSubID", DataRow[i]["FHQtyMust"].ToString());//分母分子
                            ModelEnty.Add("FNumerator", DataRow[i]["FNumerator"].ToString());//分母
                            ModelEnty.Add("FDenominator", DataRow[i]["FDenominator"].ToString());//分子
                            ModelEnty.Add("FFIXSCRAPQTY", DataRow[i]["FFIXSCRAPQTY"].ToString());//固定损耗
                            ModelEnty.Add("FHQtyScrap", DataRow[i]["FSCRAPRATE"].ToString());//变动损耗率%
                            Entry.Add(ModelEnty);
                        }
                        model.Add("FEntity", Entry);
@@ -105,15 +99,8 @@
                        JObject saveObj = JObject.Parse(result);
                        string saveIsSuc = saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper();

                        if (saveIsSuc == "TRUE")
                        {

                        }
                        else
                        {
                        if (saveIsSuc != "TRUE")
                            LogHelper.Error(saveIsSuc);

                        }
                    }
                }
            }