Merge remote-tracking branch 'origin/main'
This commit is contained in:
commit
914f324b2e
|
@ -81,8 +81,7 @@ public class saveBeforeCheck implements IBusinessListener {
|
||||||
} else {
|
} else {
|
||||||
try {
|
try {
|
||||||
double sQty = Double.parseDouble((String) valMap.get("sqty"));// 累计发货申请数量
|
double sQty = Double.parseDouble((String) valMap.get("sqty"));// 累计发货申请数量
|
||||||
// UFDouble bdnumUF = vo.getNshouldassistnum();// 本单应发数量
|
UFDouble bdnumUF = vo.getNshouldassistnum();// 本单应发数量
|
||||||
UFDouble bdnumUF = vo.getNassistnum();// 本单实发数量
|
|
||||||
double bdnum = 0;
|
double bdnum = 0;
|
||||||
if (bdnumUF != null) {
|
if (bdnumUF != null) {
|
||||||
bdnum = bdnumUF.getDouble();
|
bdnum = bdnumUF.getDouble();
|
||||||
|
@ -92,10 +91,10 @@ public class saveBeforeCheck implements IBusinessListener {
|
||||||
String ntotaloutnums = (ntotaloutnumsObj != null) ? ntotaloutnumsObj.toString() : "";
|
String ntotaloutnums = (ntotaloutnumsObj != null) ? ntotaloutnumsObj.toString() : "";
|
||||||
double ntotaloutnum = (ntotaloutnums.isEmpty()) ? 0 : Double.parseDouble(ntotaloutnums);// 累计出库主数量
|
double ntotaloutnum = (ntotaloutnums.isEmpty()) ? 0 : Double.parseDouble(ntotaloutnums);// 累计出库主数量
|
||||||
|
|
||||||
if (sQty < (ntotaloutnum + bdnum)) {
|
/*if (sQty < (ntotaloutnum + bdnum)) {
|
||||||
throw new BusinessException("销售出库单明细" + (i + 1) + ",累计出库应发数量'" + (ntotaloutnum + bdnum)
|
throw new BusinessException("销售出库单明细" + (i + 1) + ",累计出库应发数量'" + (ntotaloutnum + bdnum)
|
||||||
+ "'大于销售订单累计发货申请数量'" + sQty + "',无法保存!");
|
+ "'大于销售订单累计发货申请数量'" + sQty + "',无法保存!");
|
||||||
}
|
}*/
|
||||||
// 实发数量判断
|
// 实发数量判断
|
||||||
UFDouble bdsfnumUF = vo.getNassistnum();// 本单实发数量
|
UFDouble bdsfnumUF = vo.getNassistnum();// 本单实发数量
|
||||||
double bdsfnum = 0;
|
double bdsfnum = 0;
|
||||||
|
|
Loading…
Reference in New Issue