java_project
/
logisticsplatform-service
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

签收字段维护

training
汤建军 1 year ago
parent
778eba309b
commit
797bb0768e
14 changed files with 279 additions and 84 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSignforEntity.java
  2. 40
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforVO.java
  3. 9
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java
  4. 3
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java
  5. 7
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java
  6. 118
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
  7. 20
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.java
  8. 6
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.xml
  9. 55
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
  10. 15
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java
  11. 7
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
  12. 13
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
  13. 57
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
  14. 1
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseRetentionRecordMapper.xml

12
blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSignforEntity.java
Unescape View File

@ -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;
}

40
blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSignforVO.java
Unescape View File

@ -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<String> taskTimeSection;
/**
* 装车时间(区间)
*/
@ApiModelProperty(value = "装车时间(区间)")
private List<String> loadingTimeSection;
/**
* 司机签收(区间)
*/
@ApiModelProperty(value = "司机签收(区间)")
private List<String> sjsigningTimeSection;
/**
* 文员审核(区间)
*/
@ApiModelProperty(value = "文员审核(区间)")
private List<String> signingTimeSection;
/**
* 卸车班组

9
blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java
Unescape View File

@ -133,7 +133,14 @@ public class DistributionStockArticleVO extends DistributionStockArticleEntity {
* 装车数量
*/
@ApiModelProperty(value = "装车数量")
private String loadingNumber;
private Integer loadingNumber;
/**
* 签收数量
*/
@ApiModelProperty(value = "签收数量")
private Integer signingNumber;
/**
* 备货数量
*/

3
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java
Unescape View File

@ -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;

7
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java
Unescape View File

@ -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));
}
/**
* 配送在库订单 新增或修改
*/

118
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
Unescape View File

@ -1749,64 +1749,70 @@
</select>
<select id="selectDeliveryById" resultType="com.logpm.distribution.vo.DistributionDeliveryListVO">
SELECT
id,
tenant_id,
create_user,
create_time,
update_user,
update_time,
status,
is_deleted,
create_dept,
reserve1,
reserve2,
reserve3,
reserve4,
reserve5,
train_number,
warehouse_name,
warehouse_id,
type,
forklift_id,
forklift_name,
kind,
vehicle_name,
driver_name,
vehicle_id,
driver_id,
distribution_company,
distribution_company_id,
delivery_status,
delivery_list_loading_status,
customers_number,
price,
added_services_id,
order_number,
delivery_number,
scanned_number,
loading_team_type,
loading_team_id,
loading_team_name,
reservation_id,
lead_time,
order_code,
order_id,
loading_time,
note_number,
source,
fee,
task_time,
inventory_nub,
preparation_time,
positioning,
positioning_adr,
remarks,
unloading_team_id,
unloading_team_name
lddl.id,
lddl.tenant_id,
lddl.create_user,
lddl.create_time,
lddl.update_user,
lddl.update_time,
lddl.status,
lddl.is_deleted,
lddl.create_dept,
lddl.reserve1,
lddl.reserve2,
lddl.reserve3,
lddl.reserve4,
lddl.reserve5,
lddl.train_number,
lddl.warehouse_name,
lddl.warehouse_id,
lddl.type,
lddl.forklift_id,
lddl.forklift_name,
lddl.kind,
lddl.vehicle_name,
lddl.driver_name,
lddl.vehicle_id,
lddl.driver_id,
lddl.distribution_company,
lddl.distribution_company_id,
lddl.delivery_status,
lddl.delivery_list_loading_status,
lddl.customers_number,
lddl.price,
lddl.added_services_id,
lddl.order_number,
lddl.delivery_number,
lddl.scanned_number,
lddl.loading_team_type,
lddl.loading_team_id,
lddl.loading_team_name,
lddl.reservation_id,
lddl.lead_time,
lddl.order_code,
lddl.order_id,
lddl.loading_time,
lddl.note_number,
lddl.source,
lddl.fee,
lddl.task_time,
lddl.inventory_nub,
lddl.preparation_time,
lddl.positioning,
lddl.positioning_adr,
lddl.remarks,
lddl.unloading_team_id,
lddl.unloading_team_name,
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_delivery_list
logpm_distribution_delivery_list AS lddl
WHERE
id = #{deliveryId}
lddl.id = #{deliveryId}
</select>
</mapper>

