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

1.扫描添加中间表

dev-warehouse
0.0 2 years ago
parent
15b3750cd8
commit
9631e523a3
11 changed files with 276 additions and 29 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. 10
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java
  2. 50
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistrilbutionloadingscanDTO.java
  3. 1
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java
  4. 5
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.java
  5. 59
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.xml
  6. 14
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanordMapper.java
  7. 48
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanordMapper.xml
  8. 14
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanresMapper.java
  9. 49
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanresMapper.xml
  10. 4
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java
  11. 51
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

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

@ -128,6 +128,16 @@ public class DistributionDeliveryListController extends BladeController {
return msg;
}
/**
* 配送管理 库存品装车
*/
@PostMapping("/loadinginventory")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "DistrilbutionloadingscanDTO")
public R loadinginventory(@Valid @RequestBody DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
R msg = distributionDeliveryListService.loadinginventory(distrilbutionloadingscanDTO);
return msg;
}
/**
* 配送管理 装车扫描（取消）
*/

50
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistrilbutionloadingscanDTO.java
Unescape View File

@ -23,12 +23,58 @@ public class DistrilbutionloadingscanDTO {
*/
@ApiModelProperty(value = "配送任务Id")
private Long deliveryId;
/**
* 预约Id
*/
@ApiModelProperty(value = "预约Id")
private Long reservationId;
// /**
// * 扫描类型
// */
// @ApiModelProperty(value = "扫描类型(1-包条,2-托盘)")
// @NotEmpty(message = "扫描类型")
// private Integer cut;
/**
* 车辆信息Id
*/
@ApiModelProperty(value = "车辆信息Id")
@NotEmpty(message = "车辆信息Id不能为空")
private String loadingId;
/**
*司机姓名
*/
@ApiModelProperty(value = "司机姓名")
@NotEmpty(message = "司机姓名不能为空")
private String driverName;
/**
*车牌号
*/
@ApiModelProperty(value = "车牌号")
@NotEmpty(message = "车牌号不能为空")
private String vehicleName;
/**
* 扫描物品
*/
@ApiModelProperty(value = "扫描物品(1-包条,2-托盘)")
@NotEmpty(message = "扫描物品不能为空")
@ApiModelProperty(value = "扫描物品(1-包条,2-托盘,3-订单)")
// @NotEmpty(message = "扫描物品不能为空")
private Integer type;
/**
* 库存品扫描物品
*/
@ApiModelProperty(value = "扫描物品(1-手动输入,2-托盘)")
// @NotEmpty(message = "扫描物品不能为空")
private Integer inventorytype;
}

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

@ -17,6 +17,7 @@
package com.logpm.distribution.mapper;
import com.logpm.distribution.dto.DistributionDeliveryListDTO;
import com.logpm.distribution.dto.DistrilbutionloadingscanDTO;
import com.logpm.distribution.entity.DistributionDeliveryListEntity;
import com.logpm.distribution.vo.DistributionDeliveryListVO;
import com.logpm.distribution.excel.DistributionDeliveryListExcel;

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

@ -16,6 +16,7 @@
*/
package com.logpm.distribution.mapper;
import com.logpm.distribution.dto.DistrilbutionloadingscanDTO;
import com.logpm.distribution.entity.DistributionLoadscanEntity;
import com.logpm.distribution.vo.DistributionLoadscanVO;
import com.logpm.distribution.excel.DistributionLoadscanExcel;
@ -55,7 +56,7 @@ public interface DistributionLoadscanMapper extends BaseMapper<DistributionLoads
*
* @return
*/
Integer updateSumById(Long id);
Integer updateSumById(@Param("id") Long id,@Param("param") DistrilbutionloadingscanDTO distrilbutionloadingscanDTO);
/**
* 查询当前包条码所在车次
*
@ -73,5 +74,5 @@ public interface DistributionLoadscanMapper extends BaseMapper<DistributionLoads
*
* @return
*/
Integer updatecutSumById(Long id);
Integer updatecutSumById(@Param("id") Long id,@Param("param") DistrilbutionloadingscanDTO distrilbutionloadingscanDTO);
}

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

