diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java b/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java index c6351e1ae..68ad6deec 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java @@ -17,6 +17,8 @@ public class OldSystemDataPushConfig { warehourseIds.add("30"); warehourseIds.add("38"); warehourseIds.add("124"); + // 上海 + warehourseIds.add("149"); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java index 6890a94bb..6766b4b00 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java @@ -1500,6 +1500,10 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { } try { + + + log.info(">>>>>>>>>>>>>>> 文员复核推送 品牌 {} ",brand); + if (Func.isNotEmpty(brand.get("梦天"))){ mtReceiveDTO.setReceiveContentList(brand.get("梦天")); orderMainClinet.sendReceiveInfoByNewSystem(mtReceiveDTO); diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/FactoryXxlJob.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/FactoryXxlJob.java index 6a4efc013..b46716657 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/FactoryXxlJob.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/FactoryXxlJob.java @@ -54,9 +54,9 @@ public class FactoryXxlJob { private static final Logger logger = LoggerFactory.getLogger(FactoryXxlJob.class); - private final IStationlinenumService stationlinenumService; + private final IStationlinenumService stationlinenumService; - private final IOrderService orderService; + private final IOrderService orderService; private final IOrderLogService orderLogService; @@ -66,7 +66,7 @@ public class FactoryXxlJob { private final IAdvanceClient iAdvanceClient; private final IAdvanceDetailClient advanceDetailClient; private final IDetailProductClient detailProductClient; - private final IServiceNumClient serviceNumClient; + private final IServiceNumClient serviceNumClient; private final IWarehouseClient warehouseClient; private final IOuPaiFactoryService ouPaiFactoryService; @@ -177,7 +177,8 @@ public class FactoryXxlJob { resoveFactoryData(); return ReturnT.SUCCESS; } - private Timestamp initTimestamp(){ + + private Timestamp initTimestamp() { Calendar calendar = Calendar.getInstance(); return new Timestamp(calendar.get(Calendar.YEAR), @@ -185,8 +186,9 @@ public class FactoryXxlJob { calendar.get(Calendar.DAY_OF_MONTH), calendar.get(Calendar.HOUR), calendar.get(Calendar.MINUTE), - calendar.get(Calendar.SECOND),calendar.get(Calendar.MILLISECOND)); + calendar.get(Calendar.SECOND), calendar.get(Calendar.MILLISECOND)); } + @Transactional(rollbackFor = Exception.class) public Boolean resoveFactoryData() { Map> map = new HashMap<>(); @@ -401,7 +403,7 @@ public class FactoryXxlJob { String tcWlb008 = stationOrderEntity.getTcWlb008();//Log中对应的客户单号 String tcWlb007 = stationOrderEntity.getTcWlb007();//Log中对应的系统单号 Integer tcWlb009 = stationOrderEntity.getTcWlb009();//Log中对应的包件数量 - if (otcWla001.equals(tcWla001)&&otcWla002.equals(tcWla002)&&otcWlb008.equals(tcWlb008)&&otcWlb007.equals(tcWlb007)&&otcWlb009.equals(tcWlb009)) { + if (otcWla001.equals(tcWla001) && otcWla002.equals(tcWla002) && otcWlb008.equals(tcWlb008) && otcWlb007.equals(tcWlb007) && otcWlb009.equals(tcWlb009)) { dataList.remove(i); break; } @@ -418,69 +420,99 @@ public class FactoryXxlJob { /** * 欧派工程数据回推 * 启动参数格式 - * [{"codes":[包条码...],"type":4},{"codes":[包条码...],"type":7}] + * "123,f12334,gt3545" */ - @XxlJob("factoryByOpOrderPackageCodeJobHandler") - public ReturnT factoryByOpOrderPackageCodeJobHandler(String param) throws Exception { - -// todo 需要拆分方法 + @XxlJob("factoryByOpOrderPackageCodeJobHandlerIn") + public ReturnT factoryByOpOrderPackageCodeJobHandlerIn(String param) throws Exception { + if (StringUtils.isBlank(param)) { + return ReturnT.FAIL; + } + String[] split = param.split(","); - // 获取执行参数的中参数 - JSONArray jsonArray; try { + for (String orderPackageCode : split) { - jsonArray = JSON.parseArray(param); + OrderStatusDTO orderStatusDTO = new OrderStatusDTO(); + orderStatusDTO.setUnitNo(orderPackageCode); + orderStatusDTO.setStatus("1"); - // 入库的数据请求 - JSONObject inArgs =null; - // 出库的数据请求 - JSONObject outArgs =null; + // 查询老系统的操作人 + orderStatusDTO.setUsername("zhangsna ");// 操作人 + ouPaiFactoryService.handleStatusData(orderStatusDTO); - for (int i = 0; i < jsonArray.size(); i++) { - JSONObject t = jsonArray.getJSONObject(i); - if (t.get("type").equals(4)){ - inArgs= t; - } - if (t.get("type").equals(7)){ - outArgs= t; - } } + return ReturnT.SUCCESS; + } catch (Exception e) { + XxlJobLogger.log(e); + logger.error(">>>> 执行失败"); + return ReturnT.FAIL; - JSONArray codes = inArgs.getJSONArray("codes"); - extractedJsonArray(codes,"4"); - + } - }catch (Exception e){ + } + @XxlJob("factoryByOpOrderPackageCodeJobHandlerOut") + public ReturnT factoryByOpOrderPackageCodeJobHandlerOut(String param) throws Exception { + if (StringUtils.isBlank(param)) { return ReturnT.FAIL; } + String[] split = param.split(","); + + try { + for (String orderPackageCode : split) { + OrderStatusDTO orderStatusDTO = new OrderStatusDTO(); + orderStatusDTO.setUnitNo(orderPackageCode); + orderStatusDTO.setStatus("7"); + // 查询老系统的操作人 + orderStatusDTO.setUsername("zhangsna");// 操作人 + ouPaiFactoryService.handleStatusData(orderStatusDTO); + + } + return ReturnT.SUCCESS; + } catch (Exception e) { + XxlJobLogger.log(e); + logger.error(">>>> 执行失败"); + return ReturnT.FAIL; + + } - return ReturnT.SUCCESS; } - private void extractedJsonArray(JSONArray codes,String status) { - if(codes !=null&& !codes.isEmpty()){ - for (int i = 0; i < codes.size(); i++) { - // 得到包件码 - String o = (String) codes.get(i); - // 还需要查询老系统的数据 得到这个包件的操作人 - // 补充推送欧派的推送数据 - OrderStatusDTO orderStatusDTO = new OrderStatusDTO() ; - orderStatusDTO.setUnitNo(o); - orderStatusDTO.setStatus(status); - orderStatusDTO.setUsername();// 操作人 + @XxlJob("factory2OpReplayGetOrderInforByReceivCode") + public ReturnT factory2OpReplayGetOrderInforByReceivCode(String param) throws Exception { + + // todo 需要拆分方法 + if (StringUtils.isBlank(param)) { + return ReturnT.FAIL; + } + String[] split = param.split(","); + + + try { + for (String receivCode : split) { + + XxlJobLogger.log(">>>>> 收货单执行单号 开始 {}",receivCode); + ouPaiFactoryService.saveOuPaiFactoryOrderDTOByCarCarNumber(receivCode); + XxlJobLogger.log(">>>>> 收货单执行单号 结束 {}",receivCode); + - ouPaiFactoryService.handleStatusData(orderStatusDTO); } + return ReturnT.SUCCESS; + } catch (Exception e) { + XxlJobLogger.log(e); + return ReturnT.FAIL; + } } + + } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/feign/MtOrderMainClinet.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/feign/MtOrderMainClinet.java index 8bdd1cb29..7902372c9 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/feign/MtOrderMainClinet.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/feign/MtOrderMainClinet.java @@ -5,6 +5,7 @@ import com.logpm.factory.mt.dto.MtReceiveDTO; import com.logpm.factory.mt.service.IMtFactoryDataService; import com.logpm.factory.mt.service.IMtFactoryOrderMainService; import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springblade.core.tenant.annotation.NonDS; import org.springblade.core.tool.api.R; import org.springframework.web.bind.annotation.GetMapping; @@ -18,6 +19,7 @@ import java.security.NoSuchAlgorithmException; @ApiIgnore @RestController @AllArgsConstructor +@Slf4j public class MtOrderMainClinet implements IMtOrderMainClinet { private final IMtFactoryOrderMainService mtFactoryOrderMainService; @@ -27,6 +29,7 @@ public class MtOrderMainClinet implements IMtOrderMainClinet { @Override @GetMapping(TOP) public R sendOrderPackageScan(String orderPackageCode, String operationTime, String distributionContactId, String distributionContactCode, String destinationWarehouse) throws NoSuchAlgorithmException, JsonProcessingException { + log.info(">>>>>>> 签收扫描 start"); // return mtFactoryDataService.qianshouScanForNewSystem(orderPackageCode,operationTime,distributionContactId,destinationWarehouse); return null; } @@ -35,6 +38,7 @@ public class MtOrderMainClinet implements IMtOrderMainClinet { @Override @PostMapping(SENDRECEIVEINFOBYNEWSYSTEM) public R sendReceiveInfoByNewSystem(MtReceiveDTO mtReceiveDTO) throws NoSuchAlgorithmException, JsonProcessingException { + log.info(">>>>>>> 文员复核 start"); // return mtFactoryDataService.sendReceiveInfoByNewSystem(mtReceiveDTO); return null; }