20
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.java
Unescape View File

@ -101,4 +101,24 @@ public interface DistributionLoadscanMapper extends BaseMapper<DistributionLoads
Integer selectOrderLoadingNum(@Param("orderId") Long id);
Integer selectOrderSignNum(@Param("orderId") Long id);
/**
* 查询签收列表中订单的装车数
* @param reservationId
* @param deliveryId
* @param id
* @return
*/
Integer selectOrderLoadingNumByReservationIdAndDeliveryIdAndOrderId(@Param("reservationId") Long reservationId,@Param("deliveryId") Long deliveryId,@Param("orderId") Long id);
/**
* 查询签收列表中订单的签收数
* @param reservationId
* @param deliveryId
* @param id
* @return
*/
Integer selectOrderSigningNumByReservationIdAndDeliveryIdAndOrderId(@Param("reservationId") Long reservationId,@Param("deliveryId") Long deliveryId,@Param("orderId") Long id);
}

6
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.xml
Unescape View File

@ -238,6 +238,12 @@
<select id="selectOrderSignNum" resultType="java.lang.Integer">
SELECT SUM(received_quantity) FROM logpm_distribution_loadscan WHERE scan_status != 1 AND signfor_state =2 And order_id =#{orderId}
</select>
<select id="selectOrderLoadingNumByReservationIdAndDeliveryIdAndOrderId" resultType="java.lang.Integer">
SELECT IF(sum( loaded_nub) is null ,0,sum( loaded_nub) ) AS loadingNumber FROM logpm_distribution_loadscan WHERE is_deleted = 0 AND reservation_id = #{reservationId} AND delivery_id = #{deliveryId} AND order_id = #{orderId} AND scan_status != 1
</select>
<select id="selectOrderSigningNumByReservationIdAndDeliveryIdAndOrderId" resultType="java.lang.Integer">
SELECT IF(sum( received_quantity) is null ,0,sum( received_quantity) ) AS signingNumber FROM logpm_distribution_loadscan WHERE is_deleted = 0 AND reservation_id = #{reservationId} AND delivery_id = #{deliveryId} AND order_id = #{orderId} AND scan_status != 1
</select>
</mapper>

55
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
Unescape View File

