Browse Source

1.修改装车扫描

dev-warehouse
0.0 1 year ago
parent
commit
cb5a1c812d
  1. 22
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionLoadscanEntity.java
  2. 2
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSigndetailEntity.java
  3. 1
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSignforEntity.java
  4. 4
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSigndetailVO.java
  5. 11
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java
  6. 12
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistrilbutionloadingscanDTO.java
  7. 13
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
  8. 8
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.java
  9. 14
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.xml
  10. 4
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java
  11. 231
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

22
blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionLoadscanEntity.java

@ -268,4 +268,26 @@ public class DistributionLoadscanEntity extends TenantEntity {
@ApiModelProperty(value = "包内数量")
private Integer packageNub;
/**
* 签收状态(1-未签收,2签收)
*/
@ApiModelProperty(value = "签收状态(1-未签收,2签收)")
private Integer signforState;
/**
* 是否再签收(1-不是,2-)
*/
@ApiModelProperty(value = "是否再签收(1-不是,2-是)")
private Integer isSignfor;
/**
* 异常签收原因
*/
@ApiModelProperty(value = "异常签收原因")
private String abnormalNote;
/**
* 签收数量
*/
@ApiModelProperty(value = "签收数量")
private Integer receivedQuantity;
}

2
blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSigndetailEntity.java

@ -152,7 +152,7 @@ public class DistributionSigndetailEntity extends TenantEntity {
* 是否齐套
*/
@ApiModelProperty(value = "是否齐套")
private String isKitting;
private String completeSet;
/**
* 品牌
*/

1
blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSignforEntity.java

@ -236,7 +236,6 @@ public class DistributionSignforEntity extends TenantEntity {
@ApiModelProperty(value = "编号")
private String number;
/**
* 配送时间
*/

4
blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSigndetailVO.java

@ -69,9 +69,9 @@ public class DistributionSigndetailVO extends DistributionSigndetailEntity {
// private String orderId;
/**
* 签收时间
* 文员签收时间
*/
@ApiModelProperty(value = "签收时间")
@ApiModelProperty(value = "文员签收时间")
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private String signingTime;
/**

11
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java

@ -128,6 +128,17 @@ public class DistributionDeliveryListController extends BladeController {
return msg;
}
/**
* 配送管理 装车扫描取消
*/
@PostMapping("/loadingscanoff")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入distributionDeliveryList")
public R loadingscanoff(@Valid @RequestBody DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
R msg = distributionDeliveryListService.loadingscanoff(distrilbutionloadingscanDTO);
return msg;
}
/**
* 配送管理 装车扫描(一件装车)
*/

12
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistrilbutionloadingscanDTO.java

@ -12,14 +12,22 @@ public class DistrilbutionloadingscanDTO {
/**
* 扫描包条信息
* 扫描
*/
@ApiModelProperty(value = "扫描包条信息")
@ApiModelProperty(value = "扫描")
private String barcode;
/**
* 配送任务Id
*/
@ApiModelProperty(value = "配送任务Id")
private Long deliveryId;
/**
* 扫描物品
*/
@ApiModelProperty(value = "扫描物品(1-包条,2-托盘)")
@NotEmpty(message = "扫描物品不能为空")
private Integer type;

13
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml

@ -144,9 +144,6 @@
<if test="param.distributionCompany != null and param.distributionCompany!=''">
and lddl.distribution_company = #{param.distributionCompany}
</if>
<if test="param.type != null and param.type!=''">
and lddl.type = #{param.type}
</if>
<if test="param.state != null and param.state!=''">
and lddl.state = #{param.state}
</if>
@ -187,9 +184,6 @@
<if test="param.distributionCompany != null and param.distributionCompany!=''">
and lddl.distribution_company = #{param.distributionCompany}
</if>
<if test="param.type != null and param.type!=''">
and lddl.type = #{param.type}
</if>
<if test="param.state != null and param.state!=''">
and lddl.state = #{param.state}
</if>
@ -226,9 +220,7 @@
<if test="param.distributionCompany != null and param.distributionCompany!=''">
and lddl.distribution_company = #{param.distributionCompany}
</if>
<if test="param.type != null and param.type!=''">
and lddl.type = #{param.type}
</if>
<if test="param.state != null and param.state!=''">
and lddl.state = #{param.state}
</if>
@ -269,9 +261,6 @@
<if test="param.distributionCompany != null and param.distributionCompany!=''">
and lddl.distribution_company = #{param.distributionCompany}
</if>
<if test="param.type != null and param.type!=''">
and lddl.type = #{param.type}
</if>
<if test="param.state != null and param.state!=''">
and lddl.state = #{param.state}
</if>

8
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.java

@ -55,7 +55,7 @@ public interface DistributionLoadscanMapper extends BaseMapper<DistributionLoads
*
* @return
*/
Integer updateByPackageId(Long id);
Integer updateSumById(Long id);
/**
* 查询当前包条码所在车次
*
@ -68,4 +68,10 @@ public interface DistributionLoadscanMapper extends BaseMapper<DistributionLoads
* @return
*/
Integer selectWrapdreCount(Long id);
/**
* 装车扫描修改状态
*
* @return
*/
Integer updatecutSumById(Long id);
}

14
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.xml

@ -150,14 +150,24 @@
<result column="loaded_nub" property="loadedNub"/>
<result column="package_nub" property="packageNub"/>
</resultMap>
<update id="updateByPackageId">
<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 package_id = #{id}
END where id = #{id}
</update>
<update id="updatecutSumById">
UPDATE logpm_distribution_loadscan
SET scan_status = 1,
loaded_nub =
CASE
WHEN ( loaded_nub - 1 ) &lt; 0 THEN
package_nub ELSE ( loaded_nub - 1 )
END where id = #{id}
</update>

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

@ -92,4 +92,8 @@ public interface IDistributionDeliveryListService extends BaseService<Distributi
*装车扫描(一键确认)
*/
R oneack();
/**
*装车扫描(取消)
*/
R loadingscanoff(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO);
}

231
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

@ -78,6 +78,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
private final DistributionSigndetailServiceImpl distributionSigndetailService;
private final DistributionPackadeliServiceImpl distributionPackadeliService;
private final BladeRedis bladeRedis;
@Override
public IPage<DistributionDeliveryListVO> selectDistributionDeliveryListPage(IPage<DistributionDeliveryListVO> page, DistributionDeliveryListDTO distributionDeliveryList) {
//转换创建时间
@ -105,13 +106,13 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
//转移数据到VO上
Func.copy(detail, distributionDeliveryListVO);
//查询包条数据
List<DistributionDeliveryInfoVO> stripList =distributionDeliveryInfoMapper.selectStripList(detail.getId());
List<DistributionDeliveryInfoVO> stripList = distributionDeliveryInfoMapper.selectStripList(detail.getId());
distributionDeliveryListVO.setPackadeList(stripList);
if (detail.getSource()==1){
//查询客户信息
List<DistributionDeliveryInfoVO> customList = distributionDeliveryInfoMapper.selectcustomList(detail.getId());
distributionDeliveryListVO.setReservationList(customList);
}else if (detail.getSource()==2){
if (detail.getSource() == 1) {
//查询客户信息
List<DistributionDeliveryInfoVO> customList = distributionDeliveryInfoMapper.selectcustomList(detail.getId());
distributionDeliveryListVO.setReservationList(customList);
} else if (detail.getSource() == 2) {
//查询订单信息
List<DistributionDeliveryInfoVO> customList = distributionDeliveryInfoMapper.selectcustomListByOrderId(detail.getOrderId());
distributionDeliveryListVO.setReservationList(customList);
@ -126,8 +127,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
distributionDeliveryList.setCreateTime_query(sdf.format(distributionDeliveryList.getCreateTime()));
}
// redisCache.put("....",123);
// log.info(">>>>>>>>{}",redisCache.get("..."));
DistributionstatisticsnmbVO distributionstatisticsnmbVO = new DistributionstatisticsnmbVO();
//商配车次
@ -154,51 +153,51 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
public Boolean start(DistributionDeliveryListDTO distributionDeliveryList) {
log.info("开始发车>>>>>>>>>{}", distributionDeliveryList);
//获取关联的客户信息
if (distributionDeliveryList.getSource() ==1){
String reservationId = distributionDeliveryList.getReservationId();
List<Long> reservationIds = Arrays.asList(Long.valueOf(String.valueOf(reservationId.split(","))));
//查询客户信息,装车情况
if (distributionDeliveryList.getSource() == 1) {
String reservationId = distributionDeliveryList.getReservationId();
List<Long> reservationIds = Arrays.asList(Long.valueOf(String.valueOf(reservationId.split(","))));
//查询客户信息,装车情况
// List<DistributionDeliveryInfoEntity> distributionDeliveryInfoEntities = distributionDeliveryInfoMapper.selectList(new QueryWrapper<DistributionDeliveryInfoEntity>().lambda()
// .eq(DistributionDeliveryInfoEntity::getLoadedState, "2")
// .in(null != reservationIds && reservationIds.size() > 0, DistributionDeliveryInfoEntity::getReservationId, reservationIds)
// );
//统计客户的配送数量,加入签收表(通过预约单查询总数量)
List<DistributionReservationEntity> distributionReservationEntities = distributionReservationMapper.selectBatchIds(reservationIds);
ArrayList<DistributionSignforEntity> distributionSignforEntities = new ArrayList<DistributionSignforEntity>();
//TODO 冗余加入签收表
distributionReservationEntities.forEach(e->{
DistributionSignforEntity distributionSignforEntity = new DistributionSignforEntity();
Func.copy(e,distributionSignforEntity);
distributionSignforEntity.setReservationId(e.getId());
distributionSignforEntity.setConsigneeName(e.getConsignee());
distributionSignforEntity.setWarehouseId(distributionDeliveryList.getWarehouseId());
distributionSignforEntity.setWarehouseName(distributionDeliveryList.getWarehouseName());
distributionSignforEntity.setTrainNumber(distributionDeliveryList.getTrainNumber());
distributionSignforEntity.setDeliveryDriverName(distributionDeliveryList.getDriverName());
distributionSignforEntity.setDeliveryDriverId(distributionDeliveryList.getDriverId());
//配送时间
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
String format = simpleDateFormat.format(new Date());
distributionSignforEntity.setDeliveryTime(format);
//通过客户查询已经上车的订单(待定)
// String orderIds = distributionDeliveryInfoMapper.selectorderIdList(e.getId());
distributionSignforEntity.setOrderId(e.getStockArticleId());
//查询订单总数
Integer i = StringUtils.countMatches(e.getStockArticleId(), ",")+1;
distributionSignforEntity.setOrderTotal(i);
//该客户总件数
Integer i1 =distributionDeliveryInfoMapper.selectWrapCount(e.getId());
distributionSignforEntity.setTotal(i1);
//装车件数
Integer dre = distributionLoadscanMapper.selectWrapdreCount(e.getId());
distributionSignforEntity.setLoadedNumber(dre);
//签收状态
distributionSignforEntity.setSigningStatus("1");
distributionSignforEntity.setReservationId(e.getId());
distributionSignforEntities.add(distributionSignforEntity);
});
//统计客户的配送数量,加入签收表(通过预约单查询总数量)
List<DistributionReservationEntity> distributionReservationEntities = distributionReservationMapper.selectBatchIds(reservationIds);
ArrayList<DistributionSignforEntity> distributionSignforEntities = new ArrayList<DistributionSignforEntity>();
//TODO 冗余加入签收表
distributionReservationEntities.forEach(e -> {
DistributionSignforEntity distributionSignforEntity = new DistributionSignforEntity();
Func.copy(e, distributionSignforEntity);
distributionSignforEntity.setReservationId(e.getId());
distributionSignforEntity.setConsigneeName(e.getConsignee());
distributionSignforEntity.setWarehouseId(distributionDeliveryList.getWarehouseId());
distributionSignforEntity.setWarehouseName(distributionDeliveryList.getWarehouseName());
distributionSignforEntity.setTrainNumber(distributionDeliveryList.getTrainNumber());
distributionSignforEntity.setDeliveryDriverName(distributionDeliveryList.getDriverName());
distributionSignforEntity.setDeliveryDriverId(distributionDeliveryList.getDriverId());
//配送时间
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
String format = simpleDateFormat.format(new Date());
distributionSignforEntity.setDeliveryTime(format);
//通过客户查询已经上车的订单(待定)
// String orderIds = distributionDeliveryInfoMapper.selectorderIdList(e.getId());
distributionSignforEntity.setOrderId(e.getStockArticleId());
//查询订单总数
Integer i = StringUtils.countMatches(e.getStockArticleId(), ",") + 1;
distributionSignforEntity.setOrderTotal(i);
//该客户总件数
Integer i1 = distributionDeliveryInfoMapper.selectWrapCount(e.getId());
distributionSignforEntity.setTotal(i1);
//装车件数
Integer dre = distributionLoadscanMapper.selectWrapdreCount(e.getId());
distributionSignforEntity.setLoadedNumber(dre);
//签收状态
distributionSignforEntity.setSigningStatus("1");
distributionSignforEntity.setReservationId(e.getId());
distributionSignforEntities.add(distributionSignforEntity);
});
distributionSignforService.saveBatch(distributionSignforEntities);
}else {
} else {
}
//获取关联订单
@ -208,11 +207,11 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
List<DistributionStockArticleEntity> distributionStockArticleEntities = distributionStockArticleMapper.selectBatchIds(orderIds);
//插入配送详情表
ArrayList<DistributionSigndetailEntity> arrayList = new ArrayList<>();
distributionStockArticleEntities.forEach(e->{
distributionStockArticleEntities.forEach(e -> {
DistributionSigndetailEntity distributionSigndetailEntity = new DistributionSigndetailEntity();
Func.copy(e,distributionSigndetailEntity);
Func.copy(e, distributionSigndetailEntity);
//查询签收表id
Long masterId = distributionSignforService.selectIdByOrderId(e.getId());
Long masterId = distributionSignforService.selectIdByOrderId(e.getId());
distributionSigndetailEntity.setMasterId(masterId);
distributionSigndetailEntity.setOrderId(e.getId());
});
@ -220,9 +219,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
//插入签收包条表
ArrayList<DistributionPackadeliEntity> DistributionPackadeliEntitys = new ArrayList<>();
List<DistributionLoadscanEntity> distributionLoadscanEntities = distributionLoadscanMapper.selectList(new QueryWrapper<DistributionLoadscanEntity>().lambda()
.eq(DistributionLoadscanEntity::getDeliveryId,distributionDeliveryList.getId())
.ne(DistributionLoadscanEntity::getScanStatus,1));
distributionLoadscanEntities.forEach(e->{
.eq(DistributionLoadscanEntity::getDeliveryId, distributionDeliveryList.getId())
.ne(DistributionLoadscanEntity::getScanStatus, 1));
distributionLoadscanEntities.forEach(e -> {
DistributionPackadeliEntity distributionPackadeliEntity = new DistributionPackadeliEntity();
DistributionPackadeliEntitys.add(distributionPackadeliEntity);
@ -230,8 +229,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
distributionPackadeliService.saveBatch(DistributionPackadeliEntitys);
//TODO 修改配送表
return this.update(new UpdateWrapper<DistributionDeliveryListEntity>().lambda()
.eq(DistributionDeliveryListEntity::getId,distributionDeliveryList.getId())
.set(DistributionDeliveryListEntity::getState,"2")
.eq(DistributionDeliveryListEntity::getId, distributionDeliveryList.getId())
.set(DistributionDeliveryListEntity::getState, "2")
);
}
@ -239,38 +238,77 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
@Override
@Transactional(isolation = Isolation.READ_COMMITTED, rollbackFor = Exception.class)
public R loadingscan(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
//获取当前用户司机
BladeUser user = AuthUtil.getUser();
//寻找车次
List<DistributionDeliveryListEntity> distributionDeliveryListEntities = distributionDeliveryListMapper.selectList(new QueryWrapper<DistributionDeliveryListEntity>()
.lambda().eq(DistributionDeliveryListEntity::getState, 1).like(DistributionDeliveryListEntity::getDriverId, user.getUserId())
);
if (distributionDeliveryListEntities.size()<0){return R.fail(3001,"该司机无车次");}
//查询缓存
if (distrilbutionloadingscanDTO.getType()==1){
//找出该包条码
List<DistributionParcelListEntity> distributionParcelListEntities = distributionParcelListMapper.selectList(new QueryWrapper<DistributionParcelListEntity>().lambda()
.eq(DistributionParcelListEntity::getPacketBarCode,distrilbutionloadingscanDTO.getBarcode()));
for (DistributionParcelListEntity e : distributionParcelListEntities) {
String trainNumber = distributionLoadscanMapper.selecttrainNumberByPackageId(e.getId());
if (!trainNumber.equals(distributionDeliveryListEntities.get(0).getTrainNumber())) {return R.fail(3002,"不是当前司机配送车次");}
if (Func.notNull(bladeRedis.get("ZC"+user.getUserId()))){
if (!(bladeRedis.get("ZC"+user.getUserId().toString()).equals(trainNumber))){
return R.fail(3003,"串货");
}
}else {
//第一次缓存
bladeRedis.setEx("ZC"+user.getUserId(),trainNumber,3600L);
//TODO 查询本车次是否第一次扫码,没有则更新上车时间
Integer i = distributionDeliveryListMapper.updateloadingTimeById(distributionDeliveryListEntities.get(0).getId());
}
//修改对应的装车表
distributionLoadscanMapper.updateByPackageId(e.getId());
// baseMapper.updateloadingTime(e.getId());
if (distrilbutionloadingscanDTO.getType() == 1) {
//查询该包条是否属于该配送任务
List<DistributionLoadscanEntity> distributionLoadscanEntities = distributionLoadscanMapper.selectList(new QueryWrapper<DistributionLoadscanEntity>().lambda()
.eq(DistributionLoadscanEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId())
.eq(DistributionLoadscanEntity::getPacketBarCode, distrilbutionloadingscanDTO.getBarcode())
);
// List<DistributionDeliveryListEntity> distributionDeliveryListEntities = distributionDeliveryListMapper.selectList(new QueryWrapper<DistributionDeliveryListEntity>()
// .lambda().eq(DistributionDeliveryListEntity::getState, 1).like(DistributionDeliveryListEntity::getDriverId, user.getUserId())
// );
if (distributionLoadscanEntities.size() < 0) {
return R.fail(3001, "窜货");
}
//获取当前用户司机
BladeUser user = AuthUtil.getUser();
for (DistributionLoadscanEntity distributionLoadscanEntity : distributionLoadscanEntities) {
if (distributionLoadscanEntity.getScanState() !=1){return R.fail(3002, "重复扫码");}
//更新该装车记录
distributionLoadscanMapper.updateSumById(distributionLoadscanEntity.getId());
//查询本车次是否第一次扫码,没有则更新上车时间
Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId());
}
// //找出该包条码
// List<DistributionParcelListEntity> distributionParcelListEntities = distributionParcelListMapper.selectList(new QueryWrapper<DistributionParcelListEntity>().lambda()
// .eq(DistributionParcelListEntity::getPacketBarCode, distrilbutionloadingscanDTO.getBarcode()));
// for (DistributionParcelListEntity e : distributionParcelListEntities) {
// String trainNumber = distributionLoadscanMapper.selecttrainNumberByPackageId(e.getId());
// if (!trainNumber.equals(distributionDeliveryListEntities.get(0).getTrainNumber())) {
// return R.fail(3002, "不是当前司机配送车次");
// }
// if (Func.notNull(bladeRedis.get("ZC" + user.getUserId()))) {
// if (!(bladeRedis.get("ZC" + user.getUserId().toString()).equals(trainNumber))) {
// return R.fail(3003, "串货");
// }
// } else {
// //第一次缓存
// bladeRedis.setEx("ZC" + user.getUserId(), trainNumber, 3600L);
// //TODO 查询本车次是否第一次扫码,没有则更新上车时间
// Integer i = distributionDeliveryListMapper.updateloadingTimeById(distributionDeliveryListEntities.get(0).getId());
// //查询该车次包条,加入签收表
//
//
// //修改对应的装车表
//
// distributionLoadscanMapper.updateByPackageId(e.getId());
// }
// }
}else if (distrilbutionloadingscanDTO.getType()==2){
//TODO 托盘扫描
} 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) {
if (distributionLoadscanEntity.getScanState() !=1){return R.fail(3003, "有重复货物");}
//更新该装车记录
distributionLoadscanMapper.updateSumById(distributionLoadscanEntity.getId());
//查询本车次是否第一次扫码,没有则更新上车时间
Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId());
}
}
return R.success("成功");
@ -295,4 +333,25 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
return null;
}
@Override
public R loadingscanoff(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
if (distrilbutionloadingscanDTO.getType()==1){
//查询该包条是否属于该配送任务
List<DistributionLoadscanEntity> distributionLoadscanEntities = distributionLoadscanMapper.selectList(new QueryWrapper<DistributionLoadscanEntity>().lambda()
.eq(DistributionLoadscanEntity::getDeliveryId, distrilbutionloadingscanDTO.getDeliveryId())
.eq(DistributionLoadscanEntity::getPacketBarCode, distrilbutionloadingscanDTO.getBarcode())
);
if (distributionLoadscanEntities.size() < 0) {
return R.fail(3001, "窜货");
}
for (DistributionLoadscanEntity distributionLoadscanEntity : distributionLoadscanEntities) {
//更新该装车记录
distributionLoadscanMapper.updatecutSumById(distributionLoadscanEntity.getId());
}
}else if (distrilbutionloadingscanDTO.getType()==2){
}
return R.success("成功");
}
}

Loading…
Cancel
Save