From 871b31518854ac25a538ff7a2644ba3ee4a5ba5b Mon Sep 17 00:00:00 2001 From: zhaoqiaobo Date: Fri, 10 May 2024 19:28:11 +0800 Subject: [PATCH] =?UTF-8?q?feat(all):=20=E5=A2=9E=E5=8A=A0=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E7=B3=BB=E7=BB=9F=E4=BD=9C=E4=B8=9A=E5=9B=9E=E6=8E=A8?= =?UTF-8?q?=E5=B7=A5=E5=8E=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/dto/OrderStatusDTO.java | 114 ++++++++++++ .../DistrilbutionBillLadingServiceImpl.java | 29 ++- .../logpm/trunkline/dto/OrderStatusDTO.java | 114 ++++++++++++ .../service/impl/InComingServiceImpl.java | 113 +++++++----- .../impl/TrunklineCarsLoadServiceImpl.java | 166 ++++++++++-------- 5 files changed, 417 insertions(+), 119 deletions(-) create mode 100644 blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/OrderStatusDTO.java create mode 100644 blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/dto/OrderStatusDTO.java diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/OrderStatusDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/OrderStatusDTO.java new file mode 100644 index 000000000..2ef06df05 --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/OrderStatusDTO.java @@ -0,0 +1,114 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.distribution.dto; + +import lombok.Data; +import org.springblade.core.tool.utils.StringUtil; + +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; + +/** + * OrderStatus + * + * @author zhy + * @since 2023-06-12 + */ +@Data +public class OrderStatusDTO implements Serializable { + private static final long serialVersionUID = 1L; + + @NotEmpty(message = "派车单号不能为空") + private String dispatchNumber;//派车单号 + + @NotEmpty(message = "客户订单号不能为空") + private String orderNo;//客户订单号 + + @NotEmpty(message = "工厂ID不能为空") + private String plantId;//工厂ID + + @NotEmpty(message = "物流单号不能为空") + private String logiBillNo;//物流单号 + + @NotEmpty(message = "包件码不能为空") + private String unitNo;//包件码 + + @NotEmpty(message = "操作时间不能为空") + private String operationTime;//操作时间 + + @NotEmpty(message = "当前仓库不能为空") + private String currentWarehouse;//当前仓库 + + @NotEmpty(message = "目的仓库不能为空") + private String destinationWarehouse;//目的仓库 + + @NotEmpty(message = "状态不能为空") + private String status;//状态 + + @NotEmpty(message = "送货任务ID不能为空") + private String distributionContactId; + + @NotEmpty(message = "托盘id") + private Integer trayId; + + @NotEmpty(message = "托盘编码") + private String trayNo; + + @NotEmpty(message = "操作人名称") + private String username; + + + /** + * 验证参数是否都存在 + * @return + */ + public boolean verifyData(){ + if(StringUtil.isBlank(dispatchNumber)){ + return false; + } + if(StringUtil.isBlank(orderNo)){ + return false; + } + if(StringUtil.isBlank(plantId)){ + return false; + } + if(StringUtil.isBlank(logiBillNo)){ + return false; + } + if(StringUtil.isBlank(unitNo)){ + return false; + } + if(StringUtil.isBlank(operationTime)){ + return false; + } + if(StringUtil.isBlank(currentWarehouse)){ + return false; + } + if(StringUtil.isBlank(destinationWarehouse)){ + return false; + } + if(StringUtil.isBlank(status)){ + return false; + } + if(StringUtil.isBlank(distributionContactId)){ + return false; + } + return true; + } + + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java index d9e213795..006e5c89d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java @@ -17,6 +17,7 @@ package com.logpm.distribution.service.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONObject; @@ -35,6 +36,7 @@ import com.logpm.distribution.bean.Resp; import com.logpm.distribution.dto.DistributionParcelListDTO; import com.logpm.distribution.dto.DistributionStockListDTO; import com.logpm.distribution.dto.DistrilbutionBillLadingDTO; +import com.logpm.distribution.dto.OrderStatusDTO; import com.logpm.distribution.dto.app.BillLadingAppDTO; import com.logpm.distribution.entity.*; import com.logpm.distribution.excel.DistrilbutionBillLadingExcel; @@ -52,6 +54,7 @@ import lombok.extern.log4j.Log4j2; import org.apache.logging.log4j.util.Strings; import org.springblade.common.constant.DictBizConstant; import org.springblade.common.constant.Inventory.InventoryStockUpStatusConstant; +import org.springblade.common.constant.RabbitConstant; import org.springblade.common.constant.WorkNodeEnums; import org.springblade.common.constant.billLading.BillLadingStatusConstant; import org.springblade.common.constant.common.IsOrNoConstant; @@ -76,6 +79,7 @@ import org.springblade.core.tool.utils.BeanUtil; import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.StringUtil; import org.springblade.system.cache.DictBizCache; +import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; @@ -152,6 +156,8 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl map = new HashMap<>(); + map.put("messageData", orderStatusDTO); + rabbitTemplate.convertAndSend(RabbitConstant.HWY_ORDER_STATUS_EXCHANGE, RabbitConstant.HWY_ORDER_STATUS_ROUTING, map); + } catch (Exception e) { + log.error("入库推送失败：{}", e); + } + } + /** * 处理提货库存品签收 */ diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/dto/OrderStatusDTO.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/dto/OrderStatusDTO.java new file mode 100644 index 000000000..44f8983f3 --- /dev/null +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/dto/OrderStatusDTO.java @@ -0,0 +1,114 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.trunkline.dto; + +import lombok.Data; +import org.springblade.core.tool.utils.StringUtil; + +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; + +/** + * OrderStatus + * + * @author zhy + * @since 2023-06-12 + */ +@Data +public class OrderStatusDTO implements Serializable { + private static final long serialVersionUID = 1L; + + @NotEmpty(message = "派车单号不能为空") + private String dispatchNumber;//派车单号 + + @NotEmpty(message = "客户订单号不能为空") + private String orderNo;//客户订单号 + + @NotEmpty(message = "工厂ID不能为空") + private String plantId;//工厂ID + + @NotEmpty(message = "物流单号不能为空") + private String logiBillNo;//物流单号 + + @NotEmpty(message = "包件码不能为空") + private String unitNo;//包件码 + + @NotEmpty(message = "操作时间不能为空") + private String operationTime;//操作时间 + + @NotEmpty(message = "当前仓库不能为空") + private String currentWarehouse;//当前仓库 + + @NotEmpty(message = "目的仓库不能为空") + private String destinationWarehouse;//目的仓库 + + @NotEmpty(message = "状态不能为空") + private String status;//状态 + + @NotEmpty(message = "送货任务ID不能为空") + private String distributionContactId; + + @NotEmpty(message = "托盘id") + private Integer trayId; + + @NotEmpty(message = "托盘编码") + private String trayNo; + + @NotEmpty(message = "操作人名称") + private String username; + + + /** + * 验证参数是否都存在 + * @return + */ + public boolean verifyData(){ + if(StringUtil.isBlank(dispatchNumber)){ + return false; + } + if(StringUtil.isBlank(orderNo)){ + return false; + } + if(StringUtil.isBlank(plantId)){ + return false; + } + if(StringUtil.isBlank(logiBillNo)){ + return false; + } + if(StringUtil.isBlank(unitNo)){ + return false; + } + if(StringUtil.isBlank(operationTime)){ + return false; + } + if(StringUtil.isBlank(currentWarehouse)){ + return false; + } + if(StringUtil.isBlank(destinationWarehouse)){ + return false; + } + if(StringUtil.isBlank(status)){ + return false; + } + if(StringUtil.isBlank(distributionContactId)){ + return false; + } + return true; + } + + +} diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java index a8b3a103b..6c9e1af03 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java @@ -1,10 +1,12 @@ package com.logpm.trunkline.service.impl; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.logpm.basicdata.entity.BasicdataWarehouseEntity; import com.logpm.basicdata.feign.IBasicdataWarehouseClient; import com.logpm.trunkline.bean.Resp; import com.logpm.trunkline.dto.InComingDTO; +import com.logpm.trunkline.dto.OrderStatusDTO; import com.logpm.trunkline.entity.TrunklineAdvanceDetailEntity; import com.logpm.trunkline.entity.TrunklineBillladingPackageEntity; import com.logpm.trunkline.service.*; @@ -13,11 +15,14 @@ import com.logpm.warehouse.feign.IWarehouseTrayTypeClient; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.common.constant.IncomingTypeEnum; +import org.springblade.common.constant.RabbitConstant; import org.springblade.common.constant.WorkNodeEnums; +import org.springblade.common.utils.CommonUtil; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.StringUtil; +import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.stereotype.Service; import java.util.*; @@ -33,7 +38,8 @@ public class InComingServiceImpl implements IInComingService { private final IWarehouseTrayTypeClient warehouseTrayTypeClient; private final IBasicdataWarehouseClient warehouseClient; private final IPackageTrackLogAsyncService packageTrackLogAsyncService; -// private final DynamicDataSourceProvider dynamicDataSourceProvider; + // private final DynamicDataSourceProvider dynamicDataSourceProvider; + private final RabbitTemplate rabbitTemplate; @Override @@ -48,84 +54,99 @@ public class InComingServiceImpl implements IInComingService { String[] packageCodes = orderPackageCode.split(","); for (String packageCode : packageCodes) { - log.info("############incomingPackage: 包件入库开始 packageCode={} billladingId={} warehouseId={}",packageCode,billladingId,warehouseId); + log.info("############incomingPackage: 包件入库开始 packageCode={} billladingId={} warehouseId={}", packageCode, billladingId, warehouseId); //包件入库开始 //查询包件是否有数据 QueryWrapper advanceDetailQueryWrapper = new QueryWrapper<>(); - advanceDetailQueryWrapper.eq("order_package_code",packageCode); + advanceDetailQueryWrapper.eq("order_package_code", packageCode); TrunklineAdvanceDetailEntity advanceDetailEntity = advanceDetailService.getOne(advanceDetailQueryWrapper); - if(Objects.isNull(advanceDetailEntity)){ - log.warn("############incomingPackage: 包件不存在 packageCode={} warehouseId={}",packageCode,warehouseId); - return Resp.scanFail(405,"包件无数据","包件无数据"); + if (Objects.isNull(advanceDetailEntity)) { + log.warn("############incomingPackage: 包件不存在 packageCode={} warehouseId={}", packageCode, warehouseId); + return Resp.scanFail(405, "包件无数据", "包件无数据"); } Long advanceDetailId = advanceDetailEntity.getId(); String packageStatus = advanceDetailEntity.getPackageStatus(); Long advanceId = advanceDetailEntity.getAdvanceId(); - if("1".equals(packageStatus)){ - if(incomingType != 1){ - log.warn("############incomingPackage: 包件已入库 packageCode={} warehouseId={}",packageCode,warehouseId); - return Resp.scanFail(405,"包件已入库","包件已入库"); - }else{ - if(!Objects.isNull(billladingId)){ + if ("1".equals(packageStatus)) { + if (incomingType != 1) { + log.warn("############incomingPackage: 包件已入库 packageCode={} warehouseId={}", packageCode, warehouseId); + return Resp.scanFail(405, "包件已入库", "包件已入库"); + } else { + if (!Objects.isNull(billladingId)) { //先判断该包件是否已经有提货记录了 TrunklineBillladingPackageEntity billladingPackageEntity = billladingPackageServicie.findBillladingPackage(packageCode); - if(Objects.isNull(billladingPackageEntity)){ - billladingPackageServicie.saveEntity(packageCode,billladingId,warehouseId,incomingType); + if (Objects.isNull(billladingPackageEntity)) { + billladingPackageServicie.saveEntity(packageCode, billladingId, warehouseId, incomingType); } } //4.如果有托盘码 - if(StringUtil.isNotBlank(trayCode) && StringUtil.isNotBlank(trayType)){ - Map map = new HashMap<>(); - map.put("trayType",trayType); - map.put("trayCode",trayCode); - map.put("warehouseId",warehouseId); - map.put("orderPackageCode",packageCode); + if (StringUtil.isNotBlank(trayCode) && StringUtil.isNotBlank(trayType)) { + Map map = new HashMap<>(); + map.put("trayType", trayType); + map.put("trayCode", trayCode); + map.put("warehouseId", warehouseId); + map.put("orderPackageCode", packageCode); warehouseTrayTypeClient.orderScanOrderPackageCode(map); } } - }else{ - if(StringUtil.isBlank(warehouseName)){ + } else { + if (StringUtil.isBlank(warehouseName)) { BasicdataWarehouseEntity warehouseEntity = warehouseClient.getEntityWarehouseId(warehouseId); - if(!Objects.isNull(warehouseEntity)){ + if (!Objects.isNull(warehouseEntity)) { warehouseName = warehouseEntity.getName(); } } //1.修改暂存单包件入库状态 - advanceDetailService.updatePackageStatusById("1",advanceDetailId,warehouseId,warehouseName); + advanceDetailService.updatePackageStatusById("1", advanceDetailId, warehouseId, warehouseName); List incomingWarehouseNames = advanceDetailService.findIncomingWarehouseName(advanceId); - advanceService.updateIncomingWarehouseName(String.join(",",incomingWarehouseNames),advanceId); + advanceService.updateIncomingWarehouseName(String.join(",", incomingWarehouseNames), advanceId); List orderPackageCodes = new ArrayList<>(); orderPackageCodes.add(orderPackageCode); //存入日志 - packageTrackLogAsyncService.addPackageTrackLog(AuthUtil.getTenantId(),AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()),AuthUtil.getNickName(),orderPackageCodes,warehouseId,warehouseName, WorkNodeEnums.INITIAL_WAREHOUSE_ENTRY.getCode(),"包件"+ IncomingTypeEnum.getValue(incomingType)); + packageTrackLogAsyncService.addPackageTrackLog(AuthUtil.getTenantId(), AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getNickName(), orderPackageCodes, warehouseId, warehouseName, WorkNodeEnums.INITIAL_WAREHOUSE_ENTRY.getCode(), "包件" + IncomingTypeEnum.getValue(incomingType)); //2.判断包件和订单是否已经存入在库订单 boolean b = advanceService.saveOrderAndPackage(advanceDetailEntity, warehouseId); - if(b){ + if (b) { //3.根据是否有提货单id绑定提货单 - if(!Objects.isNull(billladingId)){ + if (!Objects.isNull(billladingId)) { //先判断该包件是否已经有提货记录了 TrunklineBillladingPackageEntity billladingPackageEntity = billladingPackageServicie.findBillladingPackage(packageCode); - if(Objects.isNull(billladingPackageEntity)){ - billladingPackageServicie.saveEntity(packageCode,billladingId,warehouseId,incomingType); + if (Objects.isNull(billladingPackageEntity)) { + billladingPackageServicie.saveEntity(packageCode, billladingId, warehouseId, incomingType); } } //4.如果有托盘码 - if(StringUtil.isNotBlank(trayCode) && StringUtil.isNotBlank(trayType)){ - Map map = new HashMap<>(); - map.put("trayType",trayType); - map.put("trayCode",trayCode); - map.put("warehouseId",warehouseId); - map.put("orderPackageCode",packageCode); + if (StringUtil.isNotBlank(trayCode) && StringUtil.isNotBlank(trayType)) { + Map map = new HashMap<>(); + map.put("trayType", trayType); + map.put("trayCode", trayCode); + map.put("warehouseId", warehouseId); + map.put("orderPackageCode", packageCode); warehouseTrayTypeClient.orderScanOrderPackageCode(map); } } + try { + // 发送入库消息 + OrderStatusDTO orderStatusDTO = new OrderStatusDTO(); + // 通过包件id 查询包件 + orderStatusDTO.setUnitNo(packageCode); + orderStatusDTO.setOrderNo(advanceDetailEntity.getOrderCode()); + orderStatusDTO.setStatus("4"); + orderStatusDTO.setOperationTime(DateUtil.now()); + orderStatusDTO.setCurrentWarehouse(warehouseId.toString()); + Map map = new HashMap<>(); + map.put("messageData", orderStatusDTO); + rabbitTemplate.convertAndSend(RabbitConstant.HWY_ORDER_STATUS_EXCHANGE, RabbitConstant.HWY_ORDER_STATUS_ROUTING, map); + } catch (Exception e) { + log.error("入库推送失败：{}", e); + } } } return R.success("入库成功"); @@ -134,14 +155,14 @@ public class InComingServiceImpl implements IInComingService { @Override public R findIncomingOrderList(InComingDTO inComingDTO) { Integer incomingType = inComingDTO.getIncomingType(); - if(incomingType == 5){ + if (incomingType == 5) { String incomingCode = inComingDTO.getIncomingCode(); - if(!StringUtil.isBlank(incomingCode)){ - incomingCode = incomingCode.replaceAll("，",","); + if (!StringUtil.isBlank(incomingCode)) { + incomingCode = incomingCode.replaceAll("，", ","); List orderCodes = new ArrayList<>(); - if(incomingCode.contains(",")){ + if (incomingCode.contains(",")) { orderCodes.addAll(Arrays.asList(incomingCode.split(","))); - }else{ + } else { orderCodes.add(incomingCode); } inComingDTO.setOrderCodes(orderCodes); @@ -177,20 +198,20 @@ public class InComingServiceImpl implements IInComingService { for (Long advanceId : advanceIds) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("advance_id",advanceId) - .eq("package_status","0"); + queryWrapper.eq("advance_id", advanceId) + .eq("package_status", "0"); //查询所有包件 List detailList = advanceDetailService.list(queryWrapper); - List orderPackageCodes = advanceService.incomingPackageBatch(advanceId, warehouseId, detailList,userId,deptId,tenantId); + List orderPackageCodes = advanceService.incomingPackageBatch(advanceId, warehouseId, detailList, userId, deptId, tenantId); advanceDetailService.updateBatchById(detailList); List incomingWarehouseNames = advanceDetailService.findIncomingWarehouseName(advanceId); - advanceService.updateIncomingWarehouseName(String.join(",",incomingWarehouseNames),advanceId); + advanceService.updateIncomingWarehouseName(String.join(",", incomingWarehouseNames), advanceId); //存入日志 - packageTrackLogAsyncService.addPackageTrackLog(tenantId,userId, deptId,nickName,orderPackageCodes,warehouseId,warehouseName, WorkNodeEnums.INITIAL_WAREHOUSE_ENTRY.getCode(),"包件"+ IncomingTypeEnum.getValue(incomingType)); + packageTrackLogAsyncService.addPackageTrackLog(tenantId, userId, deptId, nickName, orderPackageCodes, warehouseId, warehouseName, WorkNodeEnums.INITIAL_WAREHOUSE_ENTRY.getCode(), "包件" + IncomingTypeEnum.getValue(incomingType)); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java index e061a4324..7f25df359 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java @@ -1,6 +1,7 @@ package com.logpm.trunkline.service.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.exceptions.ExceptionUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; @@ -450,8 +451,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl waybillNos = lineCarsOrderList.stream().map(TrunklineCarsOrderDTO::getWaybillNo).collect(Collectors.toList()); List freezeOrAbolishWaybillList = warehouseWaybillClient.findFreezeOrAbolishByWaybillNos(waybillNos); - if(!CollUtil.isEmpty(freezeOrAbolishWaybillList)){ + if (!CollUtil.isEmpty(freezeOrAbolishWaybillList)) { log.warn("##########saveNew: 运单有变动，请重新做计划"); throw new CustomerException(400, "运单有变动，请重新做计划"); } @@ -1431,7 +1432,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl waybillNos = addList.stream().map(TrunklineCarsOrderDTO::getWaybillNo).collect(Collectors.toList()); List freezeOrAbolishWaybillList = warehouseWaybillClient.findFreezeOrAbolishByWaybillNos(waybillNos); - if(!CollUtil.isEmpty(freezeOrAbolishWaybillList)){ + if (!CollUtil.isEmpty(freezeOrAbolishWaybillList)) { log.warn("##########saveNew: 运单有变动，请重新做计划"); throw new CustomerException(400, "运单有变动，请重新做计划"); } @@ -2004,7 +2005,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl orderPackageCodes = trunklineCarsLoadScanService.findSignListOrderPackageCodes(loadId); @@ -2308,16 +2309,35 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl orderPackageCodes = new ArrayList<>(); orderPackageCodes.add(orderPackageCode); - String content = "包件在 " + warehouseName + " "+(StringUtil.isBlank(trayName)?"扫码": "托盘（"+trayName+"）")+" 装车,配载计划目的仓 " + carsLoadScanEntity.getFinalNodeName() + ",数据来源仓库 " + fromWarehouseName; + String content = "包件在 " + warehouseName + " " + (StringUtil.isBlank(trayName) ? "扫码" : "托盘（" + trayName + "）") + " 装车,配载计划目的仓 " + carsLoadScanEntity.getFinalNodeName() + ",数据来源仓库 " + fromWarehouseName; packageTrackLogAsyncService.addPackageTrackLog(AuthUtil.getTenantId(), AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getNickName(), orderPackageCodes, warehouseId, warehouseName, WorkNodeEnums.INITIAL_WAREHOUSE_LOADING.getCode(), content); trunklineCarsLoadingLogService.savaLoadingLog(warehouseId, warehouseName, loadId, loadCode, waybillId, waybillNo, orderCode, orderPackageCode, 1, 1, isData, isAbnormal, trayId, trayCode, trayName, fromWarehouseId, loadScanId, remark); updateNumByLoadId(loadId); - + // 推送包件装车数据到工厂 + pushFactoryOrderData(warehouseId, orderPackageCode, orderCode); return R.success("装车成功"); } + private void pushFactoryOrderData(Long warehouseId, String orderPackageCode, String orderCode) { + try { + // 发送入库消息 + OrderStatusDTO orderStatusDTO = new OrderStatusDTO(); + // 通过包件id 查询包件 + orderStatusDTO.setUnitNo(orderPackageCode); + orderStatusDTO.setOrderNo(orderCode); + orderStatusDTO.setStatus("3"); + orderStatusDTO.setOperationTime(DateUtil.now()); + orderStatusDTO.setCurrentWarehouse(warehouseId.toString()); + Map map = new HashMap<>(); + map.put("messageData", orderStatusDTO); + rabbitTemplate.convertAndSend(RabbitConstant.HWY_ORDER_STATUS_EXCHANGE, RabbitConstant.HWY_ORDER_STATUS_ROUTING, map); + } catch (Exception e) { + log.error("入库推送失败：{}", e); + } + } + @Override public R loadingZero(Long loadId, Long warehouseId, String waybillNo, String orderCode, String trayCode, Integer enterNum, String remark) { @@ -3448,7 +3468,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl loadScanEntityList = trunklineCarsLoadScanService.findListByIdsNoPackage(carsLoadScanIds,warehouseId); + List loadScanEntityList = trunklineCarsLoadScanService.findListByIdsNoPackage(carsLoadScanIds, warehouseId); List parcelListEntities = trunklineCarsLoadScanService.findParceListByCarsLoadScanIds(carsLoadScanIds); //把parcelListEntities转成orderPackageCode为键值的map - Map parcelListMap = parcelListEntities.stream().collect(Collectors.toMap(DistributionParcelListEntity::getOrderPackageCode, e -> e)); + Map parcelListMap = parcelListEntities.stream().collect(Collectors.toMap(DistributionParcelListEntity::getOrderPackageCode, e -> e)); List stockArticleEntities = trunklineCarsLoadScanService.findOrderListByCarsLoadScanIds(carsLoadScanIds); //把stockArticleEntities转成orderCode为键值的map - Map stockArticleMap = stockArticleEntities.stream().collect(Collectors.toMap(DistributionStockArticleEntity::getOrderCode, e -> e)); + Map stockArticleMap = stockArticleEntities.stream().collect(Collectors.toMap(DistributionStockArticleEntity::getOrderCode, e -> e)); // List waybillEntities = trunklineCarsLoadScanService.findWaybillListByCarsLoadScanIds(carsLoadScanIds); // //把waybillEntities转成WaybillNo为键值的map // Map waybillMap = waybillEntities.stream().collect(Collectors.toMap(WarehouseWaybillEntity::getWaybillNo, e -> e)); List unloadLogList = new ArrayList<>(); - List orderCodeList = trunklineCarsLoadScanService.findIncomingOrdeCodesByCarsLoadScanIds(carsLoadScanIds,warehouseId); - Map orderCodes = new HashMap<>(); - if(!Objects.isNull(orderCodeList)){ + List orderCodeList = trunklineCarsLoadScanService.findIncomingOrdeCodesByCarsLoadScanIds(carsLoadScanIds, warehouseId); + Map orderCodes = new HashMap<>(); + if (!Objects.isNull(orderCodeList)) { Map finalOrderCodes2 = orderCodes; orderCodeList.forEach(e -> { String[] split = e.split("----"); - finalOrderCodes2.put(split[0],Long.valueOf(split[1])); + finalOrderCodes2.put(split[0], Long.valueOf(split[1])); }); orderCodes = finalOrderCodes2; } @@ -3520,7 +3540,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl> unbingTrayAndDelAllocationPackages = new HashMap<>(); + Map> unbingTrayAndDelAllocationPackages = new HashMap<>(); //直接新增的包件 List newParcelListEntities = new ArrayList<>(); //需要修改仓库信息的打托数据 @@ -3575,15 +3595,15 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl { //判断是否有已经有order了 Long orderId = null; - if(!finalOrderCodes.isEmpty()){ + if (!finalOrderCodes.isEmpty()) { orderId = finalOrderCodes.get(e); } - if(ObjectUtil.isNull(orderId)){ + if (ObjectUtil.isNull(orderId)) { //没有id DistributionStockArticleEntity stockArticleEntity = stockArticleMap.get(e); DistributionStockArticleEntity newStockArticleEntity = new DistributionStockArticleEntity(); - BeanUtil.copy(stockArticleEntity,newStockArticleEntity); + BeanUtil.copy(stockArticleEntity, newStockArticleEntity); newStockArticleEntity.setId(null); newStockArticleEntity.setCreateUser(userId); newStockArticleEntity.setUpdateUser(userId); @@ -3599,7 +3619,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl list = unbingTrayAndDelAllocationPackages.get(fromWarehouseId); - if(Objects.isNull(list)){ + if (Objects.isNull(list)) { list = new ArrayList<>(); list.add(p.getScanCode()); - }else{ + } else { list.add(p.getScanCode()); } - unbingTrayAndDelAllocationPackages.put(fromWarehouseId,list); + unbingTrayAndDelAllocationPackages.put(fromWarehouseId, list); Integer isAbnormal = 0; String remark = "正常卸车"; @@ -3646,7 +3666,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl { //判断是否有已经有order了 Long orderId = finalOrderCodes1.get(e); - if(ObjectUtil.isNull(orderId)){ + if (ObjectUtil.isNull(orderId)) { //没有id DistributionStockArticleEntity stockArticleEntity = stockArticleMap.get(e); DistributionStockArticleEntity newStockArticleEntity = new DistributionStockArticleEntity(); - BeanUtil.copy(stockArticleEntity,newStockArticleEntity); + BeanUtil.copy(stockArticleEntity, newStockArticleEntity); newStockArticleEntity.setId(null); newStockArticleEntity.setCreateUser(userId); newStockArticleEntity.setUpdateUser(userId); @@ -3717,7 +3737,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl carsLoadScanList = carsLoadScanEntitiesMap.get(e); @@ -3726,7 +3746,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl { List list = unbingTrayAndDelAllocationPackages.get(w); - updownTypeClient.downPackageOrDelTray(StringUtil.join(list),w,"批量入库解托下架"); + updownTypeClient.downPackageOrDelTray(StringUtil.join(list), w, "批量入库解托下架"); }); //需要修改仓库信息的打托数据 trayCodes.forEach(trayCode -> { - trayTypeClient.changeTrayWarehouseInfo(trayCode,warehouseId); + trayTypeClient.changeTrayWarehouseInfo(trayCode, warehouseId); }); newParcelListEntities.forEach(e -> { - carsLoadAsyncService.dealwithAfterAbnormalPackage(e.getOrderPackageCode(),warehouseId,warehouseName,carsLoadEntity.getCarsNo(),userId, deptId, nickName); + carsLoadAsyncService.dealwithAfterAbnormalPackage(e.getOrderPackageCode(), warehouseId, warehouseName, carsLoadEntity.getCarsNo(), userId, deptId, nickName); }); String content = "包件在 " + warehouseName + "卸车，卸车方式：" + IncomingTypeEnum.getValue(incomingType); @@ -4273,7 +4293,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl !"1".equals(e.getScanStatus())).collect(Collectors.toList()); @@ -4284,18 +4304,18 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl> map = list.stream().collect(Collectors.groupingBy(TrunklineCarsLoadScanVO::getSignOrderId)); map.keySet().forEach(e -> { List trunklineCarsLoadScanVOS = map.get(e);//该签收单对应的包件 - trunklineCarsLoadScanVOS.forEach(t ->{ + trunklineCarsLoadScanVOS.forEach(t -> { TrunklineCarsLoadScanEntity entity = new TrunklineCarsLoadScanEntity(); - BeanUtil.copy(t,entity); + BeanUtil.copy(t, entity); entity.setScanStatus("3"); entity.setUnloadNum(t.getNum()); entity.setSignTime(date); entity.setUnloadTime(date); - if(entity.getType().equals(1)){ + if (entity.getType().equals(1)) { String scanCode = entity.getScanCode(); List parcelList = parcelListMap.get(scanCode); - if(!Objects.isNull(parcelList)){ - parcelList.forEach(p ->{ + if (!Objects.isNull(parcelList)) { + parcelList.forEach(p -> { p.setOrderPackageStatus("70"); updateParcelList.add(p); }); @@ -4431,12 +4451,12 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl entityListByOrderCode = distributionParcelListClient.findEntityListByOrderCodeAndStatus(orderCode, warehouseId, "20",waybillNo); + List entityListByOrderCode = distributionParcelListClient.findEntityListByOrderCodeAndStatus(orderCode, warehouseId, "20", waybillNo); int size = entityListByOrderCode.size(); - if(planNum.equals(size + realNum)){ + if (planNum.equals(size + realNum)) { for (DistributionParcelListEntity parcelListEntity : entityListByOrderCode) { String orderPackageCode = parcelListEntity.getOrderPackageCode(); TrunklineCarsLoadScanEntity carsLoadScanEntity = new TrunklineCarsLoadScanEntity(); @@ -4482,11 +4502,13 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl orderPackageCodes = trunklineCarsLoadScanService.findSignListOrderPackageCodesByIds(loadScanIds); //通过loadId查询是否所有包件都签收了 Integer num = trunklineCarsLoadScanService.findSignNumByLoadId(loadId); - if(realLoadingNumber.equals(num)){ + if (realLoadingNumber.equals(num)) { carsLoadEntity.setSignTime(date); carsLoadEntity.setLoadStatus("90"); - }else{ - if(num == 1){ + } else { + if (num == 1) { carsLoadEntity.setSignTime(date); carsLoadEntity.setLoadStatus("91"); } @@ -4646,9 +4668,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl map = new HashMap<>(); - map.put("one",carsLoadLineEntity.getReportOne()); - map.put("two",carsLoadLineEntity.getReportTwo()); + Map map = new HashMap<>(); + map.put("one", carsLoadLineEntity.getReportOne()); + map.put("two", carsLoadLineEntity.getReportTwo()); - JSONObject abnormalRecord = abnormalRecordClient.findListByCarsNoAndUpWarehouseId(carsNo,warehouseId); + JSONObject abnormalRecord = abnormalRecordClient.findListByCarsNoAndUpWarehouseId(carsNo, warehouseId); - map.put("three","当前待处理异常 "+abnormalRecord.getInteger("dealwithNum")+" 条、已处理异常 "+abnormalRecord.getInteger("noDealwithNum")+" 条"); + map.put("three", "当前待处理异常 " + abnormalRecord.getInteger("dealwithNum") + " 条、已处理异常 " + abnormalRecord.getInteger("noDealwithNum") + " 条"); return R.data(map); } @@ -5406,7 +5428,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl orderPackageCodes = new ArrayList<>(); @@ -5826,7 +5848,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl