From 030f8970f0f36574188d1723e1fbdbaaad09a852 Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Thu, 24 Aug 2023 13:59:08 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=87=E8=B4=A7?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=9F=A5=E8=AF=A2=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/DistributionParcelTrayVO.java | 17 +++++++ .../vo/DistributionStockupListVO.java | 1 + .../vo/DistributionStockupOrderListVO.java | 4 ++ .../feign/IWarehouseTaryAllocationClient.java | 26 +++++++++++ .../feign/IWarehouseTrayGoodsClient.java | 10 +++++ .../DistributionStockupAppController.java | 7 +-- .../distribution/dto/app/StockupDTO.java | 1 + .../mapper/DistributionReservationMapper.xml | 30 ++++++++++++- .../DistributionReservationPackageMapper.java | 7 ++- .../DistributionReservationPackageMapper.xml | 12 +++++ ...DistributionReservationPackageService.java | 3 ++ .../service/IDistributionStockupService.java | 8 ++++ ...ributionReservationPackageServiceImpl.java | 16 ++++--- .../impl/DistributionStockupServiceImpl.java | 45 +++++++++++++++++-- .../feign/WarehouseTaryAllocationClient.java | 32 +++++++++++++ .../feign/WarehouseTrayGoodsClient.java | 21 +++++---- 16 files changed, 215 insertions(+), 25 deletions(-) create mode 100644 blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelTrayVO.java create mode 100644 blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTaryAllocationClient.java create mode 100644 blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseTaryAllocationClient.java diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelTrayVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelTrayVO.java new file mode 100644 index 000000000..f8603fe95 --- /dev/null +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelTrayVO.java @@ -0,0 +1,17 @@ +package com.logpm.distribution.vo; + +import lombok.Data; + +/** + * @program: LogisticsPlatform-Service + * @description: 客户货物托盘 + * @author: cyz + * @create: 2023-08-24 11:32 + **/ +@Data +public class DistributionParcelTrayVO { + private String trayId; //托盘id + private String trayCode; //托盘名称 + private String trayPackNum; //托盘名称 + +} diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupListVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupListVO.java index 81a4774a7..3a184ceb9 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupListVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupListVO.java @@ -7,6 +7,7 @@ import java.io.Serializable; @Data public class DistributionStockupListVO implements Serializable { + private Long id;//预约单id private Long reservationId;//预约单id private String reservation;//预约单id diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupOrderListVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupOrderListVO.java index a20147798..d2eec0867 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupOrderListVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupOrderListVO.java @@ -32,4 +32,8 @@ public class DistributionStockupOrderListVO implements Serializable { @ApiModelProperty(value = "扫描件数") private Integer scanNum;//扫描件数 + private Long areaId; //货区id + private Long shelfId; //货架id + private Long allocationId; //货位id + } diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTaryAllocationClient.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTaryAllocationClient.java new file mode 100644 index 000000000..f842e8611 --- /dev/null +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTaryAllocationClient.java @@ -0,0 +1,26 @@ +package com.logpm.warehouse.feign; + + +import com.logpm.warehouse.entity.WarehouseTaryAllocationEntity; +import org.springblade.common.constant.ModuleNameConstant; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; + +import java.util.List; + +@FeignClient( + value = ModuleNameConstant.APPLICATION_WAREHOUSE_NAME +) +public interface IWarehouseTaryAllocationClient { + + String API_PREFIX = "/client"; + String TOP = API_PREFIX + "/top"; + String GETALLOCATIONID = API_PREFIX + "/allocationId"; + + + @GetMapping(GETALLOCATIONID) + List getAllocationId(@RequestParam Long allocationId); + + +} diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTrayGoodsClient.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTrayGoodsClient.java index 72eb3ea1a..43999d8ae 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTrayGoodsClient.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTrayGoodsClient.java @@ -17,6 +17,7 @@ package com.logpm.warehouse.feign; +import com.logpm.warehouse.entity.WarehouseTrayGoodsEntity; import org.springblade.common.constant.ModuleNameConstant; import org.springframework.cloud.openfeign.FeignClient; @@ -25,6 +26,8 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestParam; +import java.util.List; + /** * 托盘 货物 绑定 Feign接口类 * @@ -38,6 +41,7 @@ public interface IWarehouseTrayGoodsClient { String API_PREFIX = "warehousetraygoods/client"; String TOP = API_PREFIX + "/top10"; + String GETTRAYIDLIST = API_PREFIX + "/trayIdList"; /** * 通过主键删除 @@ -62,5 +66,11 @@ public interface IWarehouseTrayGoodsClient { */ @PostMapping(TOP+"/delByTrayByCode") Boolean delByTrayByCode(@RequestParam String code); + /** + * 通过托盘id查询托盘上面的货物 + * @param trayId + */ + @PostMapping(GETTRAYIDLIST) + List getTrayIdList(@RequestParam Long trayId); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java index 97b9b9d5f..530cd1577 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java @@ -143,7 +143,8 @@ public class DistributionStockupAppController extends BladeController { for (DistributionStockupOrderListVO vo:list){ planNum = planNum + vo.getPlanNum(); scanNum = scanNum + vo.getScanNum(); - Boolean aBoolean = distributionReservationPackageService.selectClientStockupState(reservationId, vo.getStockArticleId()); + Boolean aBoolean = distributionStockupService.getClientStockupTray(reservationId, vo.getAllocationId()); +// Boolean aBoolean = distributionReservationPackageService.selectClientStockupState(reservationId, vo.getStockArticleId()); vo.setTrayLean(aBoolean); } map.put("planNum",planNum); @@ -240,7 +241,7 @@ public class DistributionStockupAppController extends BladeController { return R.data(list); } - @PostMapping("scanningCode") + @PostMapping("/scanningCode") @ApiOperation(value = "整托扫码") public R scanningCodelist(@RequestBody StockupDTO stockupDTO){ if(ObjectUtils.isNull(stockupDTO.getStockupId())){ @@ -249,7 +250,7 @@ public class DistributionStockupAppController extends BladeController { if(ObjectUtils.isNull(stockupDTO.getReservationId())){ return R.fail(3002,"预约Id不能为空"); } - if(ObjectUtils.isNull(stockupDTO.getTrayBarCode())){ + if(ObjectUtils.isNull(stockupDTO.getTrayId())){ return R.fail(3002,"托盘码不能为空"); } boolean b = distributionStockupService.addPackTrayList(stockupDTO); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/StockupDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/StockupDTO.java index ea22f6c49..f892d5945 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/StockupDTO.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/StockupDTO.java @@ -43,6 +43,7 @@ public class StockupDTO implements Serializable { private Integer scanType;//备货扫码类型 1 包件 2库存品 private String packetBarCode;//包件码 private String trayBarCode;//托盘码 + private String trayId;//货位ID private String stockupArea;//备货区 private String stockupId;//备货区Id private Long stockListId;//库存品id diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml index 8b48bed6c..f7dd32344 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml @@ -175,7 +175,7 @@ + + + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationPackageService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationPackageService.java index 456498517..203a81e3e 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationPackageService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationPackageService.java @@ -22,6 +22,7 @@ import com.logpm.distribution.dto.DistributionStockArticleDTO; import com.logpm.distribution.entity.DistributionParcelListEntity; import com.logpm.distribution.entity.DistributionReservationPackageEntity; import com.logpm.distribution.vo.DistributionParcelListVO; +import com.logpm.distribution.vo.DistributionParcelTrayVO; import com.logpm.distribution.vo.DistributionReservationPackageVO; import com.logpm.distribution.excel.DistributionReservationPackageExcel; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -86,4 +87,6 @@ public interface IDistributionReservationPackageService extends BaseService getStockArticlePackageList(List reservationPackageEntity); + + List selectClientStockupPackTray(Long reservationId); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java index 435eae88e..e16435b7e 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java @@ -120,4 +120,12 @@ public interface IDistributionStockupService extends BaseService selectClientStockupPackTray(Long reservationId) { + return baseMapper.listPackageTray(reservationId); + } + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java index 37bd12220..13ec55570 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java @@ -22,7 +22,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.StringUtils; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.logpm.basicdata.entity.BasicdataWarehouseEntity; import com.logpm.basicdata.feign.IBasicdataCodeClient; @@ -34,6 +33,10 @@ import com.logpm.distribution.mapper.DistributionStockupMapper; import com.logpm.distribution.service.*; import com.logpm.distribution.vo.*; import com.logpm.distribution.wrapper.DistributionStockupWrapper; +import com.logpm.warehouse.entity.WarehouseTaryAllocationEntity; +import com.logpm.warehouse.entity.WarehouseTrayGoodsEntity; +import com.logpm.warehouse.feign.IWarehouseTaryAllocationClient; +import com.logpm.warehouse.feign.IWarehouseTrayGoodsClient; import org.springblade.common.constant.CodeDesEnum; import org.springblade.common.constant.DictBizConstant; import org.springblade.common.constant.stockup.StockAssignStatusConstant; @@ -51,6 +54,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.*; +import java.util.concurrent.atomic.AtomicReference; /** * 备货信息表 服务实现类 @@ -65,6 +69,9 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl distributionStockupEntityIPage = baseMapper.selectHomeStockupPage(page, stockupDTO); - IPage distributionStockupEntityIPage = baseMapper.selectStockupPage(page, stockupDTO); + IPage distributionStockupEntityIPage = baseMapper.selectHomeStockupPage(page, stockupDTO); +// IPage distributionStockupEntityIPage = baseMapper.selectStockupPage(page, stockupDTO); List records = distributionStockupEntityIPage.getRecords(); for (DistributionStockupListVO vo : records) { intToStrDistributionStockupListVO(vo); @@ -578,5 +585,37 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl list = distributionReservationPackageService.selectClientStockupPackTray(reservationId);//查询在那些托盘 + List allocationId1 = warehouseTaryAllocationClient.getAllocationId(allocationId);//查询托盘 + AtomicReference trays = new AtomicReference<>(false); + allocationId1.forEach( i ->{ + boolean b = list.stream().anyMatch(a -> a.getTrayId().equals(i.getTrayId())); + if(b){ + //有 + Iterator iterator = list.iterator(); + while (iterator.hasNext()){ + if(i.getTrayId().equals(iterator.next().getTrayId())){ + String trayPackNum = iterator.next().getTrayPackNum(); //在这个托盘的数量 + List trayIdList = warehouseTrayGoodsClient.getTrayIdList(i.getTrayId()); + if(trayPackNum.equals(trayIdList.size())){ + trays.set(true); + } + + } + } + } + }); + return trays.get(); + } + } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseTaryAllocationClient.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseTaryAllocationClient.java new file mode 100644 index 000000000..e7458083c --- /dev/null +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseTaryAllocationClient.java @@ -0,0 +1,32 @@ +package com.logpm.warehouse.feign; + +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.logpm.warehouse.entity.WarehouseTaryAllocationEntity; +import com.logpm.warehouse.service.IWarehouseTaryAllocationService; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * @program: LogisticsPlatform-Service + * @description: + * @author: cyz + * @create: 2023-08-24 11:20 + **/ +@RestController +@AllArgsConstructor +public class WarehouseTaryAllocationClient implements IWarehouseTaryAllocationClient { + + private IWarehouseTaryAllocationService warehouseTaryAllocationService; + + @Override + @GetMapping(GETALLOCATIONID) + public List getAllocationId(Long allocationId) { + return warehouseTaryAllocationService.list(Wrappers.query().lambda() + .eq(WarehouseTaryAllocationEntity::getAllocationId,allocationId) + .eq(WarehouseTaryAllocationEntity::getBindStatus , "1") + ); + } +} diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseTrayGoodsClient.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseTrayGoodsClient.java index bf450b7a8..d451241e9 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseTrayGoodsClient.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseTrayGoodsClient.java @@ -1,22 +1,18 @@ package com.logpm.warehouse.feign; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.logpm.warehouse.entity.WarehouseWaybillEntity; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.logpm.warehouse.entity.WarehouseTrayGoodsEntity; import com.logpm.warehouse.service.IWarehouseTrayGoodsService; import com.logpm.warehouse.service.IWarehouseTrayTypeService; -import com.logpm.warehouse.service.IWarehouseWaybillService; import lombok.AllArgsConstructor; -import org.springblade.core.mp.support.BladePage; -import org.springblade.core.mp.support.Condition; -import org.springblade.core.mp.support.Query; -import org.springblade.core.tenant.annotation.NonDS; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; -import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; +import java.util.List; + @ApiIgnore() @RestController @AllArgsConstructor @@ -48,4 +44,13 @@ public class WarehouseTrayGoodsClient implements IWarehouseTrayGoodsClient { R r = warehouseTrayTypeService.trayToNull(code); return r.isSuccess() ; } + + @Override + @PostMapping(GETTRAYIDLIST) + public List getTrayIdList(Long trayId) { + return warehouseTrayGoodsService.list(Wrappers.query().lambda() + .eq(WarehouseTrayGoodsEntity::getTrayId,trayId) + .eq(WarehouseTrayGoodsEntity::getAssociationType,"3") + ); + } } From 92ab56c72b47381b9e9bc43e52b414472b6f7f02 Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Thu, 24 Aug 2023 17:38:17 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=87=E8=B4=A7?= =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feign/IBasicdataGoodsAreaClient.java | 12 +++ .../entity/DistributionStockupEntity.java | 4 +- .../vo/DistributionStockupStockListVO.java | 2 + .../feign/IWarehouseTaryAllocationClient.java | 9 ++- .../feign/BasicdataGoodsAreaClient.java | 19 +++++ .../mapper/BasicdataGoodsAreaMapper.xml | 5 +- .../DistributionStockupAppController.java | 73 +++++++++++++++---- .../distribution/dto/app/StockupDTO.java | 5 +- .../mapper/DistributionReservationMapper.xml | 2 +- .../service/IDistributionStockupService.java | 3 +- .../DistributionReservationServiceImpl.java | 2 +- .../impl/DistributionStockServiceImpl.java | 26 ++++++- .../impl/DistributionStockupServiceImpl.java | 66 +++++++++++------ .../feign/WarehouseTaryAllocationClient.java | 3 +- 14 files changed, 182 insertions(+), 49 deletions(-) diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataGoodsAreaClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataGoodsAreaClient.java index 0a9cbbabf..837c46bd7 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataGoodsAreaClient.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataGoodsAreaClient.java @@ -17,6 +17,7 @@ package com.logpm.basicdata.feign; import com.logpm.basicdata.entity.BasicdataGoodsAreaEntity; +import com.logpm.basicdata.vo.BasicdataGoodsAreaVO; import org.springblade.common.constant.ModuleNameConstant; import org.springblade.core.mp.support.BladePage; import org.springframework.cloud.openfeign.FeignClient; @@ -25,6 +26,8 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; +import java.util.List; + /** * 货区 Feign接口类 * @@ -38,6 +41,7 @@ public interface IBasicdataGoodsAreaClient { String API_PREFIX = "goodsArea/client"; String TOP = API_PREFIX + "/top"; + String GETDEPARTMENTID = API_PREFIX + "/departmentId"; /** * 获取货区列表 @@ -55,4 +59,12 @@ public interface IBasicdataGoodsAreaClient { @GetMapping(API_PREFIX+"/getEntityByGoodsAreaId") BasicdataGoodsAreaEntity getEntityByGoodsAreaId(@RequestParam Long goodsAreaId); + /** + * 根据部门id查询备货区 + * @param goodsAreaId + * @return + */ + @GetMapping(GETDEPARTMENTID) + List getDepartmentId(@RequestParam Long goodsAreaId); + } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockupEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockupEntity.java index ff9887872..da19d8d17 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockupEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockupEntity.java @@ -77,9 +77,9 @@ public class DistributionStockupEntity extends TenantEntity { @ApiModelProperty(value = "备货库位") private String stockipAllocation; /** - * 预约信息编号 + * 备货区ID */ - @ApiModelProperty(value = "预约信息编号") + @ApiModelProperty(value = "备货区ID") private Long goodsAreaId; /** * 预留1 diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupStockListVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupStockListVO.java index 25dd69d74..e9ae58cef 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupStockListVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupStockListVO.java @@ -24,6 +24,8 @@ public class DistributionStockupStockListVO implements Serializable { private String trayName;//托盘信息 + private Boolean trayLean;//整托状态 + private Integer unpack;//是否拆包 0 没有 1 拆了 } diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTaryAllocationClient.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTaryAllocationClient.java index f842e8611..bdd69921d 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTaryAllocationClient.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTaryAllocationClient.java @@ -5,6 +5,7 @@ import com.logpm.warehouse.entity.WarehouseTaryAllocationEntity; import org.springblade.common.constant.ModuleNameConstant; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestParam; import java.util.List; @@ -18,8 +19,12 @@ public interface IWarehouseTaryAllocationClient { String TOP = API_PREFIX + "/top"; String GETALLOCATIONID = API_PREFIX + "/allocationId"; - - @GetMapping(GETALLOCATIONID) + /** + * 查询货位上的托盘 + * @param allocationId + * @return + */ + @PostMapping(GETALLOCATIONID) List getAllocationId(@RequestParam Long allocationId); diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataGoodsAreaClient.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataGoodsAreaClient.java index f90d9e1dc..a1f2ba05e 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataGoodsAreaClient.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataGoodsAreaClient.java @@ -19,6 +19,9 @@ package com.logpm.basicdata.feign; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.basicdata.entity.BasicdataGoodsAreaEntity; import com.logpm.basicdata.service.IBasicdataGoodsAreaService; +import com.logpm.basicdata.vo.BasicdataGoodsAreaVO; +import com.logpm.basicdata.wrapper.WarehouseGoodsAreaWrapper; +import com.logpm.warehouse.entity.WarehouseGoodsAreaEntity; import lombok.AllArgsConstructor; import org.springblade.core.mp.support.BladePage; import org.springblade.core.mp.support.Condition; @@ -27,6 +30,8 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; +import java.util.List; + /** * 货区 Feign实现类 * @@ -65,4 +70,18 @@ public class BasicdataGoodsAreaClient implements IBasicdataGoodsAreaClient { return basicdataGoodsAreaService.getById(goodsAreaId); } + /** + * 查询部门备货区 + * @param goodsAreaId + * @return + */ + @Override + @GetMapping(GETDEPARTMENTID) + public List getDepartmentId(Long goodsAreaId) { + BasicdataGoodsAreaEntity warehouseWarehouse = new BasicdataGoodsAreaEntity(); + warehouseWarehouse.setDepartment(String.valueOf(goodsAreaId)); + List pages = basicdataGoodsAreaService.stockUp(warehouseWarehouse); + return pages; + } + } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml index 2d8908222..2510c29b1 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml @@ -33,9 +33,8 @@ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java index 530cd1577..182dd7110 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java @@ -19,11 +19,14 @@ package com.logpm.distribution.appcontroller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.logpm.basicdata.feign.IBasicdataGoodsAreaClient; +import com.logpm.basicdata.vo.BasicdataGoodsAreaVO; import com.logpm.distribution.bean.Resp; import com.logpm.distribution.dto.app.StockupDTO; import com.logpm.distribution.entity.DistributionReservationEntity; import com.logpm.distribution.entity.DistributionStockEntity; import com.logpm.distribution.entity.DistributionStockListEntity; +import com.logpm.distribution.entity.DistributionStockupEntity; import com.logpm.distribution.service.*; import com.logpm.distribution.vo.*; import io.swagger.annotations.Api; @@ -34,6 +37,7 @@ import org.springblade.common.constant.DictBizConstant; import org.springblade.common.constant.RabbitConstant; import org.springblade.common.utils.CommonUtil; import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.StringUtil; import org.springblade.system.cache.DictBizCache; @@ -58,6 +62,7 @@ public class DistributionStockupAppController extends BladeController { private final IDistributionStockupService distributionStockupService; private final IDistributionReservationService distributionReservationService; + private final IBasicdataGoodsAreaClient basicdataGoodsAreaClient; private final IDistributionStockService distributionStockService; private final IDistributionReservationPackageService distributionReservationPackageService; @@ -103,7 +108,7 @@ public class DistributionStockupAppController extends BladeController { public R> homePageList(@RequestBody StockupDTO stockupDTO) { // Integer current = stockupDTO.getCurrent(); // Integer size = stockupDTO.getSize(); - String stockupId = stockupDTO.getStockupId(); + Long stockupId = stockupDTO.getStockupId(); // if(Objects.isNull(current)){ // log.info("#################pageList: 当前页码不能为空"); // return R.fail(401,"当前页码不能为空"); @@ -159,6 +164,8 @@ public class DistributionStockupAppController extends BladeController { for (DistributionStockupStockListVO vo:list){ planNum = planNum + vo.getPlanNum(); scanNum = scanNum + vo.getRealNum(); +// Boolean aBoolean = distributionStockupService.getClientStockupTray(reservationId, vo.getAllocationId()); +// vo.setTrayLean(aBoolean); } map.put("planNum",planNum); map.put("scanNum",scanNum); @@ -242,7 +249,7 @@ public class DistributionStockupAppController extends BladeController { } @PostMapping("/scanningCode") - @ApiOperation(value = "整托扫码") + @ApiOperation(value = "整托备货") public R scanningCodelist(@RequestBody StockupDTO stockupDTO){ if(ObjectUtils.isNull(stockupDTO.getStockupId())){ return R.fail(3002,"备货id不能为空"); @@ -253,9 +260,45 @@ public class DistributionStockupAppController extends BladeController { if(ObjectUtils.isNull(stockupDTO.getTrayId())){ return R.fail(3002,"托盘码不能为空"); } - boolean b = distributionStockupService.addPackTrayList(stockupDTO); + R b = distributionStockupService.addPackTrayList(stockupDTO); + return b; + }; + + + @PutMapping("/updateStockArea") + @ApiOperation(value = "修改备货区") + public R updateStockArea(@RequestBody StockupDTO stockupDTO){ + if(ObjectUtils.isNull(stockupDTO.getStockupId())){ + return R.fail(3002,"备货任务id不能为空"); + } + if(ObjectUtils.isNull(stockupDTO.getStockupAreaId())){ + return R.fail(3002,"备货区Id不能为空"); + } + if(ObjectUtils.isNull(stockupDTO.getStockupArea())){ + return R.fail(3002,"备货区名称不能为空"); + } + DistributionStockupEntity distributionStockupEntity = new DistributionStockupEntity(); + distributionStockupEntity.setGoodsAreaId(stockupDTO.getStockupAreaId()); + distributionStockupEntity.setId(stockupDTO.getStockupId()); + distributionStockupEntity.setStockupArea(stockupDTO.getStockupArea()); + return R.data(distributionStockupService.updateById(distributionStockupEntity)); + }; + + @PostMapping("/getStockupArea") + @ApiOperation(value = "查询可修改备货区") + public R getGoodsArea(@RequestBody StockupDTO stockupDTO){ - return R.data(b); + if(ObjectUtils.isNull(stockupDTO.getUserId())){ + return R.fail(3002,"当前操作人ID不能为空"); + } + Long userId = AuthUtil.getUserId(); + if(stockupDTO.getUserId().equals(userId)){ + String deptId = AuthUtil.getDeptId(); + return R.data(basicdataGoodsAreaClient.getDepartmentId(Long.parseLong(deptId))); + }else{ + R.fail(3005,"操作人不对！"); + } + return R.fail(500,"未知错误！"); }; @@ -270,7 +313,8 @@ public class DistributionStockupAppController extends BladeController { //包件扫描 String orderCode = stockupDTO.getOrderCode();//订单自编号 String packetBarCode = stockupDTO.getPacketBarCode();//包件码 - String stockupArea = stockupDTO.getStockupArea();//备货区 +// String stockupArea = stockupDTO.getStockupArea();//备货区 + Long stockupId = stockupDTO.getStockupId();//备货任务ID Long reservationId = stockupDTO.getReservationId();//预约单id if(StringUtil.isBlank(orderCode)){ log.warn("##################stockupScan: 包件扫码，订单自编号为空"); @@ -280,9 +324,9 @@ public class DistributionStockupAppController extends BladeController { log.warn("##################stockupScan: 包件扫码，包件码为空"); return R.fail("包件扫码:包件码不能为空"); } - if(StringUtil.isBlank(stockupArea)){ - log.warn("##################stockupScan: 包件扫码，备货区为空"); - return R.fail("包件扫码:备货区不能为空"); + if(ObjectUtils.isNull(stockupId)){ + log.warn("##################stockupId: 包件扫码，备货区为空"); + return R.fail("包件扫码:备货任务ID不能为空"); } if(Objects.isNull(reservationId)){ log.warn("##################stockupScan: 包件扫码，预约单id为空"); @@ -293,7 +337,8 @@ public class DistributionStockupAppController extends BladeController { DistributionStockEntity entity = new DistributionStockEntity(); entity.setOrderSelfNumbering(orderCode); entity.setCoding(packetBarCode); - entity.setStockupArea(stockupArea); +// entity.setStockupArea(stockupArea); + entity.setStockupId(stockupId); entity.setReservationId(reservationId); entity.setConditions("0"); entity.setType(2); @@ -316,14 +361,15 @@ public class DistributionStockupAppController extends BladeController { Long reservationId = stockupDTO.getReservationId(); Long stockListId = stockupDTO.getStockListId(); String packetBarCode = stockupDTO.getPacketBarCode(); - String stockupArea = stockupDTO.getStockupArea();//备货区 +// String stockupArea = stockupDTO.getStockupArea();//备货区 + Long stockupId = stockupDTO.getStockupId();//备货区 if(StringUtil.isBlank(packetBarCode)){ log.warn("##################stockupScan: 库存品扫码，包件码为空"); return R.fail("库存品扫码:包件码不能为空"); } - if(StringUtil.isBlank(stockupArea)){ + if(ObjectUtils.isNull(stockupId)){ log.warn("##################stockupScan: 库存品扫码，备货区为空"); - return R.fail("库存品扫码:备货区不能为空"); + return R.fail("库存品扫码:备货任务ID不能为空"); } if(Objects.isNull(stockListId)){ log.warn("##################stockupScan: 库存品扫码，库存品id为空"); @@ -337,7 +383,8 @@ public class DistributionStockupAppController extends BladeController { //先保存扫码包件信息,后续由队列来出来余下补充信息 DistributionStockEntity entity = new DistributionStockEntity(); entity.setCoding(packetBarCode); - entity.setStockupArea(stockupArea); +// entity.setStockupArea(stockupArea); + entity.setStockupId(stockupId); entity.setReservationId(reservationId); entity.setStockListId(stockListId); //添加物料信息 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/StockupDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/StockupDTO.java index f892d5945..c48d3228f 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/StockupDTO.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/StockupDTO.java @@ -43,9 +43,10 @@ public class StockupDTO implements Serializable { private Integer scanType;//备货扫码类型 1 包件 2库存品 private String packetBarCode;//包件码 private String trayBarCode;//托盘码 - private String trayId;//货位ID + private Long trayId;//货位ID private String stockupArea;//备货区 - private String stockupId;//备货区Id + private Long stockupAreaId;//备货区ID + private Long stockupId;//备货任务区Id private Long stockListId;//库存品id private Integer packageNum;//包条数量 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml index f7dd32344..a71820840 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml @@ -197,7 +197,7 @@ ldrs.stock_article_id, ldpl.pallet --> select DISTINCT GROUP_CONCAT(lwug.area_title,'-',lwug.shelf_title,'-',lwug.allocation_title ) allocation , lwtg.tray_code pallet, - lwug.area_id areaId,lwug.shelf_id shelfId,lwug.allocation_id allocationId + lwug.area_id areaId,lwug.shelf_id shelfId,lwug.allocation_id allocationId,lwtg.tray_id trayId ,( select COUNT(drp.id) from logpm_distribution_reservation_package drp diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java index e16435b7e..737ef5213 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java @@ -23,6 +23,7 @@ import com.logpm.distribution.entity.DistributionStockupEntity; import com.logpm.distribution.excel.DistributionStockupExcel; import com.logpm.distribution.vo.*; import org.springblade.core.mp.base.BaseService; +import org.springblade.core.tool.api.R; import java.util.List; import java.util.Map; @@ -119,7 +120,7 @@ public interface IDistributionStockupService extends BaseService queryWrapper = new QueryWrapper<>(); queryWrapper.eq("packet_bar_code",coding); DistributionParcelListEntity parcelListEntity = distributionParcelListService.getOne(queryWrapper);//包件信息 DistributionReservationEntity reservationEntity = distributionReservationService.getById(reservationId); + DistributionStockupEntity distributionStockupEntity = distributionStockupMapper.selectOne(Wrappers.query().lambda() + .eq(DistributionStockupEntity::getId, distributionStockEntity.getStockupId()) + ); if(!Objects.isNull(parcelListEntity)){ String cargoTitle = parcelListEntity.getCargoTitle();//货区 String shelfTitle = parcelListEntity.getShelfTitle();//货位 @@ -111,13 +120,20 @@ public class DistributionStockServiceImpl extends BaseServiceImplquery().lambda() + .eq(DistributionStockupEntity::getId, distributionStockEntity.getStockupId()) + ); if(!Objects.isNull(stockListEntity)){ distributionStockEntity.setGoodsAllocation(stockListEntity.getStorageLocation()); distributionStockEntity.setGoodsName(stockListEntity.getDescriptionGoods()); distributionStockEntity.setUnpackingQuantity(stockListEntity.getUnpackingQuantity()); distributionStockEntity.setUnit(stockListEntity.getCargoUnit()); distributionStockEntity.setParcelListId(stockListEntity.getParcelListId()); + distributionStockEntity.setStockupArea(distributionStockupEntity.getStockupArea()); distributionStockEntity.setReservationCode(reservationEntity.getReservationCode()); + distributionStockEntity.setMaterialId(stockListEntity.getMaterialId()); + distributionStockEntity.setMarketId(stockListEntity.getMarketId()); } distributionStockEntity.setConditions("1"); baseMapper.updateById(distributionStockEntity); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java index 13ec55570..515760613 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java @@ -45,6 +45,7 @@ import org.springblade.common.exception.CustomerException; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; +import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.StringUtil; import org.springblade.system.cache.DictBizCache; import org.springframework.beans.BeanUtils; @@ -68,8 +69,9 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl stock = new AtomicReference<>(false); + //查询包件信息 List list = distributionReservationPackageService.listPackage(stockupDTO.getReservationId()); - List list1 = new ArrayList<>(); - list.forEach(i ->{ - DistributionStockEntity distributionStock = new DistributionStockEntity(); - distributionStock.setStockupId(Long.parseLong(stockupDTO.getStockupId())); - distributionStock.setStockArticle(i.getStockArticleId()); - distributionStock.setGoodsAllocation(i.getGoodsAllocation());//货位信息 - distributionStock.setConditions("1"); - distributionStock.setParcelListId(i.getParcelListId()); - distributionStock.setOrderSelfNumbering(i.getOrderCode()); - distributionStock.setType(1); - distributionStock.setDeliveryListCode(i.getNoteNumber()); - distributionStock.setDeliveryListId(i.getDeliveryId()); - distributionStock.setReservationId(i.getReservationId()); - distributionStock.setReservationCode(i.getReservationCode()); - distributionStock.setCoding(i.getPacketBarCode()); - list1.add(distributionStock); + //查询托盘上面的包件 + List trayIdList = warehouseTrayGoodsClient.getTrayIdList(stockupDTO.getTrayId()); + List voList = new ArrayList<>(); + trayIdList.forEach( t ->{ + Optional first = list.stream().filter(l -> l.getParcelListId().equals(t.getAssociationId())).findFirst(); + if (first.isPresent()) { + DistributionStockPackageVO distributionStockPackageVO = first.get(); + log.warn("找到了匹配的对象：" + distributionStockPackageVO); + voList.add(distributionStockPackageVO); + } else{ + log.warn("没有找到了匹配的对象;"); + stock.set(true); + } }); - //TODO 其他操作 - //添加扫描记录 - return distributionStockService.saveBatch(list1); + if(stock.get()){ + return R.fail(3001,"备货失败！"); + }else{ + List list1 = new ArrayList<>(); + voList.forEach(i ->{ + DistributionStockEntity distributionStock = new DistributionStockEntity(); + distributionStock.setStockupId(stockupDTO.getStockupId()); + distributionStock.setStockArticle(i.getStockArticleId()); + distributionStock.setGoodsAllocation(i.getGoodsAllocation());//货位信息 + distributionStock.setConditions("1"); + distributionStock.setParcelListId(i.getParcelListId()); + distributionStock.setOrderSelfNumbering(i.getOrderCode()); + distributionStock.setType(1); + distributionStock.setDeliveryListCode(i.getNoteNumber()); + distributionStock.setDeliveryListId(i.getDeliveryId()); + distributionStock.setReservationId(i.getReservationId()); + distributionStock.setReservationCode(i.getReservationCode()); + distributionStock.setCoding(i.getPacketBarCode()); + list1.add(distributionStock); + }); + //TODO 其他操作 + //添加扫描记录 + distributionStockService.saveBatch(list1); + return R.fail(200,"备货成功"); + } + } /** diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseTaryAllocationClient.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseTaryAllocationClient.java index e7458083c..295e816cb 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseTaryAllocationClient.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseTaryAllocationClient.java @@ -5,6 +5,7 @@ import com.logpm.warehouse.entity.WarehouseTaryAllocationEntity; import com.logpm.warehouse.service.IWarehouseTaryAllocationService; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RestController; import java.util.List; @@ -22,7 +23,7 @@ public class WarehouseTaryAllocationClient implements IWarehouseTaryAllocationCl private IWarehouseTaryAllocationService warehouseTaryAllocationService; @Override - @GetMapping(GETALLOCATIONID) + @PostMapping(GETALLOCATIONID) public List getAllocationId(Long allocationId) { return warehouseTaryAllocationService.list(Wrappers.query().lambda() .eq(WarehouseTaryAllocationEntity::getAllocationId,allocationId) From 4b5139d723a6e94fbd5abcb0a5e1d75b721a5ed3 Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Thu, 24 Aug 2023 19:02:30 +0800 Subject: [PATCH 3/4] =?UTF-8?q?1.=E7=94=9F=E6=88=90=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E8=AE=B0=E5=BD=95,=E4=BF=AE=E6=94=B9DTO?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/DistributionStockArticleVO.java | 6 + .../WarehouseStockArticleCopyEntity.java | 438 ------------------ .../entity/WarehouseStockEntity.java | 185 ++++++++ .../entity/WarehouseStockListCopyEntity.java | 286 ------------ .../feign/IWarehouseStockClient.java | 50 ++ ...ava => WarehouseStockArticleZationVO.java} | 5 +- ...O.java => WarehouseStockListZationVO.java} | 6 +- .../logpm/warehouse/vo/WarehouseStockVO.java | 19 +- .../mapper/DistributionLoadscanMapper.java | 6 + .../mapper/DistributionLoadscanMapper.xml | 3 + .../service/IDistributionLoadscanService.java | 6 + .../impl/DistributionLoadscanServiceImpl.java | 5 + .../DistributionStockArticleWrapper.java | 13 +- .../WarehouseGoodsAllocationController.java | 28 +- .../controller/WarehouseStockController.java | 151 ++++++ ...va => WarehouseStockArticleZationDTO.java} | 3 +- .../warehouse/dto/WarehouseStockDTO.java | 34 ++ ....java => WarehouseStockListZationDTO.java} | 6 +- .../warehouse/excel/WarehouseStockExcel.java | 231 +++++++++ .../warehouse/feign/WarehouseStockClient.java | 53 +++ .../WarehouseGoodsAllocationMapper.java | 12 +- .../mapper/WarehouseGoodsAllocationMapper.xml | 15 +- .../mapper/WarehouseStockMapper.java | 54 +++ .../warehouse/mapper/WarehouseStockMapper.xml | 57 +++ .../IWarehouseGoodsAllocationService.java | 14 +- .../service/IWarehouseStockService.java | 52 +++ .../WarehouseGoodsAllocationServiceImpl.java | 53 +-- .../impl/WarehouseStockServiceImpl.java | 54 +++ .../wrapper/WarehouseStockWrapper.java | 51 ++ 29 files changed, 1086 insertions(+), 810 deletions(-) delete mode 100644 blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseStockArticleCopyEntity.java create mode 100644 blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseStockEntity.java delete mode 100644 blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseStockListCopyEntity.java create mode 100644 blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseStockClient.java rename blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/{WarehouseStockArticleCopyVO.java => WarehouseStockArticleZationVO.java} (86%) rename blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/{WarehouseStockListCopyVO.java => WarehouseStockListZationVO.java} (90%) create mode 100644 blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseStockController.java rename blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/{WarehouseStockArticleCopyDTO.java => WarehouseStockArticleZationDTO.java} (93%) create mode 100644 blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WarehouseStockDTO.java rename blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/{WarehouseStockListCopyDTO.java => WarehouseStockListZationDTO.java} (94%) create mode 100644 blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/excel/WarehouseStockExcel.java create mode 100644 blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseStockClient.java create mode 100644 blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseStockMapper.java create mode 100644 blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseStockMapper.xml create mode 100644 blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseStockService.java create mode 100644 blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseStockServiceImpl.java create mode 100644 blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/wrapper/WarehouseStockWrapper.java diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java index a4c626e3d..7f90eb6f7 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java @@ -105,6 +105,12 @@ public class DistributionStockArticleVO extends DistributionStockArticleEntity { @ApiModelProperty(value = "是否齐套名称") private String completeSetName; + /** + * 配送司机 + */ + @ApiModelProperty(value = "配送司机") + private String driverName; + /** * 所有包件信息 */ diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseStockArticleCopyEntity.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseStockArticleCopyEntity.java deleted file mode 100644 index cce6888d1..000000000 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseStockArticleCopyEntity.java +++ /dev/null @@ -1,438 +0,0 @@ -/* - * 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.warehouse.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.springblade.core.tenant.mp.TenantEntity; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * 配送在库订单 实体类 - * - * @author cyz - * @since 2023-06-13 - */ -@Data -@TableName("logpm_distribution_stock_article") -@ApiModel(value = "WarehouseStockArticleCopyEntity对象", description = "配送在库订单") -@EqualsAndHashCode(callSuper = true) -public class WarehouseStockArticleCopyEntity extends TenantEntity { - - /** - * 预留1 - */ - @ApiModelProperty(value = "预留1") - private String reserve1; - /** - * 预留2 - */ - @ApiModelProperty(value = "预留2") - private String reserve2; - /** - * 预留3 - */ - @ApiModelProperty(value = "预留3") - private String reserve3; - /** - * 预留4 - */ - @ApiModelProperty(value = "预留4") - private String reserve4; - /** - * 预留5 - */ - @ApiModelProperty(value = "预留5") - private String reserve5; - - /** - * 创建用户名称 - */ - @ApiModelProperty(value = "创建用户名称 ") - @TableField(exist = false) - private String createUserName; - - /** - * 服务号 - */ - @ApiModelProperty(value = "服务号") - private String serviceNumber; - /** - * 订单自编号 - */ - @ApiModelProperty(value = "订单自编号") - private String orderCode; - /** - * 寄件信息 - */ - @ApiModelProperty(value = "寄件信息") - private String sending; - - /** - * 门店id - */ - @ApiModelProperty(value = "门店id") - private Long storeId; - - - /** - * 商场id - */ - @ApiModelProperty(value = "商场id") - private Long mallId; - - /** - * 商场名称 - */ - @ApiModelProperty(value = "商场名称") - private String mallName; - /** - * 商场编号 - */ - @ApiModelProperty(value = "商场编码") - private String mallCode; - - - /** - * 门店编号 - */ - @ApiModelProperty(value = "门店编码") - private String storeCode; - - - /** - * 门店名称 - */ - @ApiModelProperty(value = "门店名称") - private String storeName; - /** - * 货物名称 - */ - @ApiModelProperty(value = "货物名称") - private String descriptionGoods; - /** - * 仓库 - */ - @ApiModelProperty(value = "仓库") - private String warehouse; - /** - * 车次号 - */ - @ApiModelProperty(value = "车次号") - private String trainNumber; - - /** - * 仓库ID - */ - @ApiModelProperty(value = "仓库ID") - private Long warehouseId; - - - - /** - * 入库时间 - */ - @ApiModelProperty(value = "入库时间") - @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss") - private Date warehouseEntryTime; - /** - * 在库时间 - */ - @ApiModelProperty(value = "在库时间") - private String storeTime; - /** - * 订单总件数 - */ - @ApiModelProperty(value = "订单总件数") - private Integer totalNumber; - /** - * 在库件数 - */ - @ApiModelProperty(value = "在库件数") - private Integer handQuantity; - /** - * 是否齐套 - */ - @ApiModelProperty(value = "是否齐套") - private Integer completeSet; - - /** - * 品牌 - */ - @ApiModelProperty(value = "品牌") - private String brand; - /** - * 服务类型 - */ - @ApiModelProperty(value = "服务类型") - private String typeService; - /** - * 顾客名字 - */ - @ApiModelProperty(value = "顾客名字") - private String customerName; - /** - * 顾客电话 - */ - @ApiModelProperty(value = "顾客电话") - private String customerTelephone; - /** - * 顾客地址 - */ - @ApiModelProperty(value = "顾客地址") - private String customerAddress; - /** - * 类型;1 预约单 2库存单 - */ - @ApiModelProperty(value = "类型;1 预约单 2库存单") - private Integer genre; - -// /** -// * 状态;1 配送 2 待配送 3部分入库 4已入库 -// */ -// @ApiModelProperty(value = "状态;1 配送 2 待配送 3部分入库 4已入库") -// @TableField(exist = false) -// private String stateName; - - /** - * 状态;1 已通知 2 未通知 - */ - @ApiModelProperty(value = "状态;1 已通知 2 未通知") - private Integer notification; - - /** - * 增值服务总费用 - */ - @ApiModelProperty(value = "增值服务总费用") - private BigDecimal fee; - - /** - * 协商费用 - */ - @ApiModelProperty(value = "协商费用") - private BigDecimal rate; - - /** - * 老系统advanceId - */ - @ApiModelProperty(value = "老系统advanceId") - private Integer advanceId; - /** - * 预约数量 - */ - @TableField(exist = false) - @ApiModelProperty(value = "预约数量") - private Integer reservationNum; - /** - * 运单号 - */ - @ApiModelProperty(value = "运单号") - private String waybillNumber; - /** - * 收货单位 - */ - @ApiModelProperty(value = "收货单位") - private String consigneeUnit; - /** - * 到付费用 - */ - @ApiModelProperty(value = "到付费用") - private BigDecimal collectFee; - /** - * 仓储费 - */ - @ApiModelProperty(value = "仓储费") - private BigDecimal storageFee; - - - - - - - - //-------------2023-07-16 新增在库订单字段 - - /** - * 收货人 - */ - @ApiModelProperty(value = "收货人") - private String consigneePerson; - - /** - * 收货人地址 - */ - @ApiModelProperty(value = "收货人地址") - private String consigneeAddress; - - - /** - * 收货人电话 - */ - @ApiModelProperty(value = "收货人电话") - private String consigneeMobile; - - - - // -----------2023-07-18 增加字段 - - - - @ApiModelProperty(value = "经销商名称") - private String dealerName; - - @ApiModelProperty(value = "经销商编码") - private String dealerCode; - - - - /** - * 可用数量(在库数-已经预约的包件数) - */ - @ApiModelProperty(value = "可用数量") - private Integer availableQuantity; - - /** - * 入库时间-终 - */ - @ApiModelProperty(value = "入库时间-终") - @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss") - private Date warehouseEntryTimeEnd; - - /** - * 分拣件数 - */ - @ApiModelProperty(value = "分拣件数") - private Integer sortingQuantity; - - /** - * 配送件数 - */ - @ApiModelProperty(value = "配送件数") - private Integer deliveryQuantity; - - /** - * 中转件数 - */ - @ApiModelProperty(value = "中转件数") - private Integer transferQuantity; - - /** - * 签收件数 - */ - @ApiModelProperty(value = "签收件数") - private Integer signinQuantity; - - - - /** - * 货位信息 - */ - @ApiModelProperty(value = "货位信息") - private String allocation; - - /** - * 订单来源 - */ - @ApiModelProperty(value = "订单来源") - private String resource; - - /** - * 托盘 - */ - @ApiModelProperty(value = "托盘") - private String trays; - - /** - * 干仓配 - */ - @ApiModelProperty(value = "干仓配") - private Integer isOpai; - - - /** - * 盘点时间 - */ - @ApiModelProperty(value = "盘点时间") - private Date inventoryDate; - - /** - * 盘点人 - */ - @ApiModelProperty(value = "盘点人") - private String inventoryPerson; - - /** - * 盘点人id - */ - @ApiModelProperty(value = "盘点人id") - private Long inventoryPersonId; - - @ApiModelProperty(value = "冻结状态") - private String freezeStatus; - /** - * 上架状态 - */ - @ApiModelProperty(value = "上架状态") - private String groundingStatus; - - - @ApiModelProperty(value = "订单状态") - private String orderStatus; - - @ApiModelProperty(value = "预约状态") - private String reservationStatus; - - @ApiModelProperty(value = "备货状态") - private String stockupStatus; - - @ApiModelProperty(value = "收货状态") - private String orderReceiveStatus; - - - - - - /** - * 有无数据源 - */ - @ApiModelProperty(value = "有无数据源；1-否、2-是") - private Integer isHaveData; - - /** - * 订单码 - */ - @ApiModelProperty(value = "订单码") - private String stockArticleCode; - /** - * 工厂车次 - */ - @ApiModelProperty(value = "工厂车次") - private String factoryTrain; - @ApiModelProperty(value = "是否零担 0否 1是") - private String isZero;//是否零担 0否 1是 - - - - -} diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseStockEntity.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseStockEntity.java new file mode 100644 index 000000000..75fb25798 --- /dev/null +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseStockEntity.java @@ -0,0 +1,185 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * ReWarehouse and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * ReWarehouses of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * ReWarehouses 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 Warehouse. + * 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.warehouse.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +/** + * 备货扫描记录 实体类 + * + * @author lmy + * @since 2023-08-24 + */ +@Data +@TableName("logpm_distribution_stock") +@ApiModel(value = "WarehouseStock对象", description = "备货扫描记录") +@EqualsAndHashCode(callSuper = true) +public class WarehouseStockEntity extends TenantEntity { + + /** + * + */ + @ApiModelProperty(value = "") + private String reserve1; + /** + * 预留2 + */ + @ApiModelProperty(value = "预留2") + private String reserve2; + /** + * 预留3 + */ + @ApiModelProperty(value = "预留3") + private String reserve3; + /** + * + */ + @ApiModelProperty(value = "") + private String reserve4; + /** + * 预留5 + */ + @ApiModelProperty(value = "预留5") + private String reserve5; + /** + * 货位信息 + */ + @ApiModelProperty(value = "货位信息") + private String goodsAllocation; + /** + * 在库订单ID + */ + @ApiModelProperty(value = "在库订单ID") + private String stockArticle; + /** + * 包条码 + */ + @ApiModelProperty(value = "包条码") + private String coding; + /** + * 状态 1 配送 2自提 + */ + @ApiModelProperty(value = " 状态 1 配送 2自提") + private Integer conditions; + /** + * 货物名称 + */ + @ApiModelProperty(value = "货物名称") + private String goodsName; + /** + * 库存品ID + */ + @ApiModelProperty(value = "库存品ID") + private String stockListId; + /** + * 拆包数 + */ + @ApiModelProperty(value = "拆包数") + private Integer unpackingQuantity; + /** + * 在库包件ID + */ + @ApiModelProperty(value = "在库包件ID") + private Long parcelListId; + /** + * 单位 + */ + @ApiModelProperty(value = "单位") + private String unit; + /** + * 工厂车次(无用) + */ + @ApiModelProperty(value = "工厂车次(无用)") + private String factory; + /** + * 物流车次（无用） + */ + @ApiModelProperty(value = "物流车次（无用）") + private String logistics; + /** + * 商城名称（无用） + */ + @ApiModelProperty(value = "商城名称（无用）") + private String mallName; + /** + * 订单自编号 + */ + @ApiModelProperty(value = "订单自编号") + private String orderSelfNumbering; + /** + * 预约id + */ + @ApiModelProperty(value = "预约id") + private Long reservationId; + /** + * 预约单号 + */ + @ApiModelProperty(value = "预约单号") + private String reservationCode; + /** + * 出库类型 1商 2市 3自 + */ + @ApiModelProperty(value = "出库类型 1商 2市 3自") + private String outboundType; + /** + * 配送ID + */ + @ApiModelProperty(value = "配送ID") + private Long deliveryListId; + /** + * 配送编号 + */ + @ApiModelProperty(value = "配送编号") + private String deliveryListCode; + /** + * 备货区 + */ + @ApiModelProperty(value = "备货区") + private String stockupArea; + /** + * 自提ID + */ + @ApiModelProperty(value = "自提ID") + private Long billLadingId; + /** + * 扫码类型 1包件 2库存品 + */ + @ApiModelProperty(value = "扫码类型 1包件 2库存品") + private String type; + /** + * 物料id + */ + @ApiModelProperty(value = "物料id") + private Long materialId; + /** + * 商场/客户 + */ + @ApiModelProperty(value = "商场/客户") + private Long marketId; + /** + * 备货id + */ + @ApiModelProperty(value = "备货id") + private Long stockupId; + +} diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseStockListCopyEntity.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseStockListCopyEntity.java deleted file mode 100644 index eb55601b4..000000000 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseStockListCopyEntity.java +++ /dev/null @@ -1,286 +0,0 @@ -/* - * 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.warehouse.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.springblade.core.tenant.mp.TenantEntity; - -import java.util.Date; - -/** - * 库存品管理 实体类 - * - * @author cyz - * @since 2023-06-15 - */ -@Data -@TableName("logpm_distribution_stock_list") -@ApiModel(value = "DistributionStockList对象", description = "库存品管理") -@EqualsAndHashCode(callSuper = true) -public class WarehouseStockListCopyEntity extends TenantEntity { - - /** - * 预留1 - */ - @ApiModelProperty(value = "预留1") - private String reserve1; - /** - * sku - */ - @ApiModelProperty(value = "sku") - private String sku; - /** - * 预留2 - */ - @ApiModelProperty(value = "预留2") - private String reserve2; - /** - * 预留3 - */ - @ApiModelProperty(value = "预留3") - private String reserve3; - /** - * 预留4 - */ - @ApiModelProperty(value = "预留4") - private String reserve4; - /** - * 预留5 - */ - @ApiModelProperty(value = "预留5") - private String reserve5; - /** - * 服务类型 - */ - @ApiModelProperty(value = "服务类型") - private String serviceType; - /** - * 订单自编号 - */ - @ApiModelProperty(value = "订单自编号") - private String orderCode; - /** - * 在库订单ID - */ - @ApiModelProperty(value = "在库订单ID") - private Long stockArticleId; - /** - * 在库订单ID - */ - @ApiModelProperty(value = "在库订单ID") - private Long parcelListId; - /** - * 入库批次号 - */ - @ApiModelProperty(value = "入库批次号") - private String incomingBatch; - /** - * 货物名称 - */ - @ApiModelProperty(value = "货物名称") - private String descriptionGoods; - /** - * 货物规则 - */ - @ApiModelProperty(value = "货物规则") - private String cargoNorms; - - /** - * 车牌 - */ - @ApiModelProperty(value = "车牌") - private String licensePlate; - /** - * 品牌名称 - */ - @ApiModelProperty(value = "品牌名称") - private String brandName; - /** - * 品牌Id - */ - @ApiModelProperty(value = "品牌ID") - private Long brandId; - /** - * 入库时间 - */ - @ApiModelProperty(value = "入库时间") - private Date warehousingTime; - /** - * 上架时间 - */ - @ApiModelProperty(value = "上架时间") - private Date groundingTime; - /** - * 拆包数 - */ - @ApiModelProperty(value = "拆包数") - private Integer unpackingQuantity; - /** - * 货物编号 - */ - @ApiModelProperty(value = "货物编号") - private String cargoNumber; - /** - * 货物ID - */ - @ApiModelProperty(value = "货物id") - private Long materialId; - - - @ApiModelProperty(value = "仓库Id") - private Long warehouseId; -// /** -// * 拆分包件 -// */ -// @ApiModelProperty(value = "拆分包件") -// @TableField(exist = false) -// private List parcels; - /** - * 工厂车次 - */ - @ApiModelProperty(value = "工厂车次") - private String factory; - /** - * 品分类 - */ - @ApiModelProperty(value = "品分类") - private String category; - /** - * 商场ID - */ - @ApiModelProperty(value = "商场ID") - private Long marketId; - /** - * 货物单位 - */ - @ApiModelProperty(value = "货物单位") - private String cargoUnit; -// /** -// * 门店 -// */ -// @ApiModelProperty(value = "门店") -// private String shop; - /** - * 库位信息 - */ - @ApiModelProperty(value = "库位信息") - private String storageLocation; - /** - * 商城名称 - */ - @ApiModelProperty(value = "商城名称") - private String mallName; - /** - * 拆包状态 - */ - @ApiModelProperty(value = "拆包") - private Boolean unpack; - /** - * 库存数量 - */ - @ApiModelProperty(value = "库存数量") - private Integer quantityStock; - /** - * 出库数量 - */ - @ApiModelProperty(value = "出库数量") - private Integer outboundQuantity; - /** - * 发运车次 - */ - @ApiModelProperty(value = "发运车次") - private String despatch; - /** - * 服务号 - */ - @ApiModelProperty(value = "服务号") - private String serviceNumber; - - /** - * 预约数量 - */ - @ApiModelProperty(value = "预约数量") - @TableField(exist = false) - private Integer reservationNum; - /** - * 仓库名称 - */ - @ApiModelProperty(value = "仓库名称") - private String warehouseName; - /** - * 门店ID - */ - @ApiModelProperty(value = "门店ID") - private Long storeId; - /** - * 所属商场 - */ - @ApiModelProperty(value = "所属商场") - private Long shoppingMall; - /** - * 商场编码 - */ - @ApiModelProperty(value = "商场编码") - private String marketCode; - /** - * 商场名称 - */ - @ApiModelProperty(value = "商场名称") - private String marketName; - /** - * 门店编码 - */ - @ApiModelProperty(value = "门店编码") - private String storeCode; - - /** - * 门店名称 - */ - @ApiModelProperty(value = "门店名称") - private String storeName; - - /** - * 冻结数量 - */ - @ApiModelProperty(value = "冻结数量") - private Integer quantityOccupied; - - /** - * 拆包ID - */ - @ApiModelProperty(value = "拆包ID") - private Long pid; - /** - * 托盘ID - */ - @ApiModelProperty(value = "托盘ID") - private Long trayId; - /** - * 托盘名称 - */ - @ApiModelProperty(value = "托盘名称") - private String trayName; - - - - -} diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseStockClient.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseStockClient.java new file mode 100644 index 000000000..1ccaeac94 --- /dev/null +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseStockClient.java @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * ReWarehouse and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * ReWarehouses of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * ReWarehouses 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 Warehouse. + * 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.warehouse.feign; + +import org.springblade.common.constant.ModuleNameConstant; +import org.springblade.core.mp.support.BladePage; +import com.logpm.warehouse.entity.WarehouseStockEntity; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; + +/** + * 备货扫描记录 Feign接口类 + * + * @author lmy + * @since 2023-08-24 + */ +@FeignClient( + value = ModuleNameConstant.APPLICATION_WAREHOUSE_NAME +) +public interface IWarehouseStockClient { + + String API_PREFIX = "WarehouseStock/client"; + String TOP = API_PREFIX + "/top"; + + /** + * 获取备货扫描记录列表 + * + * @param current 页号 + * @param size 页数 + * @return BladePage + */ + @GetMapping(TOP) + BladePage top(@RequestParam("current") Integer current, @RequestParam("size") Integer size); + +} diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseStockArticleCopyVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseStockArticleZationVO.java similarity index 86% rename from blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseStockArticleCopyVO.java rename to blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseStockArticleZationVO.java index bfc53e13e..e067c8872 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseStockArticleCopyVO.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseStockArticleZationVO.java @@ -19,7 +19,6 @@ package com.logpm.warehouse.vo; import com.logpm.distribution.entity.DistributionStockArticleEntity; -import com.logpm.warehouse.entity.WarehouseStockArticleCopyEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -37,8 +36,8 @@ import java.util.List; */ @Data @EqualsAndHashCode(callSuper = true) -@ApiModel(value = "WarehouseStockArticleCopyVO对象", description = "配送在库订单") -public class WarehouseStockArticleCopyVO extends WarehouseStockArticleCopyEntity{ +@ApiModel(value = "WarehouseStockArticleZationVO对象", description = "可视化配送在库订单") +public class WarehouseStockArticleZationVO extends DistributionStockArticleEntity{ private static final long serialVersionUID = 1L; /** diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseStockListCopyVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseStockListZationVO.java similarity index 90% rename from blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseStockListCopyVO.java rename to blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseStockListZationVO.java index 6edefaa77..d8fc7de5e 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseStockListCopyVO.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseStockListZationVO.java @@ -17,7 +17,7 @@ package com.logpm.warehouse.vo; -import com.logpm.warehouse.entity.WarehouseStockListCopyEntity; +import com.logpm.distribution.entity.DistributionStockListEntity;; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -31,8 +31,8 @@ import lombok.EqualsAndHashCode; */ @Data @EqualsAndHashCode(callSuper = true) -@ApiModel(value = "WarehouseStockListCopyVO对象", description = "库存品管理VO") -public class WarehouseStockListCopyVO extends WarehouseStockListCopyEntity { +@ApiModel(value = "WarehouseStockListZationVO对象", description = "可视化库存品管理") +public class WarehouseStockListZationVO extends DistributionStockListEntity { private static final long serialVersionUID = 1L; /** * 备货数 diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseStockVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseStockVO.java index 4bb952733..ebe5f01ad 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseStockVO.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseStockVO.java @@ -1,14 +1,14 @@ /* * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. * - * Redistribution and use in source and binary forms, with or without + * ReWarehouse 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, + * ReWarehouses 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 + * ReWarehouses 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. + * documentation and/or other materials provided with the Warehouse. * 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. @@ -16,19 +16,20 @@ */ package com.logpm.warehouse.vo; -import com.logpm.distribution.entity.DistributionStockEntity; +import com.logpm.warehouse.entity.WarehouseStockEntity; +import org.springblade.core.tool.node.INode; import lombok.Data; import lombok.EqualsAndHashCode; /** - * 库存品详情信息 视图实体类 + * 备货扫描记录 视图实体类 * - * @author cyz - * @since 2023-06-26 + * @author lmy + * @since 2023-08-24 */ @Data @EqualsAndHashCode(callSuper = true) -public class WarehouseStockVO extends DistributionStockEntity { +public class WarehouseStockVO extends WarehouseStockEntity { private static final long serialVersionUID = 1L; } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.java index 96b72d606..6d5096004 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.java @@ -76,4 +76,10 @@ public interface DistributionLoadscanMapper extends BaseMapper + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionLoadscanService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionLoadscanService.java index 5c29e4664..32ba5f83b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionLoadscanService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionLoadscanService.java @@ -49,4 +49,10 @@ public interface IDistributionLoadscanService extends BaseService exportDistributionLoadscan(Wrapper queryWrapper); + /** + * 查询司机姓名 + * @param id + * @return + */ + String selectDriverNameByOrderId(Long id); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionLoadscanServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionLoadscanServiceImpl.java index f77cb219b..46c3299a1 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionLoadscanServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionLoadscanServiceImpl.java @@ -51,4 +51,9 @@ public class DistributionLoadscanServiceImpl extends BaseServiceImpl { private IUserClient userCliient = SpringUtil.getBean(IUserClient.class); private IDistributionParcelListService distributionParcelListService = SpringUtil.getBean(IDistributionParcelListService.class); - + private IDistributionLoadscanService distributionLoadscanService = SpringUtil.getBean(IDistributionLoadscanService.class); public static DistributionStockArticleWrapper build() { @@ -39,6 +44,12 @@ public class DistributionStockArticleWrapper extends BaseEntityWrapper> order(WarehouseStockArticleCopyDTO warehouseGoodsAllocation, Query query) { - IPage pages = warehouseGoodsAllocationService.selectorder(warehouseGoodsAllocation, Condition.getPage(query)); + public R> order(WarehouseStockArticleZationDTO warehouseGoodsAllocation, Query query) { + IPage pages = warehouseGoodsAllocationService.selectorder(warehouseGoodsAllocation, Condition.getPage(query)); return R.data(pages); } @@ -152,8 +148,8 @@ public class WarehouseGoodsAllocationController extends BladeController { @GetMapping("/servicenub") @ApiOperationSupport(order = 7) @ApiOperation(value = "货位上架 查询服务号", notes = "传入warehouseGoodsAllocation") - public R> servicenub(WarehouseStockArticleCopyDTO warehouseGoodsAllocation, Query query) { - IPage pages = warehouseGoodsAllocationService.selectservicenub(warehouseGoodsAllocation, Condition.getPage(query)); + public R> servicenub(WarehouseStockArticleZationDTO warehouseGoodsAllocation, Query query) { + IPage pages = warehouseGoodsAllocationService.selectservicenub(warehouseGoodsAllocation, Condition.getPage(query)); return R.data(pages); } @@ -175,8 +171,8 @@ public class WarehouseGoodsAllocationController extends BladeController { @GetMapping("/Inventory") @ApiOperationSupport(order = 9) @ApiOperation(value = "货位上架 查询库存品", notes = "传入warehouseGoodsAllocation") - public R> Inventory(WarehouseStockListCopyDTO warehouseGoodsAllocation, Query query) { - IPage pages = warehouseGoodsAllocationService.selectInventory(warehouseGoodsAllocation, Condition.getPage(query)); + public R> Inventory(WarehouseStockListZationDTO warehouseGoodsAllocation, Query query) { + IPage pages = warehouseGoodsAllocationService.selectInventory(warehouseGoodsAllocation, Condition.getPage(query)); return R.data(pages); } @@ -186,8 +182,8 @@ public class WarehouseGoodsAllocationController extends BladeController { @GetMapping("/ZeroOrder") @ApiOperationSupport(order = 10) @ApiOperation(value = "货位上架 查询零担", notes = "传入warehouseGoodsAllocation") - public R> ZeroOrder(WarehouseStockArticleCopyDTO warehouseStockArticleCopyDTO, Query query) { - IPage pages = warehouseGoodsAllocationService.selectZeroOrder(warehouseStockArticleCopyDTO, Condition.getPage(query)); + public R> ZeroOrder(WarehouseStockArticleZationDTO warehouseStockArticleZationDTO, Query query) { + IPage pages = warehouseGoodsAllocationService.selectZeroOrder(warehouseStockArticleZationDTO, Condition.getPage(query)); return R.data(pages); } @@ -390,8 +386,8 @@ public class WarehouseGoodsAllocationController extends BladeController { @GetMapping("/selectInventory") @ApiOperationSupport(order = 21) @ApiOperation(value = "货位 查询库存品", notes = "传入warehouseGoodsAllocation") - public R> selectInventory(WarehouseGoodsAllocationDTO warehouseGoodsAllocation, Query query) { - IPage pages = warehouseGoodsAllocationService.selectAllInventory(warehouseGoodsAllocation, Condition.getPage(query)); + public R> selectInventory(WarehouseGoodsAllocationDTO warehouseGoodsAllocation, Query query) { + IPage pages = warehouseGoodsAllocationService.selectAllInventory(warehouseGoodsAllocation, Condition.getPage(query)); return R.data(pages); } @@ -401,8 +397,8 @@ public class WarehouseGoodsAllocationController extends BladeController { @GetMapping("/selectZeroOrder") @ApiOperationSupport(order = 22) @ApiOperation(value = "货位 查询零担", notes = "传入warehouseGoodsAllocation") - public R> selectZeroOrder(WarehouseStockArticleCopyDTO warehouseStockArticleCopyDTO, Query query) { - IPage pages = warehouseGoodsAllocationService.selectAllZeroOrder(warehouseStockArticleCopyDTO, Condition.getPage(query)); + public R> selectZeroOrder(WarehouseStockArticleZationDTO warehouseStockArticleZationDTO, Query query) { + IPage pages = warehouseGoodsAllocationService.selectAllZeroOrder(warehouseStockArticleZationDTO, Condition.getPage(query)); return R.data(pages); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseStockController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseStockController.java new file mode 100644 index 000000000..41cf4a95c --- /dev/null +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseStockController.java @@ -0,0 +1,151 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * ReWarehouse and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * ReWarehouses of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * ReWarehouses 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 Warehouse. + * 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.warehouse.controller; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import lombok.AllArgsConstructor; +import javax.validation.Valid; + +import org.springblade.core.secure.BladeUser; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; +import org.springframework.web.bind.annotation.*; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.warehouse.entity.WarehouseStockEntity; +import com.logpm.warehouse.vo.WarehouseStockVO; +import com.logpm.warehouse.excel.WarehouseStockExcel; +import com.logpm.warehouse.wrapper.WarehouseStockWrapper; +import com.logpm.warehouse.service.IWarehouseStockService; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.tool.constant.BladeConstant; +import springfox.documentation.annotations.ApiIgnore; +import java.util.Map; +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +/** + * 备货扫描记录 控制器 + * + * @author lmy + * @since 2023-08-24 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/warehouseStock") +@Api(value = "备货扫描记录", tags = "备货扫描记录接口") +public class WarehouseStockController extends BladeController { + + private final IWarehouseStockService warehouseStockService; + + /** + * 备货扫描记录 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入WarehouseStock") + public R detail(WarehouseStockEntity WarehouseStock) { + WarehouseStockEntity detail = warehouseStockService.getOne(Condition.getQueryWrapper(WarehouseStock)); + return R.data(WarehouseStockWrapper.build().entityVO(detail)); + } + /** + * 备货扫描记录 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "传入WarehouseStock") + public R> list(@ApiIgnore @RequestParam Map WarehouseStock, Query query) { + IPage pages = warehouseStockService.page(Condition.getPage(query), Condition.getQueryWrapper(WarehouseStock, WarehouseStockEntity.class)); + return R.data(WarehouseStockWrapper.build().pageVO(pages)); + } + + /** + * 备货扫描记录 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "分页", notes = "传入WarehouseStock") + public R> page(WarehouseStockVO WarehouseStock, Query query) { + IPage pages = warehouseStockService.selectWarehouseStockPage(Condition.getPage(query), WarehouseStock); + return R.data(pages); + } + + /** + * 备货扫描记录 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @ApiOperation(value = "新增", notes = "传入WarehouseStock") + public R save(@Valid @RequestBody WarehouseStockEntity WarehouseStock) { + return R.status(warehouseStockService.save(WarehouseStock)); + } + + /** + * 备货扫描记录 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "修改", notes = "传入WarehouseStock") + public R update(@Valid @RequestBody WarehouseStockEntity WarehouseStock) { + return R.status(warehouseStockService.updateById(WarehouseStock)); + } + + /** + * 备货扫描记录 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @ApiOperation(value = "新增或修改", notes = "传入WarehouseStock") + public R submit(@Valid @RequestBody WarehouseStockEntity WarehouseStock) { + return R.status(warehouseStockService.saveOrUpdate(WarehouseStock)); + } + + /** + * 备货扫描记录 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @ApiOperation(value = "逻辑删除", notes = "传入ids") + public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + return R.status(warehouseStockService.deleteLogic(Func.toLongList(ids))); + } + + + /** + * 导出数据 + */ + @GetMapping("/export-WarehouseStock") + @ApiOperationSupport(order = 9) + @ApiOperation(value = "导出数据", notes = "传入WarehouseStock") + public void exportWarehouseStock(@ApiIgnore @RequestParam Map WarehouseStock, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(WarehouseStock, WarehouseStockEntity.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(WarehouseStock::getTenantId, bladeUser.getTenantId()); + //} + queryWrapper.lambda().eq(WarehouseStockEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = warehouseStockService.exportWarehouseStock(queryWrapper); + ExcelUtil.export(response, "备货扫描记录数据" + DateUtil.time(), "备货扫描记录数据表", list, WarehouseStockExcel.class); + } + +} diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WarehouseStockArticleCopyDTO.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WarehouseStockArticleZationDTO.java similarity index 93% rename from blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WarehouseStockArticleCopyDTO.java rename to blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WarehouseStockArticleZationDTO.java index c955b9d6a..3610be104 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WarehouseStockArticleCopyDTO.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WarehouseStockArticleZationDTO.java @@ -17,6 +17,7 @@ package com.logpm.warehouse.dto; + import com.logpm.distribution.entity.DistributionStockArticleEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -30,7 +31,7 @@ import lombok.EqualsAndHashCode; */ @Data @EqualsAndHashCode(callSuper = true) -public class WarehouseStockArticleCopyDTO extends DistributionStockArticleEntity { +public class WarehouseStockArticleZationDTO extends DistributionStockArticleEntity { private static final long serialVersionUID = 1L; diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WarehouseStockDTO.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WarehouseStockDTO.java new file mode 100644 index 000000000..4f1ef9115 --- /dev/null +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WarehouseStockDTO.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * ReWarehouse and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * ReWarehouses of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * ReWarehouses 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 Warehouse. + * 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.warehouse.dto; + +import com.logpm.warehouse.entity.WarehouseStockEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 备货扫描记录 数据传输对象实体类 + * + * @author lmy + * @since 2023-08-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class WarehouseStockDTO extends WarehouseStockEntity { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WarehouseStockListCopyDTO.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WarehouseStockListZationDTO.java similarity index 94% rename from blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WarehouseStockListCopyDTO.java rename to blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WarehouseStockListZationDTO.java index 080f29453..c21c1e853 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WarehouseStockListCopyDTO.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WarehouseStockListZationDTO.java @@ -17,11 +17,13 @@ package com.logpm.warehouse.dto; -import com.logpm.warehouse.entity.WarehouseStockListCopyEntity; + +import com.logpm.distribution.entity.DistributionStockListEntity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; + /** * 库存品管理 视图实体类 * @@ -30,7 +32,7 @@ import lombok.EqualsAndHashCode; */ @Data @EqualsAndHashCode(callSuper = true) -public class WarehouseStockListCopyDTO extends WarehouseStockListCopyEntity { +public class WarehouseStockListZationDTO extends DistributionStockListEntity { private static final long serialVersionUID = 1L; /** * 备货数 diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/excel/WarehouseStockExcel.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/excel/WarehouseStockExcel.java new file mode 100644 index 000000000..c5089edb3 --- /dev/null +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/excel/WarehouseStockExcel.java @@ -0,0 +1,231 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * ReWarehouse and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * ReWarehouses of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * ReWarehouses 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 Warehouse. + * 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.warehouse.excel; + + +import lombok.Data; + +import java.util.Date; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import java.io.Serializable; + + +/** + * 备货扫描记录 Excel实体类 + * + * @author lmy + * @since 2023-08-24 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class WarehouseStockExcel implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 租户号 + */ + @ColumnWidth(20) + @ExcelProperty("租户号") + private Long tenantId; + /** + * 是否已删除 + */ + @ColumnWidth(20) + @ExcelProperty("是否已删除") + private Integer isDeleted; + /** + * + */ + @ColumnWidth(20) + @ExcelProperty("") + private String reserve1; + /** + * 预留2 + */ + @ColumnWidth(20) + @ExcelProperty("预留2") + private String reserve2; + /** + * 预留3 + */ + @ColumnWidth(20) + @ExcelProperty("预留3") + private String reserve3; + /** + * + */ + @ColumnWidth(20) + @ExcelProperty("") + private String reserve4; + /** + * 预留5 + */ + @ColumnWidth(20) + @ExcelProperty("预留5") + private String reserve5; + /** + * 货位信息 + */ + @ColumnWidth(20) + @ExcelProperty("货位信息") + private String goodsAllocation; + /** + * 在库订单ID + */ + @ColumnWidth(20) + @ExcelProperty("在库订单ID") + private String stockArticle; + /** + * 包条码 + */ + @ColumnWidth(20) + @ExcelProperty("包条码") + private String coding; + /** + * 状态 1 配送 2自提 + */ + @ColumnWidth(20) + @ExcelProperty(" 状态 1 配送 2自提") + private Integer conditions; + /** + * 货物名称 + */ + @ColumnWidth(20) + @ExcelProperty("货物名称") + private String goodsName; + /** + * 库存品ID + */ + @ColumnWidth(20) + @ExcelProperty("库存品ID") + private String stockListId; + /** + * 拆包数 + */ + @ColumnWidth(20) + @ExcelProperty("拆包数") + private Integer unpackingQuantity; + /** + * 在库包件ID + */ + @ColumnWidth(20) + @ExcelProperty("在库包件ID") + private Long parcelListId; + /** + * 单位 + */ + @ColumnWidth(20) + @ExcelProperty("单位") + private String unit; + /** + * 工厂车次(无用) + */ + @ColumnWidth(20) + @ExcelProperty("工厂车次(无用)") + private String factory; + /** + * 物流车次（无用） + */ + @ColumnWidth(20) + @ExcelProperty("物流车次（无用）") + private String logistics; + /** + * 商城名称（无用） + */ + @ColumnWidth(20) + @ExcelProperty("商城名称（无用）") + private String mallName; + /** + * 订单自编号 + */ + @ColumnWidth(20) + @ExcelProperty("订单自编号") + private String orderSelfNumbering; + /** + * 预约id + */ + @ColumnWidth(20) + @ExcelProperty("预约id") + private Long reservationId; + /** + * 预约单号 + */ + @ColumnWidth(20) + @ExcelProperty("预约单号") + private String reservationCode; + /** + * 出库类型 1商 2市 3自 + */ + @ColumnWidth(20) + @ExcelProperty("出库类型 1商 2市 3自") + private String outboundType; + /** + * 配送ID + */ + @ColumnWidth(20) + @ExcelProperty("配送ID") + private Long deliveryListId; + /** + * 配送编号 + */ + @ColumnWidth(20) + @ExcelProperty("配送编号") + private String deliveryListCode; + /** + * 备货区 + */ + @ColumnWidth(20) + @ExcelProperty("备货区") + private String stockupArea; + /** + * 自提ID + */ + @ColumnWidth(20) + @ExcelProperty("自提ID") + private Long billLadingId; + /** + * 扫码类型 1包件 2库存品 + */ + @ColumnWidth(20) + @ExcelProperty("扫码类型 1包件 2库存品") + private String type; + /** + * 物料id + */ + @ColumnWidth(20) + @ExcelProperty("物料id") + private Long materialId; + /** + * 商场/客户 + */ + @ColumnWidth(20) + @ExcelProperty("商场/客户") + private Long marketId; + /** + * 备货id + */ + @ColumnWidth(20) + @ExcelProperty("备货id") + private Long stockupId; + +} diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseStockClient.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseStockClient.java new file mode 100644 index 000000000..fb746a89a --- /dev/null +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseStockClient.java @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * ReWarehouse and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * ReWarehouses of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * ReWarehouses 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 Warehouse. + * 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.warehouse.feign; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import lombok.AllArgsConstructor; +import org.springblade.core.mp.support.BladePage; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import com.logpm.warehouse.entity.WarehouseStockEntity; +import com.logpm.warehouse.service.IWarehouseStockService; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; + +/** + * 备货扫描记录 Feign实现类 + * + * @author lmy + * @since 2023-08-24 + */ +@ApiIgnore() +@RestController +@AllArgsConstructor +public class WarehouseStockClient implements IWarehouseStockClient { + + private final IWarehouseStockService WarehouseStockService; + + @Override + @GetMapping(TOP) + public BladePage top(Integer current, Integer size) { + Query query = new Query(); + query.setCurrent(current); + query.setSize(size); + IPage page = WarehouseStockService.page(Condition.getPage(query)); + return BladePage.of(page); + } + +} diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.java index 51aa3400a..bae9a2b7f 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.java @@ -90,13 +90,13 @@ public interface WarehouseGoodsAllocationMapper extends BaseMapper selectStockList(@Param("id")Long id); - List selectOrder(IPage page,@Param("param") WarehouseStockArticleCopyDTO warehouseGoodsAllocation); + List selectOrder(IPage page, @Param("param") WarehouseStockArticleZationDTO warehouseGoodsAllocation); /** * 查询服务号 * * @return */ - List selectservicenub(IPage page,@Param("param") WarehouseStockArticleCopyDTO warehouseGoodsAllocation); + List selectservicenub(IPage page, @Param("param") WarehouseStockArticleZationDTO warehouseGoodsAllocation); /** * 根据服务号查询订单 * @@ -126,14 +126,14 @@ public interface WarehouseGoodsAllocationMapper extends BaseMapper selectAllInventory(IPage page,@Param("param") WarehouseGoodsAllocationDTO warehouseGoodsAllocation); + List selectAllInventory(IPage page, @Param("param") WarehouseGoodsAllocationDTO warehouseGoodsAllocation); /** *货位 查询库存品 * * @return */ - List selectInventory(IPage page,@Param("param") WarehouseStockListCopyDTO warehouseGoodsAllocation); + List selectInventory(IPage page, @Param("param") WarehouseStockListZationDTO warehouseGoodsAllocation); /** *查询货位托盘 * @@ -145,13 +145,13 @@ public interface WarehouseGoodsAllocationMapper extends BaseMapper selectZeroOrder(IPage page,@Param("param") WarehouseStockArticleCopyDTO warehouseStockArticleCopyDTO); + List selectZeroOrder(IPage page, @Param("param") WarehouseStockArticleZationDTO warehouseStockArticleZationDTO); /** *查询货位零担 * * @return */ - List selectAllZeroOrder(IPage page,@Param("param") WarehouseStockArticleCopyDTO warehouseStockArticleCopyDTO); + List selectAllZeroOrder(IPage page, @Param("param") WarehouseStockArticleZationDTO warehouseStockArticleZationDTO); /** *查询货区 * diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.xml index 615c9828c..808431581 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.xml @@ -39,19 +39,22 @@ - select ldsa.* from logpm_distribution_stock_article ldsa ldsa.is_deleted = 0 and ldsa.is_zero ='0' and ldsa.service_number like concat('%',#{param.serviceNumber},'%') + + and ldsa.warehouse_id = #{param.warehouseId} + and ldsa.order_code like concat('%',#{param.orderCode},'%') - select GROUP_CONCAT( ldsa.order_Code SEPARATOR ',' ) orderCode, ldsa.service_number serviceNumber,GROUP_CONCAT(ldsa.customer_name SEPARATOR ',' ) customerName,ldsa.customer_address customerAddress, ldsa.customer_telephone customerTelephone from logpm_distribution_stock_article ldsa @@ -147,7 +150,7 @@ AND ldpl.is_deleted = 0 and lwug.allocation_id =#{param.id} - SELECT ldsl.order_code orderCode, ldsl.service_number serviceNumber, @@ -168,7 +171,7 @@ lwug.association_type = 4 and ldsl.market_id = lwug.market_id AND ldsl.is_deleted = 0 and lwug.allocation_id =#{param.id} - SELECT ldsl.material_id materialId, ldsl.order_code orderCode, @@ -217,10 +220,10 @@ and lwta.allocation_id =#{param.id} - SELECT ldsa.* FROM logpm_distribution_stock_article ldsa WHERE ldsa.is_zero ='1' - SELECT ldsa.* FROM logpm_distribution_stock_article ldsa join logpm_warehouse_updown_goods lwug on lwug.association_id = ldsa.id WHERE ldsa.is_zero ='1' + select * from logpm_Warehouse_stock where is_deleted = 0 + + + + + + diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseGoodsAllocationService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseGoodsAllocationService.java index 3d868718b..892e77018 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseGoodsAllocationService.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseGoodsAllocationService.java @@ -23,9 +23,7 @@ import com.logpm.warehouse.vo.*; import com.logpm.warehouse.excel.WarehouseGoodsAllocationExcel; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; -import org.springblade.core.mp.support.Query; -import java.util.ArrayList; import java.util.List; /** @@ -63,11 +61,11 @@ public interface IWarehouseGoodsAllocationService extends BaseService selectorder(WarehouseStockArticleCopyDTO warehouseGoodsAllocation, IPage page); + IPage selectorder(WarehouseStockArticleZationDTO warehouseGoodsAllocation, IPage page); /** * 上架 查询服务号 */ - IPage selectservicenub(WarehouseStockArticleCopyDTO warehouseGoodsAllocation, IPage page); + IPage selectservicenub(WarehouseStockArticleZationDTO warehouseGoodsAllocation, IPage page); /** * 上架 查询服务号对应的订单 */ @@ -87,11 +85,11 @@ public interface IWarehouseGoodsAllocationService extends BaseService selectAllInventory(WarehouseGoodsAllocationDTO warehouseGoodsAllocation, IPage page); + IPage selectAllInventory(WarehouseGoodsAllocationDTO warehouseGoodsAllocation, IPage page); /** * 货位 查询库存品 */ - IPage selectInventory(WarehouseStockListCopyDTO warehouseGoodsAllocation, IPage page); + IPage selectInventory(WarehouseStockListZationDTO warehouseGoodsAllocation, IPage page); /** * 货位 查询托盘 */ @@ -99,11 +97,11 @@ public interface IWarehouseGoodsAllocationService extends BaseService selectZeroOrder(WarehouseStockArticleCopyDTO updownZeroOrderDTO, IPage page); + IPage selectZeroOrder(WarehouseStockArticleZationDTO updownZeroOrderDTO, IPage page); /** * 查询货位零担 */ - IPage selectAllZeroOrder(WarehouseStockArticleCopyDTO warehouseStockArticleCopyDTO, IPage page); + IPage selectAllZeroOrder(WarehouseStockArticleZationDTO warehouseStockArticleZationDTO, IPage page); /** * 货位 统计库位数量 */ diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseStockService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseStockService.java new file mode 100644 index 000000000..914026d93 --- /dev/null +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseStockService.java @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * ReWarehouse and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * ReWarehouses of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * ReWarehouses 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 Warehouse. + * 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.warehouse.service; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.logpm.warehouse.entity.WarehouseStockEntity; +import com.logpm.warehouse.vo.WarehouseStockVO; +import com.logpm.warehouse.excel.WarehouseStockExcel; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import java.util.List; + +/** + * 备货扫描记录 服务类 + * + * @author lmy + * @since 2023-08-24 + */ +public interface IWarehouseStockService extends BaseService { + /** + * 自定义分页 + * + * @param page + * @param WarehouseStock + * @return + */ + IPage selectWarehouseStockPage(IPage page, WarehouseStockVO WarehouseStock); + + + /** + * 导出数据 + * + * @param queryWrapper + * @return + */ + List exportWarehouseStock(Wrapper queryWrapper); + +} diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseGoodsAllocationServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseGoodsAllocationServiceImpl.java index 4748fc958..350e54364 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseGoodsAllocationServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseGoodsAllocationServiceImpl.java @@ -17,22 +17,15 @@ package com.logpm.warehouse.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.logpm.basicdata.entity.BasicdataWarehouseEntity; -import com.logpm.basicdata.feign.IBasicdataWarehouseClient; import com.logpm.warehouse.dto.*; import com.logpm.warehouse.entity.*; -import com.logpm.warehouse.mapper.WarehouseUpdownGoodsMapper; import com.logpm.warehouse.service.IWarehouseUpdownGoodsService; import com.logpm.warehouse.vo.*; import com.logpm.warehouse.excel.WarehouseGoodsAllocationExcel; import com.logpm.warehouse.mapper.WarehouseGoodsAllocationMapper; import com.logpm.warehouse.service.IWarehouseGoodsAllocationService; import lombok.AllArgsConstructor; -import lombok.extern.log4j.Log4j; import lombok.extern.log4j.Log4j2; -import org.springblade.core.mp.support.BladePage; -import org.springblade.core.mp.support.Query; -import org.springblade.core.redis.cache.BladeRedis; import org.springblade.core.tool.utils.Func; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; @@ -41,9 +34,7 @@ import org.springblade.core.mp.base.BaseServiceImpl; import java.util.ArrayList; import java.util.HashMap; -import java.util.HashSet; import java.util.List; -import java.util.concurrent.TimeUnit; /** * 货位 服务实现类 @@ -131,14 +122,14 @@ public class WarehouseGoodsAllocationServiceImpl extends BaseServiceImpl selectorder(WarehouseStockArticleCopyDTO warehouseGoodsAllocation, IPage page) { - List list = baseMapper.selectOrder(page,warehouseGoodsAllocation); + public IPage selectorder(WarehouseStockArticleZationDTO warehouseGoodsAllocation, IPage page) { + List list = baseMapper.selectOrder(page,warehouseGoodsAllocation); return page.setRecords(list); } @Override - public IPage selectservicenub(WarehouseStockArticleCopyDTO warehouseGoodsAllocation, IPage page) { - List list = baseMapper.selectservicenub(page,warehouseGoodsAllocation); + public IPage selectservicenub(WarehouseStockArticleZationDTO warehouseGoodsAllocation, IPage page) { + List list = baseMapper.selectservicenub(page,warehouseGoodsAllocation); return page.setRecords(list); } @@ -168,16 +159,16 @@ public class WarehouseGoodsAllocationServiceImpl extends BaseServiceImpl selectAllInventory(WarehouseGoodsAllocationDTO warehouseGoodsAllocation, IPage page) { + public IPage selectAllInventory(WarehouseGoodsAllocationDTO warehouseGoodsAllocation, IPage page) { //查询货位库存品 - List list = baseMapper.selectAllInventory(page,warehouseGoodsAllocation); + List list = baseMapper.selectAllInventory(page,warehouseGoodsAllocation); return page.setRecords(list); } @Override - public IPage selectInventory(WarehouseStockListCopyDTO warehouseGoodsAllocation, IPage page) { + public IPage selectInventory(WarehouseStockListZationDTO warehouseGoodsAllocation, IPage page) { //查询没有上架的库存品 - Listlist = baseMapper.selectInventory(page,warehouseGoodsAllocation); + Listlist = baseMapper.selectInventory(page,warehouseGoodsAllocation); return page.setRecords(list); } @@ -189,16 +180,16 @@ public class WarehouseGoodsAllocationServiceImpl extends BaseServiceImpl selectZeroOrder(WarehouseStockArticleCopyDTO warehouseStockArticleCopyDTO, IPage page) { + public IPage selectZeroOrder(WarehouseStockArticleZationDTO warehouseStockArticleZationDTO, IPage page) { //查询的零担 - List list = baseMapper.selectZeroOrder(page,warehouseStockArticleCopyDTO); - for (WarehouseStockArticleCopyVO warehouseStockArticleCopyVO : list) { + List list = baseMapper.selectZeroOrder(page, warehouseStockArticleZationDTO); + for (WarehouseStockArticleZationVO warehouseStockArticleZationVO : list) { List warehouseUpdownGoodsEntityList= warehouseUpdownGoodsService.list(new QueryWrapper().lambda() - .eq(WarehouseUpdownGoodsEntity::getAssociationValue,warehouseStockArticleCopyVO.getOrderCode()) + .eq(WarehouseUpdownGoodsEntity::getAssociationValue, warehouseStockArticleZationVO.getOrderCode()) .eq(WarehouseUpdownGoodsEntity::getAssociationType,"1") ); Integer useNum = 0; - Integer totalNumber = warehouseStockArticleCopyVO.getTotalNumber();//合同数量 + Integer totalNumber = warehouseStockArticleZationVO.getTotalNumber();//合同数量 List ls = new ArrayList<>(); for (WarehouseUpdownGoodsEntity warehouseUpdownGoodsEntity : warehouseUpdownGoodsEntityList) { Integer num = warehouseUpdownGoodsEntity.getNum(); @@ -208,23 +199,23 @@ public class WarehouseGoodsAllocationServiceImpl extends BaseServiceImpl selectAllZeroOrder(WarehouseStockArticleCopyDTO warehouseStockArticleCopyDTO, IPage page) { + public IPage selectAllZeroOrder(WarehouseStockArticleZationDTO warehouseStockArticleZationDTO, IPage page) { //查询库位的零担 - List list = baseMapper.selectAllZeroOrder(page,warehouseStockArticleCopyDTO); - for (WarehouseStockArticleCopyVO warehouseStockArticleCopyVO : list) { + List list = baseMapper.selectAllZeroOrder(page, warehouseStockArticleZationDTO); + for (WarehouseStockArticleZationVO warehouseStockArticleZationVO : list) { List warehouseUpdownGoodsEntityList= warehouseUpdownGoodsService.list(new QueryWrapper().lambda() - .eq(WarehouseUpdownGoodsEntity::getAssociationValue,warehouseStockArticleCopyVO.getOrderCode()) + .eq(WarehouseUpdownGoodsEntity::getAssociationValue, warehouseStockArticleZationVO.getOrderCode()) .eq(WarehouseUpdownGoodsEntity::getAssociationType,"1") ); Integer useNum = 0; - Integer totalNumber = warehouseStockArticleCopyVO.getTotalNumber();//合同数量 + Integer totalNumber = warehouseStockArticleZationVO.getTotalNumber();//合同数量 List ls = new ArrayList<>(); for (WarehouseUpdownGoodsEntity warehouseUpdownGoodsEntity : warehouseUpdownGoodsEntityList) { Integer num = warehouseUpdownGoodsEntity.getNum(); @@ -234,8 +225,8 @@ public class WarehouseGoodsAllocationServiceImpl extends BaseServiceImpl implements IWarehouseStockService { + + @Override + public IPage selectWarehouseStockPage(IPage page, WarehouseStockVO WarehouseStock) { + return page.setRecords(baseMapper.selectWarehouseStockPage(page, WarehouseStock)); + } + + + @Override + public List exportWarehouseStock(Wrapper queryWrapper) { + List WarehouseStockList = baseMapper.exportWarehouseStock(queryWrapper); + //WarehouseStockList.forEach(WarehouseStock -> { + // WarehouseStock.setTypeName(DictCache.getValue(DictEnum.YES_NO, WarehouseStock.getType())); + //}); + return WarehouseStockList; + } + +} diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/wrapper/WarehouseStockWrapper.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/wrapper/WarehouseStockWrapper.java new file mode 100644 index 000000000..3106296fa --- /dev/null +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/wrapper/WarehouseStockWrapper.java @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * ReWarehouse and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * ReWarehouses of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * ReWarehouses 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 Warehouse. + * 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.warehouse.wrapper; + +import com.logpm.warehouse.entity.WarehouseStockEntity; +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; + +import com.logpm.warehouse.vo.WarehouseStockVO; +import java.util.Objects; + +/** + * 备货扫描记录 包装类,返回视图层所需的字段 + * + * @author lmy + * @since 2023-08-24 + */ +public class WarehouseStockWrapper extends BaseEntityWrapper { + + public static WarehouseStockWrapper build() { + return new WarehouseStockWrapper(); + } + + @Override + public WarehouseStockVO entityVO(WarehouseStockEntity WarehouseStock) { + WarehouseStockVO WarehouseStockVO = Objects.requireNonNull(BeanUtil.copy(WarehouseStock, WarehouseStockVO.class)); + + //User createUser = UserCache.getUser(WarehouseStock.getCreateUser()); + //User updateUser = UserCache.getUser(WarehouseStock.getUpdateUser()); + //WarehouseStockVO.setCreateUserName(createUser.getName()); + //WarehouseStockVO.setUpdateUserName(updateUser.getName()); + + return WarehouseStockVO; + } + + +} From c11b6713440425083598edf624f2c34baadccc94 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Thu, 24 Aug 2023 19:11:28 +0800 Subject: [PATCH 4/4] =?UTF-8?q?1.=E5=BA=93=E5=86=85=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/WarehouseTrayGoodsMapper.xml | 4 +- .../impl/WarehouseTrayTypeServiceImpl.java | 109 +++++++++++++----- .../impl/WarehouseUpdownGoodsServiceImpl.java | 8 +- .../impl/WarehouseUpdownTypeServiceImpl.java | 33 +++--- 4 files changed, 107 insertions(+), 47 deletions(-) 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 881a9d798..0a525298a 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 @@ -18,7 +18,7 @@ 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 032d17190..6b7453958 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 @@ -19,14 +19,11 @@ import com.logpm.warehouse.dto.ZeroOrderVO; import com.logpm.warehouse.entity.WarehouseTrayGoodsEntity; import com.logpm.warehouse.entity.WarehouseTrayGoodsLogEntity; import com.logpm.warehouse.entity.WarehouseTrayTypeEntity; +import com.logpm.warehouse.entity.WarehouseUpdownGoodsEntity; import com.logpm.warehouse.mapper.WarehouseTrayTypeMapper; -import com.logpm.warehouse.service.IWarehouseTaryAllocationService; -import com.logpm.warehouse.service.IWarehouseTrayGoodsLogService; -import com.logpm.warehouse.service.IWarehouseTrayGoodsService; -import com.logpm.warehouse.service.IWarehouseTrayTypeService; +import com.logpm.warehouse.service.*; import com.logpm.warehouse.vo.*; import com.logpm.warehouse.wrapper.WarehouseTrayTypeWrapper; -import lombok.AllArgsConstructor; import lombok.extern.log4j.Log4j2; import org.springblade.common.constant.DictBizConstant; import org.springblade.common.constant.apiwarehouse.PalletProductTypeConstant; @@ -35,6 +32,8 @@ import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.BeanUtil; import org.springblade.system.cache.DictBizCache; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -45,24 +44,27 @@ import java.util.Objects; @Log4j2 @Service -@AllArgsConstructor public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl implements IWarehouseTrayTypeService { - private final IWarehouseTrayGoodsService warehouseTrayGoodsService; - - private final IDistributionStockArticleClient distributionStockArticleClient; - - private final IDistributionParcelListClient distributionParcelListClient; - - private final IBasicMaterialClient basicMaterialClient; - - private final IDistributionStockListClient distributionStockListClient; - - private final IBasicdataTrayClient basicdataTrayClient; - - private final IWarehouseTrayGoodsLogService warehouseTrayGoodsLogService; - - private final IWarehouseTaryAllocationService warehouseTaryAllocationService; + @Autowired + private IWarehouseTrayGoodsService warehouseTrayGoodsService; + @Autowired + private IDistributionStockArticleClient distributionStockArticleClient; + @Autowired + private IDistributionParcelListClient distributionParcelListClient; + @Autowired + private IBasicMaterialClient basicMaterialClient; + @Autowired + private IDistributionStockListClient distributionStockListClient; + @Autowired + private IBasicdataTrayClient basicdataTrayClient; + @Autowired + private IWarehouseTrayGoodsLogService warehouseTrayGoodsLogService; + @Autowired + private IWarehouseTaryAllocationService warehouseTaryAllocationService; + @Autowired + @Lazy + private IWarehouseUpdownGoodsService warehouseUpdownGoodsService; @Override public IPage orderPageList(TrayTypeDTO trayTypeDTO) { @@ -107,6 +109,13 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl queryTrayTypeWrapper = new QueryWrapper<>(); queryTrayTypeWrapper.eq("tray_code",trayCode) @@ -167,6 +176,14 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl updownGoodsEntityQueryWrapper = new QueryWrapper<>(); + updownGoodsEntityQueryWrapper.eq("association_value",orderPackageCode); + WarehouseUpdownGoodsEntity updownGoodsEntity = warehouseUpdownGoodsService.getOne(updownGoodsEntityQueryWrapper); + if(!Objects.isNull(updownGoodsEntity)){ + log.warn("#########orderScanOrderPackageCode: 包件已上架 orderPackageCode={}",orderPackageCode); + return R.fail(403,"包件已上架"); + } + BasicdataTrayEntity basicdataTrayEntity = basicdataTrayClient.getTrayByTrayCode(trayCode); if(Objects.isNull(basicdataTrayEntity)){ log.warn("#########orderScanOrderPackageCode: 未找到托盘信息 trayCode={}",trayCode); @@ -482,9 +499,46 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl getZeroOrderByWaybillCode(String waybillCode) { +// List zeroOrderByWaybillCode = baseMapper.getZeroOrderByWaybillCode(waybillCode); +// for (TrayTypeDataListVO trayTypeDataListVO:zeroOrderByWaybillCode){ +// +// String ordeCode = trayTypeDataListVO.getDataCode(); +// Long orderId = trayTypeDataListVO.getDataId(); +// //计算零担订单可用数量 +// countZeroAvailableNum(orderId); +// +// } return baseMapper.getZeroOrderByWaybillCode(waybillCode); } + /** + * 计算零担订单的可用数量 + * @param orderId + * @return + */ + private Integer countZeroAvailableNum(Long orderId) { + //计算已打托数量 + QueryWrapper trayGoodsEntityQueryWrapper = new QueryWrapper<>(); + trayGoodsEntityQueryWrapper.eq("association_id",orderId) + .eq("association_type",1); + List trayGoodsList = warehouseTrayGoodsService.list(trayGoodsEntityQueryWrapper); + QueryWrapper updownGoodsEntityQueryWrapper = new QueryWrapper<>(); + trayGoodsEntityQueryWrapper.eq("association_id",orderId) + .eq("association_type",1); + List updownGoodsList = warehouseUpdownGoodsService.list(updownGoodsEntityQueryWrapper); + for (WarehouseTrayGoodsEntity trayGoodsEntity:trayGoodsList){ + + for (WarehouseUpdownGoodsEntity updownGoodsEntity:updownGoodsList){ + + } + + } + + + + return 0; + } + @Transactional(rollbackFor = Exception.class) @Override public R enterZeroOrderByTrayCode(String trayType,String trayCode, List zeroList) { @@ -1225,12 +1279,13 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl taryAllocationEntityQueryWrapper = new QueryWrapper<>(); + taryAllocationEntityQueryWrapper.eq("allocation_id",allocationId) + .eq("is_deleted",0); + WarehouseTaryAllocationEntity taryAllocationEntity = warehouseTaryAllocationService.getOne(taryAllocationEntityQueryWrapper); +// BasicdataTrayEntity trayEntity = warehouseTaryAllocationService.getTrayByAllocationId(allocationId); + if(!Objects.isNull(taryAllocationEntity)){ //有托盘，托盘下托 warehouseTrayTypeService.downPackageByOrderPackageCode(orderPackageCode,"包件下架:同步下托"); } @@ -810,6 +814,10 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl taryAllocationEntityQueryWrapper = new QueryWrapper<>(); + taryAllocationEntityQueryWrapper.eq("allocation_id",allocationId) + .eq("is_deleted",0); + WarehouseTaryAllocationEntity taryAllocationEntity = warehouseTaryAllocationService.getOne(taryAllocationEntityQueryWrapper); + if(!Objects.isNull(taryAllocationEntity)){ //绑定了托盘 - warehouseTrayTypeService.downTrayGoodsByTrayId(trayEntity.getId(),"下架:按库位下架"); + warehouseTaryAllocationService.deleteById(taryAllocationEntity); +// warehouseTrayTypeService.downTrayGoodsByTrayId(trayEntity.getId(),"下架:按库位下架"); } return R.success("下架成功"); } @@ -1020,7 +1027,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("tary_id",trayId) + queryWrapper.eq("tray_id",trayId) .eq("is_deleted",0); WarehouseTaryAllocationEntity taryAllocationEntity = warehouseTaryAllocationService.getOne(queryWrapper); if(Objects.isNull(taryAllocationEntity)){ @@ -1029,7 +1036,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl