diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferInPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferInPluginInitializer.java index a9793075..c82314ac 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferInPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferInPluginInitializer.java @@ -52,7 +52,7 @@ import java.util.concurrent.locks.ReentrantLock; public class TransferInPluginInitializer extends PluginBaseEntity { Logger logger = LoggerFactory.getLogger(TransferInPluginInitializer.class); - private static final ReentrantLock LOCK = new ReentrantLock(true); + private static final Object OBJECT_LOCK = new Object(); @Override public void initialize() { @@ -152,29 +152,32 @@ public class TransferInPluginInitializer extends PluginBaseEntity { */ public void start() { try { - //获取当前时间 - Date currentDate = new Date(); - Date startTime = DateUtil.offset(currentDate, DateField.MINUTE, -10); - Date endTime = DateUtil.offset(currentDate, DateField.MINUTE, -2); - String startTimeStr = DateUtil.format(startTime, "yyyy-MM-dd HH:mm:ss"); - String endTimeStr = DateUtil.format(endTime, "yyyy-MM-dd HH:mm:ss"); + synchronized (OBJECT_LOCK) { - QueryOfsStockinOrderRequestVO queryOfsStockinOrderRequestVO = new QueryOfsStockinOrderRequestVO(); - queryOfsStockinOrderRequestVO.setClosedAt_start(startTimeStr); - queryOfsStockinOrderRequestVO.setClosedAt_end(endTimeStr); - //状态 500待同步 510已同步 700收货中 900入库完成 911作废 100订单池 200暂挂 400待合单 410待出库单出库 - queryOfsStockinOrderRequestVO.setStatus("900"); - List transferInOrder = queryOfsStockinOrder(queryOfsStockinOrderRequestVO); + //获取当前时间 + Date currentDate = new Date(); + Date startTime = DateUtil.offset(currentDate, DateField.MINUTE, -10); + Date endTime = DateUtil.offset(currentDate, DateField.MINUTE, -2); + String startTimeStr = DateUtil.format(startTime, "yyyy-MM-dd HH:mm:ss"); + String endTimeStr = DateUtil.format(endTime, "yyyy-MM-dd HH:mm:ss"); - if (transferInOrder == null || transferInOrder.size() == 0) { - return; + QueryOfsStockinOrderRequestVO queryOfsStockinOrderRequestVO = new QueryOfsStockinOrderRequestVO(); + queryOfsStockinOrderRequestVO.setClosedAt_start(startTimeStr); + queryOfsStockinOrderRequestVO.setClosedAt_end(endTimeStr); + //状态 500待同步 510已同步 700收货中 900入库完成 911作废 100订单池 200暂挂 400待合单 410待出库单出库 + queryOfsStockinOrderRequestVO.setStatus("900"); + List transferInOrder = queryOfsStockinOrder(queryOfsStockinOrderRequestVO); + + if (transferInOrder == null || transferInOrder.size() == 0) { + return; + } + //过滤日志 + List filterTransferInOrders = filterData(transferInOrder); + if (filterTransferInOrders.size() == 0) { + return; + } + implement(filterTransferInOrders); } - //过滤日志 - List filterTransferInOrders = filterData(transferInOrder); - if (filterTransferInOrders.size() == 0) { - return; - } - implement(filterTransferInOrders); } catch (Exception e) { @@ -187,23 +190,24 @@ public class TransferInPluginInitializer extends PluginBaseEntity { */ public void start(String stockinNo) { try { + synchronized (OBJECT_LOCK) { - QueryOfsStockinOrderRequestVO queryOfsStockinOrderRequestVO = new QueryOfsStockinOrderRequestVO(); - queryOfsStockinOrderRequestVO.setCode(stockinNo); - //状态 500待同步 510已同步 700收货中 900入库完成 911作废 100订单池 200暂挂 400待合单 410待出库单出库 - queryOfsStockinOrderRequestVO.setStatus("900"); - List transferInOrder = queryOfsStockinOrder(queryOfsStockinOrderRequestVO); + QueryOfsStockinOrderRequestVO queryOfsStockinOrderRequestVO = new QueryOfsStockinOrderRequestVO(); + queryOfsStockinOrderRequestVO.setCode(stockinNo); + //状态 500待同步 510已同步 700收货中 900入库完成 911作废 100订单池 200暂挂 400待合单 410待出库单出库 + queryOfsStockinOrderRequestVO.setStatus("900"); + List transferInOrder = queryOfsStockinOrder(queryOfsStockinOrderRequestVO); - if (transferInOrder == null || transferInOrder.size() == 0) { - Assert.state(false, "丽知：OFS调拨入库--->U8C调拨入库根据单据号[入库完成]：{}，未查询到调拨入库单", stockinNo); + if (transferInOrder == null || transferInOrder.size() == 0) { + Assert.state(false, "丽知：OFS调拨入库--->U8C调拨入库根据单据号[入库完成]：{}，未查询到调拨入库单", stockinNo); + } + //过滤日志 + List filterTransferInOrders = filterData(transferInOrder); + if (filterTransferInOrders.size() == 0) { + Assert.state(false, "丽知：OFS调拨入库--->U8C调拨入库根据单据号[入库完成]：{}，该调拨入库单已被推送成功，请勿重新推送", stockinNo); + } + implement(filterTransferInOrders); } - //过滤日志 - List filterTransferInOrders = filterData(transferInOrder); - if (filterTransferInOrders.size() == 0) { - Assert.state(false, "丽知：OFS调拨入库--->U8C调拨入库根据单据号[入库完成]：{}，该调拨入库单已被推送成功，请勿重新推送", stockinNo); - } - implement(filterTransferInOrders); - } catch (Exception e) { logger.error("丽知：OFS调拨入库订单--->U8C调拨入库订单（保存签字，关联U8C调拨出库单）,start(String goodsName)方法报错：", e); @@ -216,27 +220,30 @@ public class TransferInPluginInitializer extends PluginBaseEntity { */ public void start(String startTime, String endTime) { try { - Date business_start = DateUtil.parse(startTime); - Date business_end = DateUtil.parse(endTime); - String start = DateUtil.format(business_start, "yyyy-MM-dd") + " 00:00:00"; - String end = DateUtil.format(business_end, "yyyy-MM-dd") + " 23:59:59"; + synchronized (OBJECT_LOCK) { - QueryOfsStockinOrderRequestVO queryOfsStockinOrderRequestVO = new QueryOfsStockinOrderRequestVO(); - queryOfsStockinOrderRequestVO.setClosedAt_start(start); - queryOfsStockinOrderRequestVO.setClosedAt_end(end); - //状态 500待同步 510已同步 700收货中 900入库完成 911作废 100订单池 200暂挂 400待合单 410待出库单出库 - queryOfsStockinOrderRequestVO.setStatus("900"); - List transferInOrder = queryOfsStockinOrder(queryOfsStockinOrderRequestVO); + Date business_start = DateUtil.parse(startTime); + Date business_end = DateUtil.parse(endTime); + String start = DateUtil.format(business_start, "yyyy-MM-dd") + " 00:00:00"; + String end = DateUtil.format(business_end, "yyyy-MM-dd") + " 23:59:59"; - if (transferInOrder == null || transferInOrder.size() == 0) { - Assert.state(false, "丽知：OFS调拨入库订单--->U8C调拨入库订单根据日期期间[开始时间]-[结束时间]：{}-{}，未查询到调拨入库单[入库完成]", startTime, endTime); + QueryOfsStockinOrderRequestVO queryOfsStockinOrderRequestVO = new QueryOfsStockinOrderRequestVO(); + queryOfsStockinOrderRequestVO.setClosedAt_start(start); + queryOfsStockinOrderRequestVO.setClosedAt_end(end); + //状态 500待同步 510已同步 700收货中 900入库完成 911作废 100订单池 200暂挂 400待合单 410待出库单出库 + queryOfsStockinOrderRequestVO.setStatus("900"); + List transferInOrder = queryOfsStockinOrder(queryOfsStockinOrderRequestVO); + + if (transferInOrder == null || transferInOrder.size() == 0) { + Assert.state(false, "丽知：OFS调拨入库订单--->U8C调拨入库订单根据日期期间[开始时间]-[结束时间]：{}-{}，未查询到调拨入库单[入库完成]", startTime, endTime); + } + //过滤日志 + List filterTransferInOrders = filterData(transferInOrder); + if (filterTransferInOrders.size() == 0) { + Assert.state(false, "丽知：OFS调拨入库订单--->U8C调拨入库订单根据日期期间[开始时间]-[结束时间]：{}-{}，该调期调拨入库单[入库完成]已被推送成功，请勿重新推送", startTime, endTime); + } + implement(filterTransferInOrders); } - //过滤日志 - List filterTransferInOrders = filterData(transferInOrder); - if (filterTransferInOrders.size() == 0) { - Assert.state(false, "丽知：OFS调拨入库订单--->U8C调拨入库订单根据日期期间[开始时间]-[结束时间]：{}-{}，该调期调拨入库单[入库完成]已被推送成功，请勿重新推送", startTime, endTime); - } - implement(filterTransferInOrders); } catch (Exception e) { 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 d65113a3..cc6638f3 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 @@ -58,7 +58,7 @@ import java.util.concurrent.locks.ReentrantLock; public class TransferOutPluginInitializer extends PluginBaseEntity { Logger logger = LoggerFactory.getLogger(TransferOutPluginInitializer.class); - private static final ReentrantLock LOCK = new ReentrantLock(true); + private static final Object OBJECT_LOCK = new Object(); @Override public void initialize() { @@ -153,28 +153,30 @@ public class TransferOutPluginInitializer extends PluginBaseEntity { */ public void start() { try { - //获取当前时间 - Date currentDate = new Date(); - Date startTime = DateUtil.offset(currentDate, DateField.MINUTE, -10); - Date endTime = DateUtil.offset(currentDate, DateField.MINUTE, -2); - String startTimeStr = DateUtil.format(startTime, "yyyy-MM-dd HH:mm:ss"); - String endTimeStr = DateUtil.format(endTime, "yyyy-MM-dd HH:mm:ss"); + synchronized (OBJECT_LOCK) { + //获取当前时间 + Date currentDate = new Date(); + Date startTime = DateUtil.offset(currentDate, DateField.MINUTE, -10); + Date endTime = DateUtil.offset(currentDate, DateField.MINUTE, -2); + String startTimeStr = DateUtil.format(startTime, "yyyy-MM-dd HH:mm:ss"); + String endTimeStr = DateUtil.format(endTime, "yyyy-MM-dd HH:mm:ss"); - QueryOfsStockoutOrderRequestVO queryOfsStockoutOrderRequestVO = new QueryOfsStockoutOrderRequestVO(); - 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 == null || transferOutOrder.size() == 0) { - return; + QueryOfsStockoutOrderRequestVO queryOfsStockoutOrderRequestVO = new QueryOfsStockoutOrderRequestVO(); + 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 == null || transferOutOrder.size() == 0) { + return; + } + //过滤成功日志 + List filterTransferOutOrders = filterData(transferOutOrder); + if (filterTransferOutOrders.size() == 0) { + return; + } + //推送U8C + implement(filterTransferOutOrders); } - //过滤成功日志 - List filterTransferOutOrders = filterData(transferOutOrder); - if (filterTransferOutOrders.size() == 0) { - return; - } - //推送U8C - implement(filterTransferOutOrders); } catch (Exception e) { logger.error("丽知：OFS调拨出库订单--->U8C调拨订单，自动生成调拨出库单（保存签字）,start()方法报错：", e); } @@ -185,20 +187,22 @@ public class TransferOutPluginInitializer extends PluginBaseEntity { */ public void start(String stockoutNo) { try { - QueryOfsStockoutOrderRequestVO queryOfsStockoutOrderRequestVO = new QueryOfsStockoutOrderRequestVO(); - queryOfsStockoutOrderRequestVO.setCode(stockoutNo); - queryOfsStockoutOrderRequestVO.setStatus("900");//状态 500待同步 510已同步 700收货中 900入库完成 911作废 100订单池 200暂挂 400待合单 410待出库单出库 - List transferOutOrder = queryOfsStockoutOrder(queryOfsStockoutOrderRequestVO); - if (transferOutOrder.size() == 0) { - Assert.state(false, "丽知：OFS调拨出库订单[出库完成]--->U8C调拨订单，自动生成调拨出库单（保存签字），未查询到调拨出库单：{}", stockoutNo); + synchronized (OBJECT_LOCK) { + QueryOfsStockoutOrderRequestVO queryOfsStockoutOrderRequestVO = new QueryOfsStockoutOrderRequestVO(); + queryOfsStockoutOrderRequestVO.setCode(stockoutNo); + queryOfsStockoutOrderRequestVO.setStatus("900");//状态 500待同步 510已同步 700收货中 900入库完成 911作废 100订单池 200暂挂 400待合单 410待出库单出库 + List transferOutOrder = queryOfsStockoutOrder(queryOfsStockoutOrderRequestVO); + if (transferOutOrder.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); } - //过滤成功日志 - List filterTransferOutOrders = filterData(transferOutOrder); - if (filterTransferOutOrders.size() == 0) { - Assert.state(false, "丽知：OFS调拨出库订单[出库完成]--->U8C调拨订单，自动生成调拨出库单（保存签字），该调拨出库单：{}，已被推送成功，请勿重新推送", stockoutNo); - } - //推送U8C - implement(filterTransferOutOrders); } catch (Exception e) { logger.error("丽知：OFS调拨出库订单--->U8C调拨订单，自动生成调拨出库单（保存签字）,start(String goodsName)方法报错：", e); @@ -210,28 +214,30 @@ public class TransferOutPluginInitializer extends PluginBaseEntity { */ public void start(String startTime, String endTime) { try { - Date business_start = DateUtil.parse(startTime); - Date business_end = DateUtil.parse(endTime); - String start = DateUtil.format(business_start, "yyyy-MM-dd") + " 00:00:00"; - String end = DateUtil.format(business_end, "yyyy-MM-dd") + " 23:59:59"; + synchronized (OBJECT_LOCK) { + Date business_start = DateUtil.parse(startTime); + Date business_end = DateUtil.parse(endTime); + String start = DateUtil.format(business_start, "yyyy-MM-dd") + " 00:00:00"; + String end = DateUtil.format(business_end, "yyyy-MM-dd") + " 23:59:59"; - QueryOfsStockoutOrderRequestVO queryOfsStockoutOrderRequestVO = new QueryOfsStockoutOrderRequestVO(); - queryOfsStockoutOrderRequestVO.setShipAt_start(start); - queryOfsStockoutOrderRequestVO.setShipAt_end(end); - queryOfsStockoutOrderRequestVO.setStatus("900");//状态 500待同步 510已同步 700收货中 900入库完成 911作废 100订单池 200暂挂 400待合单 410待出库单出库 - List transferOutOrder = queryOfsStockoutOrder(queryOfsStockoutOrderRequestVO); + QueryOfsStockoutOrderRequestVO queryOfsStockoutOrderRequestVO = new QueryOfsStockoutOrderRequestVO(); + queryOfsStockoutOrderRequestVO.setShipAt_start(start); + queryOfsStockoutOrderRequestVO.setShipAt_end(end); + queryOfsStockoutOrderRequestVO.setStatus("900");//状态 500待同步 510已同步 700收货中 900入库完成 911作废 100订单池 200暂挂 400待合单 410待出库单出库 + List transferOutOrder = queryOfsStockoutOrder(queryOfsStockoutOrderRequestVO); - if (transferOutOrder.size() == 0) { - Assert.state(false, "丽知：OFS调拨出库订单--->U8C调拨订单，自动生成调拨出库单（保存签字）根据日期期间[开始时间]-[结束时间]：{}-{}，未查询到调拨出库单[出库完成]", startTime, endTime); - } - //过滤成功日志 - List filterTransferOutOrders = filterData(transferOutOrder); - if (filterTransferOutOrders.size() == 0) { - Assert.state(false, "丽知：OFS调拨出库订单--->U8C调拨订单，自动生成调拨出库单（保存签字）根据日期期间[开始时间]-[结束时间]：{}-{}，该调期调拨出库单[出库完成]已被推送成功，请勿重新推送", startTime, endTime); - } - //推送U8C + if (transferOutOrder.size() == 0) { + Assert.state(false, "丽知：OFS调拨出库订单--->U8C调拨订单，自动生成调拨出库单（保存签字）根据日期期间[开始时间]-[结束时间]：{}-{}，未查询到调拨出库单[出库完成]", startTime, endTime); + } + //过滤成功日志 + List filterTransferOutOrders = filterData(transferOutOrder); + if (filterTransferOutOrders.size() == 0) { + Assert.state(false, "丽知：OFS调拨出库订单--->U8C调拨订单，自动生成调拨出库单（保存签字）根据日期期间[开始时间]-[结束时间]：{}-{}，该调期调拨出库单[出库完成]已被推送成功，请勿重新推送", startTime, endTime); + } + //推送U8C // implement(transferOutOrder); - implement(filterTransferOutOrders); + implement(filterTransferOutOrders); + } } catch (Exception e) { logger.error("丽知：OFS调拨出库订单--->U8C调拨订单，自动生成调拨出库单（保存签字）,start(String startTime, String endTime)方法报错：", e); }