模治具，设备测试(2)修复

zzr99

2022-08-22 d7fea8884bbad8d34bda41ff8e05873cebc3b7f1

模治具，设备测试(2)修复

 .gitignore

@@ -135,3 +135,7 @@
/NETERPNoWin/obj/Debug
/WebAPI/Sc_MouldProdInBill/Log
/WebAPI/Vlog
/PayM/obj/x86/Release
/PayM/obj/Release
/PayM/obj/Debug
/NETERPNoWin/obj

 WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs

@@ -374,9 +374,10 @@
                string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
                string msg2 = sArray[0].ToString();
                string msg3 = sArray[1].ToString();
                string msg4 = sArray[2].ToString();
                //string msg4 = sArray[2].ToString();
                //string msg5 = sArray[3].ToString();
                

                //编辑权限
                if (!DBUtility.ClsPub.Security_Log_second("Gy_Department_Edit", 1, false, msg3))
                {
@@ -387,6 +388,8 @@
                    return objJsonResult;
                }
                //反序列化
                msg2 = msg2.Replace("\\", "");
                msg2 = msg2.Replace("\n", "");  
                msg2 = "[" + msg2.ToString() + "]";
                List<Department> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Department>>(msg2);

@@ -406,7 +409,7 @@
                //string HCreator = list[0].HCreator;
                long HCreateOrgID = list[0].HCreateOrgID;
                //DateTime HCreateDate = list[0].HCreateDate;
                long HUseOrgID = list[0].HUseOrgID;
                long HUseOrgID = long.Parse(msg4);
                string HUpdater = list[0].HUpDater;
                //DateTime HUpdateDate = list[0].HUpDateDate;
                string HChecker = list[0].HChecker;

 WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepInBillListController .cs

@@ -121,11 +121,11 @@
            string sql1 = string.Format(@"select * from h_v_Sc_MouldMoveStockStepInBillListDetail where (调入组织='" + Organization + "' or 调出组织='" + Organization + "' )");
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by hmainid desc", "h_v_Sc_MouldMoveStockStepInBillListDetail");
                return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by 制单日期 desc", "h_v_Sc_MouldMoveStockStepInBillListDetail");
            }
            else
            {
                string sql = sql1 + sWhere + "order by hmainid desc";
                string sql = sql1 + sWhere + "order by 制单日期 desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldMoveStockStepInBillListDetail");
            }

@@ -167,7 +167,7 @@
                                                设计寿命 HDesignLife, 剩余寿命 HLeaveLife, 累积使用寿命 HUseLife, 应发数量 HQtyMust, 实发数量 HQty, 
                                                单价 HPrice, 金额 HMoney,HStockOrgID, HOtherOrgID,调出组织代码 HOtherOrgCode,调出组织 HOtherOrgName, HWHID, 调入仓库代码 HWHCode, 调入仓库 HWHName,HSPID, 
                                                调入仓位代码 HSPCode, 调入仓位 HSPName,HSCWHID, 调出仓库代码 HSCWHCode, 调出仓库 HSCWHName,HSCSPID, 
                                                调出仓位代码 HSCSPCode, 调出仓位 HSCSPName,表体备注 HRemark,HStockOrgID,HUnitID,计量单位代码,计量单位 FROM h_v_Sc_MouldMoveStockStepInBillListDetail"), "h_v_Sc_MouldMoveStockStepInBillListDetail");
                                                调出仓位代码 HSCSPCode, 调出仓位 HSCSPName,表体备注 HRemark,HStockOrgID,HUnitID,计量单位代码 HUnitCode,计量单位 HUnitName FROM h_v_Sc_MouldMoveStockStepInBillListDetail"), "h_v_Sc_MouldMoveStockStepInBillListDetail");

                }
                else
