zzr99
2021-10-22 e0c4604c10fa2b31992f236da6f48049f4b23e96
WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs
@@ -409,6 +409,7 @@
        public object Sc_MouldScrapInProdBillListProjectDetai(string sqlWhere)
        {
            DataSet ds;
            DataSet ds1;
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
@@ -417,8 +418,13 @@
                    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
                                          HSPID, 收料仓位代码 HSPCode,收料仓位 HSPName,表体备注 HRemark,HStockOrgID
                                          FROM h_v_Sc_MouldProdInHouseBillList"), "h_v_Sc_MouldProdInHouseBillList");
                    //查汇总
                    ds1 = oCN.RunProcReturn(string.Format(@"select 模具代码,模具名称,单据号,规格型号,批次,实收数量,hwhid1,收料仓库代码,
                                                收料仓库,表体备注,sum(HMaterID) from h_v_Sc_MouldProdInHouseBillList group by 模具代码,
                                                模具名称,单据号,规格型号,批次,实收数量,hwhid1,收料仓库代码,收料仓库,表体备注"),
                                                "h_v_Sc_MouldProdInHouseBillList");
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
@@ -432,7 +438,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
                                          HSPID, 收料仓位代码 HSPCode,收料仓位 HSPName,表体备注 HRemark,HStockOrgID
                                          FROM h_v_Sc_MouldProdInHouseBillList where 1=1");
                    string sql = sql1 + sqlWhere;
                    ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldProdInHouseBillList");