From 46080c7e3b0ad2def4451acfb0d25c4ca203a63f Mon Sep 17 00:00:00 2001 From: zhengyf Date: Sun, 12 Jan 2025 14:26:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BD=E7=9F=A5=EF=BC=9A=E8=BF=87=E6=BB=A401?= =?UTF-8?q?07=E5=92=8C0207=20=E6=97=A0=E6=BA=90=E5=A4=B4=E4=BB=B6=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adjust/AdjustInPluginInitializer.java | 21 +++++++++---------- .../adjust/AdjustOutPluginInitializer.java | 2 +- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInPluginInitializer.java index 9819d51f..0bf33f16 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInPluginInitializer.java @@ -46,7 +46,6 @@ import java.util.concurrent.locks.ReentrantLock; * 排除（U8_RECEIPT_TYPE）：组装入库 * U8入库类型（U8_RECEIPT_TYPE） * U8_RECEIPT_TYPE 0106 组装入库 - * */ public class AdjustInPluginInitializer extends PluginBaseEntity { @@ -156,7 +155,7 @@ public class AdjustInPluginInitializer extends PluginBaseEntity { queryOfsStockinOrderRequestVO.setClosedAt_end(endTimeStr); List stockinOrders = queryOfsStockinOrder(queryOfsStockinOrderRequestVO); - if (stockinOrders==null||stockinOrders.size() == 0) { + if (stockinOrders == null || stockinOrders.size() == 0) { return; } //过滤日志 @@ -246,7 +245,7 @@ public class AdjustInPluginInitializer extends PluginBaseEntity { for (StockinOrderSearchResponse.StockinOrder stockinOrder : stockinOrders) { StockinOrderSearchResponse.StockinOrder.StockinH header = stockinOrder.getHeader(); //过滤"NMNS"\"YNS"\"HJ" - if("NMNS".equals(header.getCompanyCode())||"YNS".equals(header.getCompanyCode())||"HJ".equals(header.getCompanyCode())){ + if ("NMNS".equals(header.getCompanyCode()) || "YNS".equals(header.getCompanyCode()) || "HJ".equals(header.getCompanyCode())) { continue; } String rootAppPk = header.getCode(); @@ -319,10 +318,10 @@ public class AdjustInPluginInitializer extends PluginBaseEntity { Assert.state(false, "根据调整入库单号：{}，查询调整单：{}，失败。不存在或不唯一。", ofsCode, ofsHeader.getRefOrderCode()); } String u8ReceiptType = ofsAdjustOrders.get(0).getHeader().getU8ReceiptType(); - if(u8ReceiptType==null){ - Assert.state(false,"调整单：{}，收发类别（入库类别）为空，请维护。",ofsAdjustOrders.get(0).getHeader().getCode()); + if (u8ReceiptType == null) { + Assert.state(false, "调整单：{}，收发类别（入库类别）为空，请维护。", ofsAdjustOrders.get(0).getHeader().getCode()); } - if("0106".equals(u8ReceiptType)){//20240910：排除组装入库，单独做一个插件 + if ("0106".equals(u8ReceiptType) || "0107".equals(u8ReceiptType)) {//20240910：排除组装入库，单独做一个插件，20250112：无源件不接 continue; } // BdRdclEntity bdRdclEntity = new BdRdclEntity(); @@ -351,7 +350,7 @@ public class AdjustInPluginInitializer extends PluginBaseEntity { children.setNshouldinnum(String.valueOf(ofsDetail.getRequestQty())); //nintnum--实入数量,20241106妮妮姐私聊：可以改成实收是0你就不传这条明细 明细里就不传这个 - if(ofsDetail.getReceivedQty()==null||"0".equals(ofsDetail.getReceivedQty())){ + if (ofsDetail.getReceivedQty() == null || "0".equals(ofsDetail.getReceivedQty())) { continue; } children.setNinnum(String.valueOf(ofsDetail.getReceivedQty())); @@ -398,7 +397,7 @@ public class AdjustInPluginInitializer extends PluginBaseEntity { integrationTaskLivingDetailsEntity.setRootAppPk(ofsCode); integrationTaskLivingDetailsEntity.setRootAppBill(ofsCode); integrationTaskLivingDetailsEntity.setNewSystemPrimary(vbillId); - integrationTaskLivingDetailsEntity.setNewSystemNumber(corpCode+"_"+vbillcode); + integrationTaskLivingDetailsEntity.setNewSystemNumber(corpCode + "_" + vbillcode); integrationTaskLivingDetailsEntity.setPluginId(getPluginId()); saveOrUpdateBusinessLogUtil.saveOrUpdate(integrationTaskLivingDetailsEntity); @@ -407,12 +406,12 @@ public class AdjustInPluginInitializer extends PluginBaseEntity { logger.error("推送U8C，丽知：OFS调整入库--->U8C其它入库失败，失败原因：" + e); ReusltStrDto reusltStrDto = JSON.parseObject(response, ReusltStrDto.class); - String ErrMessage=""; + String ErrMessage = ""; if (reusltStrDto != null) { ErrMessage = "推送U8C，丽知：OFS调整入库--->U8C其它入库失败，失败原因：" + reusltStrDto.getErrormsg(); - }else { - ErrMessage=e.getMessage(); + } else { + ErrMessage = e.getMessage(); } //失败 diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustOutPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustOutPluginInitializer.java index 74a386bb..723b0c03 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustOutPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustOutPluginInitializer.java @@ -322,7 +322,7 @@ public class AdjustOutPluginInitializer extends PluginBaseEntity { if(u8ShipmentType==null){ Assert.state(false,"调整单：{}，收发类别（出库类别）为空，请维护。",ofsAdjustOrders.get(0).getHeader().getCode()); } - if("0206".equals(u8ShipmentType)){//20240910：排除组装出库，不做处理 + if("0206".equals(u8ShipmentType) || "0207".equals(u8ShipmentType)){//20240910：排除组装出库，不做处理。20250112：无源件不做处理 continue; }