@@ -177,7 +177,7 @@
                                                设计寿命 HDesignLife, 剩余寿命 HLeaveLife, 累积使用寿命 HUseLife, 应发数量 HQtyMust, 实发数量 HQty, 
                                                单价 HPrice, 金额 HMoney,HStockOrgID, HOtherOrgID,调出组织代码 HOtherOrgCode,调出组织 HOtherOrgName,  HWHID, 调入仓库代码 HWHCode, 调入仓库 HWHName,HSPID, 
                                                调入仓位代码 HSPCode, 调入仓位 HSPName,HSCWHID, 调出仓库代码 HSCWHCode, 调出仓库 HSCWHName,HSCSPID, 
                                                调出仓位代码 HSCSPCode, 调出仓位 HSCSPName,表体备注 HRemark,HStockOrgID,HUnitID,计量单位代码,计量单位 FROM h_v_Sc_MouldMoveStockStepInBillListDetail where 1 = 1 ");
                                                调出仓位代码 HSCSPCode, 调出仓位 HSCSPName,表体备注 HRemark,HStockOrgID,HUnitID,计量单位代码 HUnitCode,计量单位 HUnitName FROM h_v_Sc_MouldMoveStockStepInBillListDetail where 1 = 1 ");
                    string sql = sql1 + sqlWhere;
                    ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldMoveStockStepInBillListDetail");


 WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepOutBillController.cs

@@ -121,11 +121,11 @@
            string sql1 = string.Format(@"select * from h_v_Sc_MouldMoveStockStepOutBill where (调出组织='" + Organization + "' or 调入组织='" + Organization + "')");
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn(sql1+ "order by hmainid desc", "h_v_Sc_MouldMoveStockStepOutBill");
                return new SQLHelper.ClsCN().RunProcReturn(sql1+ "order by 制单日期 desc", "h_v_Sc_MouldMoveStockStepOutBill");
            }
            else
            {
                string sql = sql1 + sWhere+ "order by hmainid desc";
                string sql = sql1 + sWhere+ "order by 制单日期 desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldMoveStockStepOutBill");
            }

@@ -167,7 +167,7 @@
                                                设计寿命 HDesignLife, 剩余寿命 HLeaveLife, 累积使用寿命 HUseLife, 应发数量 HQtyMust, 实发数量 HQty, 
                                                单价 HPrice, 金额 HMoney,HStockOrgID,调入组织代码 HStockOrgCode,调入组织 HStockOrgName, HOtherOrgID ,调出组织代码 HOtherOrgCode,调出组织 HOtherOrgName, HWHID, 调入仓库代码 HWHCode, 调入仓库 HWHName,HSPID, 
                                                调入仓位代码 HSPCode, 调入仓位 HSPName,HSCWHID, 调出仓库代码 HSCWHCode, 调出仓库 HSCWHName,HSCSPID, 
                                                调出仓位代码 HSCSPCode, 调出仓位 HSCSPName,表体备注 HRemark,HStockOrgID,HUnitID,计量单位代码,计量单位 FROM h_v_Sc_MouldMoveStockStepOutBill"), "h_v_Sc_MouldMoveStockStepOutBill");
                                                调出仓位代码 HSCSPCode, 调出仓位 HSCSPName,表体备注 HRemark,HStockOrgID,HUnitID,计量单位代码 HUnitCode,计量单位 HUnitName FROM h_v_Sc_MouldMoveStockStepOutBill"), "h_v_Sc_MouldMoveStockStepOutBill");

                }
                else
@@ -177,7 +177,7 @@
                                                设计寿命 HDesignLife, 剩余寿命 HLeaveLife, 累积使用寿命 HUseLife, 应发数量 HQtyMust, 实发数量 HQty, 
                                                单价 HPrice, 金额 HMoney,HStockOrgID,调入组织代码 HStockOrgCode,调入组织 HStockOrgName, HOtherOrgID,调出组织代码 HOtherOrgCode,调出组织 HOtherOrgName, HWHID, 调入仓库代码 HWHCode, 调入仓库 HWHName,HSPID, 
                                                调入仓位代码 HSPCode, 调入仓位 HSPName,HSCWHID, 调出仓库代码 HSCWHCode, 调出仓库 HSCWHName,HSCSPID, 
                                                调出仓位代码 HSCSPCode, 调出仓位 HSCSPName,表体备注 HRemark,HStockOrgID,HUnitID,计量单位代码,计量单位 FROM h_v_Sc_MouldMoveStockStepOutBill where 1 = 1 ");
                                                调出仓位代码 HSCSPCode, 调出仓位 HSCSPName,表体备注 HRemark,HStockOrgID,HUnitID,计量单位代码 HUnitCode,计量单位 HUnitName FROM h_v_Sc_MouldMoveStockStepOutBill where 1 = 1 ");
                    string sql = sql1 + sqlWhere;
                    ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldMoveStockStepOutBill");


 WebAPI/Controllers/MJGL/Sc_MouldOtherOutBillController.cs

