diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java index 8b0aa8a3a..7a1aa630a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java @@ -24,6 +24,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springblade.common.exception.CustomerException; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; @@ -31,9 +32,7 @@ import org.springblade.core.tool.utils.ObjectUtil; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * 签收 控制器 @@ -143,9 +142,15 @@ public class DistributionSignforAppController { @ApiOperationSupport(order = 2) public R signfor(@Valid @RequestBody DistrilbutionAppsignforDTO distrilbutionloadingscanDTO) { R r = distributionSignforService.signfor(distrilbutionloadingscanDTO); + long time = new Date().getTime(); try{ BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); + if(Objects.isNull(myCurrentWarehouse)){ + log.warn("#############signfor:"+time+" 下架仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse); + throw new CustomerException("下架仓库信息为空"); + } List packageCodes = (List) r.getData(); + log.info("#############signfor:"+time+" 处理下架的包件 packageCodes={}",packageCodes); String orderPackageCodes = null; for (String packageCode : packageCodes) { if(StringUtils.isBlank(orderPackageCodes)){ @@ -156,7 +161,7 @@ public class DistributionSignforAppController { } updownTypeClient.downPackageOrDelTray(orderPackageCodes,myCurrentWarehouse.getId()); }catch (Exception e){ - log.error("#############signfor: 下架失败"); + log.error("#############signfor:"+time+" 下架失败",e); } return r; } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java index 67a88453d..8f8bf24a6 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java @@ -16,7 +16,6 @@ */ package com.logpm.distribution.controller; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; @@ -24,7 +23,6 @@ import com.logpm.basicdata.entity.BasicdataWarehouseEntity; import com.logpm.basicdata.feign.IBasicdataWarehouseClient; import com.logpm.distribution.bean.MyExcelUtil; import com.logpm.distribution.dto.DistributionDeliveryExcelDTO; -import com.logpm.distribution.dto.DistributionDeliveryInfoDTO; import com.logpm.distribution.dto.DistributionDeliveryListDTO; import com.logpm.distribution.dto.DistrilbutionAppsignforDTO; import com.logpm.distribution.dto.app.DistrilbutionloadingscanDTO; @@ -42,13 +40,13 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springblade.common.exception.CustomerException; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.secure.BladeUser; import org.springblade.core.tool.api.R; -import org.springblade.core.tool.constant.BladeConstant; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springframework.web.bind.annotation.*; @@ -57,9 +55,10 @@ import springfox.documentation.annotations.ApiIgnore; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.text.ParseException; -import java.util.HashMap; +import java.util.Date; import java.util.List; import java.util.Map; +import java.util.Objects; /** * 配送管理 控制器 @@ -477,9 +476,16 @@ public class DistributionDeliveryListController extends BladeController { @ApiOperation(value = "PC签收包件") public R signfor(@Valid @RequestBody DistrilbutionAppsignforDTO distrilbutionloadingscanDTO) { R r = distributionSignforService.signforPC(distrilbutionloadingscanDTO); + long time = new Date().getTime(); try{ + BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse(); + if(Objects.isNull(myCurrentWarehouse)){ + log.warn("#############signforPC:"+time+" 仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse); + throw new CustomerException("仓库信息为空"); + } List packageCodes = (List) r.getData(); + log.info("#############signforPC:"+time+" 处理下架的包件 packageCodes={}",packageCodes); String orderPackageCodes = null; for (String packageCode : packageCodes) { if(StringUtils.isBlank(orderPackageCodes)){ @@ -490,7 +496,7 @@ public class DistributionDeliveryListController extends BladeController { } warehouseUpdownTypeClient.downPackageOrDelTray(orderPackageCodes,myCurrentWarehouse.getId()); }catch (Exception e){ - log.error("#############signfor: 下架失败"); + log.error("#############signforPC:"+time+" 下架失败",e); } return r; } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index d56bfe307..6f0719239 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -50,7 +50,6 @@ import com.logpm.warehouse.feign.IWarehouseUpdownTypeClient; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.jetbrains.annotations.NotNull; -import org.springblade.common.constant.DictBizConstant; import org.springblade.common.constant.DistributionTypeConstant; import org.springblade.common.constant.Inventory.InventoryLoadingStatusConstant; import org.springblade.common.constant.Inventory.InventorySigningStatusConstant; @@ -83,7 +82,6 @@ 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.ObjectUtil; -import org.springblade.system.cache.DictBizCache; import org.springblade.system.entity.User; import org.springblade.system.feign.IDictBizClient; import org.springblade.system.feign.IUserClient; @@ -2375,7 +2373,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl { DistributionParcelListEntityVO getByUnitNoByPyl(@Param("unitNo")String unitNo); List findListByAdvanceId(@Param("advanceId") Integer advanceId); + + AdvanceDetailEntity getOneByUnitNo(@Param("unitNo") String unitNo); } diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml index ce91366aa..b817aabea 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml @@ -211,4 +211,12 @@ and advance_id = #{advanceId} + + diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/AdvanceDetailServiceImpl.java b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/AdvanceDetailServiceImpl.java index b1dc2f67f..e4aafafd1 100644 --- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/AdvanceDetailServiceImpl.java +++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/AdvanceDetailServiceImpl.java @@ -59,10 +59,7 @@ public class AdvanceDetailServiceImpl implements IAdvanceDetailService { @Override public AdvanceDetailEntity getOneByUnitNo(String unitNo) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("unitNo",unitNo) - .eq("delete_time",0); - return advanceDetailMapper.selectOne(queryWrapper); + return advanceDetailMapper.getOneByUnitNo(unitNo); } @Override diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.java index 28f98032d..24b462b6e 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.java @@ -41,4 +41,6 @@ public interface TrunklineAdvanceDetailMapper extends BaseMapper findIncomingWarehouseName(@Param("advanceId") Long advanceId); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml index ac1de591a..e9f90ffe8 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml @@ -172,5 +172,12 @@ where advance_id = #{advanceId} + diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.java index 5d0f84c77..fb646060b 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.java @@ -30,4 +30,6 @@ public interface TrunklineAdvanceMapper extends BaseMapper advanceIds); void subTotalNumByAdvanceId(@Param("advanceId") Long advanceId); + + void updateIncomingWarehouseName(@Param("incomingWarehouseName") String incomingWarehouseName, @Param("advanceId") Long advanceId); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.xml index 4a38b95cd..ad477cd17 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.xml @@ -12,8 +12,11 @@ @@ -125,4 +131,10 @@ where id = #{advanceId} + + update logpm_trunkline_advance + set incoming_warehouse_name = #{incomingWarehouseName} + and id = #{advanceId} + + diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java index 9fc933b02..b379aa80e 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java @@ -51,4 +51,7 @@ public interface ITrunklineAdvanceDetailService extends BaseService findIncomingWarehouseName(Long advanceId); + } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceService.java index 2cd8df812..1c542e00c 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceService.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceService.java @@ -30,4 +30,7 @@ public interface ITrunklineAdvanceService extends BaseService advanceIds); + + void updateIncomingWarehouseName(String incomingWarehouseName, Long advanceId); + } 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 7b7817d85..9e02f3795 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 @@ -19,6 +19,7 @@ import org.springblade.core.tool.utils.StringUtil; import org.springframework.stereotype.Service; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Objects; @@ -57,6 +58,7 @@ public class InComingServiceImpl implements IInComingService { } Long advanceDetailId = advanceDetailEntity.getId(); String packageStatus = advanceDetailEntity.getPackageStatus(); + Long advanceId = advanceDetailEntity.getAdvanceId(); if("1".equals(packageStatus)){ log.warn("############incomingPackage: 包件已入库 packageCode={} warehouseId={}",packageCode,warehouseId); return Resp.scanFail(405,"包件已入库","包件已入库"); @@ -71,6 +73,8 @@ public class InComingServiceImpl implements IInComingService { //1.修改暂存单包件入库状态 advanceDetailService.updatePackageStatusById("1",advanceDetailId,warehouseId,warehouseName); + List incomingWarehouseNames = advanceDetailService.findIncomingWarehouseName(advanceId); + advanceService.updateIncomingWarehouseName(String.join(",",incomingWarehouseNames),advanceId); //2.判断包件和订单是否已经存入在库订单 boolean b = advanceService.saveOrderAndPackage(advanceDetailEntity, warehouseId); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java index 3983ebcee..97b4bf03f 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java @@ -1131,6 +1131,9 @@ public class OpenOrderServiceImpl implements IOpenOrderService { trunklineAdvanceEntity.setTrainNumber(importCustomizedOuPaiDTO.getTrainNumber()); trunklineAdvanceEntity.setFreezeStatus("0"); trunklineAdvanceEntity.setLegacyStatus("0"); + if(orderCode.contains("遗")){ + trunklineAdvanceEntity.setLegacyStatus("1"); + } trunklineAdvanceEntity.setDeliveryDate(CommonUtil.StringToDate(importCustomizedOuPaiDTO.getDueDateStr())); trunklineAdvanceEntity.setCreateUserName(AuthUtil.getNickName()); advanceService.save(trunklineAdvanceEntity); @@ -1241,6 +1244,9 @@ public class OpenOrderServiceImpl implements IOpenOrderService { trunklineAdvanceEntity.setTrainNumber(importStandardOuPaiDTO.getTrainNumber()); trunklineAdvanceEntity.setFreezeStatus("0"); trunklineAdvanceEntity.setLegacyStatus("0"); + if(orderCode.contains("遗")){ + trunklineAdvanceEntity.setLegacyStatus("1"); + } trunklineAdvanceEntity.setDeliveryDate(CommonUtil.StringToDate(importStandardOuPaiDTO.getDueDateStr())); trunklineAdvanceEntity.setCreateUserName(AuthUtil.getNickName()); advanceService.save(trunklineAdvanceEntity); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java index 54d39b6d0..9f50d3194 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java @@ -235,4 +235,9 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl findIncomingWarehouseName(Long advanceId) { + return baseMapper.findIncomingWarehouseName(advanceId); + } } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java index 19b07867b..11c236d99 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java @@ -374,4 +374,9 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl