YL
2021-10-18 756c87c9467e9ba5ec472ca3e39fd9ad58eb85c5
WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillListController.cs
@@ -83,7 +83,7 @@
        [Route("Sc_MouldProdMoveBill/GetMouldProdMoveBill")]
        [HttpGet]
        public object GetMouldProdMoveBill(string sWhere,string user)
        public object GetMouldProdMoveBill(string sWhere,string user, string Organization)
        {
            try
            {
@@ -97,7 +97,7 @@
                    return objJsonResult;
                }
                ds = Sc_GetMouldProdMoveBill(sWhere);
                ds = Sc_GetMouldProdMoveBill(sWhere,Organization);
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "返回记录成功!";
@@ -114,15 +114,15 @@
            }
        }
        public static DataSet Sc_GetMouldProdMoveBill(string sWhere)
        public static DataSet Sc_GetMouldProdMoveBill(string sWhere, string Organization)
        {
            string sql1 = string.Format(@"select * from h_v_Sc_MouldProdMoveBillList where (调入组织='" + Organization + "' or 调出组织='" + Organization + "')");
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldProdMoveBillList order by 日期 desc", "h_v_Sc_MouldProdMoveBillList");
                return new SQLHelper.ClsCN().RunProcReturn(sql1+ "order by 日期 desc", "h_v_Sc_MouldProdMoveBillList");
            }
            else
            {
                string sql1 = "select * from h_v_Sc_MouldProdMoveBillList where 1 = 1 ";
                string sql = sql1 + sWhere+ "order by 日期 desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldProdMoveBillList");
            }
@@ -161,8 +161,9 @@
                {
                    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 FROM h_v_Sc_MouldProdMoveBillList"), "h_v_Sc_MouldProdMoveBillList");
                                                单价 HPrice, 金额 HMoney,HStockOrgID,调入组织代码 HStockOrgCode,调入组织 HStockOrgName, HOtherOrgID ,调出组织代码 HOtherOrgCode,调出组织 HOtherOrgName, HWHID, 调入仓库代码 HWHCode, 调入仓库 HWHName,HSPID,
                                                调入仓位代码 HSPCode, 调入仓位 HSPName,HSCWHID, 调出仓库代码 HSCWHCode, 调出仓库 HSCWHName,HSCSPID,
                                                调出仓位代码 HSCSPCode, 调出仓位 HSCSPName,表体备注 HRemark FROM h_v_Sc_MouldProdMoveBillList"), "h_v_Sc_MouldProdMoveBillList");
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
@@ -175,8 +176,9 @@
                    //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, 
                                                单价 HPrice, 金额 HMoney,HWHSonID HWHID, 发料仓库代码 HWHCode, 发料仓库 HWHName,HSPID,
                                                仓位代码 HSPCode, 仓位 HSPName,表体备注 HRemark FROM h_v_Sc_MouldProdMoveBillList where 1 = 1 ");
                                                单价 HPrice, 金额 HMoney,HStockOrgID,调入组织代码 HStockOrgCode,调入组织 HStockOrgName, HOtherOrgID ,调出组织代码 HOtherOrgCode,调出组织 HOtherOrgName, HWHID, 调入仓库代码 HWHCode, 调入仓库 HWHName,HSPID,
                                                调入仓位代码 HSPCode, 调入仓位 HSPName,HSCWHID, 调出仓库代码 HSCWHCode, 调出仓库 HSCWHName,HSCSPID,
                                                调出仓位代码 HSCSPCode, 调出仓位 HSCSPName,表体备注 HRemark FROM h_v_Sc_MouldProdMoveBillList where 1 = 1 ");
                    string sql = sql1 + sqlWhere;
                    ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldProdMoveBillList");