1

沈泽

2021-10-22 46795bf8ad801a7f0345052bd861086d9fdad3dd

 WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs

@@ -4213,7 +4213,7 @@

        [Route("Sc_CheckToolsRepairWorkBillList/GetMouldRepairInBillList")]
        [HttpGet]
        public object GetMouldRepairInBillList(string sWhere,string user)
        public object GetMouldRepairInBillList(string sWhere,string user, string Organization)
        {
            try
            {
@@ -4227,7 +4227,7 @@
                    return objJsonResult;
                }

                ds = Sc_MouldRepairInBillList(sWhere);
                ds = Sc_MouldRepairInBillList(sWhere,Organization);
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "返回记录成功！";
@@ -4244,15 +4244,15 @@
            }
        }

        public static DataSet Sc_MouldRepairInBillList(string sWhere)
        public static DataSet Sc_MouldRepairInBillList(string sWhere,string Organization)
        {
            string sql1 = string.Format(@"select * from h_v_Sc_MouldRepairInBillList where 库存组织='" + Organization + "'");
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldRepairInBillList order by 日期 desc", "h_v_Sc_MouldRepairInBillList");
                return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by 日期 desc", "h_v_Sc_MouldRepairInBillList");
            }
            else
            {
                string sql1 = "select * from h_v_Sc_MouldRepairInBillList where 1 = 1 ";
                string sql = sql1 + sWhere+ "order by 日期 desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldRepairInBillList");
            }
@@ -4274,7 +4274,7 @@
                {
                    ds = oCN.RunProcReturn(string.Format(@"SELECT HMaterID,模具代码 HMaterCode,模具名称 HMaterName,规格型号 HMaterSpec,
                                          批次 HBatchNo,设计寿命 HDesignLife, 剩余寿命 HLeaveLife, 使用寿命 HUseLife,应收数量 HQtyMust,
                                          实收数量 HQty, HWHID, 仓库代码 HWHCode,仓库 HWHName,子备注 HRemark 
                                          实收数量 HQty, HWHID, 仓库代码 HWHCode,仓库 HWHName,子备注 HRemark,HStockOrgID 
                                          FROM h_v_Sc_MouldRepairInBillList"), "h_v_Sc_MouldRepairInBillList");

                    objJsonResult.code = "0";
@@ -4288,7 +4288,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 
                                          实收数量 HQty, HWHID, 仓库代码 HWHCode,仓库 HWHName,子备注 HRemark,HStockOrgID 
                                          FROM h_v_Sc_MouldRepairInBillList where 1=1 ");
                    string sql = sql1 + sqlWhere;
                    ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldRepairInBillList");