测试问题项更改

王 垚

2020-11-26 a0e7ad65f78935d8b4818f063f6974db567d199d

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

@@ -111,7 +111,7 @@
                    {
                        //Entity entity = this.View.BillBusinessInfo.GetEntity("FEntity");
                        //DynamicObjectCollection rows = this.Model.GetEntityDataObject(entity);

                        this.Model.DeleteEntryData("FEntity");

                        for (int i = 0; i < dt.Rows.Count; i++)
                        {
@@ -138,30 +138,6 @@
                            {
                                this.Model.SetValue("FT" + "" + j + "", dt.Rows[i][15 + j].ToString(), i);
                            }

                            //entity.SeqDynamicProperty.SetValue(row, i + 1);//序号
                            //row["FSalOrderNo"] = dt.Rows[i][0].ToString();//销售订单号
                            //row["FSCOrderNo"] = dt.Rows[i][1].ToString();//生产订单号
                            //row["FORGID"] = Convert.ToInt32(dt.Rows[i][2].ToString());//生产组织
                            //row["FProductWorkShopId"] = Convert.ToInt32(dt.Rows[i][3].ToString());//生产车间
                            //row["FResourcesId"] = Convert.ToInt32(dt.Rows[i][4].ToString());//生产资源
                            //row["FMatrailId"] = dt.Rows[i][5].ToString(); //产品代码
                            //row["FMatrailName"] = dt.Rows[i][6].ToString(); //产品名称
                            //row["FModel"] = dt.Rows[i][7].ToString(); //规格型号
                            //row["FUnit"] = dt.Rows[i][8].ToString(); //计量单位
                            //row["FBatch"] = dt.Rows[i][9].ToString(); //批次号
                            //row["FSalOrderCount"] = dt.Rows[i][10].ToString(); //销售订单数量
                            //row["FProOrderCount"] = dt.Rows[i][11].ToString(); //生产订单数量
                            //row["FCompleteSetCount"] = dt.Rows[i][12].ToString(); //总齐套数量
                            //row["FDeliveryDate"] = GetDateTime(Convert.ToInt32(dt.Rows[i][13].ToString())); //交货日期
                            //row["FOrderLevel"] = dt.Rows[i][14].ToString(); //订单等级
                            //for (int j = 0; j <= 60; j++)
                            //{
                            //    row["FT" + "" + j + ""] = dt.Rows[i][15 + j].ToString();
                            //}
                            //this.View.GetControl("FSalOrderNo").Text = "入库单号";
                            //this.View.GetControl("FSCOrderNo").Text = "采购入库数量";
                            // rows.Add(row);
                        }
                    }

@@ -175,7 +151,6 @@
                }

            }
            this.View.GetMainBarItem("TBWJSC").Enabled = false; //锁定按钮


        }
