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 29c8f483f..69ab12eae 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 @@ -292,6 +292,18 @@ public class DistributionSignforEntity extends TenantEntity { @ApiModelProperty(value = "是否有异常装车包件 1-否 2-是") private Integer isHaveAbnormalPackage; + /** + * 审核人Id + */ + @ApiModelProperty(value = "审核人Id") + private Long examineUserId; + + /** + * 审核人名称 + */ + @ApiModelProperty(value = "审核人名称") + private String examineUserName; + } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforVO.java index 4ad899e33..aadf7ea49 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforVO.java @@ -146,6 +146,12 @@ public class DistributionSignforVO extends DistributionSignforEntity { @ApiModelProperty(value = "配送司机") private String driverName; + /** + * 配送司机 + */ + @ApiModelProperty(value = "配送司机") + private String driverPhone; + /** * 装车班组 */ @@ -155,7 +161,39 @@ public class DistributionSignforVO extends DistributionSignforEntity { * 配车时间 */ @ApiModelProperty(value = "配车时间") - private Date taskTime; + private String taskTime; + + /** + * 装车时间 + */ + @ApiModelProperty(value = "装车时间") + private String signLoadingDate; + + /** + * 装车时间(区间) + */ + @ApiModelProperty(value = "装车时间(区间)") + private List taskTimeSection; + + + /** + * 装车时间(区间) + */ + @ApiModelProperty(value = "装车时间(区间)") + private List loadingTimeSection; + + /** + * 司机签收(区间) + */ + @ApiModelProperty(value = "司机签收(区间)") + private List sjsigningTimeSection; + + /** + * 文员审核(区间) + */ + @ApiModelProperty(value = "文员审核(区间)") + private List signingTimeSection; + /** * 卸车班组 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 4fc965798..19ca855a8 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 @@ -133,7 +133,14 @@ public class DistributionStockArticleVO extends DistributionStockArticleEntity { * 装车数量 */ @ApiModelProperty(value = "装车数量") - private String loadingNumber; + private Integer loadingNumber; + + /** + * 签收数量 + */ + @ApiModelProperty(value = "签收数量") + private Integer signingNumber; + /** * 备货数量 */ 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 658f718bd..55a5a7887 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 @@ -261,6 +261,9 @@ public class DistributionSignforController extends BladeController { @ApiOperationSupport(order = 5) @ApiOperation(value = "修改", notes = "传入distributionSignfor") public R update(@Valid @RequestBody DistributionSignforDTO distributionSignfor) { + BladeUser user = AuthUtil.getUser(); + distributionSignfor.setExamineUserId(user.getUserId()); + distributionSignfor.setExamineUserName(user.getNickName()); R r = distributionSignforService.updateSign(distributionSignfor); // return R.status(distributionSignforService.updateById(distributionSignfor)); return r; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java index a3e59d0bf..43cac09b4 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java @@ -331,6 +331,13 @@ public class DistributionStockArticleController extends BladeController { return R.status(distributionStockArticleService.updateById(distributionStockArticle)); } + @PostMapping("/updateClient") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "修改", notes = "传入distributionStockArticle") + public R updateClient(@Valid @RequestBody DistributionStockArticleEntity distributionStockArticle) { + return R.status(distributionStockArticleService.updateById(distributionStockArticle)); + } + /** * 配送在库订单 新增或修改 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml index 5533b0d46..eca214a7b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml @@ -1749,64 +1749,70 @@ 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 cf76982e0..fbce97d42 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 @@ -101,4 +101,24 @@ public interface DistributionLoadscanMapper extends BaseMapper SELECT SUM(received_quantity) FROM logpm_distribution_loadscan WHERE scan_status != 1 AND signfor_state =2 And order_id =#{orderId} + + 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 9e7fb77a7..41046cde7 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 @@ -284,7 +284,6 @@ -- logpm_distribution_signfor lds--> SELECT lds.id id, - lds.signee_name signeeName, ldr.mall_name mallName, lds.positioning positioning, lddl.warehouse_name warehouseName, @@ -300,11 +299,15 @@ lds.is_have_abnormal_package isHaveAbnormalPackage, lds.signing_type signingType, lddl.train_number trainNumber, + lddl.driver_name driverName, + lddl.vehicle_name vehicleName, lddl.task_time taskTime, + lddl.loading_time AS signLoadingDate, lds.received_quantity receivedQuantity, + lds.examine_user_id examineUserId, + lds.examine_user_name examineUserName, ldr.delivery_phone deliveryPhone, - (SELECT GROUP_CONCAT(distinct driver_name SEPARATOR ',') from logpm_distribution_loadscan ldl WHERE ldl.reservation_id = lds.reservation_id) deliveryDriverName, - (SELECT GROUP_CONCAT(distinct driver_phone SEPARATOR ',') from logpm_distribution_loadscan ldl WHERE ldl.reservation_id = lds.reservation_id) deliveryDriverPhone, + ldr.reservation_code reservationCode, ldr.delivery_address deliveryAddress, lds.delivery_sign_pictures deliverySignPictures, ldr.reservation_num reservationNum, @@ -326,13 +329,19 @@ lds.signing_status, ldr.reservation_num - lds.received_quantity unsigneds, ldr.reservation_num - lds.loaded_number withoutScanning, - lds.reservation_id reservationId + lds.reservation_id reservationId, + CASE lddl.kind + WHEN '1' THEN (SELECT driver_phone FROM logpm_distribution_delivery_self AS ldds WHERE ldds.delivery_id= lddl.id AND ldds.is_deleted = 0 AND ldds.is_master = 2) + WHEN '2' THEN (SELECT driver_phone FROM logpm_distribution_delivery_tripartite AS lddt WHERE lddt.delivery_id= lddl.id AND lddt.is_deleted = 0) + ELSE + '' + END driverPhone FROM logpm_distribution_signfor lds JOIN logpm_distribution_delivery_list lddl ON lddl.id = lds.delivery_id JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id - lds.is_deleted = 0 and ldr.is_deleted = 0 + lds.is_deleted = 0 and ldr.is_deleted = 0 and lddl.is_deleted = 0 and ldr.mall_name like concat('%',#{param.mallName},'%') @@ -345,6 +354,15 @@ and ldr.store_name like concat('%',#{param.storeName},'%') + + and ldr.reservation_code like concat('%',#{param.reservationCode},'%') + + + and lddl.driver_name like concat('%',#{param.driverName},'%') + + + and lddl.vehicle_name like concat('%',#{param.vehicleName},'%') + and date_format(lds.delivery_time,'%y%m%d%') = date_format(#{param.deliveryTime},'%y%m%d%') @@ -372,7 +390,6 @@ and lddl.train_number like concat('%',#{param.trainNumber},'%') - and ldr.delivery_address like concat('%',#{param.deliveryAddress},'%') @@ -385,6 +402,21 @@ and date_format(lddl.task_time,'%Y-%m-%d') = #{param.taskTime} + + and date_format(lddl.loading_time,'%Y-%m-%d') = #{param.signLoadingDate} + + + and lddl.task_time between #{param.taskTimeSection[0]} and #{param.taskTimeSection[1]} + + + and lddl.loading_time between #{param.loadingTimeSection[0]} and #{param.loadingTimeSection[1]} + + + and lds.sjsigning_time between #{param.sjsigningTimeSection[0]} and #{param.sjsigningTimeSection[1]} + + + and lds.signing_time between #{param.signingTimeSection[0]} and #{param.signingTimeSection[1]} + @@ -451,7 +483,7 @@ JOIN logpm_distribution_delivery_list lddl ON lddl.id = lds.delivery_id JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id - lds.is_deleted = 0 and lds.driver_signing ='1' and ldr.is_deleted = 0 + lds.is_deleted = 0 and lds.driver_signing ='1' and ldr.is_deleted = 0 and lddl.is_deleted = 0 and ldr.mall_name like concat('%',#{param.mallName},'%') @@ -486,6 +518,9 @@ and ldr.delivery_address like concat('%',#{param.deliveryAddress},'%') + + and ldr.warehouse_id = #{param.warehouseId} + @@ -497,7 +532,7 @@ JOIN logpm_distribution_delivery_list lddl ON lddl.id = lds.delivery_id JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id - lds.is_deleted = 0 and lds.signing_status ='1' and ldr.is_deleted = 0 + lds.is_deleted = 0 and lds.signing_status ='1' and ldr.is_deleted = 0 and lddl.is_deleted = 0 and ldr.mall_name like concat('%',#{param.mallName},'%') @@ -533,6 +568,10 @@ and ldr.delivery_address like concat('%',#{param.deliveryAddress},'%') + + and ldr.warehouse_id = #{param.warehouseId} + + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java index dd66d09d1..02d418fbb 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java @@ -120,4 +120,19 @@ public interface DistributionStockArticleMapper extends BaseMapper + + UPDATE logpm_distribution_stock_article SET hand_quantity = (hand_quantity - #{deductionNum}) WHERE id=#{orderId} AND is_deleted = 0 AND hand_quantity >= 0 + + + UPDATE logpm_distribution_stock_article SET hand_quantity = (hand_quantity + #{augmentNum}) WHERE id=#{orderId} AND is_deleted = 0 AND hand_quantity >= 0 + + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index 557e240f5..88e9d393b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -570,6 +570,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl selectDistributionSignforPage(IPage page, DistributionSignforVO distributionSignfor) { //转换创建时间 + SimpleDateFormat sdf = new SimpleDateFormat("yyyy:MM:dd HH:mm:ss"); if (null != distributionSignfor.getCreateTime()) { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); distributionSignfor.setCreateTime_query(sdf.format(distributionSignfor.getCreateTime())); } //获取当前登录人仓库 @@ -148,17 +149,17 @@ public class DistributionSignforServiceImpl extends BaseServiceImplquery().lambda().eq(DistributionDeliveryListEntity::getId, deliveryId)); - List list = new ArrayList<>(); - if (Func.equals(deliveryListEntity.getKind(), ServiceConstant.DELIVERLIST_KIND_SELF)) { - List distributionDeliverySelfEntities = distributionDeliverySelfMapper.selectList(Wrappers.query().lambda().eq(DistributionDeliverySelfEntity::getDeliveryId, deliveryId)); - distributionDeliverySelfEntities.forEach(s -> list.add(s.getDriverPhone())); - } else { - DistributionDeliveryTripartiteEntity tripartiteEntity = distributionDeliveryTripartiteMapper.selectOne(Wrappers.query().lambda().eq(DistributionDeliveryTripartiteEntity::getDeliveryId, deliveryId)); - list.add(tripartiteEntity.getDriverPhone()); - } - d.setDeliveryDriverPhone(String.join(",", list)); +// Long deliveryId = d.getDeliveryId(); +// DistributionDeliveryListEntity deliveryListEntity = distributionDeliveryListMapper.selectOne(Wrappers.query().lambda().eq(DistributionDeliveryListEntity::getId, deliveryId)); +// List list = new ArrayList<>(); +// if (Func.equals(deliveryListEntity.getKind(), ServiceConstant.DELIVERLIST_KIND_SELF)) { +// List distributionDeliverySelfEntities = distributionDeliverySelfMapper.selectList(Wrappers.query().lambda().eq(DistributionDeliverySelfEntity::getDeliveryId, deliveryId)); +// distributionDeliverySelfEntities.forEach(s -> list.add(s.getDriverPhone())); +// } else { +// DistributionDeliveryTripartiteEntity tripartiteEntity = distributionDeliveryTripartiteMapper.selectOne(Wrappers.query().lambda().eq(DistributionDeliveryTripartiteEntity::getDeliveryId, deliveryId)); +// list.add(tripartiteEntity.getDriverPhone()); +// } +// d.setDeliveryDriverPhone(String.join(",", list)); }); return page.setRecords(distributionSignforVOS); } @@ -253,6 +254,10 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl reservationStockarticleEntityList = distributionReservationStockarticleService.list(Wrappers.query().lambda().eq(DistributionReservationStockarticleEntity::getReservationId, signforEntity.getReservationId()).ne( - DistributionReservationStockarticleEntity::getStockArticleStatus, ReservationOrderStatusConstant.quxiao.getValue())); + List reservationStockarticleEntityList = distributionReservationStockarticleService.list(Wrappers.query().lambda() + .eq(DistributionReservationStockarticleEntity::getReservationId, signforEntity.getReservationId()) + .ne(DistributionReservationStockarticleEntity::getStockArticleStatus, ReservationOrderStatusConstant.quxiao.getValue())); // if (Func.isEmpty(reservationStockarticleEntityList)) { // log.error("#####################预约查询无订单信息，reservationId:{}", signforEntity.getReservationId()); // return null; @@ -503,11 +511,25 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl stockArticleEntities = distributionStockArticleService.listByIds(orderIds); + List distributionStockArticleVOS = DistributionStockArticleWrapper.build().listVO(stockArticleEntities); + for (DistributionStockArticleVO distributionStockArticleVO : distributionStockArticleVOS) { + //查询计划、装车、签收数量 + DistributionReservationStockarticleEntity reservationStockarticleEntity = distributionReservationStockarticleService.getOne(Wrappers.query().lambda() + .eq(DistributionReservationStockarticleEntity::getReservationId, signforEntity.getReservationId()) + .eq(DistributionReservationStockarticleEntity::getStockArticleId, distributionStockArticleVO.getId()) + .ne(DistributionReservationStockarticleEntity::getStockArticleStatus, ReservationOrderStatusConstant.quxiao.getValue()) + ); + distributionStockArticleVO.setReservationNum(reservationStockarticleEntity.getReservationNum()); + Integer loadingNum = distributionLoadscanMapper.selectOrderLoadingNumByReservationIdAndDeliveryIdAndOrderId(signforEntity.getReservationId(),signforEntity.getDeliveryId(),distributionStockArticleVO.getId()); + distributionStockArticleVO.setLoadingNumber(loadingNum); + Integer signingNum = distributionLoadscanMapper.selectOrderSigningNumByReservationIdAndDeliveryIdAndOrderId(signforEntity.getReservationId(),signforEntity.getDeliveryId(),distributionStockArticleVO.getId()); + distributionStockArticleVO.setSigningNumber(signingNum); + } List printEntities = baseMapper.selectSignImgsUrl(distributionSignforVO.getReservationId()); distributionSignforVO.setPrintVOList(printEntities); if (Func.isNotEmpty(stockArticleEntities)) { - distributionSignforVO.setOrderInfo(DistributionStockArticleWrapper.build().listVO(stockArticleEntities)); + distributionSignforVO.setOrderInfo(distributionStockArticleVOS); } } // List stockArticleEntityList = baseMapper.selectOrderList(id); @@ -1840,6 +1862,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl>>>>>>>>>>>>>>parcelListEntity.getOrderPackageCode():{}",parcelListEntity.getOrderPackageCode()); warehouseUpdownTypeClient.downPackageOrDelTray(parcelListEntity.getOrderPackageCode(), myCurrentWarehouse.getId()); @@ -1851,6 +1875,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl