blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
YL
2021-12-23 517b819913e5146cc47b80877dd557326c76246a 
 WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillListController.cs


@@ -155,6 +155,8 @@


        public object Sc_MouldProdMoveBillListProjectDetai(string sqlWhere)


        {


            DataSet ds;


            DataSet ds1;


            List<object> list = new List<object>();


            try


            {


                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();


@@ -164,12 +166,8 @@


                                                设计寿命 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 FROM h_v_Sc_MouldProdMoveBillList"), "h_v_Sc_MouldProdMoveBillList");


                                                调出仓位代码 HSCSPCode, 调出仓位 HSCSPName,表体备注 HRemark,HStockOrgID,HUnitID,计量单位代码,计量单位 FROM h_v_Sc_MouldProdMoveBillList"), "h_v_Sc_MouldProdMoveBillList");




                    objJsonResult.code = "0";


                    objJsonResult.count = 1;


                    objJsonResult.Message = "获取信息成功！";


                    objJsonResult.data = ds.Tables[0];


                }


                else


                {


@@ -179,15 +177,22 @@


                                                设计寿命 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 FROM h_v_Sc_MouldProdMoveBillList where 1 = 1 ");


                                                调出仓位代码 HSCSPCode, 调出仓位 HSCSPName,表体备注 HRemark,HStockOrgID,HUnitID,计量单位代码,计量单位 FROM h_v_Sc_MouldProdMoveBillList where 1 = 1 ");


                    string sql = sql1 + sqlWhere;


                    ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldProdMoveBillList");




                    objJsonResult.code = "0";


                    objJsonResult.count = 1;


                    objJsonResult.Message = "获取信息成功！";


                    objJsonResult.data = ds.Tables[0];


                }


                //查汇总


                ds1 = oCN.RunProcReturn(string.Format(@"select  物料代码,max(物料名称)物料名称,规格型号,max(单据号)单据号,批次,sum(实发数量)实发数量,


                                            HSCWHID,max(调出仓库代码)调出仓库代码,max(调出仓库)调出仓库,表体备注 from h_v_Sc_MouldProdMoveBillList 


                                            where 1=1 " + sqlWhere + " group by 物料代码,规格型号,HSCWHID,批次,表体备注"), "h_v_Sc_MouldProdMoveBillList");




                list.Add(ds.Tables[0]);


                list.Add(ds1.Tables[0]);


                objJsonResult.code = "0";


                objJsonResult.count = 1;


                objJsonResult.Message = "获取信息成功！";


                objJsonResult.list = list;


            }


            catch (Exception e)


            {


@@ -317,6 +322,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 = "保存成功！";