@@ -208,6 +183,26 @@
                //单据体信息转换为列表集合
                DynamicObjectCollection entityDataObjoct = this.View.Model.GetEntityDataObject(entity);

                string _result = "";
                foreach (DynamicObject current in entityDataObjoct)
                {
                    //根据生产订单号和物料查询是否存在明细
                    sql = string.Format(@"/*dialect*/SELECT T1.FBILLNO,T2.* FROM T_PRD_MO T1
                                LEFT JOIN T_PRD_MOENTRY T2 ON T1.FID = T2.FID
                                WHERE T1.FBILLNO = '{0}'  AND T2.FMATERIALID = '{1}'", Convert.ToString(current["FSCOrderNo"]), Convert.ToString(current["FMatrailId_Id"]));
                    DataTable dt = new DataTable();
                    dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
                    if (dt.Rows.Count == 0)
                        _result += "序号：" + Convert.ToString(current["SEQ"]) + ",生产订单号：" + Convert.ToString(current["FSCOrderNo"]) + "对应的物料" + (current["FMatrailId"] as DynamicObject)["Number"] + "不存在";

                }
                if (_result != "")
                {
                    this.View.ShowErrMessage(_result);
                    return;
                }


                foreach (DynamicObject current in entityDataObjoct)
                {
                    if (string.IsNullOrEmpty(Convert.ToString(current["FSalOrderNo"])) || string.IsNullOrEmpty(Convert.ToString(current["FSCOrderNo"])))
@@ -216,9 +211,11 @@
                    //根据生产订单号和物料查询是否存在明细
                    sql = string.Format(@"/*dialect*/SELECT T1.FBILLNO,T2.* FROM T_PRD_MO T1
                                LEFT JOIN T_PRD_MOENTRY T2 ON T1.FID = T2.FID
                                WHERE T1.FBILLNO = '{0}'  ", Convert.ToString(current["FSCOrderNo"]));
                                WHERE T1.FBILLNO = '{0}'  AND T2.FMATERIALID = '{1}'", Convert.ToString(current["FSCOrderNo"]), Convert.ToString(current["FMatrailId_Id"]));
                    DataTable dt = new DataTable();
                    dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
                    if (dt.Rows.Count == 0)
                        continue;

                    string FID = "";//FID 源单主内码
                    string FENTRYID = "";//FENTRYID 源单子内码
@@ -239,7 +236,7 @@
                    jsonRoot.Add("Creator", "");
                    jsonRoot.Add("NeedUpDateFields", new JArray());
                    jsonRoot.Add("NeedReturnFields", new JArray());
                    jsonRoot.Add("IsDeleteEntry", "true");
                    jsonRoot.Add("IsDeleteEntry", "false");
                    jsonRoot.Add("SubSystemId", "");
                    jsonRoot.Add("IsVerifyBaseDataField", "");

@@ -262,18 +259,26 @@
                    jsonFHMaterID.Add("FNumber", (current["FMatrailId"] as DynamicObject)["Number"].ToString());
                    jsonModel.Add("FHMaterID", jsonFHMaterID);//FHMaterID 物料

                    if (Convert.ToString(current["FORGID_Id"]) != "0")
                    {
                    JObject jsonFHPRDORGID = new JObject();
                    jsonFHPRDORGID.Add("FNumber", (current["FORGID"] as DynamicObject)["Number"].ToString());
                    jsonModel.Add("FHPRDORGID", jsonFHPRDORGID);//FHMaterID 生产组织

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

                    //JObject jsonFResourcesId = new JObject();
                    //jsonFHMaterID.Add("FNumber", (current["FResourcesId"] as DynamicObject)["Number"].ToString());
                    //jsonModel.Add("FHSourceID", jsonFResourcesId);//FHMaterID 生产资源

                    if (Convert.ToString(current["FResourcesId_Id"]) != "0")
                    {
                        JObject jsonFResourcesId = new JObject();
                        jsonFResourcesId.Add("FNumber", (current["FResourcesId"] as DynamicObject)["Number"].ToString());
                        jsonModel.Add("FHWorkShopID", jsonFResourcesId);//FHWorkShopID  生产资源
                    }
                    JArray Entry = new JArray();
                    for (int i = 0; i <= 60; i++)
                    {
@@ -291,9 +296,11 @@
                    }

                    jsonModel.Add("FEntity", Entry);
                    //日计划工单不为空时update
                    if (Convert.ToString(current["FDayPlanID"]) != "0")
                    {
                        jsonModel.Add("FID", Convert.ToString(current["FDayPlanID"])); ;//源单编号
                    jsonRoot.Add("Model", jsonModel);


                    CloudClient cloudClient = new CloudClient("http://localhost/K3Cloud/");
                    var result = cloudClient.Save("Paez_Sc_WorkBillAutoSortBill", jsonRoot.ToString());
                    JObject saveObj = JObject.Parse(result);
@@ -301,6 +308,13 @@

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

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


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

                    }
@@ -309,6 +323,36 @@
                        this.View.ShowErrMessage("导入失败");

                    }
                    }
                    else
                    {
                        jsonRoot.Add("Model", jsonModel);
                        CloudClient cloudClient = new CloudClient("http://localhost/K3Cloud/");
                        var result = cloudClient.Save("Paez_Sc_WorkBillAutoSortBill", jsonRoot.ToString());
                        JObject saveObj = JObject.Parse(result);
                        string saveIsSuc = saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper();

                        if (saveIsSuc == "TRUE")
                        {
                            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.View.ShowMessage("导入成功");

                        }
                        else
                        {
                            this.View.ShowErrMessage("导入失败");

                        }
                    }




                }
            }