From 4f1701c12d9c876c86f4826611d0f762a4416273 Mon Sep 17 00:00:00 2001 From: mzr Date: Mon, 26 May 2025 16:39:55 +0800 Subject: [PATCH 1/2] =?UTF-8?q?Revert=20"=E9=94=80=E5=94=AE=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E4=BF=9D=E5=AD=98=E6=A0=A1=E9=AA=8C=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E5=BA=94=E5=8F=91=E6=95=B0=E9=87=8F=E6=94=B9=E4=B8=BA=E5=AE=9E?= =?UTF-8?q?=E5=8F=91=E6=95=B0=E9=87=8F"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit dc805fce0d229617b0a5f506c425a0c4002a9254. --- .../nccloud/resources/ic/ic/saleout/saveBeforeCheck.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ic/src/public/nccloud/resources/ic/ic/saleout/saveBeforeCheck.java b/ic/src/public/nccloud/resources/ic/ic/saleout/saveBeforeCheck.java index 0eb18c2..1a60121 100644 --- a/ic/src/public/nccloud/resources/ic/ic/saleout/saveBeforeCheck.java +++ b/ic/src/public/nccloud/resources/ic/ic/saleout/saveBeforeCheck.java @@ -81,8 +81,7 @@ public class saveBeforeCheck implements IBusinessListener { } else { try { double sQty = Double.parseDouble((String) valMap.get("sqty"));// 累计发货申请数量 - // UFDouble bdnumUF = vo.getNshouldassistnum();// 本单应发数量 - UFDouble bdnumUF = vo.getNassistnum();// 本单实发数量 + UFDouble bdnumUF = vo.getNshouldassistnum();// 本单应发数量 double bdnum = 0; if (bdnumUF != null) { bdnum = bdnumUF.getDouble(); From ceb154b03e929d5446c0a2871b2e524f065fa1d0 Mon Sep 17 00:00:00 2001 From: mzr Date: Mon, 26 May 2025 17:04:52 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=94=80=E5=94=AE=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=A0=A1=E9=AA=8C=E4=B8=AD=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E5=BA=94=E5=8F=91=E6=95=B0=E9=87=8F=E7=9A=84=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nccloud/resources/ic/ic/saleout/saveBeforeCheck.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ic/src/public/nccloud/resources/ic/ic/saleout/saveBeforeCheck.java b/ic/src/public/nccloud/resources/ic/ic/saleout/saveBeforeCheck.java index 1a60121..7e33cda 100644 --- a/ic/src/public/nccloud/resources/ic/ic/saleout/saveBeforeCheck.java +++ b/ic/src/public/nccloud/resources/ic/ic/saleout/saveBeforeCheck.java @@ -91,10 +91,10 @@ public class saveBeforeCheck implements IBusinessListener { String ntotaloutnums = (ntotaloutnumsObj != null) ? ntotaloutnumsObj.toString() : ""; double ntotaloutnum = (ntotaloutnums.isEmpty()) ? 0 : Double.parseDouble(ntotaloutnums);// 累计出库主数量 - if (sQty < (ntotaloutnum + bdnum)) { + /*if (sQty < (ntotaloutnum + bdnum)) { throw new BusinessException("销售出库单明细" + (i + 1) + "，累计出库应发数量'" + (ntotaloutnum + bdnum) + "'大于销售订单累计发货申请数量'" + sQty + "'，无法保存！"); - } + }*/ // 实发数量判断 UFDouble bdsfnumUF = vo.getNassistnum();// 本单实发数量 double bdsfnum = 0;