From b6e5ce793bc68df6fa9a30ba0eb9b9927380e430 Mon Sep 17 00:00:00 2001 From: daiweihong <242520063@qq.com> Date: Thu, 22 Aug 2024 13:17:20 +0800 Subject: [PATCH] =?UTF-8?q?20240822=E6=9C=8D=E5=8A=A1=E5=99=A8=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=9C=80=E6=96=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shkj/wms/mapper/BaseLocationMapper.java | 12 ++++---- .../shkj/wms/mapper/SysStockDetailMapper.java | 4 +-- .../wms/outbound/SchedulingOutboundInfo.java | 12 ++++---- .../java/com/shkj/wms/plc/PlcEventTask.java | 3 ++ .../com/shkj/wms/plc/PlcEventTmpTask.java | 2 +- .../wms/scheduled/AllocationTasksUtils.java | 4 +-- .../wms/service/IBasRuleDetailService.java | 2 +- .../wms/service/IBaseGoodsDataService.java | 2 +- .../wms/service/IBaseLocationService.java | 8 ++--- .../service/IBusinDataTaskDetailService.java | 8 ++--- .../service/IBusinEnptyContainerService.java | 2 +- .../wms/service/IBusinPickupDtlService.java | 2 +- .../wms/service/IPutInOutStorageService.java | 6 ++-- .../wms/service/ISysStockDetailService.java | 10 +++---- .../shkj/wms/service/ISysStockService.java | 2 +- .../impl/BaseBarcodesInServiceImpl.java | 29 ++++++++++--------- 16 files changed, 58 insertions(+), 50 deletions(-) diff --git a/shkj-wms/src/main/java/com/shkj/wms/mapper/BaseLocationMapper.java b/shkj-wms/src/main/java/com/shkj/wms/mapper/BaseLocationMapper.java index 98b2a0e..7088803 100644 --- a/shkj-wms/src/main/java/com/shkj/wms/mapper/BaseLocationMapper.java +++ b/shkj-wms/src/main/java/com/shkj/wms/mapper/BaseLocationMapper.java @@ -75,12 +75,12 @@ public interface BaseLocationMapper extends BaseMapper { * @param bo * @return */ - List queryBaseLocationListByDerive( BaseLocationQueryListBo bo); - List queryBaseLocationListByDerive1( BaseLocationQueryListBo bo); + List queryBaseLocationListByDerive(BaseLocationQueryListBo bo); + List queryBaseLocationListByDerive1(BaseLocationQueryListBo bo); - List getLocationByAreaId( Long areaId); + List getLocationByAreaId(Long areaId); - List getLocationByAreaIdTunel( BaseLocationQueryBo bo); + List getLocationByAreaIdTunel(BaseLocationQueryBo bo); /** * 获取 异常、冲孔出库货位数据 @@ -89,7 +89,7 @@ public interface BaseLocationMapper extends BaseMapper { * @param areaId * @return java.util.List */ - List getOutLocationByAreaId( Long areaId); + List getOutLocationByAreaId(Long areaId); /** *根据库位id查询巷道信息 * @param goodsNo @@ -99,7 +99,7 @@ public interface BaseLocationMapper extends BaseMapper { List getEmptyContainerFromLocation(Long areaId); - List queryBaseLocationListByGoods( BaseLocationQueryListBo bo); + List queryBaseLocationListByGoods(BaseLocationQueryListBo bo); List getBaseLocationForMap(BaseLocationQueryPageBo bo); diff --git a/shkj-wms/src/main/java/com/shkj/wms/mapper/SysStockDetailMapper.java b/shkj-wms/src/main/java/com/shkj/wms/mapper/SysStockDetailMapper.java index b7de035..11ded99 100644 --- a/shkj-wms/src/main/java/com/shkj/wms/mapper/SysStockDetailMapper.java +++ b/shkj-wms/src/main/java/com/shkj/wms/mapper/SysStockDetailMapper.java @@ -34,13 +34,13 @@ public interface SysStockDetailMapper extends BaseMapper { * @param goodsNo * @return */ - Map getInventoryInStockByGoods(List goodsNoList,String goodsNo); + Map getInventoryInStockByGoods(List goodsNoList, String goodsNo); int updateSysStockDetail(SysStockReduceBo bo); List getStockDetailByLocationId(String id); - List selectsystock(@Param("GoodsNos")List GoodsNos, @Param("locationid") Long locationid); + List selectsystock(@Param("GoodsNos") List GoodsNos, @Param("locationid") Long locationid); void deleteBySysStockByLocationId(@Param("locationId") Long locationId); diff --git a/shkj-wms/src/main/java/com/shkj/wms/outbound/SchedulingOutboundInfo.java b/shkj-wms/src/main/java/com/shkj/wms/outbound/SchedulingOutboundInfo.java index 69517d3..39a3388 100644 --- a/shkj-wms/src/main/java/com/shkj/wms/outbound/SchedulingOutboundInfo.java +++ b/shkj-wms/src/main/java/com/shkj/wms/outbound/SchedulingOutboundInfo.java @@ -106,14 +106,16 @@ public class SchedulingOutboundInfo { BaseBarcodesOutQueryBo baseBarcodesOutQueryBo = new BaseBarcodesOutQueryBo(); baseBarcodesOutQueryBo.setTraverseDate(startBarcodesOut.getTraverseDate()); baseBarcodesOutQueryBo.setEndTraverseDate(endBarcodesOut.getTraverseDate()); - baseBarcodesOutQueryBo.setColor(startBarcodesOut.getColor()); - baseBarcodesOutQueryBo.setBumperType(startBarcodesOut.getBumperType()); - baseBarcodesOutQueryBo.setVehicleCode(startBarcodesOut.getVehicleCode()); +// baseBarcodesOutQueryBo.setColor(startBarcodesOut.getColor()); +// baseBarcodesOutQueryBo.setBumperType(startBarcodesOut.getBumperType()); +// baseBarcodesOutQueryBo.setVehicleCode(startBarcodesOut.getVehicleCode()); BaseBarcodesOutAddBo barcodesOut = iBaseBarcodesOutService.selectVinOutboundListOne(baseBarcodesOutQueryBo); // 判断是否有任务，如果没有任务则返回 barcodesOutList.add(barcodesOut); - if (ObjectUtils.isEmpty(barcodesOutList)) { + if (ObjectUtils.isEmpty(barcodesOut)) { log.info("暂无任务"); + redisTemplate.delete(RedisConstant.startTaskVin); + redisTemplate.delete(RedisConstant.endTaskVin); return; } // 获取小组装任务最大等待数 @@ -138,7 +140,7 @@ public class SchedulingOutboundInfo { // 如果没执行到该停止任务，这不需要理会 if(ObjectUtils.isNotEmpty(redisTemplate.opsForValue().get(RedisConstant.endTaskVin))){ String endTaskVin = redisTemplate.opsForValue().get(RedisConstant.endTaskVin).toString(); - if(endTaskVin.equals(barcodesOut.getVin())){ + if(ObjectUtils.isNotEmpty(barcodesOut.getVin()) && endTaskVin.equals(barcodesOut.getVin())){ redisTemplate.delete(RedisConstant.startTaskVin); redisTemplate.delete(RedisConstant.endTaskVin); } diff --git a/shkj-wms/src/main/java/com/shkj/wms/plc/PlcEventTask.java b/shkj-wms/src/main/java/com/shkj/wms/plc/PlcEventTask.java index 71bbd0f..357d99d 100644 --- a/shkj-wms/src/main/java/com/shkj/wms/plc/PlcEventTask.java +++ b/shkj-wms/src/main/java/com/shkj/wms/plc/PlcEventTask.java @@ -899,6 +899,9 @@ public class PlcEventTask { snPointMap.put("3","KW28"); agvPoints.add("KW28"); } + }else if ("21".equals(taskType)){ + snPointMap.put("3",taskPath); + agvPoints.add(taskPath); } businDataTask.setPoints(JsonUtil.toJSONString(snPointMap)); diff --git a/shkj-wms/src/main/java/com/shkj/wms/plc/PlcEventTmpTask.java b/shkj-wms/src/main/java/com/shkj/wms/plc/PlcEventTmpTask.java index e862e9c..e7eab3d 100644 --- a/shkj-wms/src/main/java/com/shkj/wms/plc/PlcEventTmpTask.java +++ b/shkj-wms/src/main/java/com/shkj/wms/plc/PlcEventTmpTask.java @@ -427,7 +427,7 @@ class WeightRandomStrategy { } } - public java.lang.String randome(){ + public String randome(){ Map.putAll(weightMap); String k = random(); return k; diff --git a/shkj-wms/src/main/java/com/shkj/wms/scheduled/AllocationTasksUtils.java b/shkj-wms/src/main/java/com/shkj/wms/scheduled/AllocationTasksUtils.java index f25977d..8bc556e 100644 --- a/shkj-wms/src/main/java/com/shkj/wms/scheduled/AllocationTasksUtils.java +++ b/shkj-wms/src/main/java/com/shkj/wms/scheduled/AllocationTasksUtils.java @@ -109,7 +109,7 @@ public class AllocationTasksUtils { redisTemplate.opsForValue().set("Distributor"+"copyMap",copyMap); if (copyMap.size()==0){ - List collect = map.entrySet().stream().map(java.util.Map.Entry::getKey).collect(Collectors.toList()); + List collect = map.entrySet().stream().map(Map.Entry::getKey).collect(Collectors.toList()); collect.stream().forEach(e->{ map.put(String.valueOf(e),0D); }); @@ -151,7 +151,7 @@ public class AllocationTasksUtils { redisTemplate.opsForValue().set("Distributorout"+"copyMap",outcopyMap); if (outcopyMap.size()==0){ - List collect = outmap.entrySet().stream().map(java.util.Map.Entry::getKey).collect(Collectors.toList()); + List collect = outmap.entrySet().stream().map(Map.Entry::getKey).collect(Collectors.toList()); collect.stream().forEach(e->{ outmap.put(String.valueOf(e),0D); }); diff --git a/shkj-wms/src/main/java/com/shkj/wms/service/IBasRuleDetailService.java b/shkj-wms/src/main/java/com/shkj/wms/service/IBasRuleDetailService.java index a982ef9..e7d2a6c 100644 --- a/shkj-wms/src/main/java/com/shkj/wms/service/IBasRuleDetailService.java +++ b/shkj-wms/src/main/java/com/shkj/wms/service/IBasRuleDetailService.java @@ -22,6 +22,6 @@ public interface IBasRuleDetailService extends IService { /** * 新增编码规则 */ - Boolean saveBatchRuleDetail (List bo); + Boolean saveBatchRuleDetail(List bo); } diff --git a/shkj-wms/src/main/java/com/shkj/wms/service/IBaseGoodsDataService.java b/shkj-wms/src/main/java/com/shkj/wms/service/IBaseGoodsDataService.java index b750ad7..e4b2061 100644 --- a/shkj-wms/src/main/java/com/shkj/wms/service/IBaseGoodsDataService.java +++ b/shkj-wms/src/main/java/com/shkj/wms/service/IBaseGoodsDataService.java @@ -81,6 +81,6 @@ public interface IBaseGoodsDataService extends IService { List getbaseGooddata(BaseGoodsData goodsData); List getBaseGoodDataInByDerice(BaseDerive baseDerive); - List getBaseGoodDatarear (BaseDerive baseDerive); + List getBaseGoodDatarear(BaseDerive baseDerive); } diff --git a/shkj-wms/src/main/java/com/shkj/wms/service/IBaseLocationService.java b/shkj-wms/src/main/java/com/shkj/wms/service/IBaseLocationService.java index cf67744..af5a465 100644 --- a/shkj-wms/src/main/java/com/shkj/wms/service/IBaseLocationService.java +++ b/shkj-wms/src/main/java/com/shkj/wms/service/IBaseLocationService.java @@ -97,7 +97,7 @@ public interface IBaseLocationService extends IService { */ List queryBaseLocationList(BaseLocationQueryPageBo bo); - BaseLocation queryBaseLocationByrcl(String locationRow,String locationCol,String layer,String tunnel); + BaseLocation queryBaseLocationByrcl(String locationRow, String locationCol, String layer, String tunnel); /** @@ -145,7 +145,7 @@ public interface IBaseLocationService extends IService { * @param vehicheModel * @return */ - Result assignEmptyLocation(String vehicheModel,String color ,String batch,List businDataTaskGoodsVos); + Result assignEmptyLocation(String vehicheModel, String color, String batch, List businDataTaskGoodsVos); /** * 根据产品查找库内库存数量最少的巷道 @@ -154,10 +154,10 @@ public interface IBaseLocationService extends IService { * @param businDataTaskGoodsVos * @return */ - Result assignEmptyLocationByStock( String goodsNo,String vehicheModel, String batch,List businDataTaskGoodsVos); + Result assignEmptyLocationByStock(String goodsNo, String vehicheModel, String batch, List businDataTaskGoodsVos); - Result assignEmptyLocationAll(AssingEmptyLocBo assingEmptyLocBo,String tunnel); + Result assignEmptyLocationAll(AssingEmptyLocBo assingEmptyLocBo, String tunnel); /** * 冲孔杠分配货位 diff --git a/shkj-wms/src/main/java/com/shkj/wms/service/IBusinDataTaskDetailService.java b/shkj-wms/src/main/java/com/shkj/wms/service/IBusinDataTaskDetailService.java index 30c40a9..fd0edc0 100644 --- a/shkj-wms/src/main/java/com/shkj/wms/service/IBusinDataTaskDetailService.java +++ b/shkj-wms/src/main/java/com/shkj/wms/service/IBusinDataTaskDetailService.java @@ -29,15 +29,15 @@ public interface IBusinDataTaskDetailService extends IService insertBusinTaskDetail(BusinDataTaskDetail businDataTaskDetail); /** - * + * * @author Comair * @date 2023/7/30 15:07 * @param oldLocationId - * @param newLocation + * @param newLocation * @return boolean */ - public int updateInfoByLocationCode(Long oldLocationId,Long newLocation ); + public int updateInfoByLocationCode(Long oldLocationId, Long newLocation); public int updateOld(Long oldLocationId); - public int updateNew(Long newLocation ); + public int updateNew(Long newLocation); } diff --git a/shkj-wms/src/main/java/com/shkj/wms/service/IBusinEnptyContainerService.java b/shkj-wms/src/main/java/com/shkj/wms/service/IBusinEnptyContainerService.java index be20b9b..03557b2 100644 --- a/shkj-wms/src/main/java/com/shkj/wms/service/IBusinEnptyContainerService.java +++ b/shkj-wms/src/main/java/com/shkj/wms/service/IBusinEnptyContainerService.java @@ -21,7 +21,7 @@ public interface IBusinEnptyContainerService extends IService { * @param containerCode 治具编号 * @return 结果 */ - public Result emptyContainerFlowDir(String fromPoint,Long containerCode,String taskCode,String agvtype); + public Result emptyContainerFlowDir(String fromPoint, Long containerCode, String taskCode, String agvtype); /** * 空治具出库流程 diff --git a/shkj-wms/src/main/java/com/shkj/wms/service/IBusinPickupDtlService.java b/shkj-wms/src/main/java/com/shkj/wms/service/IBusinPickupDtlService.java index 5b2812a..3210e10 100644 --- a/shkj-wms/src/main/java/com/shkj/wms/service/IBusinPickupDtlService.java +++ b/shkj-wms/src/main/java/com/shkj/wms/service/IBusinPickupDtlService.java @@ -20,5 +20,5 @@ public interface IBusinPickupDtlService extends IService { * @param dtlList * @return 结果 */ - public Boolean saveBusinPickupDtl(List dtlList ); + public Boolean saveBusinPickupDtl(List dtlList); } diff --git a/shkj-wms/src/main/java/com/shkj/wms/service/IPutInOutStorageService.java b/shkj-wms/src/main/java/com/shkj/wms/service/IPutInOutStorageService.java index 1b2d2a7..edf564c 100644 --- a/shkj-wms/src/main/java/com/shkj/wms/service/IPutInOutStorageService.java +++ b/shkj-wms/src/main/java/com/shkj/wms/service/IPutInOutStorageService.java @@ -19,7 +19,7 @@ import java.util.List; public interface IPutInOutStorageService extends IService { /** 自动入库*/ - public Result saveBusinBillTaskData(MachineHandAddBo bo,String type); + public Result saveBusinBillTaskData(MachineHandAddBo bo, String type); /** * 下挂生成相关任务 @@ -41,7 +41,7 @@ public interface IPutInOutStorageService extends IService { * @param billTaskAddbo * @return */ - public Result saveBillTaskIn(BillTaskAddbo billTaskAddbo,String type); + public Result saveBillTaskIn(BillTaskAddbo billTaskAddbo, String type); public Result queryderiveId(BillTaskAddbo billTaskAddbo); @@ -57,5 +57,5 @@ public interface IPutInOutStorageService extends IService { /** * 部分取货，减去库存 */ - public Result reduceInventory(Long taskId,List goods); + public Result reduceInventory(Long taskId, List goods); } diff --git a/shkj-wms/src/main/java/com/shkj/wms/service/ISysStockDetailService.java b/shkj-wms/src/main/java/com/shkj/wms/service/ISysStockDetailService.java index bc3bced..9f9e4ab 100644 --- a/shkj-wms/src/main/java/com/shkj/wms/service/ISysStockDetailService.java +++ b/shkj-wms/src/main/java/com/shkj/wms/service/ISysStockDetailService.java @@ -76,7 +76,7 @@ public interface ISysStockDetailService extends IService { * @param goods 入库产品信息 * @return */ - Result productDepositDetail(Long locationId, Long containerId, String batch, String isPuch, List> goods,Long storageCode); + Result productDepositDetail(Long locationId, Long containerId, String batch, String isPuch, List> goods, Long storageCode); /** @@ -88,7 +88,7 @@ public interface ISysStockDetailService extends IService { * @param goods * @return */ - Result reduceInventoryDetail(Long branchId, Long locationId, Long storageId,Long areaId, List> goods); + Result reduceInventoryDetail(Long branchId, Long locationId, Long storageId, Long areaId, List> goods); /** * 库存查询 @@ -99,12 +99,12 @@ public interface ISysStockDetailService extends IService { /** * 修改信息 */ - Result updateStock(BaseGoodsData goodsData,String id); + Result updateStock(BaseGoodsData goodsData, String id); /** * 库位调整 */ - Result removeLocation(String oldLocation, String newLoaction,String id,String newid); + Result removeLocation(String oldLocation, String newLoaction, String id, String newid); /** * 查询货位 @@ -113,7 +113,7 @@ public interface ISysStockDetailService extends IService { List getLocation(List goodsnoList); - List selectsystock(List goods,Long locationid); + List selectsystock(List goods, Long locationid); /** * 扣减库存信息 diff --git a/shkj-wms/src/main/java/com/shkj/wms/service/ISysStockService.java b/shkj-wms/src/main/java/com/shkj/wms/service/ISysStockService.java index 185d841..2cb0554 100644 --- a/shkj-wms/src/main/java/com/shkj/wms/service/ISysStockService.java +++ b/shkj-wms/src/main/java/com/shkj/wms/service/ISysStockService.java @@ -67,7 +67,7 @@ public interface ISysStockService extends IService { * @param goods 入库产品信息 * @return */ - Result productDeposit(Long locationId, Long containerId, String batch, String isPuch, List> goods,Long storageCode); + Result productDeposit(Long locationId, Long containerId, String batch, String isPuch, List> goods, Long storageCode); /** diff --git a/shkj-wms/src/main/java/com/shkj/wms/service/impl/BaseBarcodesInServiceImpl.java b/shkj-wms/src/main/java/com/shkj/wms/service/impl/BaseBarcodesInServiceImpl.java index b1c9b55..4677992 100644 --- a/shkj-wms/src/main/java/com/shkj/wms/service/impl/BaseBarcodesInServiceImpl.java +++ b/shkj-wms/src/main/java/com/shkj/wms/service/impl/BaseBarcodesInServiceImpl.java @@ -166,20 +166,22 @@ public class BaseBarcodesInServiceImpl extends ServiceImpl