@@ -121,11 +121,11 @@
            string sql1 = string.Format(@"select * from h_v_Sc_MouldOtherOutBillList where 库存组织='" + Organization + "'");
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn(sql1+ "order by hmainid desc", "h_v_Sc_MouldOtherOutBillList");
                return new SQLHelper.ClsCN().RunProcReturn(sql1+ "order by 制单日期 desc", "h_v_Sc_MouldOtherOutBillList");
            }
            else
            {
                string sql = sql1 + sWhere+ "order by hmainid desc";
                string sql = sql1 + sWhere+ "order by 制单日期 desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldOtherOutBillList");
            }

@@ -165,7 +165,7 @@
                    ds = oCN.RunProcReturn(string.Format(@"SELECT HMaterID,模具代码 HMaterCode,模具名称 HMaterName,规格型号 HMaterSpec,批次 HBatchNo,
                                                设计寿命 HDesignLife, 剩余寿命 HLeaveLife, 累积使用寿命 HUseLife, 应发数量 HQtyMust, 实发数量 HQty, 
                                                单价 HPrice, 金额 HMoney,HWHSonID HWHID, 发料仓库代码 HWHCode, 发料仓库 HWHName,HSPID, 
                                                仓位代码 HSPCode, 仓位 HSPName,表体备注 HRemark,HStockOrgID,HUnitID,计量单位代码,计量单位 FROM h_v_Sc_MouldOtherOutBillList"), "h_v_Sc_MouldOtherOutBillList");
                                                仓位代码 HSPCode, 仓位 HSPName,表体备注 HRemark,HStockOrgID,HUnitID,计量单位代码 HUnitCode,计量单位 HUnitName FROM h_v_Sc_MouldOtherOutBillList"), "h_v_Sc_MouldOtherOutBillList");

                }
                else
@@ -175,7 +175,7 @@
                    string sql1 = string.Format(@"SELECT HMaterID,模具代码 HMaterCode,模具名称 HMaterName,规格型号 HMaterSpec,批次 HBatchNo,
                                                设计寿命 HDesignLife, 剩余寿命 HLeaveLife, 累积使用寿命 HUseLife, 应发数量 HQtyMust, 实发数量 HQty, 
                                                单价 HPrice, 金额 HMoney,HWHSonID HWHID, 发料仓库代码 HWHCode, 发料仓库 HWHName,HSPID, 
                                                仓位代码 HSPCode, 仓位 HSPName,表体备注 HRemark,HStockOrgID,HUnitID,计量单位代码,计量单位 FROM h_v_Sc_MouldOtherOutBillList where 1 = 1 ");
                                                仓位代码 HSPCode, 仓位 HSPName,表体备注 HRemark,HStockOrgID,HUnitID,计量单位代码 HUnitCode,计量单位 HUnitName FROM h_v_Sc_MouldOtherOutBillList where 1 = 1 ");
                    string sql = sql1 + sqlWhere;
                    ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldOtherOutBillList");


 WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs

@@ -75,11 +75,11 @@
            string sql1 = string.Format(@"select * from h_v_Sc_MouldProdInHouseBillList where 库存组织='" + Organization + "'");
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn(sql1+ sWhere + "order by hmainid desc", "h_v_Sc_MouldProdInHouseBillList");
                return new SQLHelper.ClsCN().RunProcReturn(sql1+ sWhere + "order by 制单日期 desc", "h_v_Sc_MouldProdInHouseBillList");
            }
            else
            {
                string sql = sql1 + sWhere+ "order by hmainid desc";
                string sql = sql1 + sWhere+ "order by 制单日期 desc";
                Log.LogInfo(sql);
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldProdInHouseBillList");
            }
@@ -437,7 +437,7 @@
                    ds = oCN.RunProcReturn(string.Format(@"SELECT HMaterID,模具代码 HMaterCode,模具名称 HMaterName,规格型号 HMaterSpec,
                                          批次 HBatchNo,设计寿命 HDesignLife, 剩余寿命 HLeaveLife, 使用寿命 HUseLife,应收数量 HQtyMust,
                                          实收数量 HQty, 单价 HPrice, 金额 HMoney,hwhid1 HWHID, 收料仓库代码 HWHCode,收料仓库 HWHName,
                                          HSPID, 收料仓位代码 HSPCode,收料仓位 HSPName,表体备注 HRemark,HStockOrgID,HUnitID,计量单位代码,计量单位  
                                          HSPID, 收料仓位代码 HSPCode,收料仓位 HSPName,表体备注 HRemark,HStockOrgID,HUnitID,计量单位代码 HUnitCode,计量单位 HUnitName
                                          FROM h_v_Sc_MouldProdInHouseBillList"), "h_v_Sc_MouldProdInHouseBillList");
                    
                }
@@ -448,7 +448,7 @@
                    string sql1 = string.Format(@"SELECT HMaterID,模具代码 HMaterCode,模具名称 HMaterName,规格型号 HMaterSpec,
                                          批次 HBatchNo,设计寿命 HDesignLife, 剩余寿命 HLeaveLife, 使用寿命 HUseLife,应收数量 HQtyMust,
                                          实收数量 HQty, 单价 HPrice, 金额 HMoney,hwhid1 HWHID, 收料仓库代码 HWHCode,收料仓库 HWHName,
                                          HSPID, 收料仓位代码 HSPCode,收料仓位 HSPName,表体备注 HRemark,HStockOrgID,HUnitID,计量单位代码,计量单位  
                                          HSPID, 收料仓位代码 HSPCode,收料仓位 HSPName,表体备注 HRemark,HStockOrgID,HUnitID,计量单位代码 HUnitCode,计量单位 HUnitName 
                                          FROM h_v_Sc_MouldProdInHouseBillList where 1=1");
                    string sql = sql1 + sqlWhere;
                    ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldProdInHouseBillList");

 WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillListController.cs

@@ -121,11 +121,11 @@
            string sql1 = string.Format(@"select * from h_v_Sc_MouldProdMoveBillList where (调入组织='" + Organization + "' or 调出组织='" + Organization + "')");
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn(sql1+ "order by hmainid desc", "h_v_Sc_MouldProdMoveBillList");
                return new SQLHelper.ClsCN().RunProcReturn(sql1+ "order by 制单日期 desc", "h_v_Sc_MouldProdMoveBillList");
            }
            else
            {
                string sql = sql1 + sWhere+ "order by hmainid desc";
                string sql = sql1 + sWhere+ "order by 制单日期 desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldProdMoveBillList");
            }

@@ -167,7 +167,7 @@
                                                设计寿命 HDesignLife, 剩余寿命 HLeaveLife, 累积使用寿命 HUseLife, 应发数量 HQtyMust, 实发数量 HQty, 
                                                单价 HPrice, 金额 HMoney,HStockOrgID,调入组织代码 HStockOrgCode,调入组织 HStockOrgName, HOtherOrgID ,调出组织代码 HOtherOrgCode,调出组织 HOtherOrgName, HWHID, 调入仓库代码 HWHCode, 调入仓库 HWHName,HSPID, 
                                                调入仓位代码 HSPCode, 调入仓位 HSPName,HSCWHID, 调出仓库代码 HSCWHCode, 调出仓库 HSCWHName,HSCSPID, 
                                                调出仓位代码 HSCSPCode, 调出仓位 HSCSPName,表体备注 HRemark,HStockOrgID,HUnitID,计量单位代码,计量单位 FROM h_v_Sc_MouldProdMoveBillList"), "h_v_Sc_MouldProdMoveBillList");
                                                调出仓位代码 HSCSPCode, 调出仓位 HSCSPName,表体备注 HRemark,HStockOrgID,HUnitID,计量单位代码 HUnitCode,计量单位 HUnitName FROM h_v_Sc_MouldProdMoveBillList"), "h_v_Sc_MouldProdMoveBillList");

                }
                else
@@ -178,7 +178,7 @@
                                                设计寿命 HDesignLife, 剩余寿命 HLeaveLife, 累积使用寿命 HUseLife, 应发数量 HQtyMust, 实发数量 HQty, 
                                                单价 HPrice, 金额 HMoney,HStockOrgID,调入组织代码 HStockOrgCode,调入组织 HStockOrgName, HOtherOrgID ,调出组织代码 HOtherOrgCode,调出组织 HOtherOrgName, HWHID, 调入仓库代码 HWHCode, 调入仓库 HWHName,HSPID, 
                                                调入仓位代码 HSPCode, 调入仓位 HSPName,HSCWHID, 调出仓库代码 HSCWHCode, 调出仓库 HSCWHName,HSCSPID, 
                                                调出仓位代码 HSCSPCode, 调出仓位 HSCSPName,表体备注 HRemark,HStockOrgID,HUnitID,计量单位代码,计量单位 FROM h_v_Sc_MouldProdMoveBillList where 1 = 1 ");
                                                调出仓位代码 HSCSPCode, 调出仓位 HSCSPName,表体备注 HRemark,HStockOrgID,HUnitID,计量单位代码 HUnitCode,计量单位 HUnitName FROM h_v_Sc_MouldProdMoveBillList where 1 = 1 ");
                    string sql = sql1 + sqlWhere;
                    ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldProdMoveBillList");


 WebAPI/Controllers/MJGL/Sc_MouldRepairChangeBillController.cs

@@ -71,12 +71,12 @@
        {
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldRepairChangeBillList " + sWhere + "order by hmainid desc", "h_v_Sc_MouldRepairChangeBillList");
                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldRepairChangeBillList " + sWhere + "order by 制单日期 desc", "h_v_Sc_MouldRepairChangeBillList");
            }
            else
            {
                string sql1 = "select * from h_v_Sc_MouldRepairChangeBillList where 1 = 1 ";
                string sql = sql1 + sWhere+ "order by hmainid desc";
                string sql = sql1 + sWhere+ "order by 制单日期 desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldRepairChangeBillList");
            }


 WebAPI/Controllers/MJGL/Sc_MouldRepairOutBillController.cs

@@ -61,11 +61,11 @@
            string sql1 = string.Format(@"select * from h_v_Sc_MouldRepairOutBillList where 库存组织='" + Organization + "'");
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn(sql1+ "order by hmainid desc", "h_v_Sc_MouldRepairOutBillList");
                return new SQLHelper.ClsCN().RunProcReturn(sql1+ "order by 制单日期 desc", "h_v_Sc_MouldRepairOutBillList");
            }
            else
            {
                string sql = sql1 + sWhere+ "order by hmainid desc";
                string sql = sql1 + sWhere+ "order by 制单日期 desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldRepairOutBillList");
            }

@@ -477,7 +477,7 @@
        #region[器具改制出库单编辑时获取表体数据]
        [Route("Sc_MouldRepairOutBill/Sc_MouldRepairOutBillListCheckDetai1")]
        [HttpGet]
        public object Sc_MouldRepairOutBillListCheckDetai(string sqlWhere)
        public object Sc_MouldRepairOutBillListCheckDetai1(string sqlWhere)
        {
            DataSet ds;
            DataSet ds1;
@@ -489,7 +489,7 @@
                {
                    ds = oCN.RunProcReturn(string.Format(@"SELECT HMaterID,模具代码 HMaterCode,模具名称 HMaterName,规格型号 HMaterSpec,
                                          批次 HBatchNo,设计寿命 HDesignLife, 剩余寿命 HLeaveLife, 使用寿命 HUseLife,应收数量 HQtyMust,
                                          实收数量 HQty, HWHID, 仓库代码 HWHCode,仓库 HWHName,子备注 HRemark,HStockOrgID,HUnitID,计量单位代码,计量单位  
                                          实收数量 HQty, HWHID, 仓库代码 HWHCode,仓库 HWHName,子备注 HRemark,HStockOrgID,HUnitID,计量单位代码 HUnitCode,计量单位 HUnitName 
                                          FROM h_v_Sc_MouldRepairOutBillList"), "h_v_Sc_MouldRepairOutBillList");
                }
                else
@@ -498,7 +498,7 @@
                    //string sql1 = "select HRepairCheckID,HRepairCheckContent,HManagerID,HRemark  from Sc_MouldRepairCheckBillSub where 1 = 1 ";
                    string sql1 = string.Format(@"SELECT HMaterID,模具代码 HMaterCode,模具名称 HMaterName,规格型号 HMaterSpec,
                                          批次 HBatchNo,设计寿命 HDesignLife, 剩余寿命 HLeaveLife, 使用寿命 HUseLife,应收数量 HQtyMust,
                                          实收数量 HQty, HWHID, 仓库代码 HWHCode,仓库 HWHName,子备注 HRemark,HStockOrgID,HUnitID,计量单位代码,计量单位  
                                          实收数量 HQty, HWHID, 仓库代码 HWHCode,仓库 HWHName,子备注 HRemark,HStockOrgID,HUnitID,计量单位代码 HUnitCode,计量单位 HUnitName 
                                          FROM h_v_Sc_MouldRepairOutBillList where 1=1 ");
                    string sql = sql1 + sqlWhere;
                    ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldRepairOutBillList");

 WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs

@@ -451,11 +451,11 @@
            string sql1 = string.Format(@"select * from h_v_Sc_MouldScrapInHouseBillList where 库存组织='" + Organization + "'");
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn(sql1 + sWhere + "order by hmainid desc", "h_v_Sc_MouldScrapInHouseBillList");
                return new SQLHelper.ClsCN().RunProcReturn(sql1 + sWhere + "order by 制单日期 desc", "h_v_Sc_MouldScrapInHouseBillList");
            }
            else
            {
                string sql = sql1 + sWhere + "order by hmainid desc";
                string sql = sql1 + sWhere + "order by 制单日期 desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldScrapInHouseBillList");
            }


 WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs

@@ -4251,11 +4251,11 @@
            string sql1 = string.Format(@"select * from h_v_Sc_MouldRepairInBillList where 库存组织='" + Organization + "'");
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by hmainid desc", "h_v_Sc_MouldRepairInBillList");
                return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by 制单日期 desc", "h_v_Sc_MouldRepairInBillList");
            }
            else
            {
                string sql = sql1 + sWhere+ "order by hmainid desc";
                string sql = sql1 + sWhere+ "order by 制单日期 desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldRepairInBillList");
            }

