新增器具入库申请单、器具领用申请单、器具领用出库单模块所需调用方法，器具调拨申请单模块相关调用方法优化

yxj

2025-11-28 89759d9f7c3e92876d960ed8e7469e624f0f7f45

 WebAPI/Controllers/MJGL/Sc_MouldMoveStockRequestBillController.cs

@@ -34,12 +34,14 @@
        #region 器具调拨申请单分页列表
        [Route("Sc_MouldMoveStockRequestBillController/page")]
        [HttpGet]
        public json Sc_MouldMoveStockRequestBillPage(string sWhere, string user, int page, int size)
        public json Sc_MouldMoveStockRequestBillPage(string sWhere, string user, int page, int size, string Type)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //判断权限
                //列表进入时判断权限，选源单进入不判断权限
                if (Type == ModName)
                {
                if (!DBUtility.ClsPub.Security_Log(ModRightNameList, 3, false, user))
                {
                    objJsonResult.code = CodeConstant.FAIL;
@@ -48,15 +50,16 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                }

                sWhere = sWhere.Replace("'", "''");
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCn.RunProcReturn("exec h_p_Sc_MouldMoveStockRequestBillList " + page + "," + size + ",''", "h_p_Sc_MouldMoveStockRequestBillList");
                    ds = oCn.RunProcReturn("exec h_p_Sc_MouldMoveStockRequestBillList " + page + "," + size + ",'','" + Type + "'", "h_p_Sc_MouldMoveStockRequestBillList");
                }
                else
                {
                    ds = oCn.RunProcReturn("exec h_p_Sc_MouldMoveStockRequestBillList " + page + "," + size + ",'" + sWhere + "'", "h_p_Sc_MouldMoveStockRequestBillList");
                    ds = oCn.RunProcReturn("exec h_p_Sc_MouldMoveStockRequestBillList " + page + "," + size + ",'" + sWhere + "','" + Type + "'", "h_p_Sc_MouldMoveStockRequestBillList");
                }

                //添加列名
@@ -716,7 +719,7 @@
                    string s = "";
                    int sYear = 0;
                    int sPeriod = 0;
                    if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod_Pay(oItem.HDate, ref sYear, ref sPeriod, ref s) == false)
                    if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(oItem.HDate, ref sYear, ref sPeriod, ref s) == false)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
@@ -762,6 +765,7 @@
                    objJsonResult.count = 1;
                    objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;  //成功！
                    objJsonResult.data = null;
                    objJsonResult.HInterID = oBill.omodel.HInterID.ToString(); //返回主ID
                    return objJsonResult;
                }
                else