From 7030655a59ab9f7a44da8aab0b35a5226671be1f Mon Sep 17 00:00:00 2001 From: zhengyf Date: Fri, 20 Sep 2024 16:35:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BD=E7=9F=A5=EF=BC=9A=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E4=BF=AE=E6=94=B9=EF=BC=8C=E8=B0=83?= =?UTF-8?q?=E6=8B=A8=E5=87=BA=E5=BA=93=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adjust/AdjustInZZPluginInitializer.java | 5 +++-- .../adjust/AdjustOutPluginInitializer.java | 8 ++++---- .../TransferOutPluginInitializer.java | 19 +++++++++---------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInZZPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInZZPluginInitializer.java index 41366eab..0dcc0a5d 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInZZPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInZZPluginInitializer.java @@ -151,8 +151,8 @@ public class AdjustInZZPluginInitializer extends PluginBaseEntity { String endTimeStr = DateUtil.format(endTime, "yyyy-MM-dd HH:mm:ss"); QueryOfsStockinOrderRequestVO queryOfsStockinOrderRequestVO = new QueryOfsStockinOrderRequestVO(); - queryOfsStockinOrderRequestVO.setCreated_start(startTimeStr); - queryOfsStockinOrderRequestVO.setCreated_end(endTimeStr); + queryOfsStockinOrderRequestVO.setClosedAt_start(startTimeStr); + queryOfsStockinOrderRequestVO.setClosedAt_end(endTimeStr); List stockinOrders = queryOfsStockinOrder(queryOfsStockinOrderRequestVO); System.out.println(stockinOrders); @@ -297,6 +297,7 @@ public class AdjustInZZPluginInitializer extends PluginBaseEntity { StockinOrderSearchResponse.StockinOrder.StockinH ofsHeader = stockinOrder.getHeader(); System.out.println(ofsHeader); //主表 + ofsCode=ofsHeader.getCode(); SpecialbillVO specialbillVO = new SpecialbillVO(); SpecialbillVO.Parentvo parentvo = new SpecialbillVO.Parentvo(); 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 5725accd..dedf08e4 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 @@ -153,8 +153,8 @@ public class AdjustOutPluginInitializer extends PluginBaseEntity { String endTimeStr = DateUtil.format(endTime, "yyyy-MM-dd HH:mm:ss"); QueryOfsStockoutOrderRequestVO queryOfsStockoutOrderRequestVO = new QueryOfsStockoutOrderRequestVO(); - queryOfsStockoutOrderRequestVO.setClosedAt_start(startTimeStr); - queryOfsStockoutOrderRequestVO.setClosedAt_end(endTimeStr); + queryOfsStockoutOrderRequestVO.setShipAt_start(startTimeStr); + queryOfsStockoutOrderRequestVO.setShipAt_end(endTimeStr); List stockoutOrders = queryOfsStockoutOrder(queryOfsStockoutOrderRequestVO); if (stockoutOrders == null || stockoutOrders.size() == 0) { return; @@ -390,8 +390,8 @@ public class AdjustOutPluginInitializer extends PluginBaseEntity { integrationTaskLivingDetailsEntity.setBusinessDate(format); integrationTaskLivingDetailsEntity.setRootAppPk(ofsId); integrationTaskLivingDetailsEntity.setRootAppBill(ofsCode); - integrationTaskLivingDetailsEntity.setNewSystemNumber(vbillId);//u8c其他出库单号 - integrationTaskLivingDetailsEntity.setNewSystemPrimary(vbillcode);//u8c其他出库单号 + integrationTaskLivingDetailsEntity.setNewSystemNumber(vbillcode);//u8c其他出库单号 + integrationTaskLivingDetailsEntity.setNewSystemPrimary(vbillId);//u8c其他出库单号 integrationTaskLivingDetailsEntity.setPluginId(getPluginId()); saveOrUpdateBusinessLogUtil.saveOrUpdate(integrationTaskLivingDetailsEntity); diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferOutPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferOutPluginInitializer.java index 4b355fdb..1da64879 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferOutPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferOutPluginInitializer.java @@ -158,8 +158,8 @@ public class TransferOutPluginInitializer extends PluginBaseEntity { String endTimeStr = DateUtil.format(endTime, "yyyy-MM-dd HH:mm:ss"); QueryOfsStockoutOrderRequestVO queryOfsStockoutOrderRequestVO = new QueryOfsStockoutOrderRequestVO(); - queryOfsStockoutOrderRequestVO.setClosedAt_start(startTimeStr); - queryOfsStockoutOrderRequestVO.setClosedAt_end(endTimeStr); + queryOfsStockoutOrderRequestVO.setShipAt_start(startTimeStr); + queryOfsStockoutOrderRequestVO.setShipAt_end(endTimeStr); queryOfsStockoutOrderRequestVO.setStatus("900");//状态 500待同步 510已同步 700收货中 900入库完成 911作废 100订单池 200暂挂 400待合单 410待出库单出库 List transferOutOrder = queryOfsStockoutOrder(queryOfsStockoutOrderRequestVO); if (transferOutOrder.size() == 0) { @@ -190,13 +190,12 @@ public class TransferOutPluginInitializer extends PluginBaseEntity { Assert.state(false, "丽知：OFS调拨出库订单[出库完成]--->U8C调拨订单，自动生成调拨出库单（保存签字），未查询到调拨出库单：{}", stockoutNo); } //过滤成功日志 -// List filterTransferOutOrders = filterData(transferOutOrder); -// if (filterTransferOutOrders.size() == 0) { -// Assert.state(false, "丽知：OFS调拨出库订单[出库完成]--->U8C调拨订单，自动生成调拨出库单（保存签字），该调拨出库单：{}，已被推送成功，请勿重新推送", stockoutNo); -// } + List filterTransferOutOrders = filterData(transferOutOrder); + if (filterTransferOutOrders.size() == 0) { + Assert.state(false, "丽知：OFS调拨出库订单[出库完成]--->U8C调拨订单，自动生成调拨出库单（保存签字），该调拨出库单：{}，已被推送成功，请勿重新推送", stockoutNo); + } //推送U8C -// implement(filterTransferOutOrders); - implement(transferOutOrder); + implement(filterTransferOutOrders); } catch (Exception e) { logger.error("丽知：OFS调拨出库订单--->U8C调拨订单，自动生成调拨出库单（保存签字）,start(String goodsName)方法报错：", e); @@ -214,8 +213,8 @@ public class TransferOutPluginInitializer extends PluginBaseEntity { String end = DateUtil.format(business_end, "yyyy-MM-dd") + " 23:59:59"; QueryOfsStockoutOrderRequestVO queryOfsStockoutOrderRequestVO = new QueryOfsStockoutOrderRequestVO(); - queryOfsStockoutOrderRequestVO.setClosedAt_start(start); - queryOfsStockoutOrderRequestVO.setClosedAt_end(end); + queryOfsStockoutOrderRequestVO.setShipAt_start(start); + queryOfsStockoutOrderRequestVO.setShipAt_end(end); queryOfsStockoutOrderRequestVO.setStatus("900");//状态 500待同步 510已同步 700收货中 900入库完成 911作废 100订单池 200暂挂 400待合单 410待出库单出库 List transferOutOrder = queryOfsStockoutOrder(queryOfsStockoutOrderRequestVO);