@@ -4278,7 +4278,7 @@
                {
                    ds = oCN.RunProcReturn(string.Format(@"SELECT HMaterID,模具代码 HMaterCode,模具名称 HMaterName,规格型号 HMaterSpec,
                                          批次 HBatchNo,设计寿命 HDesignLife, 剩余寿命 HLeaveLife, 使用寿命 HUseLife,应收数量 HQtyMust,
                                          实收数量 HQty, HWHID, 仓库代码 HWHCode,仓库 HWHName,子备注 HRemark,HStockOrgID,HUnitID,计量单位代码,计量单位  
                                          实收数量 HQty, HWHID, 仓库代码 HWHCode,仓库 HWHName,子备注 HRemark,HStockOrgID,HUnitID,计量单位代码 HUnitCode,计量单位 HUnitName 
                                          FROM h_v_Sc_MouldRepairInBillList"), "h_v_Sc_MouldRepairInBillList");

          
@@ -4289,8 +4289,8 @@
                    //string sql1 = "select HRepairCheckID,HRepairCheckContent,HManagerID,HRemark  from Sc_MouldRepairCheckBillSub where 1 = 1 ";
                    string sql1 = string.Format(@"SELECT HMaterID,模具代码 HMaterCode,模具名称 HMaterName,规格型号 HMaterSpec,
                                          批次 HBatchNo,设计寿命 HDesignLife, 剩余寿命 HLeaveLife, 使用寿命 HUseLife,应收数量 HQtyMust,
                                          实收数量 HQty, HWHID, 仓库代码 HWHCode,仓库 HWHName,子备注 HRemark,HStockOrgID,HUnitID,计量单位代码,计量单位  
                                          FROM h_v_Sc_MouldRepairInBillList where 1=1 ");
                                          实收数量 HQty, HWHID, 仓库代码 HWHCode,仓库 HWHName,子备注 HRemark,HStockOrgID,HUnitID,计量单位代码 HUnitCode,计量单位 HUnitName 
                                          FROM h_v_Sc_MouldRepairInBillList where 1=1 "); 
                    string sql = sql1 + sqlWhere;
                    ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldRepairInBillList");


 WebAPI/Controllers/Sc_MouldOtherInBillController.cs

@@ -120,11 +120,11 @@
            string sql1 = string.Format(@"select * from h_v_Sc_MouldOtherInBillList where 库存组织='" + Organization + "'");
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by hmainid desc", "h_v_Sc_MouldOtherInBillList");
                return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by 制单日期 desc", "h_v_Sc_MouldOtherInBillList");
            }
            else
            {
                string sql = sql1 + sWhere+ "order by hmainid desc";
                string sql = sql1 + sWhere+ "order by 制单日期 desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldOtherInBillList");
            }


 WebAPI/Controllers/Sc_MouldRepairInBillListController.cs

@@ -3192,7 +3192,32 @@
            return objJsonResult;
        }
        #endregion

        #region[模具点检记录表选择点检计划带出表格数据]
        [Route("Sc_MouldDotCheckBill/Sc_MouldDotCheckSubBillListByPlan")]
        [HttpGet]
        public object Sc_MouldDotCheckSubBillListByPlan(string HPlanInterID)
        {
            DataSet ds;
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                string sql1 = "select hsubid HDotCheckItemID,点检项目 HDotCheckItem,点检部位 HDotCheckPart,具体要求 HClaim,表体备注 HRemark,HManagerID,负责人代码 HManagerNumber,负责人 HManagerName from h_v_Sc_MouldDotCheckPlanBillList where hmainid =" + HPlanInterID;
                ds = oCN.RunProcReturn(sql1, "h_v_Sc_MouldDotCheckPlanBillList");
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "获取信息成功！";
                objJsonResult.data = ds.Tables[0];
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录！" + e.ToString();
                objJsonResult.data = null;
            }
            return objJsonResult;
        }
        #endregion
        #region [模具点检记录表删除功能]
        /// <summary>
        /// 模具点检记录删除功能
