diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/printTemplate/PrintTemplateStatusConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/printTemplate/PrintTemplateStatusConstant.java index c6b4c8470..d09956628 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/printTemplate/PrintTemplateStatusConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/printTemplate/PrintTemplateStatusConstant.java @@ -17,7 +17,8 @@ public enum PrintTemplateStatusConstant { daiqueren_7("托盘码模板","7"), daiqueren_8("货位码模板","8"), daiqueren_9("货架码模板","9"), - daiqueren_10("包件模板","10"); + daiqueren_10("包件模板","10"), + daiqueren_11("库存品包件模板","11"); /** diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DisStockListVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DisStockListVO.java new file mode 100644 index 000000000..8dc348f5e --- /dev/null +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DisStockListVO.java @@ -0,0 +1,21 @@ +package com.logpm.distribution.vo; + +import lombok.Data; + +/** + * + */ +@Data +public class DisStockListVO { + + private Long id; //id + private String sku; //sku + private String orderCode; //订单自编号 + private String descriptionGoods; //物料名称 + private String cargoUnit; //单位 + private String stockPackageCode; //包条码 + private String brandName; //品牌 + private String stockListId; //库存品ID + private String reservationId; //预约ID + +} diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupVO.java index 727b5a017..f7d0f394d 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupVO.java @@ -34,6 +34,7 @@ public class DistributionStockupVO extends DistributionStockupEntity { private static final long serialVersionUID = 1L; private String headline; + private Long stocklist; //订单库存品关联id private String cargoUnit; //数量 private String groupName; diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppDeliveryListVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppDeliveryListVO.java index 32f8bbbdb..8252cff20 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppDeliveryListVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppDeliveryListVO.java @@ -90,6 +90,12 @@ public class DistributionAppDeliveryListVO extends DistributionDeliveryListEntit @ApiModelProperty(value = "配送种类;1-市配,2-商配") private String type_name; + /** + * 配送类型;1-商配,2-市配 + */ + @ApiModelProperty(value = "配送种类;1-商配,2-市配") + private String type; + /** * 是否备货 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DisStockListDetailController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DisStockListDetailController.java index 397a914d8..c710ba54f 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DisStockListDetailController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DisStockListDetailController.java @@ -23,6 +23,8 @@ import com.logpm.distribution.entity.DisStockListDetailEntity; import com.logpm.distribution.excel.DisStockListDetailExcel; import com.logpm.distribution.service.IDisStockListDetailService; import com.logpm.distribution.vo.DisStockListDetailVO; +import com.logpm.distribution.vo.DisStockListVO; +import com.logpm.distribution.vo.OrderPackgeCodeDataVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -85,9 +87,25 @@ public class DisStockListDetailController extends BladeController { @GetMapping("/disStockList") @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入disStockListDetail") - public R> disStockList(@ApiIgnore @RequestParam Map disStockListDetail) { - List pages = disStockListDetailService.pageDisStockList(disStockListDetail); - return R.data(pages); + public R> disStockList(@ApiIgnore @RequestParam Map disStockListDetail) { + List list = disStockListDetailService.pageDisStockList(disStockListDetail); + return R.data(list); + } + + /** + * 库存品条码记录表 + */ + @GetMapping("/getPrintDetail") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "传入disStockListDetail") + public R getPrintDetail(@ApiIgnore @RequestParam Map disStockListDetail) { + OrderPackgeCodeDataVO list = null; + try { + list = disStockListDetailService.getPrintDetail(disStockListDetail); + } catch (Exception e) { + throw new RuntimeException(e); + } + return R.data(list); } /** diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml index 0920ae932..89b6682f3 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml @@ -675,6 +675,9 @@ and date_format(lddl.create_time,'%y%m%d%') = date_format(#{param.createTime_query},'%y%m%d%') + + and lddl.type = #{param.type} + and date_format(lddl.task_time,'%y%m%d%') >= date_format(#{param.taskTime_start},'%y%m%d%') and date_format(lddl.task_time,'%y%m%d%') <= date_format(#{param.taskTime_end},'%y%m%d%') diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml index 0b8a42481..f05b18037 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml @@ -235,8 +235,8 @@