From 3dd0144e6b16aa044821e853e6b74f23bf587892 Mon Sep 17 00:00:00 2001 From: mzr Date: Wed, 30 Jul 2025 18:59:08 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix(so):=20=E4=BF=AE=E5=A4=8D=E9=94=80?= =?UTF-8?q?=E5=94=AE=E8=AE=A2=E5=8D=95=E4=BF=AE=E6=94=B9API=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E5=80=BC=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/impl/so/m30/APISaleOrderMaitainImpl.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/so/src/private/nccloud/api/impl/so/m30/APISaleOrderMaitainImpl.java b/so/src/private/nccloud/api/impl/so/m30/APISaleOrderMaitainImpl.java index 49d9028..4668044 100644 --- a/so/src/private/nccloud/api/impl/so/m30/APISaleOrderMaitainImpl.java +++ b/so/src/private/nccloud/api/impl/so/m30/APISaleOrderMaitainImpl.java @@ -1637,7 +1637,6 @@ public class APISaleOrderMaitainImpl implements IAPISaleOrderMaitain { * 累计安排生产订单主数量 narrangemonum * 累计发货主数量 ntotalsendnum * 累计排产主数量 vbdef12 - * 实体的增删改 status VOStatus.NEW VOStatus.UPDATED */ if (newVO == null || oldVO == null) return; @@ -1674,12 +1673,12 @@ public class APISaleOrderMaitainImpl implements IAPISaleOrderMaitain { UFDouble newNorigtaxmny = newBody.getNorigtaxmny(); UFDouble oldNorigtaxmny = oldBody.getNorigtaxmny(); - UFDouble ntotalinvoicenum = getUFDouble_NullAsOne(newBody.getNtotalinvoicenum()); - UFDouble ntotalarmny = getUFDouble_NullAsOne(newBody.getNtotalarmny()); - UFDouble ntotaloutnum = getUFDouble_NullAsOne(newBody.getNtotaloutnum()); - UFDouble narrangemonum = getUFDouble_NullAsOne(newBody.getNarrangemonum()); - UFDouble ntotalsendnum = getUFDouble_NullAsOne(newBody.getNtotalsendnum()); - UFDouble vbdef12 = getUFDouble_NullAsOne(newBody.getVbdef12()); + UFDouble ntotalinvoicenum = BFPubTools.getUFDouble_NullAsZero(newBody.getNtotalinvoicenum()); + UFDouble ntotalarmny = BFPubTools.getUFDouble_NullAsZero(newBody.getNtotalarmny()); + UFDouble ntotaloutnum = BFPubTools.getUFDouble_NullAsZero(newBody.getNtotaloutnum()); + UFDouble narrangemonum = BFPubTools.getUFDouble_NullAsZero(newBody.getNarrangemonum()); + UFDouble ntotalsendnum = BFPubTools.getUFDouble_NullAsZero(newBody.getNtotalsendnum()); + UFDouble vbdef12 = BFPubTools.getUFDouble_NullAsZero(newBody.getVbdef12()); String crowno = newBody.getCrowno(); // 1. 修改行校验 From f06ae82111d6313497e20c6b04c13bc4845c85e5 Mon Sep 17 00:00:00 2001 From: mzr Date: Thu, 31 Jul 2025 09:25:15 +0800 Subject: [PATCH 2/3] =?UTF-8?q?refactor(ic):=20=E7=8E=B0=E5=AD=98=E9=87=8F?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3-=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ic/onhand/APIOnhandQueryIpml.java | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/ic/src/private/nccloud/api/impl/ic/onhand/APIOnhandQueryIpml.java b/ic/src/private/nccloud/api/impl/ic/onhand/APIOnhandQueryIpml.java index 0f049c8..8da8c0f 100644 --- a/ic/src/private/nccloud/api/impl/ic/onhand/APIOnhandQueryIpml.java +++ b/ic/src/private/nccloud/api/impl/ic/onhand/APIOnhandQueryIpml.java @@ -1,11 +1,5 @@ package nccloud.api.impl.ic.onhand; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; import nc.bs.framework.common.NCLocator; import nc.itf.ic.onhand.OnhandResService; import nc.vo.ic.onhand.entity.OnhandDimVO; @@ -14,10 +8,15 @@ import nc.vo.pub.BusinessException; import nc.vo.pubapp.pattern.exception.ExceptionUtils; import nccloud.api.ic.onhand.IAPIOnhandQuery; import nccloud.api.ic.onhand.OnhandDataSupplement; +import nccloud.commons.lang.StringUtils; import nccloud.openapi.ic.onhand.mapping.OnhandMapping; import nccloud.openapi.scmpub.pub.TransferCodeToPKTool; import nccloud.openapi.scmpub.pubitf.IJsonParamMapping; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + /** * 现存量查询操作实现类 * @@ -110,13 +109,13 @@ public class APIOnhandQueryIpml implements IAPIOnhandQuery { } private void requiredFieldCheck1(Map paramMap) { - Object orgValue = paramMap.get("pk_org"); - if (ObjectUtil.isEmpty(orgValue)) { + String orgValue = paramMap.getOrDefault("pk_org", "") + ""; + if (StringUtils.isEmpty(orgValue)) { ExceptionUtils.wrappBusinessException("组织字段为必输项!"); } - Object cmaterialoid = paramMap.get("cmaterialoid"); - Object cwarehouseid = paramMap.get("cwarehouseid"); - if (ObjectUtil.isEmpty(cmaterialoid) && ObjectUtil.isEmpty(cwarehouseid)) { + String cmaterialoid = paramMap.getOrDefault("cmaterialoid", "") + ""; + String cwarehouseid = paramMap.getOrDefault("cwarehouseid", "") + ""; + if (StringUtils.isEmpty(cmaterialoid) && StringUtils.isEmpty(cwarehouseid)) { ExceptionUtils.wrappBusinessException("仓库和物料字段不能都为空!"); } } From 3401493600a09d18ce2893bebc8f7620e996622c Mon Sep 17 00:00:00 2001 From: mzr Date: Thu, 31 Jul 2025 14:35:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix(so):=20=E4=BF=AE=E5=A4=8D=E9=94=80?= =?UTF-8?q?=E5=94=AE=E8=AE=A2=E5=8D=95=E7=BB=B4=E6=8A=A4=E4=B8=AD=E6=94=B6?= =?UTF-8?q?=E6=AC=BE=E5=8D=95=E5=92=8C=E9=94=80=E5=94=AE=E5=8F=91=E7=A5=A8?= =?UTF-8?q?=E8=A1=A8=E7=9A=84=E6=95=B0=E6=8D=AE=E6=9B=B4=E6=96=B0=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nccloud/api/impl/so/m30/APISaleOrderMaitainImpl.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/so/src/private/nccloud/api/impl/so/m30/APISaleOrderMaitainImpl.java b/so/src/private/nccloud/api/impl/so/m30/APISaleOrderMaitainImpl.java index 4668044..52f231c 100644 --- a/so/src/private/nccloud/api/impl/so/m30/APISaleOrderMaitainImpl.java +++ b/so/src/private/nccloud/api/impl/so/m30/APISaleOrderMaitainImpl.java @@ -1846,8 +1846,7 @@ public class APISaleOrderMaitainImpl implements IAPISaleOrderMaitain { if (!billIds.isEmpty()) { // 修改收款单 for (String billId : billIds) { - GatheringBillVO billVO = new GatheringBillVO(); - billVO.setPk_gatherbill(billId); + GatheringBillVO billVO = (GatheringBillVO) hypub.queryByPrimaryKey(GatheringBillVO.class, billId); billVO.setPk_psndoc(cemployeeid); billVO.setCustomer(ccustomerid); billVO.setPk_deptid(cdeptid); @@ -1885,12 +1884,11 @@ public class APISaleOrderMaitainImpl implements IAPISaleOrderMaitain { invoiceBVO.setStatus(VOStatus.UPDATED); hypub.update(invoiceBVO); billIds.add(invoiceBVO.getCsaleinvoiceid()); - // 修改销售发票表 } if (!billIds.isEmpty()) { // 修改销售发票表 for (String billId : billIds) { - SaleInvoiceHVO invoiceHVO = new SaleInvoiceHVO(); + SaleInvoiceHVO invoiceHVO = (SaleInvoiceHVO) hypub.queryByPrimaryKey(SaleInvoiceHVO.class, billId); invoiceHVO.setCsaleinvoiceid(billId); invoiceHVO.setCinvoicecustid(ccustomerid); invoiceHVO.setCinvoicecustvid(ccustomervid);