1

zzr99

2022-08-08 80072496b2f0014a0e12249d6066a96eb1a8ea5b

 WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepInBillListController .cs

@@ -89,7 +89,7 @@
            try
            {
                //编辑权限 
                if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldMoveStockStepInBillList", 1, true, user))
                if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldMoveStockStepInBillList", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -99,6 +99,7 @@
                }

                ds = Sc_MouldMoveStockStepInBill(sWhere, Organization);

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "返回记录成功！";
@@ -120,11 +121,11 @@
            string sql1 = string.Format(@"select * from h_v_Sc_MouldMoveStockStepInBillListDetail where (调入组织='" + Organization + "' or 调出组织='" + Organization + "' )");
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by 日期 desc", "h_v_Sc_MouldMoveStockStepInBillListDetail");
                return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by hmainid desc", "h_v_Sc_MouldMoveStockStepInBillListDetail");
            }
            else
            {
                string sql = sql1 + sWhere + "order by 日期 desc";
                string sql = sql1 + sWhere + "order by hmainid desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldMoveStockStepInBillListDetail");
            }

@@ -155,6 +156,8 @@
        public object Sc_MouldMoveStockStepInBillListProjectDetai(string sqlWhere)
        {
            DataSet ds;
            DataSet ds1;
            List<object> list = new List<object>();
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
@@ -164,12 +167,8 @@
                                                设计寿命 HDesignLife, 剩余寿命 HLeaveLife, 累积使用寿命 HUseLife, 应发数量 HQtyMust, 实发数量 HQty, 
                                                单价 HPrice, 金额 HMoney,HStockOrgID, HOtherOrgID,调出组织代码 HOtherOrgCode,调出组织 HOtherOrgName, HWHID, 调入仓库代码 HWHCode, 调入仓库 HWHName,HSPID, 
                                                调入仓位代码 HSPCode, 调入仓位 HSPName,HSCWHID, 调出仓库代码 HSCWHCode, 调出仓库 HSCWHName,HSCSPID, 
                                                调出仓位代码 HSCSPCode, 调出仓位 HSCSPName,表体备注 HRemark,HStockOrgID FROM h_v_Sc_MouldMoveStockStepInBillListDetail"), "h_v_Sc_MouldMoveStockStepInBillListDetail");
                                                调出仓位代码 HSCSPCode, 调出仓位 HSCSPName,表体备注 HRemark,HStockOrgID,HUnitID,计量单位代码,计量单位 FROM h_v_Sc_MouldMoveStockStepInBillListDetail"), "h_v_Sc_MouldMoveStockStepInBillListDetail");

                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "获取信息成功！";
                    objJsonResult.data = ds.Tables[0];
                }
                else
                {
@@ -178,15 +177,22 @@
                                                设计寿命 HDesignLife, 剩余寿命 HLeaveLife, 累积使用寿命 HUseLife, 应发数量 HQtyMust, 实发数量 HQty, 
                                                单价 HPrice, 金额 HMoney,HStockOrgID, HOtherOrgID,调出组织代码 HOtherOrgCode,调出组织 HOtherOrgName,  HWHID, 调入仓库代码 HWHCode, 调入仓库 HWHName,HSPID, 
                                                调入仓位代码 HSPCode, 调入仓位 HSPName,HSCWHID, 调出仓库代码 HSCWHCode, 调出仓库 HSCWHName,HSCSPID, 
                                                调出仓位代码 HSCSPCode, 调出仓位 HSCSPName,表体备注 HRemark,HStockOrgID FROM h_v_Sc_MouldMoveStockStepInBillListDetail where 1 = 1 ");
                                                调出仓位代码 HSCSPCode, 调出仓位 HSCSPName,表体备注 HRemark,HStockOrgID,HUnitID,计量单位代码,计量单位 FROM h_v_Sc_MouldMoveStockStepInBillListDetail where 1 = 1 ");
                    string sql = sql1 + sqlWhere;
                    ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldMoveStockStepInBillListDetail");

                    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_MouldMoveStockStepInBillListDetail 
                                            where 1=1 " + sqlWhere + " group by 物料代码,规格型号,hwhid,批次,表体备注"), "h_v_Sc_MouldMoveStockStepInBillListDetail");

                list.Add(ds.Tables[0]);
                list.Add(ds1.Tables[0]);
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "获取信息成功！";
                objJsonResult.list = list;
            }
            catch (Exception e)
            {
@@ -220,7 +226,7 @@
            ListModels oListModels = new ListModels();
            try
            {
                if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldMoveStockStepInBill_Edit", 1, true, msg4))
                if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldMoveStockStepInBill_Edit", 1, false, msg4))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -316,6 +322,8 @@
                }
                if (bResult)
                {
                    string sql =string.Format( $"exec h_p_Sc_MouldChangeFileStatus  'in','{oBill.omodel.HInterID.ToString()}' ");
                    oCn.RunProc(sql);
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "保存成功！";
@@ -353,7 +361,7 @@
        public object DeltetMouldMoveStockStepInBill(string HInterID,string user)
        {
            //编辑权限
            if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldMoveStockStepInBill_Delete", 1, true, user))
            if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldMoveStockStepInBill_Delete", 1, false, user))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
@@ -430,7 +438,7 @@
        {
            //flag=1 审核；  flag=2 反审核
            //编辑权限
            if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldMoveStockStepInBill_Check", 1, true, user))
            if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldMoveStockStepInBill_Check", 1, false, user))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;