@ -150,24 +150,55 @@
<result column="loaded_nub" property="loadedNub"/>
<result column="package_nub" property="packageNub"/>
</resultMap>
<update id="updateSumById">
UPDATE logpm_distribution_loadscan
SET scan_status = 2,
loaded_nub =
CASE
WHEN ( loaded_nub + 1 ) > package_nub THEN
package_nub ELSE ( loaded_nub + 1 )
END where id = #{id}
</update>
<update id="updatecutSumById">
UPDATE logpm_distribution_loadscan
SET scan_status = 1,
<trim prefix="SET" suffixOverrides=",">
scan_status = 1,
loaded_nub =
CASE
WHEN ( loaded_nub - 1 ) &lt; 0 THEN
package_nub ELSE ( loaded_nub - 1 )
END where id = #{id}
CASE
WHEN ( loaded_nub - 1 ) &lt; 0 THEN
package_nub ELSE ( loaded_nub - 1 )
END,
<!-- <if test="param.loadingId != null">-->
<!-- loading_id = TRIM(BOTH ',' FROM REPLACE(loading_id, #{param.loadingId}, '')),-->
<!-- </if>-->
<!-- <if test="param.driverName != null">-->
<!-- driver_name = TRIM(BOTH ',' FROM REPLACE(driver_name, #{param.driverName}, '')),-->
<!-- </if>-->
<!-- <if test="param.vehicleName != null">-->
<!-- vehicle_name = TRIM(BOTH ',' FROM REPLACE(vehicle_name, #{param.vehicleName}, ''))-->
<!-- </if>-->
</trim>
where id = #{id}
</update>
<update id="updateSumById">
UPDATE logpm_distribution_loadscan
<trim prefix="SET" suffixOverrides=",">
scan_status = 2,
loaded_nub = ( loaded_nub + 1 ),
scan_time = CASE WHEN scan_time IS NULL THEN now() else scan_time END ,
<if test="param.loadingId != null">
loading_id = CASE WHEN loading_id IS NULL OR loading_id = '' THEN #{param.loadingId}
WHEN loading_id like concat('%',#{param.loadingId},'%') THEN loading_id
ELSE CONCAT(loading_id, CONCAT(',', #{param.loadingId}))
END,
</if>
<if test="param.driverName != null">
driver_name = CASE WHEN driver_name IS NULL OR driver_name = '' THEN #{param.driverName}
WHEN driver_name like concat('%',#{param.driverName},'%') THEN driver_name
ELSE CONCAT(driver_name, CONCAT(',', #{param.driverName}))
END,
</if>
<if test="param.vehicleName != null">
vehicle_name = CASE WHEN vehicle_name IS NULL OR vehicle_name = '' THEN #{param.vehicleName}
WHEN vehicle_name like concat('%',#{param.vehicleName},'%') THEN vehicle_name
ELSE CONCAT(vehicle_name, CONCAT(',', #{param.vehicleName}))
END,
</if>
</trim>
where id = #{id}
</update>

14
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanordMapper.java
Unescape View File

@ -16,6 +16,7 @@
*/
package com.logpm.distribution.mapper;
import com.logpm.distribution.dto.DistrilbutionloadingscanDTO;
import com.logpm.distribution.entity.DistributionLoadscanordEntity;
import com.logpm.distribution.vo.DistributionLoadscanordVO;
import com.logpm.distribution.excel.DistributionLoadscanordExcel;
@ -50,5 +51,16 @@ public interface DistributionLoadscanordMapper extends BaseMapper<DistributionLo
* @return
*/
List<DistributionLoadscanordExcel> exportDistributionLoadscanord(@Param("ew") Wrapper<DistributionLoadscanordEntity> queryWrapper);
/**
* 装车扫描修改状态
*
* @return
*/
Integer updateSumById(@Param("id") Long id,@Param("param") DistrilbutionloadingscanDTO distrilbutionloadingscanDTO);
/**
* 取消装车修改状态
*
* @return
*/
Integer updatecutSumById(@Param("id") Long id,@Param("param") DistrilbutionloadingscanDTO distrilbutionloadingscanDTO);
}

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

@ -58,6 +58,54 @@
<result column="abnormal_note" property="abnormalNote"/>
<result column="received_quantity" property="receivedQuantity"/>
</resultMap>
<update id="updateSumById">
UPDATE logpm_distribution_loadscanord
<trim prefix="SET" suffixOverrides=",">
scan_status = 2,
loaded_nub = ( loaded_nub + 1 ),
scan_time = CASE WHEN scan_time IS NULL THEN now() else scan_time END ,
<if test="param.loadingId != null">
loading_id = CASE WHEN loading_id IS NULL OR loading_id = '' THEN #{param.loadingId}
WHEN loading_id like concat('%',#{param.loadingId},'%') THEN loading_id
ELSE CONCAT(loading_id, CONCAT(',', #{param.loadingId}))
END,
</if>
<if test="param.driverName != null">
driver_name = CASE WHEN driver_name IS NULL OR driver_name = '' THEN #{param.driverName}
WHEN driver_name like concat('%',#{param.driverName},'%') THEN driver_name
ELSE CONCAT(driver_name, CONCAT(',', #{param.driverName}))
END,
</if>
<if test="param.vehicleName != null">
vehicle_name = CASE WHEN vehicle_name IS NULL OR vehicle_name = '' THEN #{param.vehicleName}
WHEN vehicle_name like concat('%',#{param.vehicleName},'%') THEN vehicle_name
ELSE CONCAT(vehicle_name, CONCAT(',', #{param.vehicleName}))
END,
</if>
</trim>
where id = #{id}
</update>
<update id="updatecutSumById">
UPDATE logpm_distribution_loadscanord
<trim prefix="SET" suffixOverrides=",">
scan_status = 1,
loaded_nub =
CASE
WHEN ( loaded_nub - 1 ) &lt; 0 THEN
package_nub ELSE ( loaded_nub - 1 )
END,
<!-- <if test="param.loadingId != null">-->
<!-- loading_id = TRIM(BOTH ',' FROM REPLACE(loading_id, #{param.loadingId}, '')),-->
<!-- </if>-->
<!-- <if test="param.driverName != null">-->
<!-- driver_name = TRIM(BOTH ',' FROM REPLACE(driver_name, #{param.driverName}, '')),-->
<!-- </if>-->
<!-- <if test="param.vehicleName != null">-->
<!-- vehicle_name = TRIM(BOTH ',' FROM REPLACE(vehicle_name, #{param.vehicleName}, ''))-->
<!-- </if>-->
</trim>
where id = #{id}
</update>
<select id="selectDistributionLoadscanordPage" resultMap="distributionLoadscanordResultMap">

14
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanresMapper.java
Unescape View File

@ -16,6 +16,7 @@
*/
package com.logpm.distribution.mapper;
import com.logpm.distribution.dto.DistrilbutionloadingscanDTO;
import com.logpm.distribution.entity.DistributionLoadscanresEntity;
import com.logpm.distribution.vo.DistributionLoadscanresVO;
import com.logpm.distribution.excel.DistributionLoadscanresExcel;
@ -50,5 +51,16 @@ public interface DistributionLoadscanresMapper extends BaseMapper<DistributionLo
* @return
*/
List<DistributionLoadscanresExcel> exportDistributionLoadscanres(@Param("ew") Wrapper<DistributionLoadscanresEntity> queryWrapper);
/**
* 装车扫描修改状态
*
* @return
*/
Integer updateSumById(@Param("id") Long id,@Param("param") DistrilbutionloadingscanDTO distrilbutionloadingscanDTO);
/**
* 取消装车修改状态
*
* @return
*/
Integer updatecutSumById(@Param("id") Long id,@Param("param") DistrilbutionloadingscanDTO distrilbutionloadingscanDTO);
}

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

@ -59,6 +59,55 @@
<result column="received_quantity" property="receivedQuantity"/>
</resultMap>
<update id="updateSumById">
UPDATE logpm_distribution_loadscanres
<trim prefix="SET" suffixOverrides=",">
scan_status = 2,
loaded_nub = ( loaded_nub + 1 ),
scan_time = CASE WHEN scan_time IS NULL THEN now() else scan_time END ,
<if test="param.loadingId != null">
loading_id = CASE WHEN loading_id IS NULL OR loading_id = '' THEN #{param.loadingId}
WHEN loading_id like concat('%',#{param.loadingId},'%') THEN loading_id
ELSE CONCAT(loading_id, CONCAT(',', #{param.loadingId}))
END,
</if>
<if test="param.driverName != null">
driver_name = CASE WHEN driver_name IS NULL OR driver_name = '' THEN #{param.driverName}
WHEN driver_name like concat('%',#{param.driverName},'%') THEN driver_name
ELSE CONCAT(driver_name, CONCAT(',', #{param.driverName}))
END,
</if>
<if test="param.vehicleName != null">
vehicle_name = CASE WHEN vehicle_name IS NULL OR vehicle_name = '' THEN #{param.vehicleName}
WHEN vehicle_name like concat('%',#{param.vehicleName},'%') THEN vehicle_name
ELSE CONCAT(vehicle_name, CONCAT(',', #{param.vehicleName}))
END,
</if>
</trim>
where id = #{id}
</update>
<update id="updatecutSumById">
UPDATE logpm_distribution_loadscanres
<trim prefix="SET" suffixOverrides=",">
scan_status = 1,
loaded_nub =
CASE
WHEN ( loaded_nub - 1 ) &lt; 0 THEN
package_nub ELSE ( loaded_nub - 1 )
END,
<!-- <if test="param.loadingId != null">-->
<!-- loading_id = TRIM(BOTH ',' FROM REPLACE(loading_id, #{param.loadingId}, '')),-->
<!-- </if>-->
<!-- <if test="param.driverName != null">-->
<!-- driver_name = TRIM(BOTH ',' FROM REPLACE(driver_name, #{param.driverName}, '')),-->
<!-- </if>-->
<!-- <if test="param.vehicleName != null">-->
<!-- vehicle_name = TRIM(BOTH ',' FROM REPLACE(vehicle_name, #{param.vehicleName}, ''))-->
<!-- </if>-->
</trim>
where id = #{id}
</update>
<select id="selectDistributionLoadscanresPage" resultMap="distributionLoadscanresResultMap">
select * from logpm_distribution_loadscanres where is_deleted = 0

4
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java
Unescape View File

@ -96,4 +96,8 @@ public interface IDistributionDeliveryListService extends BaseService<Distributi
*装车扫描(取消)
*/
R loadingscanoff(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO);
/**
*库存品装车
*/
R loadinginventory(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO);
}

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

@ -77,6 +77,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
private final DistributionStockArticleMapper distributionStockArticleMapper;
private final DistributionSigndetailServiceImpl distributionSigndetailService;
private final DistributionPackadeliServiceImpl distributionPackadeliService;
private final DistributionLoadscanordMapper distributionLoadscanordMapper;
private final DistributionLoadscanresMapper distributionLoadscanresMapper;
private final BladeRedis bladeRedis;
@Override
@ -248,15 +250,17 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
// List<DistributionDeliveryListEntity> distributionDeliveryListEntities = distributionDeliveryListMapper.selectList(new QueryWrapper<DistributionDeliveryListEntity>()
// .lambda().eq(DistributionDeliveryListEntity::getState, 1).like(DistributionDeliveryListEntity::getDriverId, user.getUserId())
// );
if (distributionLoadscanEntities.size() < 0) {
if (distributionLoadscanEntities.size() <= 0) {
return R.fail(3001, "窜货");
}
//获取当前用户司机
BladeUser user = AuthUtil.getUser();
// BladeUser user = AuthUtil.getUser();
for (DistributionLoadscanEntity distributionLoadscanEntity : distributionLoadscanEntities) {
if (distributionLoadscanEntity.getScanState() !=1){return R.fail(3002, "重复扫码");}
//更新该装车记录,设置车次
distributionLoadscanMapper.updateSumById(distributionLoadscanEntity.getId());
if (distributionLoadscanEntity.getScanStatus() !=1){return R.fail(3002, "重复扫码");}
//依次更新该装车记录,设置车辆
distributionLoadscanMapper.updateSumById(distributionLoadscanEntity.getId(),distrilbutionloadingscanDTO);
// distributionLoadscanordMapper.updateSumById(distributionLoadscanEntity.getOrderId(),distrilbutionloadingscanDTO);
// distributionLoadscanresMapper.updateSumById(distributionLoadscanEntity.getReservationId(),distrilbutionloadingscanDTO);
//查询本车次是否第一次扫码,没有则更新上车时间
Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId());
}
@ -299,13 +303,18 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
return R.fail(3001, "窜货");
}
for (DistributionLoadscanEntity distributionLoadscanEntity : distributionLoadscanEntities) {
if (distributionLoadscanEntity.getScanState() !=1){return R.fail(3003, "有重复货物");}
//更新该装车记录
distributionLoadscanMapper.updateSumById(distributionLoadscanEntity.getId());
if (distributionLoadscanEntity.getScanState() !=1){return R.fail(3003, "有扫描过的货物");}
if (distributionLoadscanEntity.getDeliveryId() != distrilbutionloadingscanDTO.getDeliveryId()){return R.fail(3004, "有其他车次货物"); }
//依次更新该装车记录,设置车辆
distributionLoadscanMapper.updateSumById(distributionLoadscanEntity.getId(),distrilbutionloadingscanDTO);
// distributionLoadscanordMapper.updateSumById(distributionLoadscanEntity.getOrderId(),distrilbutionloadingscanDTO);
// distributionLoadscanresMapper.updateSumById(distributionLoadscanEntity.getReservationId(),distrilbutionloadingscanDTO);
//查询本车次是否第一次扫码,没有则更新上车时间
Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId());
}
}else if (distrilbutionloadingscanDTO.getType() == 3){
}
return R.success("成功");
@ -343,12 +352,36 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
}
for (DistributionLoadscanEntity distributionLoadscanEntity : distributionLoadscanEntities) {
//更新该装车记录
distributionLoadscanMapper.updatecutSumById(distributionLoadscanEntity.getId());
distributionLoadscanMapper.updatecutSumById(distributionLoadscanEntity.getId(),distrilbutionloadingscanDTO);
// distributionLoadscanordMapper.updatecutSumById(distributionLoadscanEntity.getOrderId(),distrilbutionloadingscanDTO);
// distributionLoadscanresMapper.updatecutSumById(distributionLoadscanEntity.getReservationId(),distrilbutionloadingscanDTO);
}
}else if (distrilbutionloadingscanDTO.getType()==2){
//TODO 托盘扫描
//查询该包条是否属于该配送任务
List<DistributionLoadscanEntity> distributionLoadscanEntities = distributionLoadscanMapper.selectList(new QueryWrapper<DistributionLoadscanEntity>().lambda()
.eq(DistributionLoadscanEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId())
.eq(DistributionLoadscanEntity::getTrayId, distrilbutionloadingscanDTO.getBarcode())
);
if (distributionLoadscanEntities.size() < 0) {
return R.fail(3001, "窜货");
}
for (DistributionLoadscanEntity distributionLoadscanEntity : distributionLoadscanEntities) {
//依次更新该装车记录,设置车辆
distributionLoadscanMapper.updateSumById(distributionLoadscanEntity.getId(),distrilbutionloadingscanDTO);
distributionLoadscanordMapper.updateSumById(distributionLoadscanEntity.getOrderId(),distrilbutionloadingscanDTO);
distributionLoadscanresMapper.updateSumById(distributionLoadscanEntity.getReservationId(),distrilbutionloadingscanDTO);
//查询本车次是否第一次扫码,没有则更新上车时间
Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId());
}
}
return R.success("成功");
}
@Override
public R loadinginventory(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
return null;
}
}

Write Preview
Loading…
Cancel
Save