委外发料单+设备器具点检保养规程完善

zzr99

2022-01-05 090e358965800ecf7707fbfc69cef0e018836ae1

 WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs

@@ -4268,6 +4268,8 @@
        public object Sc_MouldRepairInBillListCheckDetai(string sqlWhere)
        {
            DataSet ds;
            DataSet ds1;
            List<object> list = new List<object>();
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
@@ -4275,13 +4277,10 @@
                {
                    ds = oCN.RunProcReturn(string.Format(@"SELECT HMaterID,模具代码 HMaterCode,模具名称 HMaterName,规格型号 HMaterSpec,
                                          批次 HBatchNo,设计寿命 HDesignLife, 剩余寿命 HLeaveLife, 使用寿命 HUseLife,应收数量 HQtyMust,
                                          实收数量 HQty, HWHID, 仓库代码 HWHCode,仓库 HWHName,子备注 HRemark,HStockOrgID 
                                          实收数量 HQty, HWHID, 仓库代码 HWHCode,仓库 HWHName,子备注 HRemark,HStockOrgID,HUnitID,计量单位代码,计量单位  
                                          FROM h_v_Sc_MouldRepairInBillList"), "h_v_Sc_MouldRepairInBillList");

                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "获取信息成功！";
                    objJsonResult.data = ds.Tables[0];
          
                }
                else
                {
@@ -4289,16 +4288,23 @@
                    //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 
                                          实收数量 HQty, HWHID, 仓库代码 HWHCode,仓库 HWHName,子备注 HRemark,HStockOrgID,HUnitID,计量单位代码,计量单位  
                                          FROM h_v_Sc_MouldRepairInBillList where 1=1 ");
                    string sql = sql1 + sqlWhere;
                    ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldRepairInBillList");

                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "获取信息成功！";
                    objJsonResult.data = ds.Tables[0];
                }
                //查汇总
                ds1 = oCN.RunProcReturn(string.Format(@"select  物料代码,max(物料名称)物料名称,规格型号,max(单据号)单据号,批次,sum(实收数量)实收数量,
                                            hwhid,max(仓库代码)仓库代码,max(仓库)仓库,子备注 from h_v_Sc_MouldRepairInBillList 
                                            where 1=1 " + sqlWhere + " group by 物料代码,规格型号,hwhid,批次,子备注"), "h_v_Sc_MouldRepairInBillList");

                list.Add(ds.Tables[0]);
                list.Add(ds1.Tables[0]);
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "获取信息成功！";
                objJsonResult.list = list;
            }
            catch (Exception e)
            {
@@ -4479,6 +4485,8 @@
                }
                if (bResult)
                {
                    string sql = $"exec h_p_Sc_MouldChangeFileStatus  'in','{oBill.omodel.HInterID.ToString()}' ";
                    oCn.RunProc(sql);
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "保存成功！";