@ -284,7 +284,6 @@
&#45;&#45; 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
<where>
lds.is_deleted = 0 and ldr.is_deleted = 0
lds.is_deleted = 0 and ldr.is_deleted = 0 and lddl.is_deleted = 0
<if test="param.mallName != null and param.mallName!=''">
and ldr.mall_name like concat('%',#{param.mallName},'%')
</if>
@ -345,6 +354,15 @@
<if test="param.storeName != null and param.storeName!=''">
and ldr.store_name like concat('%',#{param.storeName},'%')
</if>
<if test="param.reservationCode != null and param.reservationCode!=''">
and ldr.reservation_code like concat('%',#{param.reservationCode},'%')
</if>
<if test="param.driverName != null and param.driverName!=''">
and lddl.driver_name like concat('%',#{param.driverName},'%')
</if>
<if test="param.vehicleName != null and param.vehicleName!=''">
and lddl.vehicle_name like concat('%',#{param.vehicleName},'%')
</if>
<if test="param.deliveryTime!=null and param.deliveryTime!=''">
and date_format(lds.delivery_time,'%y%m%d%') = date_format(#{param.deliveryTime},'%y%m%d%')
</if>
@ -372,7 +390,6 @@
<if test="param.trainNumber != null and param.trainNumber!=''">
and lddl.train_number like concat('%',#{param.trainNumber},'%')
</if>
<if test="param.deliveryAddress != null and param.deliveryAddress!=''">
and ldr.delivery_address like concat('%',#{param.deliveryAddress},'%')
</if>
@ -385,6 +402,21 @@
<if test="param.taskTime != null and param.taskTime!=''">
and date_format(lddl.task_time,'%Y-%m-%d') = #{param.taskTime}
</if>
<if test="param.signLoadingDate != null and param.signLoadingDate!=''">
and date_format(lddl.loading_time,'%Y-%m-%d') = #{param.signLoadingDate}
</if>
<if test="param.taskTimeSection != null and param.taskTimeSection!=''">
and lddl.task_time between #{param.taskTimeSection[0]} and #{param.taskTimeSection[1]}
</if>
<if test="param.loadingTimeSection != null and param.loadingTimeSection!=''">
and lddl.loading_time between #{param.loadingTimeSection[0]} and #{param.loadingTimeSection[1]}
</if>
<if test="param.sjsigningTimeSection != null and param.sjsigningTimeSection!=''">
and lds.sjsigning_time between #{param.sjsigningTimeSection[0]} and #{param.sjsigningTimeSection[1]}
</if>
<if test="param.signingTimeSection != null and param.signingTimeSection!=''">
and lds.signing_time between #{param.signingTimeSection[0]} and #{param.signingTimeSection[1]}
</if>
</where>
</select>
@ -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
<where>
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
<if test="param.mallName != null and param.mallName!=''">
and ldr.mall_name like concat('%',#{param.mallName},'%')
</if>
@ -486,6 +518,9 @@
<if test="param.deliveryAddress != null and param.deliveryAddress!=''">
and ldr.delivery_address like concat('%',#{param.deliveryAddress},'%')
</if>
<if test="param.warehouseId != null and param.warehouseId!=''">
and ldr.warehouse_id = #{param.warehouseId}
</if>
</where>
</select>
@ -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
<where>
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
<if test="param.mallName != null and param.mallName!=''">
and ldr.mall_name like concat('%',#{param.mallName},'%')
</if>
@ -533,6 +568,10 @@
and ldr.delivery_address like concat('%',#{param.deliveryAddress},'%')
</if>
<if test="param.warehouseId != null and param.warehouseId!=''">
and ldr.warehouse_id = #{param.warehouseId}
</if>
</where>
</select>

15
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java
Unescape View File

@ -120,4 +120,19 @@ public interface DistributionStockArticleMapper extends BaseMapper<DistributionS
void updateCustomerInfoByOrderCode(@Param("customerName") String customerName, @Param("customerPhone") String customerPhone, @Param("customerRoad") String customerRoad, @Param("orderCode") String orderCode);
void freezeByOrderCode(@Param("orderCode") String orderCode,@Param("freezeStatus") String freezeStatus);
/**
* 扣减在库订单在库数量
* @param orderId
* @param loadedNub
* @return
*/
Integer deductionHandQuantity(@Param("orderId") Long orderId, @Param("deductionNum") Integer loadedNub);
/**
* 增加订单的在库数量
* @param orderId
* @param loadedNub
*/
Integer augmentHandQuantity(@Param("orderId") Long orderId, @Param("augmentNum") Integer loadedNub);
}

7
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
Unescape View File

@ -784,5 +784,12 @@
set freeze_status = #{freezeStatus}
where order_code = #{orderCode}
</update>
<update id="deductionHandQuantity">
UPDATE logpm_distribution_stock_article SET hand_quantity = (hand_quantity - #{deductionNum}) WHERE id=#{orderId} AND is_deleted = 0 AND hand_quantity >= 0
</update>
<update id="augmentHandQuantity">
UPDATE logpm_distribution_stock_article SET hand_quantity = (hand_quantity + #{augmentNum}) WHERE id=#{orderId} AND is_deleted = 0 AND hand_quantity >= 0
</update>
</mapper>

13
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
Unescape View File

@ -570,6 +570,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId());
//更新签收表的装车数量
Integer j = distributionSignforMapper.updateloadByReservationId(loadscanEntity.getDeliveryId(), loadscanEntity.getReservationId(), loadscanEntity.getPackageNub());
//扣减订单的在库数量
Integer k = distributionStockArticleMapper.deductionHandQuantity(loadscanEntity.getOrderId(), loadscanEntity.getLoadedNub());
distributionLoadscanService.save(loadscanEntity);
//这里还需要一个维护状态的方法
//异步维护状态
@ -699,6 +701,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId());
//更新签收表的装车数量
Integer j = distributionSignforMapper.updateloadByReservationId(loadscanEntity.getDeliveryId(), loadscanEntity.getReservationId(), loadscanEntity.getPackageNub());
//扣减订单的在库数量
Integer k = distributionStockArticleMapper.deductionHandQuantity(loadscanEntity.getOrderId(), loadscanEntity.getLoadedNub());
// loadingNum.getAndAdd(loadscanEntity.getPackageNub());
distributionAsyncService.checkLoadingByPackage(parcelListEntity, loadscanEntity.getDeliveryId(), loadscanEntity.getReservationId());
}
@ -1375,9 +1379,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
//1、查询该客户下是否还存在需要装车的包件和库存品
//查询配送任务配车司机信息
DistributionDeliveryListEntity distributionDeliveryListEntity = distributionDeliveryListMapper.selectById(distrilbutionloadingscanDTO.getDeliveryId());
DistributionDeliveryListEntity distributionDeliveryListEntity = this.getById(distrilbutionloadingscanDTO.getDeliveryId());
distributionDeliveryListEntity.setDeliveryListLoadingStatus(DeliveryLoadingStatusConstant.yizhuangche.getValue());
distributionDeliveryListMapper.updateById(distributionDeliveryListEntity);
this.updateById(distributionDeliveryListEntity);
DistributionDeliverySelfEntity distributionDeliverySelfEntity = new DistributionDeliverySelfDTO();
if (StringUtils.isBlank(distrilbutionloadingscanDTO.getLoadingId())) {
if (distributionDeliveryListEntity.getKind().equals("1")) {
@ -1471,8 +1475,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
// distributionParcelListService.updateById(parcelListEntity);
distributionLoadscanService.save(loadscanEntity);
Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId());
Integer j = distributionSignforMapper.updateloadByReservationId(loadscanEntity.getDeliveryId(), loadscanEntity.getReservationId(), loadscanEntity.getPackageNub());
//扣减在库订单的在库数量
Integer k =distributionStockArticleMapper.deductionHandQuantity(loadscanEntity.getOrderId(),loadscanEntity.getLoadedNub());
warehouseUpdownTypeClient.downPackageOrDelTray(parcelListEntity.getOrderPackageCode(), myCurrentWarehouse.getId());
distributionAsyncService.checkOrderLoadingStatus(parcelListEntity.getId());
}
@ -5653,6 +5658,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
distributionLoadscanService.updateById(loadscanEntity);
// 对应签收信息的装车数量要进行扣减
int a = distributionSignforMapper.deductionLoadingPacjageNum(loadscanEntity.getReservationId(), loadscanEntity.getDeliveryId(), loadscanEntity.getLoadedNub());
//维护在库订单的在库数量字段
distributionStockArticleMapper.augmentHandQuantity(loadscanEntity.getOrderId(),loadscanEntity.getLoadedNub());
distributionAsyncService.checkReservationStatusAndLoadingStatusByPackage(parcelListEntity.getId());
}
//进行了一条包件任务的取消，此时就应该对预约、配送任务进行数量的维护

57
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
Unescape View File

@ -122,6 +122,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
private final IDistributionSignPrintService iDistributionSignPrintService;
private final IDistributionParcelNumberService distributionParcelNumberService;
private final IWarehouseUpdownTypeClient warehouseUpdownTypeClient;
private final DistributionStockArticleMapper distributionStockArticleMapper;
private final RabbitTemplate rabbitTemplate;
@ -130,8 +131,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
@Override
public IPage<DistributionSignforVO> selectDistributionSignforPage(IPage<DistributionSignforVO> 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 BaseServiceImpl<Distribution
} else {
d.setDeliveryTypeName("");
}
Long deliveryId = d.getDeliveryId();
DistributionDeliveryListEntity deliveryListEntity = distributionDeliveryListMapper.selectOne(Wrappers.<DistributionDeliveryListEntity>query().lambda().eq(DistributionDeliveryListEntity::getId, deliveryId));
List<String> list = new ArrayList<>();
if (Func.equals(deliveryListEntity.getKind(), ServiceConstant.DELIVERLIST_KIND_SELF)) {
List<DistributionDeliverySelfEntity> distributionDeliverySelfEntities = distributionDeliverySelfMapper.selectList(Wrappers.<DistributionDeliverySelfEntity>query().lambda().eq(DistributionDeliverySelfEntity::getDeliveryId, deliveryId));
distributionDeliverySelfEntities.forEach(s -> list.add(s.getDriverPhone()));
} else {
DistributionDeliveryTripartiteEntity tripartiteEntity = distributionDeliveryTripartiteMapper.selectOne(Wrappers.<DistributionDeliveryTripartiteEntity>query().lambda().eq(DistributionDeliveryTripartiteEntity::getDeliveryId, deliveryId));
list.add(tripartiteEntity.getDriverPhone());
}
d.setDeliveryDriverPhone(String.join(",", list));
// Long deliveryId = d.getDeliveryId();
// DistributionDeliveryListEntity deliveryListEntity = distributionDeliveryListMapper.selectOne(Wrappers.<DistributionDeliveryListEntity>query().lambda().eq(DistributionDeliveryListEntity::getId, deliveryId));
// List<String> list = new ArrayList<>();
// if (Func.equals(deliveryListEntity.getKind(), ServiceConstant.DELIVERLIST_KIND_SELF)) {
// List<DistributionDeliverySelfEntity> distributionDeliverySelfEntities = distributionDeliverySelfMapper.selectList(Wrappers.<DistributionDeliverySelfEntity>query().lambda().eq(DistributionDeliverySelfEntity::getDeliveryId, deliveryId));
// distributionDeliverySelfEntities.forEach(s -> list.add(s.getDriverPhone()));
// } else {
// DistributionDeliveryTripartiteEntity tripartiteEntity = distributionDeliveryTripartiteMapper.selectOne(Wrappers.<DistributionDeliveryTripartiteEntity>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<Distribution
@Override
public DistributionSignforsnmbVO getNubTotal(DistributionSignforDTO distributionSignfor) {
BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
if (Func.isNotEmpty(myCurrentWarehouse)){
distributionSignfor.setWarehouseId(myCurrentWarehouse.getId());
}
//转换创建时间
DistributionSignforsnmbVO distributionSignforsnmbVO = new DistributionSignforsnmbVO();
//司机待签收
@ -371,6 +376,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
// Integer j = distributionSignforMapper.updateSignforNum(distributionLoadscanEntity.getDeliveryId(), distributionLoadscanEntity.getReservationId(), distributionLoadscanEntity.getPackageNub());
//更新装车包件数和签收包件数
Integer j = distributionSignforMapper.updateSignforByReservationId(distributionLoadscanEntity.getDeliveryId(), distributionLoadscanEntity.getReservationId(), distributionLoadscanEntity.getPackageNub());
//扣减订单的在库数量
Integer k = distributionStockArticleMapper.deductionHandQuantity(loadscanEntity.getOrderId(), loadscanEntity.getLoadedNub());
warehouseUpdownTypeClient.downPackageOrDelTray(collect.get(0).getOrderPackageCode(), myCurrentWarehouse.getId());
distributionAsyncService.checkSignStatus(distributionLoadscanEntity.getPackageId(),distributionLoadscanEntity.getReservationId(),distributionLoadscanEntity.getDeliveryId());
}
@ -493,8 +500,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
log.error("###########查询签收信息异常，id:{}", id);
return null;
}
List<DistributionReservationStockarticleEntity> reservationStockarticleEntityList = distributionReservationStockarticleService.list(Wrappers.<DistributionReservationStockarticleEntity>query().lambda().eq(DistributionReservationStockarticleEntity::getReservationId, signforEntity.getReservationId()).ne(
DistributionReservationStockarticleEntity::getStockArticleStatus, ReservationOrderStatusConstant.quxiao.getValue()));
List<DistributionReservationStockarticleEntity> reservationStockarticleEntityList = distributionReservationStockarticleService.list(Wrappers.<DistributionReservationStockarticleEntity>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<Distribution
if (Func.isNotEmpty(orderIds)) {
List<DistributionStockArticleEntity> stockArticleEntities = distributionStockArticleService.listByIds(orderIds);
List<DistributionStockArticleVO> distributionStockArticleVOS = DistributionStockArticleWrapper.build().listVO(stockArticleEntities);
for (DistributionStockArticleVO distributionStockArticleVO : distributionStockArticleVOS) {
//查询计划、装车、签收数量
DistributionReservationStockarticleEntity reservationStockarticleEntity = distributionReservationStockarticleService.getOne(Wrappers.<DistributionReservationStockarticleEntity>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<DistributionSignPrintVO> printEntities = baseMapper.selectSignImgsUrl(distributionSignforVO.getReservationId());
distributionSignforVO.setPrintVOList(printEntities);
if (Func.isNotEmpty(stockArticleEntities)) {
distributionSignforVO.setOrderInfo(DistributionStockArticleWrapper.build().listVO(stockArticleEntities));
distributionSignforVO.setOrderInfo(distributionStockArticleVOS);
}
}
// List<DistributionStockArticleVO> stockArticleEntityList = baseMapper.selectOrderList(id);
@ -1840,6 +1862,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
Integer i = distributionDeliveryListMapper.updateloadingTimeById(distributionDeliveryListEntity.getId());
//更新签收表的签收数量和装车数量
Integer j = distributionSignforMapper.updateSignforByReservationId(loadscanEntity.getDeliveryId(), loadscanEntity.getReservationId(), loadscanEntity.getPackageNub());
//扣减订单的在库数量
Integer k = distributionStockArticleMapper.deductionHandQuantity(loadscanEntity.getOrderId(), loadscanEntity.getLoadedNub());
distributionAsyncService.checkStockArticleSignStatus(parcelListEntity);
log.info("一件签收包件下架解托>>>>>>>>>>>>>>>parcelListEntity.getOrderPackageCode():{}",parcelListEntity.getOrderPackageCode());
warehouseUpdownTypeClient.downPackageOrDelTray(parcelListEntity.getOrderPackageCode(), myCurrentWarehouse.getId());
@ -1851,6 +1875,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
loadscanEntities.setMsg("司机一键签收数据补录");
}
if (!loadscanEntities.getSignforState().equals(LoadScanSigningStatusConstant.yiqianshou.getValue())) {
//已经进行过装车 这里不需要进行订制品订单在库数量扣减
loadscanEntities.setSignforState(LoadScanSigningStatusConstant.yiqianshou.getValue());
loadscanEntities.setReceivedQuantity(parcelListEntity.getQuantity());
loadscanEntities.setOneClick(1);
@ -1990,6 +2015,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
.set(distributionSignfor.getIsClerk(), DistributionSignforEntity::getSigningTime, simpleDateFormat.format(new Date()))
.set(!distributionSignfor.getIsClerk(), DistributionSignforEntity::getSigningTime, simpleDateFormat.format(new Date()))
.set(distributionSignfor.getIsClerk() && StringUtils.isNotBlank(distributionSignfor.getClerkSignRemarks()), DistributionSignforEntity::getClerkSignRemarks, distributionSignfor.getClerkSignRemarks())
.set(distributionSignfor.getIsClerk() , DistributionSignforEntity::getExamineUserId, user.getUserId())
.set(distributionSignfor.getIsClerk() , DistributionSignforEntity::getExamineUserName, user.getNickName())
.set(!distributionSignfor.getIsClerk() && StringUtils.isNotBlank(distributionSignfor.getDriverRemarks()), DistributionSignforEntity::getDriverRemarks, distributionSignfor.getDriverRemarks())
.set(!distributionSignfor.getIsClerk(), DistributionSignforEntity::getDriverSigning, 2)
.set(!distributionSignfor.getIsClerk(), DistributionSignforEntity::getSjsigningTime, simpleDateFormat.format(new Date()));

1
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseRetentionRecordMapper.xml
Unescape View File

@ -137,6 +137,7 @@
lwrs.material_number,
lwrs.material_name,
lwrs.inventory_id,
lwrs.retention_quantity,
CASE lwrs.conditions
WHEN 1 THEN '包件'
WHEN 2 THEN '库存品'

Write Preview
Loading…
Cancel
Save