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

chenhaozhe

1 天以前 14ae0e21c8660dbb3ac20a5b0d9db9b6dde3cfb9

 WebAPI/Controllers/MJGL/Sc_MouldProdBackBillController.cs

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

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


                string checkAuditSql = $@"
                    SELECT HBillStatus 
                    FROM Sc_MouldStockBillMain 
                    WHERE HInterID = {hmainid}";

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

                if (dsAudit != null && dsAudit.Tables[0].Rows.Count > 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  
                    SET HPackQtys = {newPallet}