1

沈泽

2021-11-03 a58c13460d41ff70b1e5852297867b359820b98a

 WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs

@@ -23,21 +23,21 @@

        [Route("Sc_MouldProdInBill/Get_MouldProdInBillList")]
        [HttpGet]
        public object Get_MouldProdInBillList(string sWhere,string user)
        public object Get_MouldProdInBillList(string sWhere,string user, string Organization)
        {
            try
            {
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdInBillList", 1, true, user))
                if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdInBillList", 1, true, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无删除权限！";
                    objJsonResult.Message = "无查看权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                ds = Sc_GetMouldProdInHouseBill(sWhere);
                ds = Sc_GetMouldProdInHouseBill(sWhere,Organization);
                if (ds == null)
                {
                    objJsonResult.code = "0";
@@ -65,15 +65,15 @@
            }
        }

        public static DataSet Sc_GetMouldProdInHouseBill(string sWhere)
        public static DataSet Sc_GetMouldProdInHouseBill(string sWhere, string Organization)
        {
            string sql1 = string.Format(@"select * from h_v_Sc_MouldProdInHouseBillList where 库存组织='" + Organization + "'");
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldProdInHouseBillList order by 日期 desc " + sWhere, "h_v_Sc_MouldProdInHouseBillList");
                return new SQLHelper.ClsCN().RunProcReturn(sql1+ sWhere + "order by 日期 desc", "h_v_Sc_MouldProdInHouseBillList");
            }
            else
            {
                string sql1 = "select * from h_v_Sc_MouldProdInHouseBillList where 1 = 1 ";
                string sql = sql1 + sWhere+ "order by 日期 desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldProdInHouseBillList");
            }
@@ -92,7 +92,7 @@
        public object set_DeleteBill(string HInterID,string user)
        {
            //编辑权限
            if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdInBill_Delete", 1, true, user))
            if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdInBill_Delete", 1, true, user))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
@@ -186,7 +186,7 @@
            try
            {
                //审核权限
                if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
                if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -293,7 +293,7 @@
            try
            {
                //审核权限
                if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
                if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -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");
@@ -478,11 +484,11 @@
            try
            {
                //编辑权限
                if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdInBill_Edit", 1, true, msg4))
                if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdInBill_Edit", 1, true, msg4))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无删除权限！";
                    objJsonResult.Message = "无保存权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -550,6 +556,7 @@
                    //oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));//  --日期
                    //oItem.HInnerBillNo = "";  //  --内部单据号
                    oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
                    oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
                    oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
                    //oItem.HEquipID = 0;    //设备ID(Gy_EquipMent)
                    //oItem.HPeriod = 0;