Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

chenhaozhe

2026-03-07 291fdb29daf239a13fcfb3f5e08a2f5bf9167534

 WebAPI/Controllers/²Ö´æ¹ÜÀí/ÁìÁÏ·¢»õ/Kf_StockOutRequestBillController.cs

@@ -1,5 +1,6 @@
using DBUtility;
using Model;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
@@ -26,6 +27,7 @@
        {
            try
            {
                List<object> columnNameList = new List<object>();  //定义声明变量 ï¼ŒæŠŠé€šè¿‡ new List<object>()创建的 å®žä¾‹ï¼Œèµ‹å€¼ç»™å˜é‡
                ////判断是否有查询权限
                //if (!DBUtility.ClsPub.Security_Log("Kf_MoveStockRequestBill_Query", 1, false, user))
                //{
@@ -46,11 +48,17 @@
                    string sql = sql1 + sWhere + " order by hmainid desc";
                    ds = oCn.RunProcReturn(sql, "h_v_IF_StockOutRequestBillList");
                }

                foreach (DataColumn col in ds.Tables[0].Columns)//遍历ds中第一个表（Tables[0]）的所有列（Columns）每次循环中，col变量会持有当前列的引用
                {
                    Type dataType = col.DataType; //获取当前数据类型传入 è‡ªå®šä¹‰å˜é‡datadataType
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //字符串拼接         // å°†åˆ—名和数据类型信息拼接成一个JSON格式的字符串
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.data = ds.Tables[0];//代码将第一个DataTable（索引为0）赋值给objJsonResult的data属性
                objJsonResult.list = columnNameList;//将columnNameList赋值给objJsonResult的list属性
                return objJsonResult;
            }
            catch (Exception ex)
@@ -296,6 +304,69 @@

        #endregion

        #region å‡ºåº“申请单 - æ‰˜æ•°å˜æ›´åŠŸèƒ½
        [Route("Kf_StockOutRequestBill/UpdatePallet")]
        [HttpPost]
        public object UpdatePallet([FromBody] JObject data)
        {
            try
            {
                long hmainid = data["hmainid"]?.ToObject<long>() ?? 0;
                int newPallet = data["newPallet"]?.ToObject<int>() ?? 0;
                string operatorName = data["operator"]?.ToString() ?? "";

                if (hmainid <= 0)
                    return new { code = "0", count = 0, Message = "单据ID不能为空！" };

                if (newPallet <= 0)
                    return new { code = "0", count = 0, Message = "托数必须大于0！" };

                // æ£€æŸ¥æ˜¯å¦å·²å®¡æ ¸ - æ”¹ä¸ºæ£€æŸ¥å‡ºåº“申请单主表
                string checkAuditSql = $@"
                    SELECT COUNT(*) as HasAudit 
                    FROM Kf_StockOutRequestBillMain 
                    WHERE HInterID = {hmainid} 
                    AND HChecker IS NOT NULL 
                    AND HCheckDate IS NOT NULL";

                DataSet dsAudit = oCn.RunProcReturn(checkAuditSql, "CheckAudit");

                if (dsAudit != null && dsAudit.Tables[0].Rows.Count > 0)
                {
                    int hasAudit = Convert.ToInt32(dsAudit.Tables[0].Rows[0]["HasAudit"]);
                    if (hasAudit > 0)
                    {
                        return new { code = "0", count = 0, Message = "单据已审核，不能修改托数！" };
                    }
                }

                // ç›´æŽ¥æ›´æ–°æ‰˜æ•° - æ”¹ä¸ºæ›´æ–°å‡ºåº“申请单主表
                string updateSql = $@"
                    UPDATE Kf_StockOutRequestBillMain 
                    SET HPackQtys = {newPallet} 
                    WHERE HInterID = {hmainid}";

                oCn.RunProc(updateSql); // ç›´æŽ¥è°ƒç”¨ï¼Œä¸èµ‹å€¼ç»™å˜é‡

                return new
                {
                    code = "1",
                    count = 1,
                    Message = "托数修改成功！"
                };
            }
            catch (Exception e)
            {
                return new
                {
                    code = "0",
                    count = 0,
                    Message = "修改失败：" + e.Message
                };
            }
        }
        #endregion

        #region å‡ºåº“申请单列表
        [Route("Kf_StockOutRequestBill/cx")]
        [HttpGet]