From 5b9bf27ed5d5c41798c09fdbfbce5b5708687da8 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Thu, 22 Feb 2024 10:39:59 +0800 Subject: [PATCH 1/3] =?UTF-8?q?PDA=E8=80=83=E6=A0=B8=E6=8C=87=E6=A0=87?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/supervise/service/impl/ClassifyServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java index 8bd897378..d80bd4777 100644 --- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java @@ -265,7 +265,7 @@ public class ClassifyServiceImpl extends BaseServiceImpl1){ + if (Func.isNotEmpty(indicatorsEntityList) && indicatorsEntityList.size()>= 1){ classifyApiVO.setIsCommit(1); } } From 2a61269da77b2c669e4075fd85e4640acb1c3958 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Thu, 22 Feb 2024 10:40:36 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A4=87=E8=B4=A7=E5=BA=93=E4=BD=8D?= =?UTF-8?q?=E6=89=98=E7=9B=98=E4=B8=8A=E6=9E=B6=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/AftersalesWorkOrderMapper.xml | 2 +- ...rehouseUpdownStockupAreaApiController.java | 42 ++++++++++ .../IWarehouseUpdownStockupAreaService.java | 9 ++ ...WarehouseUpdownStockupAreaServiceImpl.java | 84 +++++++++++++++++++ 4 files changed, 136 insertions(+), 1 deletion(-) diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml index 3b8bfca27..cf5c634a6 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml @@ -160,7 +160,7 @@ date_format(from_unixtime(create_time),'%Y-%m-%d') = date_format(now(),'%Y-%m-%d and lawo.work_order_status in ( #{param.workOrderStatus }) and lawo.work_order_status in ('10') and lap.types_of = '2' and lap.processing_status in ('1') - and lawo.work_order_status in ('30') and lap.types_of = '2' and lap.processing_status in ('1') + and lawo.work_order_status in ('20') and lap.types_of = '2' and lap.types_of = '2' and lawo.work_order_status in (21,30) and lap.processing_status = '4' and lawo.work_order_status in (80,100) and lacr.warehouse_id=#{param.warehouseId} diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseUpdownStockupAreaApiController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseUpdownStockupAreaApiController.java index 6ddbb244f..5beba1513 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseUpdownStockupAreaApiController.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseUpdownStockupAreaApiController.java @@ -351,4 +351,46 @@ public class WarehouseUpdownStockupAreaApiController { } } + + + @ResponseBody + @PostMapping("/upShelfTray") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "上架托盘维度", notes = "传入trayTypeDTO") + public R upShelfTray(@RequestBody UpdownTypeDTO updownTypeDTO ) { + String method = "###########upShelfTray: "; + log.info(method + "上架托盘维度 updownTypeDTO={}", updownTypeDTO); + String trayCode = updownTypeDTO.getTrayCode();//托盘码 + Long allocationId = updownTypeDTO.getAllocationId(); + try{ + BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); + if(Objects.isNull(myCurrentWarehouse)){ + log.warn(method+"仓库信息不能为空"); + return R.fail(403,"仓库信息不能为空"); + } + + if(Objects.isNull(allocationId)){ + log.warn(method+"库位信息不能为空 allocationId={}",allocationId); + return R.fail(403,"库位信息不能为空"); + } + if(StringUtil.isBlank(trayCode)){ + log.warn(method+"托盘码不能为空 trayCode={}",trayCode); + return R.fail(403,"托盘码不能为空"); + } + + //上架托盘维度 + R r = warehouseUpdownStockupAreaService.upShelfTray(trayCode, allocationId, myCurrentWarehouse.getId()); +/* if (r.getCode() == 200) { + warehouseGoodsAllocationClient.updateAllocationCache(allocationId.toString()); + }*/ + return r; + }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,"系统异常，联系管理员"); + } + } + } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownStockupAreaService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownStockupAreaService.java index d30b67ee3..f493ab1b9 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownStockupAreaService.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownStockupAreaService.java @@ -119,4 +119,13 @@ public interface IWarehouseUpdownStockupAreaService extends BaseService upShelfZeroOrderList, Long allocationId, Long id); + + /** + * 上架托盘 + * @param trayCode + * @param allocationId + * @param id + * @return + */ + R upShelfTray(String trayCode, Long allocationId, Long id); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownStockupAreaServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownStockupAreaServiceImpl.java index 1b39496a9..47ba2b79f 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownStockupAreaServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownStockupAreaServiceImpl.java @@ -98,6 +98,8 @@ public class WarehouseUpdownStockupAreaServiceImpl extends BaseServiceImpl updownTypeEntityQueryWrapper = new QueryWrapper<>(); +// updownTypeEntityQueryWrapper.eq("allocation_id",allocationId) +// .eq("is_deleted",0); +// WarehouseUpdownTypeEntity updownTypeEntity = baseMapper.selectOne(updownTypeEntityQueryWrapper); +// if(!Objects.isNull(updownTypeEntity)){ +// log.warn("##############upShelfTray: 库位上已存在货物 allocationId={}",allocationId); +// return R.fail(403,"库位上已存在货物"); +// } + + BasicdataGoodsAllocationEntity goodsAllocationEntity = basicdataGoodsAllocationClient.getEntityByAllocationId(allocationId); + if(Objects.isNull(goodsAllocationEntity)){ + log.warn("##############upShelfTray: 库位不存在 allocationId={}",allocationId); + return R.fail(403,"库位不存在"); + } + String enableStatus = goodsAllocationEntity.getEnableStatus(); + Long goodsShelfId = goodsAllocationEntity.getGoodsShelfId(); + if("2".equals(enableStatus)){ + log.warn("##############upShelfTray: 库位已被禁用 allocationId={}",allocationId); + return R.fail(403,"库位已被禁用"); + } + BasicdataGoodsShelfEntity goodsShelfEntity = basicdataGoodsShelfClient.getEntityByGoodsShelfId(goodsShelfId); + if(Objects.isNull(goodsShelfEntity)){ + log.warn("##############upShelfTray: 货架不存在 goodsShelfId={}",goodsShelfId); + return R.fail(403,"货架不存在"); + } + Long goodsAreaId = goodsShelfEntity.getGoodsAreaId(); + BasicdataGoodsAreaEntity goodsAreaEntity = basicdataGoodsAreaClient.getEntityByGoodsAreaId(goodsAreaId); + if(Objects.isNull(goodsAreaEntity)){ + log.warn("##############upShelfTray: 货区不存在 goodsAreaId={}",goodsAreaId); + return R.fail(403,"货区不存在"); + } +// String areaType = goodsAreaEntity.getAreaType(); +// if("1".equals(areaType)){ +// log.warn("#################upShelfTray: 备货区不能上下架 goodsAreaId={}",goodsAreaId); +// throw new CustomerException(403,"备货区不能上下架"); +// } + Long wid = goodsAreaEntity.getWarehouseId(); + BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(wid); + if(Objects.isNull(warehouseEntity)){ + log.warn("##############upShelfTray: 仓库不存在 warehouseId={}",wid); + return R.fail(403,"仓库不存在"); + } + if(!wid.equals(warehouseId)){ + log.warn("##############upShelfTray: 库位不在本仓库中 warehouseId={}",warehouseId); + return R.fail(403,"库位不在本仓库中"); + } + + //查询托盘上有哪些货物，存入相同的绑定关系和记录 + QueryWrapper trayTypeEntityQueryWrapper = new QueryWrapper<>(); + trayTypeEntityQueryWrapper.eq("tray_code",trayCode) + .eq("is_deleted",0); + WarehouseTrayTypeEntity trayTypeEntity = warehouseTrayTypeService.getOne(trayTypeEntityQueryWrapper); + if(Objects.isNull(trayTypeEntity)){ + log.warn("##############upShelfTray: 托盘上没有货物信息 trayCode={}",trayCode); + return R.fail(403,"托盘上没有货物信息"); + } + //处理托盘上的货物到库位上 + return saveTrayGoodsToAllocation(trayTypeEntity,goodsAllocationEntity,goodsShelfEntity,goodsAreaEntity,warehouseId); +// return null; + } + + private R saveTrayGoodsToAllocation(WarehouseTrayTypeEntity trayTypeEntity, BasicdataGoodsAllocationEntity goodsAllocationEntity, BasicdataGoodsShelfEntity goodsShelfEntity, BasicdataGoodsAreaEntity goodsAreaEntity, Long warehouseId) { + + return null; + } + private WarehouseUpdownStockupAreaEntity createdNewUpShelfInventory(Long allocationId, Long warehouseId, UpShelfStockDTO upShelfStockDTO, WarehouseUpdownStockupAreaEntity updownTypeEntity, Long goodsAreaId, BasicdataGoodsAreaEntity goodsAreaEntity, Long goodsShelfId, BasicdataGoodsShelfEntity goodsShelfEntity, BasicdataGoodsAllocationEntity goodsAllocationEntity) { WarehouseUpdownStockupAreaEntity updownStockupAreaEntity = new WarehouseUpdownStockupAreaEntity(); updownStockupAreaEntity.setWarehouseId(warehouseId); From 86a1886ba88e47995165cf85d79f9b8473ab4465 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Thu, 22 Feb 2024 10:54:24 +0800 Subject: [PATCH 3/3] =?UTF-8?q?1.=E8=80=83=E6=A0=B8-=E6=8C=87=E6=A0=87?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/supervise/vo/IndicatorsVO.java | 3 ++- .../service/impl/ClassifyServiceImpl.java | 17 +++++++------- .../service/impl/IndicatorsServiceImpl.java | 9 ++++++++ .../impl/TrunklineCarsLoadServiceImpl.java | 23 +++++++++++-------- 4 files changed, 34 insertions(+), 18 deletions(-) diff --git a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/IndicatorsVO.java b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/IndicatorsVO.java index 3b2bdf5d6..f6d120129 100644 --- a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/IndicatorsVO.java +++ b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/IndicatorsVO.java @@ -2,7 +2,6 @@ package com.logpm.supervise.vo; import com.logpm.supervise.entity.IndicatorsAnnexEntity; import com.logpm.supervise.entity.IndicatorsEntity; -import com.logpm.supervise.entity.PointsEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -37,4 +36,6 @@ public class IndicatorsVO extends IndicatorsEntity { private List files = new ArrayList<>(); + private Integer isEdit; + } diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java index d80bd4777..d594ef894 100644 --- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java @@ -124,15 +124,16 @@ public class ClassifyServiceImpl extends BaseServiceImpl records = pages.getRecords(); + Long userId = AuthUtil.getUserId(); + for (IndicatorsVO record : records) { Long deptId = record.getCreateDept(); String deptName = deptClient.findNameById(deptId); record.setCreateDeptName(deptName); + Long createUser = record.getCreateUser(); + if(userId.equals(createUser)){ + record.setIsEdit(1); + }else{ + record.setIsEdit(0); + } } pages.setRecords(records); 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 556d5af42..272c18f97 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 @@ -943,20 +943,25 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl