diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java index 301dcc0d5..d4d3b3676 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java @@ -8,7 +8,7 @@ public interface ModuleNameConstant { /** * 如果不需要 "" */ - public static final String DEVAUTH =""; + public static final String DEVAUTH ="-zhy"; /** * 工厂对接服务名称 diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/ReCheckTrayListVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/ReCheckTrayListVO.java index f659c8b1e..f87fd3bc4 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/ReCheckTrayListVO.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/ReCheckTrayListVO.java @@ -14,4 +14,5 @@ public class ReCheckTrayListVO implements Serializable { private Long marketId;//商场id private String marketName;//商场名称 private String name; + private String isFleeing;//串货 } diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseUpdownGoodsVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseUpdownGoodsVO.java index 85cf3460b..62d65ea8d 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseUpdownGoodsVO.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseUpdownGoodsVO.java @@ -7,4 +7,7 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = true) public class WarehouseUpdownGoodsVO extends WarehouseUpdownGoodsEntity { + + private String orderCode; + } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java index 2d6555d5d..ed5f8bc5e 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/AsyncDataServiceImpl.java @@ -1,6 +1,5 @@ package com.logpm.factory.comfac.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; @@ -23,7 +22,9 @@ import com.logpm.factory.pan.service.IPanFactoryOrderService; import com.logpm.factory.pan.service.IPanPackageInfoService; import com.logpm.factory.pan.service.IPanPackageListService; import com.logpm.factory.snm.constant.PanFactoryEnum; -import com.logpm.factory.snm.entity.*; +import com.logpm.factory.snm.entity.PanFactoryOrder; +import com.logpm.factory.snm.entity.PanPackageInfo; +import com.logpm.factory.snm.entity.PanPackageList; import com.logpm.factory.zb.entity.ZbOrderPackageEntity; import com.logpm.factory.zb.entity.ZbPackageInfoEntity; import com.logpm.factory.zb.entity.ZbReceiptEntity; @@ -40,16 +41,13 @@ import com.logpm.oldproject.feign.IDetailProductClient; import com.logpm.oldproject.feign.IServiceNumClient; import lombok.AllArgsConstructor; import lombok.extern.log4j.Log4j2; -import org.checkerframework.checker.units.qual.C; import org.jetbrains.annotations.Nullable; import org.springblade.core.redis.cache.BladeRedis; -import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.utils.ObjectUtil; import org.springblade.core.tool.utils.StringUtil; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; -import java.sql.Date; import java.sql.Timestamp; import java.time.LocalDate; import java.util.ArrayList; @@ -543,7 +541,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService { advanceDetailEntity.setVolume("");//体积 advanceDetailEntity.setUnitNo(StringUtil.isBlank(factoryPackageEntity.getCode()) ? "" : factoryPackageEntity.getCode());//包条码 advanceDetailEntity.setMctsTruck(advanceEntity.getMctsTruck());//车次号 - advanceDetailEntity.setMctsTruckNo(advanceEntity.getMctsTruckNo());//车牌号 + advanceDetailEntity.setMctsTruckNo(StringUtil.isBlank(advanceEntity.getMctsTruckNo())?"":advanceEntity.getMctsTruckNo());//车牌号 advanceDetailEntity.setDate100(null);//基地发货日期 advanceDetailEntity.setDate2("");//预约到厂时间 advanceDetailEntity.setDate3("");//实际到厂时间 diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/config/InterceptorAdapterConfig.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/config/InterceptorAdapterConfig.java index e1c1fcd5f..693bdf22e 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/config/InterceptorAdapterConfig.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/config/InterceptorAdapterConfig.java @@ -19,7 +19,7 @@ public class InterceptorAdapterConfig implements WebMvcConfigurer { InterceptorRegistration registry = interceptorRegistry.addInterceptor(new FactoryAccountsInterceptor(factoryTokenService)); registry.addPathPatterns("/factory/**"). excludePathPatterns("/factory/auth/token"). - excludePathPatterns("/factory/oupai") + excludePathPatterns("/factory/oupai/**") .excludePathPatterns("/factory/common/**"); } } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java index 00e547225..a66ce7d5c 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java @@ -383,7 +383,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService { "$expand=Order($select=" + "Code,SelfCode,ContractNumber,ServiceNumber,OrderClass,OrderType,Status,FactoryShipStatus,FactorySendQty,WarehouseReceiveStatus,WarehouseReceiveQty,ReservationStatus,Store,MatingCode,IsMating,FirstClassCode,Leave,Customer,Province,City,CustomerAddress,CustomerPhone,ShopReceiver,BrandCode,BrandName,From,OutGoingTime,CreateTime,Freeze,FirstShipTime,MatingShipTime,FirstReceiveTime,MatingReceiveTime;\n" + "$expand=Store($select=Name,Code))" + - "&$expand=PackageDetails($select=Code,Name,OrgCode,OrgCode)" + + "&$expand=PackageDetails($select=Code,Name,Type,Unit,OrgCode)" + "&$expand=CurrentWarehouse($select=Name,Code)" + "&$expand=SendWarehouse($select=Name,Code)" + ")&$expand=FromWarehouse($select=Name,Code)&$expand=CurrentWarehouse($select=Name,Code)&$expand=EndWarehouse($select=Name,Code)"; diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTrayTypeApiController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTrayTypeApiController.java index 459363aa3..3b8413976 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTrayTypeApiController.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTrayTypeApiController.java @@ -794,7 +794,7 @@ public class WarehouseTrayTypeApiController { public R scanSourceTrayCode(@RequestBody TrayTypeDTO trayTypeDTO) { String method = "###########scanSourceTrayCode: "; log.info(method + "扫码来源托盘 trayTypeDTO={}", trayTypeDTO); - String sourceTrayCode = trayTypeDTO.getSourceTrayCode();//来源托盘 + String sourceTrayCode = trayTypeDTO.getTrayCode();//来源托盘 try{ if(!StringUtil.hasLength(sourceTrayCode)){ log.warn(method+"来源托盘码不能为空 sourceTrayCode={}",sourceTrayCode); @@ -810,17 +810,42 @@ public class WarehouseTrayTypeApiController { } } - @ResponseBody @PostMapping("/scanTargetTrayCode") @ApiOperationSupport(order = 1) @ApiOperation(value = "扫码目标托盘", notes = "传入trayTypeDTO") public R scanTargetTrayCode(@RequestBody TrayTypeDTO trayTypeDTO) { String method = "###########scanTargetTrayCode: "; - log.info(method + "扫码来源托盘 trayTypeDTO={}", trayTypeDTO); + log.info(method + "扫码目标托盘 trayTypeDTO={}", trayTypeDTO); + String targetTrayCode = trayTypeDTO.getTrayCode();//来源托盘 + try{ + if(!StringUtil.hasLength(targetTrayCode)){ + log.warn(method+"目标托盘码不能为空 targetTrayCode={}",targetTrayCode); + return R.fail(403,"目标托盘码不能为空"); + } + return warehouseTrayTypeService.scanTargetTrayCode(targetTrayCode); + }catch (CustomerException e){ + log.warn(e.message); + return R.fail(e.code,e.message); + }catch (Exception e){ + log.error(method+"系统异常，联系管理员",e); + return R.fail(500,"系统异常，联系管理员"); + } + } + + + + @ResponseBody + @PostMapping("/mergeTray") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "合托", notes = "传入trayTypeDTO") + public R mergeTray(@RequestBody TrayTypeDTO trayTypeDTO) { + String method = "###########mergeTray: "; + log.info(method + "合托 trayTypeDTO={}", trayTypeDTO); String sourceTrayCode = trayTypeDTO.getSourceTrayCode();//来源托盘码 String targetTrayCode = trayTypeDTO.getTargetTrayCode();//目标托盘码 try{ + if(!StringUtil.hasLength(sourceTrayCode)){ log.warn(method+"来源托盘码不能为空 sourceTrayCode={}",sourceTrayCode); return R.fail(403,"来源托盘码不能为空"); @@ -829,7 +854,13 @@ public class WarehouseTrayTypeApiController { log.warn(method+"目标托盘码不能为空 targetTrayCode={}",targetTrayCode); return R.fail(403,"目标托盘码不能为空"); } - return warehouseTrayTypeService.scanTargetTrayCode(sourceTrayCode,targetTrayCode); + if(targetTrayCode.equals(sourceTrayCode)){ + log.warn(method+"目标托盘码和来源托盘不能为同一个 targetTrayCode={} sourceTrayCode={}",targetTrayCode,sourceTrayCode); + return R.fail(403,"目标托盘码和来源托盘不能为同一个"); + } + + + return warehouseTrayTypeService.mergeTray(sourceTrayCode,targetTrayCode); }catch (CustomerException e){ log.warn(e.message); return R.fail(e.code,e.message); diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseUpdownTypeApiController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseUpdownTypeApiController.java index 8ee8a97cd..ba6ca63f6 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseUpdownTypeApiController.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseUpdownTypeApiController.java @@ -322,7 +322,7 @@ public class WarehouseUpdownTypeApiController { public R downScanPackage(@RequestBody UpdownTypeDTO updownTypeDTO ) { String method = "###########downScanPackage: "; log.info(method + "下架扫描包件码 updownTypeDTO={}", updownTypeDTO); - String orderPackageCode = updownTypeDTO.getCode(); + String orderPackageCode = updownTypeDTO.getOrderPackageCode(); try{ if(StringUtil.isBlank(orderPackageCode)){ log.warn(method+"包件码不能为空 orderPackageCode={}",orderPackageCode); diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.xml index a43df07a0..38343c776 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.xml @@ -165,6 +165,7 @@ ldpl.order_package_code code, 1 goodsType, lwtg.num num, + lwtg.is_fleeing isFleeing, ldpl.material_name name from logpm_warehouse_tray_goods lwtg left join logpm_distribution_parcel_list ldpl on ldpl.id = lwtg.association_id and ldpl.is_deleted = 0 @@ -176,6 +177,7 @@ select ldsa.order_code orderCode, 2 goodsType, lwtg.num num, + lwtg.is_fleeing isFleeing, ldsa.description_goods name from logpm_warehouse_tray_goods lwtg left join logpm_distribution_stock_article ldsa on ldsa.id = lwtg.association_id and ldsa.is_deleted = 0 @@ -189,6 +191,7 @@ ldsl.description_goods name, 3 goodsType, lwtg.num num, + lwtg.is_fleeing isFleeing, ldsl.market_id marketId, ldsl.market_name marketName from logpm_warehouse_tray_goods lwtg @@ -248,7 +251,7 @@ FROM logpm_warehouse_tray_goods lwtg LEFT JOIN logpm_warehouse_tary_allocation lwta ON lwta.tray_id = lwtg.tray_id AND lwta.is_deleted = 0 WHERE lwtg.market_id = #{marketId} - and lwtg.association_code = #{materialCode} + and lwtg.association_value = #{materialCode} and lwtg.incoming_batch = #{incomingBatch} AND lwta.id IS NULL diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.xml index 403d56568..24c824c5b 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.xml @@ -204,7 +204,7 @@ lwug.allocation_title allocationName, lwt.pallet_code trayCode, lwug.num num - from logpm_warehouse_updown_goods lwug on ldsa.id = lwug.association_id + from logpm_warehouse_updown_goods lwug left join logpm_warehouse_tary_allocation lwta on lwta.allocation_id = lwug.allocation_id and lwta.is_deleted = 0 left join logpm_warehouse_tray lwt on lwt.id = lwta.tray_id where lwug.association_id = #{orderId} @@ -218,13 +218,12 @@ lwug.allocation_title allocationName, lwt.pallet_code trayCode, lwug.num num - FROM logpm_warehouse_updown_goods lwug ON ldsa.id = lwug.association_id + FROM logpm_warehouse_updown_goods lwug LEFT JOIN logpm_warehouse_tary_allocation lwta ON lwta.allocation_id = lwug.allocation_id AND lwta.is_deleted = 0 LEFT JOIN logpm_warehouse_tray lwt ON lwt.id = lwta.tray_id WHERE lwug.market_id = #{marketId} and lwug.association_value = #{materialCode} and lwug.incoming_batch = #{incomingBatch} - AND lwta.id IS NOT NULL diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseTrayGoodsLogService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseTrayGoodsLogService.java index 219fc7d3a..53bf90641 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseTrayGoodsLogService.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseTrayGoodsLogService.java @@ -14,7 +14,7 @@ public interface IWarehouseTrayGoodsLogService extends BaseService sourceTrayGoodsList, String bindingType, String remark, String palletizingType); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseTrayGoodsService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseTrayGoodsService.java index 5e20ce00f..bd9759d1f 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseTrayGoodsService.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseTrayGoodsService.java @@ -50,7 +50,7 @@ public interface IWarehouseTrayGoodsService extends BaseService trayGoodsList) { - List ids = new ArrayList<>(); for (WarehouseTrayGoodsEntity trayGoodsEntity:trayGoodsList){ - ids.add(trayGoodsEntity.getId()); + baseMapper.deleteEntityByTrayGoodsId(trayGoodsEntity.getId()); } - baseMapper.deleteByIdList(ids); } @Override diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java index e256fd90b..dd2370de0 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java @@ -37,10 +37,7 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; @Log4j2 @Service @@ -942,20 +939,20 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl map = new HashMap<>(); String type = trayTypeEntity.getType(); Long trayTypeId = trayTypeEntity.getId(); + Integer totalNum = trayTypeEntity.getTotalNum(); + Integer orderTotalNum = trayTypeEntity.getOrderTotalNum(); + Integer stockNum = trayTypeEntity.getStockNum(); + Integer stockTotalNum = trayTypeEntity.getStockTotalNum(); List trayListVOS = null; if(PalletProductTypeConstant.CUSTOMIZED.equals(type)){//订制品打托 @@ -1370,26 +1375,32 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl sourceQueryWapper = new QueryWrapper<>(); @@ -1397,36 +1408,40 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl targetQueryWapper = new QueryWrapper<>(); targetQueryWapper.eq("tray_code",targetTrayCode) .eq("is_deleted",0); WarehouseTrayTypeEntity targetTrayTypeEntity = baseMapper.selectOne(targetQueryWapper); - if(Objects.isNull(targetTrayTypeEntity)){ - log.warn("################scanTargetTrayCode: 目标托盘信息有误 targetTrayCode={}",targetTrayCode); - return R.fail(403,"目标托盘信息有误"); - } String sourceType = sourceTrayTypeEntity.getType(); - String targetType = targetTrayTypeEntity.getType(); - if(!sourceType.equals(targetType)){ - log.warn("################scanTargetTrayCode: 托盘货物类型不同 sourceType={} targetType={}",sourceType,targetType); - return R.fail(403,"托盘货物类型不同"); - } - BasicdataTrayEntity sourceTrayEntity = basicdataTrayClient.getTrayByTrayCode(sourceTrayCode); - if(Objects.isNull(sourceTrayEntity)){ - log.warn("################scanTargetTrayCode: 托盘信息不存在 sourceTrayCode={}",sourceTrayCode); - return R.fail(403,"托盘信息不存在"); - } - Long sourceTrayId = sourceTrayEntity.getId(); + Long sourceTrayId = sourceTrayTypeEntity.getTrayId(); Long sourceTrayTypeId = sourceTrayTypeEntity.getId(); - Long targetTrayTypeId = targetTrayTypeEntity.getId(); - //先把来源托盘数据合到目标托盘 - copyTrayGoodsToTargetTray(sourceTrayTypeId,targetTrayTypeEntity); + if(Objects.isNull(targetTrayTypeEntity)){ + targetTrayTypeEntity = new WarehouseTrayTypeEntity(); + BeanUtil.copy(sourceTrayTypeEntity,targetTrayTypeEntity); + targetTrayTypeEntity.setTrayId(targetTrayId); + targetTrayTypeEntity.setTrayCode(targetTrayCode); + targetTrayTypeEntity.setId(null); + save(targetTrayTypeEntity);//保存打托方式 + //先把来源托盘数据合到目标托盘 + copyTrayGoodsToTargetTray(sourceTrayTypeId,targetTrayTypeEntity); + //空置来源托盘 + downTrayGoodsByTrayId(sourceTrayId,"合托:下托"); + }else{ + String targetType = targetTrayTypeEntity.getType(); + if(!sourceType.equals(targetType)){ + log.warn("################mergeTray: 托盘货物类型不同 sourceType={} targetType={}",sourceType,targetType); + return R.fail(403,"托盘货物类型不同"); + } - //空置来源托盘 - downTrayGoodsByTrayId(sourceTrayId,"合托:下托"); + //先把来源托盘数据合到目标托盘 + copyTrayGoodsToTargetTray(sourceTrayTypeId,targetTrayTypeEntity); + + //空置来源托盘 + downTrayGoodsByTrayId(sourceTrayId,"合托:下托"); + } return R.success("合托成功"); } @@ -1518,6 +1533,65 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("tray_id",trayId) + .eq("is_deleted",0); + WarehouseTrayTypeEntity trayTypeEntity = baseMapper.selectOne(queryWrapper); + if(Objects.isNull(trayTypeEntity)){ + log.info("################scanTargetTrayCode: 托盘未绑定数据 trayId={}",trayId); + return R.success("托盘未绑定数据"); + }else{ + Map map = new HashMap<>(); + String type = trayTypeEntity.getType(); + Long trayTypeId = trayTypeEntity.getId(); + Integer totalNum = trayTypeEntity.getTotalNum(); + Integer orderTotalNum = trayTypeEntity.getOrderTotalNum(); + Integer stockNum = trayTypeEntity.getStockNum(); + Integer stockTotalNum = trayTypeEntity.getStockTotalNum(); + + List trayListVOS = null; + if(PalletProductTypeConstant.CUSTOMIZED.equals(type)){//订制品打托 + trayListVOS = warehouseTrayGoodsService.getReCheckPackageByTrayTypeId(trayTypeId); + }else if(PalletProductTypeConstant.ARTIFICIAL.equals(type)){ + trayListVOS = warehouseTrayGoodsService.getReCheckZeroByTrayTypeId(trayTypeId); + }else if(PalletProductTypeConstant.STOCKDATA.equals(type)){ + trayListVOS = warehouseTrayGoodsService.getReCheckStockByTrayTypeId(trayTypeId); + }else if(PalletProductTypeConstant.STOCKNODATA.equals(type)){ + trayListVOS = warehouseTrayGoodsService.getReCheckStockByTrayTypeId(trayTypeId); + }else { + log.warn("##################scanTargetTrayCode: 未知的打托类型"); + } + map.put("trayCode",trayCode); + map.put("totalNum",totalNum); + map.put("orderTotalNum",orderTotalNum); + map.put("stockNum",stockNum); + map.put("stockTotalNum",stockTotalNum); + map.put("list",trayListVOS); + return R.data(map); + } + } + + private void copyTrayGoodsToTargetTray(Long sourceTrayTypeId, WarehouseTrayTypeEntity targetTrayTypeEntity) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("tray_type_id",sourceTrayTypeId); diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java index 58bb00b2f..e31a1a447 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java @@ -170,10 +170,10 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl ls = new ArrayList<>(); UpShelfDataVO dataVO = new UpShelfDataVO(); dataVO.setOrderCode(parcelListEntity.getOrderCode()); @@ -749,7 +749,10 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl ls = new ArrayList<>(); List updownGoodsEntities = warehouseUpdownGoodsService.getUpdownGoodsByZeroOrderId(orderId); List trayGoodsEntities = warehouseTrayGoodsService.getTrayGoodsByZeroOrderIdNoAllocationId(orderId); updownGoodsEntities.addAll(trayGoodsEntities); @@ -1278,7 +1280,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl