优化产线包装组托单方法，进出站报错提示，基础老包装车间方法到这个api

zrg

2025-08-19 8b1159f7744c752e9499ffd82de393d255b4b2e0

 WebAPI/Controllers/ÏîÄ¿¹ÜÀí/¹¤×÷ÈÎÎñ/PM_WorkTaskBillController.cs

@@ -12,6 +12,7 @@
using WebAPI.Models;
using System.Threading.Tasks;
using DLL;
using SyntacticSugar.constant;

namespace WebAPI.Controllers.项目管理.工作任务
{
@@ -442,6 +443,62 @@
            }
        }
        #endregion

        #region å·¥ä½œä»»åŠ¡åˆ—表分页列表
        [Route("PM_WorkTaskBill/page")]
        [HttpGet]
        public object PM_WorkTaskBillPage(string sWhere, string user, int page, int size)
        {
            DataSet ds;
            try
            {
                List<object> columnNameList = new List<object>();
                //判断权限
                //if (!DBUtility.ClsPub.Security_Log("Cg_POInStockBillQuery", 1, false, user))
                //{
                //    objJsonResult.code = CodeConstant.FAIL;
                //    objJsonResult.count = CountConstant.FAIL;
                //    objJsonResult.Message = "您没有该模块权限,请与管理员联系！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("exec h_p_PM_WorkTaskBillList " + page + "," + size + ",''", "h_p_PM_WorkTaskBillList");
                }
                else
                {
                    sWhere = sWhere.Replace("'", "''");
                    ds = oCN.RunProcReturn("exec h_p_PM_WorkTaskBillList " + page + "," + size + ",'" + sWhere + "'", "h_p_PM_WorkTaskBillList");
                }

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                objJsonResult.code = CodeConstant.SUCCEED;
                objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
                objJsonResult.Message = "Sucess！";
                objJsonResult.list = columnNameList;
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = CodeConstant.FAIL;
                objJsonResult.count = CountConstant.FAIL;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion


        #region å·¥ä½œä»»åŠ¡åˆ—表  ä¸‹æŽ¨æ•°æ®æŸ¥è¯¢
        /// <summary>
@@ -1257,6 +1314,8 @@
            public string HBackRemark;
            public int HReportEmpID;
            public string HReportEmpName;
            public string HReceiveEmp;
            public string HCopyEmp;
        }
        #endregion
        #region ä»»åŠ¡æ±‡æŠ¥ å­è¡¨æ•°æ®
@@ -1376,6 +1435,8 @@
                string HReportEmpName = mainList[0].HReportEmpName;
                string HUpdater = mainList[0].HUpdater;
                string HUpdaterDate = mainList[0].HUpdaterDate;
                string HReceiveEmp = mainList[0].HReceiveEmp;
                string HCopyEmp = mainList[0].HCopyEmp;
                reportMan = HReportEmpName;//获取汇报人名称
                //保存前控制
                DataSet BeforeDs = oCN.RunProcReturn("Exec h_p_PM_WorkTaskReportBill_BeforeSaveCtrl " + HInterID.ToString() + ",'" + HBillNo + "'," + OperationType.ToString(), "h_p_PM_WorkTaskReportBill_BeforeSaveCtrl");
@@ -1404,7 +1465,7 @@
                if ((OperationType == 1 || OperationType == 2) && ds.Tables[0].Rows.Count == 0)//新增
                {
                    string sql = "insert into PM_WorkTaskReportBillMain" +
                        "(HYear,HPeriod,HBillType,HBillSubType,HInterID,HDate,HBillNo,HBillStatus,HRemark,HMaker,HMakeDate,HOrgID,HReportEmpID) " +
                        "(HYear,HPeriod,HBillType,HBillSubType,HInterID,HDate,HBillNo,HBillStatus,HRemark,HMaker,HMakeDate,HOrgID,HReportEmpID,HReceiveEmp, HCopyEmp) " +
                        "values(" +
                        "" + HYear +
                        "," + HPeriod +
@@ -1419,8 +1480,10 @@
                        "','" + HMakerDate +
                        "'," + HOrgID +
                        "," + HReportEmpID +
                        ")";

                        ",N'" + HReceiveEmp +
                        "',N'" + HCopyEmp +
                        "')";
                    LogService.Write(sql);
                    //主表
                    oCN.RunProc(sql);
                    LogService.Write("用户:" + user + ",日期:" + DateTime.Now + ",新增任务汇报:" + HBillNo);
@@ -1441,8 +1504,9 @@
                        "',HUpdateDate = '" + HUpdaterDate +
                        "',HOrgID = " + HOrgID +
                        ",HReportEmpID = " + HReportEmpID +
                        ",HReceiveEmp = N'" + HReceiveEmp + "'" +
                        ",HCopyEmp = N'" + HCopyEmp + "'" +
                        " where HInterID = " + HInterID;

                    oCN.RunProc(sql);

                    //删除子表时  å›žå¡«å·¥ä½œä»»åŠ¡å•å…³è”数量、单据状态
@@ -1700,6 +1764,62 @@
        }
        #endregion

        #region ä»»åŠ¡æ±‡æŠ¥åˆ†é¡µåˆ—表
        [Route("PM_WorkTaskReportBill/page")]
        [HttpGet]
        public object PM_WorkTaskReportBillPage(string sWhere, string user, int page, int size)
        {
            DataSet ds;
            try
            {
                List<object> columnNameList = new List<object>();
                //判断权限
                //if (!DBUtility.ClsPub.Security_Log("Cg_POInStockBillQuery", 1, false, user))
                //{
                //    objJsonResult.code = CodeConstant.FAIL;
                //    objJsonResult.count = CountConstant.FAIL;
                //    objJsonResult.Message = "您没有该模块权限,请与管理员联系！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}

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

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                objJsonResult.code = CodeConstant.SUCCEED;
                objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
                objJsonResult.Message = "Sucess！";
                objJsonResult.list = columnNameList;
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = CodeConstant.FAIL;
                objJsonResult.count = CountConstant.FAIL;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion


        #region ä»»åŠ¡æ±‡æŠ¥ ç¼–辑-页面赋值
        /// <summary>
        ///参数：string HInterID。