From 1db4df09d95a0eac901999473dc62d28271d0816 Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Tue, 1 Aug 2023 09:46:21 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=A2=9E=E5=80=BC=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/DistributionDeliveryListEntity.java | 11 +---------- .../entity/DistributionSignforEntity.java | 11 +++++++++++ .../distribution/vo/DistributionDeliveryInfoVO.java | 5 +++++ .../controller/DistributionSignforController.java | 2 ++ .../mapper/DistributionDeliveryInfoMapper.xml | 2 +- .../service/IDistributionSignforService.java | 2 +- 6 files changed, 21 insertions(+), 12 deletions(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java index 4602d8159..285de034e 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java @@ -236,16 +236,7 @@ public class DistributionDeliveryListEntity extends TenantEntity { */ @ApiModelProperty(value = "数据来源") private Integer source; - /** - * 定位打卡 - */ - @ApiModelProperty(value = "定位打卡") - private String positioning; - /** - * 定位打卡地址 - */ - @ApiModelProperty(value = "定位打卡地址") - private String positioningAdr; + diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSignforEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSignforEntity.java index b71948e7f..d04bccc44 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSignforEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSignforEntity.java @@ -277,5 +277,16 @@ public class DistributionSignforEntity extends TenantEntity { // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") private String loadingTime; + /** + * 定位打卡 + */ + @ApiModelProperty(value = "定位打卡") + private String positioning; + /** + * 定位打卡地址 + */ + @ApiModelProperty(value = "定位打卡地址") + private String positioningAdr; + } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryInfoVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryInfoVO.java index 5128e1d36..6b1aa4ca7 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryInfoVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionDeliveryInfoVO.java @@ -79,6 +79,11 @@ public class DistributionDeliveryInfoVO extends DistributionDeliveryInfoEntity { */ @ApiModelProperty(value = "物品名称") private String materialName; + /** + * 物品编号 + */ + @ApiModelProperty(value = "物品编号") + private String materialCode; /** * 货位信息 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java index cbcad2a40..6f58db798 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java @@ -107,6 +107,8 @@ public class DistributionSignforController extends BladeController { return R.data(pages); } + + /** * 签收管理 自定义分页 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml index cb922dff4..b5e809432 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml @@ -96,8 +96,8 @@ ldpl.firsts firsts, ldpl.second second, ldpl.third_product thirdProduct, - ldpl.material material, ldpl.material_name materialName, + ldpl.material_code materialCode, ldpl.quantity quantity, ldpl.train_number trainNumber, ldpl.stock_article_id stockArticleId diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java index 29caf3487..8f5df72d0 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSignforService.java @@ -77,7 +77,7 @@ public interface IDistributionSignforService extends BaseService