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

yusijie

2026-01-16 6367b170a3db4df6e43a8962b2f17b06a020b913

 WebAPI/Controllers/²Ö´æ¹ÜÀí/µ÷²¦Å̵ã/Kf_MoveStockRequestBillController.cs

@@ -415,6 +415,68 @@
            }
        }

        #region è°ƒæ‹¨ç”³è¯·å• - æ‰˜æ•°å˜æ›´åŠŸèƒ½
        [Route("Kf_MoveStockRequestBill/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_MoveStockRequestBillMain
                    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_MoveStockRequestBillMain 
                    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 è°ƒæ‹¨ç”³è¯·å• å®¡æ ¸/反审核
        /// <summary>
        ///