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

yusijie

昨天 07968530fd2a7c0d818adc8a89c96a9499dbbee6

 WebAPI/Controllers/MJGL/Sc_MouldProdOutBillController.cs

@@ -339,6 +339,7 @@
        #region 器具领用出库单 - 托数变更功能
        [Route("Sc_MouldProdOutBill/UpdatePallet")]
        [HttpPost]
    
        public object UpdatePallet([FromBody] JObject data)
        {
            try
@@ -353,24 +354,28 @@
                if (newPallet <= 0)
                    return new { code = "0", count = 0, Message = "托数必须大于0！" };

                // 检查是否已审核

                string checkAuditSql = $@"
                    SELECT COUNT(*) as HasAudit 
                    FROM Sc_MouldStockBillMain 
                    WHERE HInterID = {hmainid} 
                    AND HChecker IS NOT NULL 
                    AND HCheckDate IS NOT NULL";
                    SELECT HBillStatus 
                    FROM Sc_MouldStockBillMain
                    WHERE HInterID = {hmainid}";

                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)
                    int hBillStatus = Convert.ToInt32(dsAudit.Tables[0].Rows[0]["HBillStatus"]);
              
                    if (hBillStatus == 2)
                    {
                        return new { code = "0", count = 0, Message = "单据已审核，不能修改托数！" };
                    }
                }
                else
                {
                    return new { code = "0", count = 0, Message = "单据不存在！" };
                }

                // 直接更新托数
                string updateSql = $@"
                    UPDATE Sc_MouldStockBillMain