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

1.扫描判断签收

test
0.0 2 years ago
parent
977087f7c2
commit
de0db63813
5 changed files with 185 additions and 60 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. 2
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionDeliveryListEntity.java
  2. 17
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSignforEntity.java
  3. 1
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java
  4. 173
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
  5. 52
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

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

@ -172,7 +172,7 @@ public class DistributionDeliveryListEntity extends TenantEntity {
* 装卸类型
*/
@ApiModelProperty(value = "装卸类型(1-装,2-卸)")
private Integer loadingTeamType;
private String loadingTeamType;
/**
* 关联预约表id（客户）
*/

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

@ -63,10 +63,15 @@ public class DistributionSignforEntity extends TenantEntity {
@ApiModelProperty(value = "预留5")
private String reserve5;
/**
* 订单自编号;订单关联id
* 订单关联id
*/
@ApiModelProperty(value = "订单自编号;订单关联id")
@ApiModelProperty(value = "订单关联id")
private String orderId;
/**
* 订单自编号
*/
@ApiModelProperty(value = "订单自编号")
private String stockArticleId;
/**
* 预约关联Id;预约关联id
*/
@ -81,7 +86,7 @@ public class DistributionSignforEntity extends TenantEntity {
* 收货人(名称)
*/
@ApiModelProperty(value = "收货人(名称)")
private String consigneeName;
private String consignee;
/**
* 收货人手机
*/
@ -236,6 +241,12 @@ public class DistributionSignforEntity extends TenantEntity {
@ApiModelProperty(value = "编号")
private String number;
/**
* 配送关联id
*/
@ApiModelProperty(value = "配送关联id")
private Long deliveryId;
/**
* 配送时间
*/

1
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java
Unescape View File

@ -122,7 +122,6 @@ public class DistributionDeliveryListController extends BladeController {
*/
@PostMapping("/loadingscan")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入distributionDeliveryList")
public R loadingscan(@Valid @RequestBody DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
R msg = distributionDeliveryListService.loadingscan(distrilbutionloadingscanDTO);
return msg;

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

@ -46,46 +46,135 @@
</resultMap>
<!-- <select id="selectDistributionSignforPage" resultType="com.logpm.distribution.vo.DistributionSignforVO">-->
<!-- SELECT-->
<!-- id id,-->
<!-- number number,-->
<!-- order_id orderId,-->
<!-- reservation_id reservationId,-->
<!-- consignee_id consigneeId,-->
<!-- consignee_name consigneeName,-->
<!-- delivery_phone deliveryPhone,-->
<!-- delivery_address delivery_Address,-->
<!-- delivery_type deliveryType,-->
<!-- delivery_way deliveryWay,-->
<!-- warehouse_name warehouseName,-->
<!-- warehouse_id warehouseId,-->
<!-- train_number trainNumber,-->
<!-- order_total orderTotal,-->
<!-- total total,-->
<!-- loaded_number loadedNumber,-->
<!-- received_quantity receivedQuantity,-->
<!-- delivery_driver_name deliveryDriverName,-->
<!-- delivery_driver_id deliveryDriverId,-->
<!-- delivery_driver_phone deliveryDriverPhone,-->
<!-- signing_time signingTime,-->
<!-- sjsigning_time sjsigningTime,-->
<!-- signee_name signeeName,-->
<!-- signee_id signeeId,-->
<!-- signing_status signingStatus,-->
<!-- driver_signing driverSigning,-->
<!-- signing_type signingType,-->
<!-- clerk_sign_pictures clerkSignPictures,-->
<!-- delivery_sign_pictures deliverySignPictures,-->
<!-- service_number serviceNumber,-->
<!-- notes notes,-->
<!-- delivery_time deliveryTime,-->
<!-- delivery_vehicle_id deliveryVehicleId,-->
<!-- delivery_vehicle_name deliveryVehicleName,-->
<!-- shopping_name shoppingName,-->
<!-- order_source orderSource-->
<!-- FROM-->
<!-- logpm_distribution_signfor-->
<!-- <where>-->
<!-- is_deleted = 0-->
<!-- <if test="param.number != null and param.number!=''">-->
<!-- and number like concat('%',#{param.number},'%')-->
<!-- </if>-->
<!-- <if test="param.shoppingName != null and param.shoppingName!=''">-->
<!-- and shopping_name like concat('%',#{param.shoppingName},'%')-->
<!-- </if>-->
<!-- <if test="param.deliveryTime!=null and param.deliveryTime!=''">-->
<!-- and date_format(delivery_time,'%y%m%d%') = date_format(#{param.deliveryTime},'%y%m%d%')-->
<!-- </if>-->
<!-- <if test="param.signingTime!=null and param.signingTime!=''">-->
<!-- and date_format(signing_time,'%y%m%d%') = date_format(#{param.signingTime},'%y%m%d%')-->
<!-- </if>-->
<!-- <if test="param.sjsigningTime!=null and param.sjsigningTime!=''">-->
<!-- and date_format(sjsigning_time,'%y%m%d%') = date_format(#{param.sjsigningTime},'%y%m%d%')-->
<!-- </if>-->
<!-- <if test="param.orderId != null and param.orderId!=''">-->
<!-- and order_id like concat('%',#{param.orderId},'%')-->
<!-- </if>-->
<!-- <if test="param.consigneeName != null and param.consigneeName!=''">-->
<!-- and consignee_name like concat('%',#{param.consigneeName},'%')-->
<!-- </if>-->
<!-- <if test="param.deliveryType != null and param.deliveryType!=''">-->
<!-- and delivery_type = #{param.deliveryType}-->
<!-- </if>-->
<!-- <if test="param.signingStatus != null and param.signingStatus!=''">-->
<!-- and signing_status = #{param.signingStatus}-->
<!-- </if>-->
<!-- <if test="param.orderSource != null and param.orderSource!=''">-->
<!-- and order_source = #{param.orderSource}-->
<!-- </if>-->
<!-- <if test="param.deliveryPhone != null and param.deliveryPhone!=''">-->
<!-- and delivery_phone = #{param.deliveryPhone}-->
<!-- </if>-->
<!-- <if test="param.trainNumber != null and param.trainNumber!=''">-->
<!-- and train_number like concat('%',#{param.trainNumber},'%')-->
<!-- </if>-->
<!-- <if test="param.deliveryDriverName != null and param.deliveryDriverName!=''">-->
<!-- and delivery_driver_name like concat('%',#{param.deliveryDriverName},'%')-->
<!-- </if>-->
<!-- <if test="param.deliveryAddress != null and param.deliveryAddress!=''">-->
<!-- and delivery_address like concat('%',#{param.deliveryAddress},'%')-->
<!-- </if>-->
<!-- <if test="param.driverSigning != null and param.driverSigning!=''">-->
<!-- and driver_signing = #{param.driverSigning}-->
<!-- </if>-->
<!-- </where>-->
<!-- </select>-->
<select id="selectDistributionSignforPage" resultType="com.logpm.distribution.vo.DistributionSignforVO">
SELECT
id id,
number number,
order_id orderId,
reservation_id reservationId,
consignee_id consigneeId,
consignee_name consigneeName,
delivery_phone deliveryPhone,
delivery_address delivery_Address,
delivery_type deliveryType,
delivery_way deliveryWay,
warehouse_name warehouseName,
warehouse_id warehouseId,
train_number trainNumber,
order_total orderTotal,
total total,
loaded_number loadedNumber,
received_quantity receivedQuantity,
delivery_driver_name deliveryDriverName,
delivery_driver_id deliveryDriverId,
delivery_driver_phone deliveryDriverPhone,
signing_time signingTime,
sjsigning_time sjsigningTime,
signee_name signeeName,
signee_id signeeId,
signing_status signingStatus,
driver_signing driverSigning,
signing_type signingType,
clerk_sign_pictures clerkSignPictures,
delivery_sign_pictures deliverySignPictures,
service_number serviceNumber,
notes notes,
delivery_time deliveryTime,
delivery_vehicle_id deliveryVehicleId,
delivery_vehicle_name deliveryVehicleName,
shopping_name shoppingName,
order_source orderSource
id id,
number number,
order_id orderId,
reservation_id reservationId,
consignee_id consigneeId,
consignee_name consigneeName,
delivery_phone deliveryPhone,
delivery_address delivery_Address,
delivery_type deliveryType,
delivery_way deliveryWay,
warehouse_name warehouseName,
warehouse_id warehouseId,
train_number trainNumber,
order_total orderTotal,
total total,
loaded_number loadedNumber,
received_quantity receivedQuantity,
delivery_driver_name deliveryDriverName,
delivery_driver_id deliveryDriverId,
delivery_driver_phone deliveryDriverPhone,
signing_time signingTime,
sjsigning_time sjsigningTime,
signee_name signeeName,
signee_id signeeId,
signing_status signingStatus,
driver_signing driverSigning,
signing_type signingType,
clerk_sign_pictures clerkSignPictures,
delivery_sign_pictures deliverySignPictures,
service_number serviceNumber,
notes notes,
delivery_time deliveryTime,
delivery_vehicle_id deliveryVehicleId,
delivery_vehicle_name deliveryVehicleName,
shopping_name shoppingName,
order_source orderSource
FROM
logpm_distribution_signfor
logpm_distribution_signfor
<where>
is_deleted = 0
<if test="param.number != null and param.number!=''">
@ -97,10 +186,10 @@
<if test="param.deliveryTime!=null and param.deliveryTime!=''">
and date_format(delivery_time,'%y%m%d%') = date_format(#{param.deliveryTime},'%y%m%d%')
</if>
<if test="param.signingTime!=null and param.signingTime!=''">
<if test="param.signingTime!=null and param.signingTime!=''">
and date_format(signing_time,'%y%m%d%') = date_format(#{param.signingTime},'%y%m%d%')
</if>
<if test="param.sjsigningTime!=null and param.sjsigningTime!=''">
<if test="param.sjsigningTime!=null and param.sjsigningTime!=''">
and date_format(sjsigning_time,'%y%m%d%') = date_format(#{param.sjsigningTime},'%y%m%d%')
</if>
<if test="param.orderId != null and param.orderId!=''">
@ -112,13 +201,13 @@
<if test="param.deliveryType != null and param.deliveryType!=''">
and delivery_type = #{param.deliveryType}
</if>
<if test="param.signingStatus != null and param.signingStatus!=''">
<if test="param.signingStatus != null and param.signingStatus!=''">
and signing_status = #{param.signingStatus}
</if>
<if test="param.orderSource != null and param.orderSource!=''">
and order_source = #{param.orderSource}
</if>
<if test="param.deliveryPhone != null and param.deliveryPhone!=''">
<if test="param.deliveryPhone != null and param.deliveryPhone!=''">
and delivery_phone = #{param.deliveryPhone}
</if>
<if test="param.trainNumber != null and param.trainNumber!=''">
@ -130,7 +219,7 @@
<if test="param.deliveryAddress != null and param.deliveryAddress!=''">
and delivery_address like concat('%',#{param.deliveryAddress},'%')
</if>
<if test="param.driverSigning != null and param.driverSigning!=''">
<if test="param.driverSigning != null and param.driverSigning!=''">
and driver_signing = #{param.driverSigning}
</if>
</where>

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

@ -74,6 +74,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
private final DistributionLoadscanMapper distributionLoadscanMapper;
private final DistributionDeliveryListMapper distributionDeliveryListMapper;
private final DistributionSignforServiceImpl distributionSignforService;
private final DistributionSignforMapper distributionSignforMapper;
private final DistributionStockArticleMapper distributionStockArticleMapper;
private final DistributionSigndetailServiceImpl distributionSigndetailService;
private final DistributionPackadeliServiceImpl distributionPackadeliService;
@ -256,13 +257,33 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
//获取当前用户司机
// BladeUser user = AuthUtil.getUser();
for (DistributionLoadscanEntity distributionLoadscanEntity : distributionLoadscanEntities) {
if (distributionLoadscanEntity.getScanStatus() !=1){return R.fail(3002, "重复扫码");}
if (distributionLoadscanEntity.getScanStatus() != 1) {return R.fail(3002, "重复扫码");}
//依次更新该装车记录,设置车辆
distributionLoadscanMapper.updateSumById(distributionLoadscanEntity.getId(),distrilbutionloadingscanDTO);
distributionLoadscanMapper.updateSumById(distributionLoadscanEntity.getId(), distrilbutionloadingscanDTO);
// distributionLoadscanordMapper.updateSumById(distributionLoadscanEntity.getOrderId(),distrilbutionloadingscanDTO);
// distributionLoadscanresMapper.updateSumById(distributionLoadscanEntity.getReservationId(),distrilbutionloadingscanDTO);
//查询本车次是否第一次扫码,没有则更新上车时间
Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId());
//判断是商配还是市配
DistributionDeliveryListEntity distributionDeliveryListEntity = distributionDeliveryListMapper.selectById(distrilbutionloadingscanDTO.getDeliveryId());
if (distributionDeliveryListEntity.getType().equals("1")) {
//判断签收表有无客户信息,没有就加入信息
Long c = distributionSignforMapper.selectCount(new QueryWrapper<DistributionSignforEntity>().lambda()
.eq(DistributionSignforEntity::getDeliveryType,"1")
.eq(DistributionSignforEntity::getReservationId,distributionLoadscanEntity.getReservationId())
);
//冗余加入
if (c<=0){
DistributionReservationEntity distributionReservationEntity = distributionReservationMapper.selectById(distributionLoadscanEntity.getReservationId());
DistributionSignforEntity distributionSignforEntity = new DistributionSignforEntity();
BeanUtils.copyProperties(distributionReservationEntity,distributionSignforEntity);
distributionSignforEntity.setReservationId(distributionReservationEntity.getId());
distributionSignforEntity.setId(null);
distributionSignforMapper.insert(distributionSignforEntity);
}
}
}
// //找出该包条码
// List<DistributionParcelListEntity> distributionParcelListEntities = distributionParcelListMapper.selectList(new QueryWrapper<DistributionParcelListEntity>().lambda()
@ -291,7 +312,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
// }
} else if (distrilbutionloadingscanDTO.getType() == 2) {
//TODO 托盘扫描
//查询该包条是否属于该配送任务
@ -303,17 +323,23 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
return R.fail(3001, "窜货");
}
for (DistributionLoadscanEntity distributionLoadscanEntity : distributionLoadscanEntities) {
if (distributionLoadscanEntity.getScanState() !=1){return R.fail(3003, "有扫描过的货物");}
if (distributionLoadscanEntity.getDeliveryId() != distrilbutionloadingscanDTO.getDeliveryId()){return R.fail(3004, "有其他车次货物"); }
if (distributionLoadscanEntity.getScanState() != 1) {
return R.fail(3003, "有扫描过的货物");
}
if (distributionLoadscanEntity.getDeliveryId() != distrilbutionloadingscanDTO.getDeliveryId()) {
return R.fail(3004, "有其他车次货物");
}
//依次更新该装车记录,设置车辆
distributionLoadscanMapper.updateSumById(distributionLoadscanEntity.getId(),distrilbutionloadingscanDTO);
distributionLoadscanMapper.updateSumById(distributionLoadscanEntity.getId(), distrilbutionloadingscanDTO);
// distributionLoadscanordMapper.updateSumById(distributionLoadscanEntity.getOrderId(),distrilbutionloadingscanDTO);
// distributionLoadscanresMapper.updateSumById(distributionLoadscanEntity.getReservationId(),distrilbutionloadingscanDTO);
//查询本车次是否第一次扫码,没有则更新上车时间
Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId());
// Integer c = distributionSignforMapper.selectCount(new QueryWrapper<DistributionSignforEntity>().lambda().eq(DistributionSignforEntity::get));
}
}else if (distrilbutionloadingscanDTO.getType() == 3){
} else if (distrilbutionloadingscanDTO.getType() == 3) {
}
@ -341,7 +367,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
@Override
public R loadingscanoff(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
if (distrilbutionloadingscanDTO.getType()==1){
if (distrilbutionloadingscanDTO.getType() == 1) {
//查询该包条是否属于该配送任务
List<DistributionLoadscanEntity> distributionLoadscanEntities = distributionLoadscanMapper.selectList(new QueryWrapper<DistributionLoadscanEntity>().lambda()
.eq(DistributionLoadscanEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId())
@ -352,11 +378,11 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
}
for (DistributionLoadscanEntity distributionLoadscanEntity : distributionLoadscanEntities) {
//更新该装车记录
distributionLoadscanMapper.updatecutSumById(distributionLoadscanEntity.getId(),distrilbutionloadingscanDTO);
distributionLoadscanMapper.updatecutSumById(distributionLoadscanEntity.getId(), distrilbutionloadingscanDTO);
// distributionLoadscanordMapper.updatecutSumById(distributionLoadscanEntity.getOrderId(),distrilbutionloadingscanDTO);
// distributionLoadscanresMapper.updatecutSumById(distributionLoadscanEntity.getReservationId(),distrilbutionloadingscanDTO);
}
}else if (distrilbutionloadingscanDTO.getType()==2){
} else if (distrilbutionloadingscanDTO.getType() == 2) {
//TODO 托盘扫描
//查询该包条是否属于该配送任务
List<DistributionLoadscanEntity> distributionLoadscanEntities = distributionLoadscanMapper.selectList(new QueryWrapper<DistributionLoadscanEntity>().lambda()
@ -368,9 +394,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
}
for (DistributionLoadscanEntity distributionLoadscanEntity : distributionLoadscanEntities) {
//依次更新该装车记录,设置车辆
distributionLoadscanMapper.updateSumById(distributionLoadscanEntity.getId(),distrilbutionloadingscanDTO);
distributionLoadscanordMapper.updateSumById(distributionLoadscanEntity.getOrderId(),distrilbutionloadingscanDTO);
distributionLoadscanresMapper.updateSumById(distributionLoadscanEntity.getReservationId(),distrilbutionloadingscanDTO);
distributionLoadscanMapper.updateSumById(distributionLoadscanEntity.getId(), distrilbutionloadingscanDTO);
distributionLoadscanordMapper.updateSumById(distributionLoadscanEntity.getOrderId(), distrilbutionloadingscanDTO);
distributionLoadscanresMapper.updateSumById(distributionLoadscanEntity.getReservationId(), distrilbutionloadingscanDTO);
//查询本车次是否第一次扫码,没有则更新上车时间
Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId());

Write Preview
Loading…
Cancel
Save