yonyou
/
taikai2312
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

This commit is contained in:
lihao 2025-07-31 16:34:39 +08:00
parent c96e75e6f6 3401493600
commit a88411238e
2 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ic/src/private/nccloud/api/impl/ic/onhand/APIOnhandQueryIpml.java
View File

@ -1,11 +1,5 @@
package nccloud.api.impl.ic.onhand; 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.bs.framework.common.NCLocator;
import nc.itf.ic.onhand.OnhandResService; import nc.itf.ic.onhand.OnhandResService;
import nc.vo.ic.onhand.entity.OnhandDimVO; import nc.vo.ic.onhand.entity.OnhandDimVO;
@ -14,10 +8,15 @@ import nc.vo.pub.BusinessException;
import nc.vo.pubapp.pattern.exception.ExceptionUtils; import nc.vo.pubapp.pattern.exception.ExceptionUtils;
import nccloud.api.ic.onhand.IAPIOnhandQuery; import nccloud.api.ic.onhand.IAPIOnhandQuery;
import nccloud.api.ic.onhand.OnhandDataSupplement; import nccloud.api.ic.onhand.OnhandDataSupplement;
import nccloud.commons.lang.StringUtils;
import nccloud.openapi.ic.onhand.mapping.OnhandMapping; import nccloud.openapi.ic.onhand.mapping.OnhandMapping;
import nccloud.openapi.scmpub.pub.TransferCodeToPKTool; import nccloud.openapi.scmpub.pub.TransferCodeToPKTool;
import nccloud.openapi.scmpub.pubitf.IJsonParamMapping; 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<String, Object> paramMap) { private void requiredFieldCheck1(Map<String, Object> paramMap) {
Object orgValue = paramMap.get("pk_org"); String orgValue = paramMap.getOrDefault("pk_org", "") + "";
if (ObjectUtil.isEmpty(orgValue)) { if (StringUtils.isEmpty(orgValue)) {
ExceptionUtils.wrappBusinessException("组织字段为必输项!"); ExceptionUtils.wrappBusinessException("组织字段为必输项!");
} }
Object cmaterialoid = paramMap.get("cmaterialoid"); String cmaterialoid = paramMap.getOrDefault("cmaterialoid", "") + "";
Object cwarehouseid = paramMap.get("cwarehouseid"); String cwarehouseid = paramMap.getOrDefault("cwarehouseid", "") + "";
if (ObjectUtil.isEmpty(cmaterialoid) && ObjectUtil.isEmpty(cwarehouseid)) { if (StringUtils.isEmpty(cmaterialoid) && StringUtils.isEmpty(cwarehouseid)) {
ExceptionUtils.wrappBusinessException("仓库和物料字段不能都为空!"); ExceptionUtils.wrappBusinessException("仓库和物料字段不能都为空!");
} }
} }

19
so/src/private/nccloud/api/impl/so/m30/APISaleOrderMaitainImpl.java
View File

@ -1637,7 +1637,6 @@ public class APISaleOrderMaitainImpl implements IAPISaleOrderMaitain {
* 累计安排生产订单主数量 narrangemonum * 累计安排生产订单主数量 narrangemonum
* 累计发货主数量 ntotalsendnum * 累计发货主数量 ntotalsendnum
* 累计排产主数量 vbdef12 * 累计排产主数量 vbdef12
* 实体的增删改 status VOStatus.NEW VOStatus.UPDATED
*/ */
if (newVO == null || oldVO == null) return; if (newVO == null || oldVO == null) return;
@ -1674,12 +1673,12 @@ public class APISaleOrderMaitainImpl implements IAPISaleOrderMaitain {
UFDouble newNorigtaxmny = newBody.getNorigtaxmny(); UFDouble newNorigtaxmny = newBody.getNorigtaxmny();
UFDouble oldNorigtaxmny = oldBody.getNorigtaxmny(); UFDouble oldNorigtaxmny = oldBody.getNorigtaxmny();
UFDouble ntotalinvoicenum = getUFDouble_NullAsOne(newBody.getNtotalinvoicenum()); UFDouble ntotalinvoicenum = BFPubTools.getUFDouble_NullAsZero(newBody.getNtotalinvoicenum());
UFDouble ntotalarmny = getUFDouble_NullAsOne(newBody.getNtotalarmny()); UFDouble ntotalarmny = BFPubTools.getUFDouble_NullAsZero(newBody.getNtotalarmny());
UFDouble ntotaloutnum = getUFDouble_NullAsOne(newBody.getNtotaloutnum()); UFDouble ntotaloutnum = BFPubTools.getUFDouble_NullAsZero(newBody.getNtotaloutnum());
UFDouble narrangemonum = getUFDouble_NullAsOne(newBody.getNarrangemonum()); UFDouble narrangemonum = BFPubTools.getUFDouble_NullAsZero(newBody.getNarrangemonum());
UFDouble ntotalsendnum = getUFDouble_NullAsOne(newBody.getNtotalsendnum()); UFDouble ntotalsendnum = BFPubTools.getUFDouble_NullAsZero(newBody.getNtotalsendnum());
UFDouble vbdef12 = getUFDouble_NullAsOne(newBody.getVbdef12()); UFDouble vbdef12 = BFPubTools.getUFDouble_NullAsZero(newBody.getVbdef12());
String crowno = newBody.getCrowno(); String crowno = newBody.getCrowno();
// 1. 修改行校验 // 1. 修改行校验
@ -1847,8 +1846,7 @@ public class APISaleOrderMaitainImpl implements IAPISaleOrderMaitain {
if (!billIds.isEmpty()) { if (!billIds.isEmpty()) {
// 修改收款单 // 修改收款单
for (String billId : billIds) { for (String billId : billIds) {
GatheringBillVO billVO = new GatheringBillVO(); GatheringBillVO billVO = (GatheringBillVO) hypub.queryByPrimaryKey(GatheringBillVO.class, billId);
billVO.setPk_gatherbill(billId);
billVO.setPk_psndoc(cemployeeid); billVO.setPk_psndoc(cemployeeid);
billVO.setCustomer(ccustomerid); billVO.setCustomer(ccustomerid);
billVO.setPk_deptid(cdeptid); billVO.setPk_deptid(cdeptid);
@ -1886,12 +1884,11 @@ public class APISaleOrderMaitainImpl implements IAPISaleOrderMaitain {
invoiceBVO.setStatus(VOStatus.UPDATED); invoiceBVO.setStatus(VOStatus.UPDATED);
hypub.update(invoiceBVO); hypub.update(invoiceBVO);
billIds.add(invoiceBVO.getCsaleinvoiceid()); billIds.add(invoiceBVO.getCsaleinvoiceid());
// 修改销售发票表
} }
if (!billIds.isEmpty()) { if (!billIds.isEmpty()) {
// 修改销售发票表 // 修改销售发票表
for (String billId : billIds) { for (String billId : billIds) {
SaleInvoiceHVO invoiceHVO = new SaleInvoiceHVO(); SaleInvoiceHVO invoiceHVO = (SaleInvoiceHVO) hypub.queryByPrimaryKey(SaleInvoiceHVO.class, billId);
invoiceHVO.setCsaleinvoiceid(billId); invoiceHVO.setCsaleinvoiceid(billId);
invoiceHVO.setCinvoicecustid(ccustomerid); invoiceHVO.setCinvoicecustid(ccustomerid);
invoiceHVO.setCinvoicecustvid(ccustomervid); invoiceHVO.setCinvoicecustvid(ccustomervid);