@@ -4018,11 +4043,11 @@
            string sql1 = string.Format(@"select * from h_v_Sc_MouldScrapOutHouseBillList where 库存组织='" + Organization + "'");
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by hmainid desc", "h_v_Sc_MouldScrapOutHouseBillList");
                return new SQLHelper.ClsCN().RunProcReturn(sql1 + " order by 制单日期 desc", "h_v_Sc_MouldScrapOutHouseBillList");
            }
            else
            {
                string sql = sql1 + sWhere + "order by hmainid desc";
                string sql = sql1 + sWhere + " order by 制单日期 desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldScrapOutHouseBillList");
            }
        }
@@ -4609,11 +4634,11 @@
            string sql1 = string.Format(@"select * from h_v_Sc_MouldProdBackBillList where 库存组织='" + Organization + "'");
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by hmainid desc", "h_v_Sc_MouldProdBackBillList");
                return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by 制单日期 desc", "h_v_Sc_MouldProdBackBillList");
            }
            else
            {
                string sql = sql1 + sWhere + "order by hmainid desc";
                string sql = sql1 + sWhere + "order by 制单日期 desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldProdBackBillList");
            }

@@ -4654,7 +4679,7 @@
                    ds = oCN.RunProcReturn(string.Format(@"SELECT HMaterID,模具代码 HMaterCode,模具名称 HMaterName,规格型号 HMaterSpec,批次 HBatchNo,
                                                设计寿命 HDesignLife, 剩余寿命 HLeaveLife, 累积使用寿命 HUseLife, 应发数量 HQtyMust, 实发数量 HQty, 
                                                单价 HPrice, 金额 HMoney,收料仓库ID HWHID, 收料仓库代码 HWHCode, 收料仓库 HWHName,HSPID, 
                                                仓位代码 HSPCode, 仓位 HSPName,表体备注 HRemark,HStockOrgID,HUnitID,计量单位代码,计量单位 FROM h_v_Sc_MouldProdBackBillList"), "h_v_Sc_MouldProdBackBillList");
                                                仓位代码 HSPCode, 仓位 HSPName,表体备注 HRemark,HStockOrgID,HUnitID,计量单位代码 HUnitCode,计量单位 HUnitName FROM h_v_Sc_MouldProdBackBillList"), "h_v_Sc_MouldProdBackBillList");

                }
                else
@@ -4664,7 +4689,7 @@
                    string sql1 = string.Format(@"SELECT HMaterID,模具代码 HMaterCode,模具名称 HMaterName,规格型号 HMaterSpec,批次 HBatchNo,
                                                设计寿命 HDesignLife, 剩余寿命 HLeaveLife, 累积使用寿命 HUseLife, 应发数量 HQtyMust, 实发数量 HQty, 
                                                单价 HPrice, 金额 HMoney,收料仓库ID HWHID, 收料仓库代码 HWHCode, 收料仓库 HWHName,HSPID, 
                                                仓位代码 HSPCode, 仓位 HSPName,表体备注 HRemark,HStockOrgID,HUnitID,计量单位代码,计量单位 FROM h_v_Sc_MouldProdBackBillList where 1 = 1 ");
                                                仓位代码 HSPCode, 仓位 HSPName,表体备注 HRemark,HStockOrgID,HUnitID,计量单位代码 HUnitCode,计量单位 HUnitName FROM h_v_Sc_MouldProdBackBillList where 1 = 1 ");
                    string sql = sql1 + sqlWhere;
                    ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldProdBackBillList");

@@ -5063,11 +5088,11 @@
            if (sWhere == null || sWhere.Equals(""))
            {
                Log.LogInfo(sql1);
                return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by hmainid desc", "h_v_Sc_MouldProdOutHouseBillList");
                return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by 制单日期 desc", "h_v_Sc_MouldProdOutHouseBillList");
            }
            else
            {
                string sql = sql1 + sWhere + "order by hmainid desc";
                string sql = sql1 + sWhere + "order by 制单日期 desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldProdOutHouseBillList");
            }

@@ -5108,7 +5133,7 @@
                    ds = oCN.RunProcReturn(string.Format(@"SELECT HMaterID,模具代码 HMaterCode,模具名称 HMaterName,规格型号 HMaterSpec,批次 HBatchNo,
                                                设计寿命 HDesignLife, 剩余寿命 HLeaveLife, 累积使用寿命 HUseLife, 应发数量 HQtyMust, 实发数量 HQty, 
                                                单价 HPrice, 金额 HMoney,HWHSonID HWHID, 发料仓库代码 HWHCode, 发料仓库 HWHName,HSPID, 
                                                仓位代码 HSPCode, 仓位 HSPName,表体备注 HRemark,HStockOrgID,HUnitID,计量单位代码,计量单位 FROM h_v_Sc_MouldProdOutHouseBillList"), "h_v_Sc_MouldProdOutHouseBillList");
                                                仓位代码 HSPCode, 仓位 HSPName,表体备注 HRemark,HStockOrgID,HUnitID,计量单位代码 HUnitCode,计量单位 HUnitName FROM h_v_Sc_MouldProdOutHouseBillList"), "h_v_Sc_MouldProdOutHouseBillList");

                }
                else
@@ -5118,7 +5143,7 @@
                    string sql1 = string.Format(@"SELECT HMaterID,模具代码 HMaterCode,模具名称 HMaterName,规格型号 HMaterSpec,批次 HBatchNo,
                                                设计寿命 HDesignLife, 剩余寿命 HLeaveLife, 累积使用寿命 HUseLife, 应发数量 HQtyMust, 实发数量 HQty, 
                                                单价 HPrice, 金额 HMoney,HWHSonID HWHID, 发料仓库代码 HWHCode, 发料仓库 HWHName,HSPID, 
                                                仓位代码 HSPCode, 仓位 HSPName,表体备注 HRemark,HStockOrgID,HUnitID,计量单位代码,计量单位 FROM h_v_Sc_MouldProdOutHouseBillList where 1 = 1 ");
                                                仓位代码 HSPCode, 仓位 HSPName,表体备注 HRemark,HStockOrgID,HUnitID,计量单位代码 HUnitCode,计量单位 HUnitName FROM h_v_Sc_MouldProdOutHouseBillList where 1 = 1 ");
                    string sql = sql1 + sqlWhere;
                    ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldProdOutHouseBillList");
                }

 WebAPI/Models/Department.cs

@@ -11,44 +11,20 @@
        public string HNumber { get; set; }
        public string HName { get; set; }
        public string HShortNumber { get; set; }

        public string HRemark { get; set; }

        public string HUseFlag { get; set; }

        public long HParentID { get; set; }

        public string HBarCode { get; set; }

        public long HSecManagerID { get; set; }

        public long HCreateOrgID { get; set; }

        public long HUseOrgID { get; set; }

        public string HHelpCode { get; set; }


        public string HCreator { get; set; }

        public bool HStopflag { get; set; }

        public Int64 HEmpID { get; set; }

        //public DateTime HCreateDate { get; set; }

        public string HEmpName { get; set; }
        public string HUpDater { get; set; }

        //public DateTime HUpDateDate { get; set; }

        public string HChecker { get; set; }

        //public DateTime HCheckDate { get; set; }

        public string HDeleteMan { get; set; }

        //public DateTime HDeleteDate { get; set; }


    }
}

 WebAPI/Sc_MouldProdOutBill/Log/637965009665183768.log

New file
@@ -0,0 +1,3 @@
------------------------2022/8/19 10:16:06------------------------------
select * from h_v_Sc_MouldProdOutHouseBillList where 库存组织='永利百合杭州工厂'