From 893c95c539a12235285293de8aab3ea7444a96d6 Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Thu, 29 Jun 2023 16:23:45 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=8F=B8=E6=9C=BA=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=BB=91=E5=AE=9A=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/BasicdataDriverArteryEntity.java | 6 +++++ .../DistributionStockArticleEntity.java | 1 + .../vo/DistributionDeliveryInfoVO.java | 16 +++++-------- .../logpm/basicdata/BasicDataApplication.java | 2 +- .../BasicdataDriverArteryController.java | 3 +++ .../mapper/BasicdataDriverArteryMapper.xml | 1 + .../DistributionDeliveryListController.java | 11 +++++++++ .../dto/DistrilbutionloadingscanDTO.java | 19 ++++++++++++--- .../mapper/DistributionDeliveryInfoMapper.xml | 1 + .../DistributionDeliveryListServiceImpl.java | 24 ++++++++++++++----- 10 files changed, 64 insertions(+), 20 deletions(-) diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataDriverArteryEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataDriverArteryEntity.java index fcc9605eb..49cfbec58 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataDriverArteryEntity.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataDriverArteryEntity.java @@ -37,6 +37,12 @@ import org.springblade.core.tenant.mp.TenantEntity; @EqualsAndHashCode(callSuper = true) public class BasicdataDriverArteryEntity extends TenantEntity { + /** + * 绑定用户id + */ + @ApiModelProperty(value = "绑定用户id") + private Long userId; + /** * 司机姓名 */ diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java index 2e8cda9c5..b0efb9d57 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java @@ -185,6 +185,7 @@ public class DistributionStockArticleEntity extends TenantEntity { /** * 预约数量 */ + @TableField(exist = false) @ApiModelProperty(value = "预约数量") private Integer reservationNum; /** 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 1bd5cccb1..841467849 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 @@ -43,6 +43,11 @@ public class DistributionDeliveryInfoVO extends DistributionDeliveryInfoEntity { */ @ApiModelProperty(value = "仓库") private String warehouse; + /** + * 订单 + */ + @ApiModelProperty(value = "订单") + private String orderIds; /** * 状态 */ @@ -93,11 +98,6 @@ public class DistributionDeliveryInfoVO extends DistributionDeliveryInfoEntity { */ @ApiModelProperty(value = "车次号") private String trainNumber; -// /** -// * 在库订单ID -// */ -// @ApiModelProperty(value = "在库订单ID") -// private String stockArticleId; @@ -183,11 +183,7 @@ public class DistributionDeliveryInfoVO extends DistributionDeliveryInfoEntity { */ @ApiModelProperty(value = "备注") private String remarks; -// /** -// * 预约单编号，系统构建生成 -// */ -// @ApiModelProperty(value = "预约单编号") -// private String reservationId; + /** * 时段 */ diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/BasicDataApplication.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/BasicDataApplication.java index d0b239072..b38103373 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/BasicDataApplication.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/BasicDataApplication.java @@ -15,7 +15,7 @@ import org.springblade.core.launch.BladeApplication; public class BasicDataApplication { public static void main(String[] args) { - BladeApplication.run(ModuleNameConstant.APPLICATION_BASICDATA_NAME, BasicDataApplication.class, args); + BladeApplication.run(ModuleNameConstant.APPLICATION_BASICDATA_NAME.concat("-lmy"), BasicDataApplication.class, args); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java index 540733c00..9fab28ab2 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java @@ -27,6 +27,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import lombok.AllArgsConstructor; import javax.validation.Valid; +import lombok.extern.slf4j.Slf4j; import org.springblade.core.secure.BladeUser; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; @@ -58,6 +59,7 @@ import javax.servlet.http.HttpServletResponse; @AllArgsConstructor @RequestMapping("/driverArtery") @Api(value = "司机信息表", tags = "司机信息表接口") +@Slf4j public class BasicdataDriverArteryController extends BladeController { private final IBasicdataDriverArteryService basicdataDriverArteryService; @@ -129,6 +131,7 @@ public class BasicdataDriverArteryController extends BladeController { @ApiOperationSupport(order = 5) @ApiOperation(value = "修改", notes = "传入basicdataDriverArtery") public R update(@Valid @RequestBody BasicdataDriverArteryDTO basicdataDriverArtery) { + //加入关联表 if (null !=basicdataDriverArtery.getBindVehicles()){ Integer b = basicdataDriverArteryService.updateVehicle(basicdataDriverArtery); diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDriverArteryMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDriverArteryMapper.xml index 28e758ce6..76fa6bc66 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDriverArteryMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDriverArteryMapper.xml @@ -85,6 +85,7 @@ lbda.license_people_photo licensePeoplePhoto, lbda.carrier_id carrierId, lbda.transportation_agreement transportationAgreement, + lbda.user_id userId, (SELECT GROUP_CONCAT(brand_id SEPARATOR ',') from logpm_basicdata_drivermiddle lbd WHERE lbd.driver_id = lbda.id and lbd.is_deleted = 0) bindVehicles FROM logpm_basicdata_driver_artery lbda diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java index 1e7768894..c1ddcb323 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java @@ -128,6 +128,17 @@ public class DistributionDeliveryListController extends BladeController { return R.data(i); } + /** + * 配送管理 装车确认 + */ + @PostMapping("/loadingack") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "传入distributionDeliveryList") + public R loadingack(@Valid @RequestBody DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) { + Integer i = distributionDeliveryListService.loadingscan(distrilbutionloadingscanDTO); + return R.data(i); + } + /** * 配送管理 点击发车 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistrilbutionloadingscanDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistrilbutionloadingscanDTO.java index 4c3e3bb40..2a0417278 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistrilbutionloadingscanDTO.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistrilbutionloadingscanDTO.java @@ -8,19 +8,32 @@ import javax.validation.constraints.NotEmpty; @Data public class DistrilbutionloadingscanDTO { + + /** - * 扫描包条信息 + * pda信息 */ + @ApiModelProperty(value = "pda信息") + @NotEmpty(message = "pda信息不能为空") + private String pdaInformation; + /** + * 扫描包条信息 + */ @ApiModelProperty(value = "扫描包条信息") @NotEmpty(message = "扫描单号不能为空") private String barcode; - - /** * 扫描类型 */ @ApiModelProperty(value = "扫描类型(1-包条,2-托盘)") @NotEmpty(message = "扫描类型不能为空") private Integer type; + + + /** + * 确认类型 + */ + @ApiModelProperty(value = "确认类型(1-整车确认,2-零星确认)") + private Integer ackType; } 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 bf4fdea87..1846dd9a1 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 @@ -59,6 +59,7 @@