From 0a4a1c2eb3cc2a56eb7150142e829808b34764ac Mon Sep 17 00:00:00 2001 From: mzr Date: Wed, 23 Jul 2025 14:21:56 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A4=87=E6=96=99=E8=AE=A1=E5=88=92-?= =?UTF-8?q?=E5=80=9F=E6=96=99=E5=85=A5=E5=BA=93=E5=BC=B9=E7=AA=97=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mmpac/pickm/query/PickmItemsQuery.java | 61 ++++++++++--------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/mmpac/src/client/nccloud/web/mmpac/pickm/query/PickmItemsQuery.java b/mmpac/src/client/nccloud/web/mmpac/pickm/query/PickmItemsQuery.java index 7313b1d..902238b 100644 --- a/mmpac/src/client/nccloud/web/mmpac/pickm/query/PickmItemsQuery.java +++ b/mmpac/src/client/nccloud/web/mmpac/pickm/query/PickmItemsQuery.java @@ -1,20 +1,19 @@ package nccloud.web.mmpac.pickm.query; -import nc.itf.mmpac.pickm.IPickmQueryService; +import nc.bs.dao.BaseDAO; +import nc.jdbc.framework.processor.ColumnProcessor; import nc.util.mmf.framework.base.MMValueCheck; -import nc.vo.mmpac.pickm.consts.PickmLangConsts; -import nc.vo.mmpac.pickm.entity.PickmItemVO; import nccloud.dto.mmpac.pickm.pub.entity.PickmQueryInfoDTO; import nccloud.framework.core.exception.ExceptionUtils; import nccloud.framework.core.json.IJson; -import nccloud.framework.service.ServiceLocator; import nccloud.framework.web.action.itf.ICommonAction; import nccloud.framework.web.container.IRequest; import nccloud.framework.web.json.JsonFactory; -import nccloud.framework.web.ui.pattern.grid.Grid; -import nccloud.framework.web.ui.pattern.grid.GridOperator; -import nccloud.web.mmpac.pickm.util.PickmScaleUtil; -import nccloud.web.mmpub.pub.action.NCCTempletQueryAction; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * 备料计划-借料入库弹窗查询 @@ -29,35 +28,37 @@ public class PickmItemsQuery implements ICommonAction { PickmQueryInfoDTO queryInfo = json.fromJson(read, PickmQueryInfoDTO.class); try { String[] cpickmbids = queryInfo.getCpickmbids(); + List bids = new ArrayList<>(); if (null != cpickmbids && cpickmbids.length != 0) { - IPickmQueryService service = ServiceLocator.find(IPickmQueryService.class); - PickmItemVO[] itemVOS = service.queryItemsByIds(cpickmbids); - if (MMValueCheck.isEmpty(itemVOS)) { - ExceptionUtils.wrapBusinessException(PickmLangConsts.getHIT_BODYNOTNULL()); + for (String cpickmbid : cpickmbids) { + String countSql = "SELECT count(1) FROM ic_generalin_b" + + " WHERE dr = 0 and csourcebillbid = '" + cpickmbid + "'"; + Integer num = (Integer) new BaseDAO().executeQuery(countSql, new ColumnProcessor()); + if (num <= 0) { + bids.add(cpickmbid); + } + + } + if (MMValueCheck.isEmpty(bids)) { + ExceptionUtils.wrapBusinessException("不存在符合条件的备料计划明细"); } - GridOperator operator = new GridOperator(queryInfo.getPageid()); - if (MMValueCheck.isNotEmpty(queryInfo.getAppcode())) { - String templetid = NCCTempletQueryAction.getTempletIdByAppCode(queryInfo.getAppcode(), queryInfo.getPageid()); - operator = new GridOperator(templetid, queryInfo.getPageid()); - } - - Grid grid = operator.toGrid(itemVOS); - // Translator translator = new Translator(); - // translator.translate(grid); - // this.afterProcess(grid); - return grid; + Map returnMap = new HashMap<>(); + returnMap.put("data", bids); + returnMap.put("success", true); + return returnMap; } else { - return null; + Map returnMap = new HashMap<>(); + returnMap.put("data", null); + returnMap.put("success", false); + return returnMap; } } catch (Exception ex) { ExceptionUtils.wrapBusinessException(ex.getMessage()); - return null; + Map returnMap = new HashMap<>(); + returnMap.put("data", null); + returnMap.put("success", false); + return returnMap; } } - - public void afterProcess(Grid grid) { - PickmScaleUtil scaleUtil = new PickmScaleUtil(); - scaleUtil.processHeadBodyGrid(grid); - } } From 2d06bd8fb2c60b4d58ce011349ff2e4d1379b33a Mon Sep 17 00:00:00 2001 From: mzr Date: Wed, 23 Jul 2025 18:07:55 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=BA=A2=E5=AD=97=E9=94=80=E5=94=AE?= =?UTF-8?q?=E5=8F=91=E7=A5=A8-=E5=AD=98bip=E6=97=97=E8=88=B0=E7=89=88?= =?UTF-8?q?=E5=8F=91=E7=A5=A8=E4=B8=BB=E9=94=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/so/saleinvoice/operator/IAPISaleInvMaitainImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/so/src/public/nccloud/api/so/saleinvoice/operator/IAPISaleInvMaitainImpl.java b/so/src/public/nccloud/api/so/saleinvoice/operator/IAPISaleInvMaitainImpl.java index 329f1ee..208d59f 100644 --- a/so/src/public/nccloud/api/so/saleinvoice/operator/IAPISaleInvMaitainImpl.java +++ b/so/src/public/nccloud/api/so/saleinvoice/operator/IAPISaleInvMaitainImpl.java @@ -536,6 +536,7 @@ public class IAPISaleInvMaitainImpl { newInvBVO.setNtotalincomemny(null); // 累计确认应收金额 newInvBVO.setNtotalincomenum(null); // 累计确认应收数量 newInvBVO.setVbdef10(null); // 回写BIP成功标志 + newInvBVO.setVbdef14(bipBvoJson.getString("vbdef14")); // bip旗舰版发票明细主键 newSaleInvoiceBVOs[i++] = newInvBVO; sumNum = sumNum.add(new UFDouble(bipBvoJson.getString("nnum"))); @@ -567,6 +568,7 @@ public class IAPISaleInvMaitainImpl { newSaleInvoiceHVO.setVdef20(null); // 电子发票回传标识 newSaleInvoiceHVO.setVdef34(null); // 回写BIP成功标志 newSaleInvoiceHVO.setVdef35(null); // 回写BIP失败原因 + newSaleInvoiceHVO.setVdef38(bject.getString("vdef38")); // bip旗舰版发票主键 // 组装VO saleInvoiceVO.setParentVO(newSaleInvoiceHVO);