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

Merge remote-tracking branch 'origin/dev' into pre-production

master
zhenghaoyu 6 months ago
parent
7bfb9d7d35 0b54e56623
commit
b77d9a8ab5
15 changed files with 318 additions and 12 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. 8
      blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesAbnormalRecordEntity.java
  2. 3
      blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/feign/IAftersalesAbnormalRecordClient.java
  3. 3
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java
  4. 10
      blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/ITrunklineCarsLoadScanClient.java
  5. 5
      blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/feign/AftersalesAbnormalRecordClient.java
  6. 162
      blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java
  7. 24
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java
  8. 12
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java
  9. 13
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/feign/TrunklineCarsLoadScanClient.java
  10. 2
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.java
  11. 11
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml
  12. 2
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadScanService.java
  13. 60
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/CarsLoadAsyncServiceImpl.java
  14. 10
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java
  15. 5
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadScanServiceImpl.java

8
blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesAbnormalRecordEntity.java
Unescape View File

@ -35,7 +35,7 @@ public class AftersalesAbnormalRecordEntity extends TenantEntity {
private String type;
@ApiModelProperty(name = "异常类型 1无系统编码 2无装车计划 3无装车记录 4无卸车记录",notes = "")
@ApiModelProperty(name = "异常类型 1无系统编码 2无装车计划 3无装车记录 4无卸车记录 5卸车数量异常",notes = "")
private String abnormalType;
@ApiModelProperty(name = "车类型 1干线",notes = "")
@ -96,6 +96,12 @@ public class AftersalesAbnormalRecordEntity extends TenantEntity {
@ApiModelProperty(name = "关联类型",notes = "")
private Integer associationType;
@ApiModelProperty(name = "是否是零担",notes = "")
private Integer isZero;
@ApiModelProperty(name = "数量",notes = "")
private Integer num;
}

3
blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/feign/IAftersalesAbnormalRecordClient.java
Unescape View File

@ -26,7 +26,6 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
import java.util.Map;
/**
* 货位 Feign接口类
@ -57,4 +56,6 @@ public interface IAftersalesAbnormalRecordClient {
@PostMapping(API_PREFIX+"/updateList")
void updateList(@RequestBody List<AftersalesAbnormalRecordEntity> abnormalRecordEntities);
@PostMapping(API_PREFIX+"/addAbnormalRecordList")
void addAbnormalRecordList(@RequestBody List<AftersalesAbnormalRecordEntity> abnormalRecordEntities);
}

3
blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java
Unescape View File

@ -201,4 +201,7 @@ public interface IDistributionParcelListClient {
@PostMapping(API_PREFIX + "/findAllParcelListByAdvanceIds")
List<DistributionParcelListEntity> findAllParcelListByAdvanceIds(@RequestBody List<Long> advanceIds);
@PostMapping(API_PREFIX + "/addZeroParcelList")
void addZeroParcelList(@RequestBody List<DistributionParcelListEntity> addParcelListEntityList);
}

10
blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/ITrunklineCarsLoadScanClient.java
Unescape View File

@ -1,9 +1,12 @@
package com.logpm.trunkline.feign;
import com.logpm.trunkline.entity.TrunklineCarsLoadScanEntity;
import org.springblade.common.constant.ModuleNameConstant;
import org.springblade.core.tool.api.R;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
@FeignClient(
@ -22,6 +25,13 @@ public interface ITrunklineCarsLoadScanClient {
@GetMapping(API_PREFIX+"/adnormalHasStock")
R adnormalHasStock(@RequestParam Long carsLoadScanId, @RequestParam Long warehouseId);
@GetMapping(API_PREFIX+"/findEntityById")
TrunklineCarsLoadScanEntity findEntityById(@RequestParam Long associationId);
@PostMapping(API_PREFIX+"/updateEntity")
void updateEntity(@RequestBody TrunklineCarsLoadScanEntity carsLoadScanEntity);
// @PostMapping(API_PREFIX+"/addAdvanceReturnId")
// Long addAdvanceReturnId(@RequestBody TrunklineAdvanceEntity trunklineAdvanceEntity);

5
blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/feign/AftersalesAbnormalRecordClient.java
Unescape View File

@ -49,4 +49,9 @@ public class AftersalesAbnormalRecordClient implements IAftersalesAbnormalRecord
public void updateList(List<AftersalesAbnormalRecordEntity> abnormalRecordEntities) {
aftersalesAbnormalRecordService.updateBatchById(abnormalRecordEntities);
}
@Override
public void addAbnormalRecordList(List<AftersalesAbnormalRecordEntity> abnormalRecordEntities) {
aftersalesAbnormalRecordService.saveBatch(abnormalRecordEntities);
}
}

162
blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java
Unescape View File

@ -9,6 +9,11 @@ import com.logpm.aftersales.mapper.AftersalesAbnormalRecordMapper;
import com.logpm.aftersales.service.IAftersalesAbnormalRecordService;
import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
import com.logpm.distribution.entity.DistributionParcelListEntity;
import com.logpm.distribution.entity.DistributionStockArticleEntity;
import com.logpm.distribution.feign.IDistributionParcelListClient;
import com.logpm.distribution.feign.IDistributionStockArticleClient;
import com.logpm.trunkline.entity.TrunklineCarsLoadScanEntity;
import com.logpm.trunkline.feign.ITrunklineCarsLoadScanClient;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@ -16,6 +21,7 @@ import org.springblade.common.utils.CommonUtil;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.BeanUtil;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
@ -33,6 +39,10 @@ public class AftersalesAbnormalRecordServiceImpl extends BaseServiceImpl<Aftersa
private final IBasicdataWarehouseClient basicdataWarehouseClient;
private final IDistributionStockArticleClient stockArticleClient;
private final IDistributionParcelListClient parcelListClient;
@Override
public R findPageList(AbnormalRecordDTO abnormalRecordDTO) {
IPage<Object> page = new Page<>();
@ -117,6 +127,158 @@ public class AftersalesAbnormalRecordServiceImpl extends BaseServiceImpl<Aftersa
abnormalRecordEntity.setRemark("已入库("+upWarehouseName+" "+AuthUtil.getNickName()+")");
}
}else if("5".equals(abnormalType)){
//零担卸车数量异常
Integer dealType = abnormalRecordDTO.getDealType();
Integer num = abnormalRecordEntity.getNum();
Long associationId = abnormalRecordEntity.getAssociationId();
TrunklineCarsLoadScanEntity carsLoadScanEntity = trunklineCarsLoadScanClient.findEntityById(associationId);
Long fromWarehouseId = carsLoadScanEntity.getFromWarehouseId();
String orderCode = carsLoadScanEntity.getOrderCode();
DistributionStockArticleEntity stockArticleEntity = stockArticleClient.findZeroByOrderCodeAndWarehouseId(orderCode, fromWarehouseId);
if(!Objects.isNull(stockArticleEntity)){
Long stockId = stockArticleEntity.getId();
if(dealType.equals(5)){
//回退原仓库
stockArticleClient.addHandQuantity(stockId,num);
abnormalRecordEntity.setRemark("差异件数退回原仓");
}else if(dealType.equals(6)){
//入库本仓
Integer enterNum = abnormalRecordDTO.getNum();
if(enterNum > 0){
Date now = new Date();
int diff = num - enterNum;
Long warehouseId = abnormalRecordEntity.getWarehouseId();
BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId);
if(diff == 0){
//全部入库到本仓
DistributionStockArticleEntity currentStockArticleEntity = stockArticleClient.findZeroByOrderCodeAndWarehouseId(orderCode, warehouseId);
if(Objects.isNull(currentStockArticleEntity)){
currentStockArticleEntity = new DistributionStockArticleEntity();
Integer totalNumber = stockArticleEntity.getTotalNumber();
BeanUtil.copy(stockArticleEntity,currentStockArticleEntity);
currentStockArticleEntity.setId(null);
currentStockArticleEntity.setHandQuantity(enterNum);
currentStockArticleEntity.setWarehouseId(warehouseId);
currentStockArticleEntity.setWarehouse(warehouseEntity.getName());
currentStockArticleEntity.setWarehouseEntryTime(now);
currentStockArticleEntity.setCompleteSet(1);
currentStockArticleEntity.setOrderReceiveStatus("20");
if(totalNumber.equals(enterNum)){
currentStockArticleEntity.setCompleteSet(2);
currentStockArticleEntity.setOrderReceiveStatus("30");
}
currentStockArticleEntity.setStockupStatus("10");
currentStockArticleEntity.setReservationStatus("10");
currentStockArticleEntity.setOrderStatus("20");
currentStockArticleEntity.setGroundingStatus("10");
currentStockArticleEntity.setFreezeStatus("10");
currentStockArticleEntity.setWarehouseEntryTimeEnd(now);
currentStockArticleEntity.setSortingQuantity(0);
currentStockArticleEntity.setDeliveryQuantity(0);
currentStockArticleEntity.setTransferQuantity(0);
currentStockArticleEntity.setSigninQuantity(0);
currentStockArticleEntity.setAllocation(null);
currentStockArticleEntity.setTrays(null);
currentStockArticleEntity.setIncomingNum(enterNum);
Long orderId = stockArticleClient.addData(currentStockArticleEntity);
if(!Objects.isNull(orderId)){
List<DistributionParcelListEntity> addParcelListEntityList = new ArrayList<>();
List<DistributionParcelListEntity> parcelListEntityList = parcelListClient.findEntityListByOrderCode(orderCode, warehouseId);
parcelListEntityList.forEach(parcelListEntity -> {
DistributionParcelListEntity currentParcelListEntity = new DistributionParcelListEntity();
BeanUtil.copy(parcelListEntity,currentParcelListEntity);
Long acceptWarehouseId = parcelListEntity.getAcceptWarehouseId();
currentParcelListEntity.setId(null);
currentParcelListEntity.setGoodsAllocation(null);
currentParcelListEntity.setStockArticleId(orderId);
currentParcelListEntity.setPallet(null);
currentParcelListEntity.setWarehouseId(warehouseId);
currentParcelListEntity.setWarehouse(warehouseEntity.getName());
currentParcelListEntity.setIsTransfer(1);
if(acceptWarehouseId.equals(warehouseId)){
currentParcelListEntity.setIsTransfer(0);
}
addParcelListEntityList.add(currentParcelListEntity);
});
parcelListClient.addZeroParcelList(addParcelListEntityList);
}
}else{
stockArticleClient.addHandQuantity(currentStockArticleEntity.getId(),enterNum);
}
abnormalRecordEntity.setRemark("差异"+enterNum+"件数入库本仓");
}else{
//回退原仓库
stockArticleClient.addHandQuantity(stockId,diff);
//全部入库到本仓
DistributionStockArticleEntity currentStockArticleEntity = stockArticleClient.findZeroByOrderCodeAndWarehouseId(orderCode, warehouseId);
if(Objects.isNull(currentStockArticleEntity)){
currentStockArticleEntity = new DistributionStockArticleEntity();
Integer totalNumber = stockArticleEntity.getTotalNumber();
BeanUtil.copy(stockArticleEntity,currentStockArticleEntity);
currentStockArticleEntity.setId(null);
currentStockArticleEntity.setHandQuantity(enterNum);
currentStockArticleEntity.setWarehouseId(warehouseId);
currentStockArticleEntity.setWarehouse(warehouseEntity.getName());
currentStockArticleEntity.setWarehouseEntryTime(now);
currentStockArticleEntity.setCompleteSet(1);
currentStockArticleEntity.setOrderReceiveStatus("20");
if(totalNumber.equals(enterNum)){
currentStockArticleEntity.setCompleteSet(2);
currentStockArticleEntity.setOrderReceiveStatus("30");
}
currentStockArticleEntity.setStockupStatus("10");
currentStockArticleEntity.setReservationStatus("10");
currentStockArticleEntity.setOrderStatus("20");
currentStockArticleEntity.setGroundingStatus("10");
currentStockArticleEntity.setFreezeStatus("10");
currentStockArticleEntity.setWarehouseEntryTimeEnd(now);
currentStockArticleEntity.setSortingQuantity(0);
currentStockArticleEntity.setDeliveryQuantity(0);
currentStockArticleEntity.setTransferQuantity(0);
currentStockArticleEntity.setSigninQuantity(0);
currentStockArticleEntity.setAllocation(null);
currentStockArticleEntity.setTrays(null);
currentStockArticleEntity.setIncomingNum(enterNum);
Long orderId = stockArticleClient.addData(currentStockArticleEntity);
if(!Objects.isNull(orderId)){
List<DistributionParcelListEntity> addParcelListEntityList = new ArrayList<>();
List<DistributionParcelListEntity> parcelListEntityList = parcelListClient.findEntityListByOrderCode(orderCode, warehouseId);
parcelListEntityList.forEach(parcelListEntity -> {
DistributionParcelListEntity currentParcelListEntity = new DistributionParcelListEntity();
BeanUtil.copy(parcelListEntity,currentParcelListEntity);
Long acceptWarehouseId = parcelListEntity.getAcceptWarehouseId();
currentParcelListEntity.setId(null);
currentParcelListEntity.setGoodsAllocation(null);
currentParcelListEntity.setStockArticleId(orderId);
currentParcelListEntity.setPallet(null);
currentParcelListEntity.setWarehouseId(warehouseId);
currentParcelListEntity.setWarehouse(warehouseEntity.getName());
currentParcelListEntity.setIsTransfer(1);
if(acceptWarehouseId.equals(warehouseId)){
currentParcelListEntity.setIsTransfer(0);
}
addParcelListEntityList.add(currentParcelListEntity);
});
parcelListClient.addZeroParcelList(addParcelListEntityList);
}
}else{
stockArticleClient.addHandQuantity(currentStockArticleEntity.getId(),enterNum);
}
abnormalRecordEntity.setRemark("差异"+enterNum+"件数入库本仓,原仓返回"+diff+"件");
}
carsLoadScanEntity.setScanStatus("2");
carsLoadScanEntity.setUnloadNum(carsLoadScanEntity.getUnloadNum()+enterNum);
trunklineCarsLoadScanClient.updateEntity(carsLoadScanEntity);
}
}
}
}
abnormalRecordEntity.setAbnormalStatus(1);
abnormalRecordEntity.setDealTime(new Date());

24
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java
Unescape View File

@ -27,8 +27,10 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.logpm.distribution.dto.FindParamterDTO;
import com.logpm.distribution.dto.OrderPackageDTO;
import com.logpm.distribution.entity.DistributionParcelListEntity;
import com.logpm.distribution.entity.DistributionParcelNumberEntity;
import com.logpm.distribution.entity.DistributionStockArticleEntity;
import com.logpm.distribution.service.IDistributionParcelListService;
import com.logpm.distribution.service.IDistributionParcelNumberService;
import com.logpm.distribution.service.IDistributionStockArticleService;
import com.logpm.distribution.vo.DistributionParcelListVO;
import lombok.AllArgsConstructor;
@ -61,6 +63,7 @@ public class DistributionParcelListClient implements IDistributionParcelListClie
private final IDistributionParcelListService distributionParcelListService;
private final IDistributionStockArticleService distributionStockArticleService;
private final IDistributionParcelNumberService distributionParcelNumberService;
/**
* 查询包件信息
@ -468,4 +471,25 @@ public class DistributionParcelListClient implements IDistributionParcelListClie
return list;
}
@Override
public void addZeroParcelList(List<DistributionParcelListEntity> addParcelListEntityList) {
distributionParcelListService.saveBatch(addParcelListEntityList);
List<DistributionParcelNumberEntity> addList = new ArrayList<>();
addParcelListEntityList.forEach(parcelListEntity -> {
DistributionParcelNumberEntity parcelNumberEntity = new DistributionParcelNumberEntity();
parcelNumberEntity.setStockArticleId(parcelListEntity.getStockArticleId());
parcelNumberEntity.setParcelListId(parcelListEntity.getId());
parcelNumberEntity.setQuantity(parcelListEntity.getQuantity());
parcelNumberEntity.setHandQuantity(parcelListEntity.getQuantity());
parcelNumberEntity.setDeliveryQuantity(0);
parcelNumberEntity.setSigninQuantity(0);
parcelNumberEntity.setOutboundQuantity(0);
parcelNumberEntity.setWarehouseId(parcelListEntity.getWarehouseId());
addList.add(parcelNumberEntity);
});
distributionParcelNumberService.saveBatch(addList);
}
}

12
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java
Unescape View File

@ -1801,12 +1801,12 @@ public class CarsLoadController {
try{
//当前登录人选择的仓库
// BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
// if(Objects.isNull(myCurrentWarehouse)){
// log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse);
// return R.fail(400,"多仓权限无法操作，请选择仓库");
// }
// loadCarsDTO.setWarehouseId(myCurrentWarehouse.getId());
BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
if(Objects.isNull(myCurrentWarehouse)){
log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse);
return R.fail(400,"多仓权限无法操作，请选择仓库");
}
loadCarsDTO.setWarehouseId(myCurrentWarehouse.getId());
if(Objects.isNull(loadId)){
log.warn(method+"配载id为空 loadId={}",loadId);

13
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/feign/TrunklineCarsLoadScanClient.java
Unescape View File

@ -1,5 +1,7 @@
package com.logpm.trunkline.feign;
import com.logpm.trunkline.entity.TrunklineCarsLoadScanEntity;
import com.logpm.trunkline.service.ITrunklineCarsLoadScanService;
import com.logpm.trunkline.service.ITrunklineCarsLoadService;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@ -14,6 +16,7 @@ import springfox.documentation.annotations.ApiIgnore;
public class TrunklineCarsLoadScanClient implements ITrunklineCarsLoadScanClient{
private final ITrunklineCarsLoadService trunklineCarsLoadService;
private final ITrunklineCarsLoadScanService trunklineCarsLoadScanService;
@Override
@ -30,4 +33,14 @@ public class TrunklineCarsLoadScanClient implements ITrunklineCarsLoadScanClient
public R adnormalHasStock(Long carsLoadScanId, Long warehouseId) {
return trunklineCarsLoadService.adnormalHasStock(carsLoadScanId,warehouseId);
}
@Override
public TrunklineCarsLoadScanEntity findEntityById(Long associationId) {
return trunklineCarsLoadScanService.getById(associationId);
}
@Override
public void updateEntity(TrunklineCarsLoadScanEntity carsLoadScanEntity) {
trunklineCarsLoadScanService.updateById(carsLoadScanEntity);
}
}

2
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.java
Unescape View File

@ -167,4 +167,6 @@ public interface TrunklineCarsLoadScanMapper extends BaseMapper<TrunklineCarsLoa
void addSignOrderIdByLoadIdAndNodeIdAndOrderCodeAndWaybillNo(@Param("loadId") Long finalLoadId, @Param("nodeId") Long nodeId, @Param("orderCode") String orderCode, @Param("waybillNo") String waybillNo, @Param("signOrderId") Long signOrderId);
void updateFinalNodeIdByLoadIdAndWarehouseIdAndOrderCodeAndWaybillNo(@Param("loadId") Long loadId, @Param("warehouseId") Long warehouseId, @Param("orderCode") String orderCode, @Param("waybillNo") String waybillNo, @Param("finalNodeId") Long finalNodeId, @Param("finalNodeName") String finalNodeName);
List<TrunklineCarsLoadScanEntity> findAbnormalZeroScanList(@Param("loadId") Long loadId, @Param("warehouseId") Long warehouseId);
}

11
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml
Unescape View File

@ -557,6 +557,7 @@
where load_id = #{loadId}
and final_node_id = #{warehouseId}
and scan_status = '1'
and type = 1
</select>
<select id="findUnloadCheckAbnormalNoDataList" resultType="com.logpm.trunkline.entity.TrunklineCarsLoadScanEntity">
@ -565,6 +566,16 @@
where load_id = #{loadId}
and unload_node_id = #{warehouseId}
and is_data = 0
and type = 1
</select>
<select id="findAbnormalZeroScanList" resultType="com.logpm.trunkline.entity.TrunklineCarsLoadScanEntity">
select *
from logpm_trunkline_cars_load_scan
where load_id = #{loadId}
and final_node_id = #{warehouseId}
and type = 2
and unload_num != num
</select>
<select id="findPackageListByLoadId" resultType="String">

2
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadScanService.java
Unescape View File

@ -162,4 +162,6 @@ public interface ITrunklineCarsLoadScanService extends BaseService<TrunklineCars
void addSignOrderIdByLoadIdAndNodeIdAndOrderCodeAndWaybillNo(Long finalLoadId, Long nodeId, String orderCode, String waybillNo, Long signOrderId);
void updateFinalNodeIdByLoadIdAndWarehouseIdAndOrderCodeAndWaybillNo(Long loadId, Long warehouseId, String orderCode, String waybillNo, Long finalNodeId,String finalNodeName);
List<TrunklineCarsLoadScanEntity> findAbnormalZeroScanList(Long loadId, Long warehouseId);
}

60
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/CarsLoadAsyncServiceImpl.java
Unescape View File

@ -1,5 +1,6 @@
package com.logpm.trunkline.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.json.JSONUtil;
import com.logpm.aftersales.entity.AftersalesAbnormalRecordEntity;
@ -373,6 +374,8 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
abnormalRecordEntity.setAssociationId(scanId);
abnormalRecordEntity.setAssociationType(1);
abnormalRecordEntity.setRemark("无计划装车---装车记录补录");
abnormalRecordEntity.setIsZero(0);
abnormalRecordEntity.setNum(1);
abnormalRecordClient.addAbnormalRecord(abnormalRecordEntity);
}
}
@ -412,6 +415,8 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
abnormalRecordEntity.setAssociationId(loadScanId);
abnormalRecordEntity.setAssociationType(1);
abnormalRecordEntity.setRemark("无装车记录 系统自动完结");
abnormalRecordEntity.setIsZero(0);
abnormalRecordEntity.setNum(1);
abnormalRecordClient.addAbnormalRecord(abnormalRecordEntity);
}
}
@ -431,6 +436,7 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
}
List<AftersalesAbnormalRecordEntity> addList = new ArrayList<>();
List<TrunklineCarsLoadScanEntity> noUnloadList = trunklineCarsLoadScanService.findUnloadCheckAbnormalNoUnloadList(loadId,warehouseId);
for (TrunklineCarsLoadScanEntity trunklineCarsLoadScanEntity : noUnloadList) {
String loadCode = trunklineCarsLoadScanEntity.getLoadCode();
@ -444,7 +450,7 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
abnormalRecordEntity.setCreateUser(userId);
abnormalRecordEntity.setUpdateUser(userId);
abnormalRecordEntity.setCreateDept(deptId);
abnormalRecordEntity.setType("2");
abnormalRecordEntity.setType("1");
abnormalRecordEntity.setAbnormalType("4");
abnormalRecordEntity.setCarType("1");
abnormalRecordEntity.setWarehouseId(warehouseId);
@ -461,7 +467,10 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
abnormalRecordEntity.setAssociationId(scanId);
abnormalRecordEntity.setAssociationType(1);
abnormalRecordEntity.setRemark("无卸车记录");
abnormalRecordClient.addAbnormalRecord(abnormalRecordEntity);
abnormalRecordEntity.setIsZero(0);
abnormalRecordEntity.setNum(1);
addList.add(abnormalRecordEntity);
// abnormalRecordClient.addAbnormalRecord(abnormalRecordEntity);
}
List<TrunklineCarsLoadScanEntity> noDataList = trunklineCarsLoadScanService.findUnloadCheckAbnormalNoDataList(loadId,warehouseId);
@ -477,7 +486,7 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
abnormalRecordEntity.setCreateUser(userId);
abnormalRecordEntity.setUpdateUser(userId);
abnormalRecordEntity.setCreateDept(deptId);
abnormalRecordEntity.setType("2");
abnormalRecordEntity.setType("1");
abnormalRecordEntity.setAbnormalType("1");
abnormalRecordEntity.setCarType("1");
abnormalRecordEntity.setWarehouseId(warehouseId);
@ -494,8 +503,51 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService {
abnormalRecordEntity.setAssociationId(scanId);
abnormalRecordEntity.setAssociationType(1);
abnormalRecordEntity.setRemark("无系统编码");
abnormalRecordClient.addAbnormalRecord(abnormalRecordEntity);
abnormalRecordEntity.setIsZero(0);
abnormalRecordEntity.setNum(1);
addList.add(abnormalRecordEntity);
// abnormalRecordClient.addAbnormalRecord(abnormalRecordEntity);
}
List<TrunklineCarsLoadScanEntity> abnormalZeroScanList = trunklineCarsLoadScanService.findAbnormalZeroScanList(loadId,warehouseId);
if(CollUtil.isNotEmpty(abnormalZeroScanList)){
abnormalZeroScanList.forEach(carsLoadScanEntity -> {
String loadCode = carsLoadScanEntity.getLoadCode();
String waybillNo = carsLoadScanEntity.getWaybillNo();
String orderCode = carsLoadScanEntity.getOrderCode();
String scanCode = carsLoadScanEntity.getScanCode();
Long scanId = carsLoadScanEntity.getId();
Integer unloadNum = carsLoadScanEntity.getUnloadNum();
Integer num = carsLoadScanEntity.getNum();
//卸车数量异常
AftersalesAbnormalRecordEntity abnormalRecordEntity = new AftersalesAbnormalRecordEntity();
abnormalRecordEntity.setTenantId(tenantId);
abnormalRecordEntity.setCreateUser(userId);
abnormalRecordEntity.setUpdateUser(userId);
abnormalRecordEntity.setCreateDept(deptId);
abnormalRecordEntity.setType("1");
abnormalRecordEntity.setAbnormalType("5");
abnormalRecordEntity.setCarType("1");
abnormalRecordEntity.setWarehouseId(warehouseId);
abnormalRecordEntity.setWarehouseName(warehouseName);
abnormalRecordEntity.setCarsNo(loadCode);
abnormalRecordEntity.setWaybillNo(waybillNo);
abnormalRecordEntity.setOrderCode(orderCode);
abnormalRecordEntity.setOrderPackageCode(scanCode);
abnormalRecordEntity.setUpUserId(userId);
abnormalRecordEntity.setUpUserName(nickName);
abnormalRecordEntity.setAbnormalStatus(0);
abnormalRecordEntity.setSendOrderStatus(0);
abnormalRecordEntity.setUpTime(new Date());
abnormalRecordEntity.setAssociationId(scanId);
abnormalRecordEntity.setAssociationType(1);
abnormalRecordEntity.setRemark("零担卸车数量异常");
abnormalRecordEntity.setIsZero(1);
abnormalRecordEntity.setNum(num-unloadNum);
addList.add(abnormalRecordEntity);
});
}
abnormalRecordClient.addAbnormalRecordList(addList);
}
@LogpmAsync("asyncExecutor")

10
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java
Unescape View File

@ -427,7 +427,17 @@ public class InComingServiceImpl implements IInComingService {
} catch (Exception e) {
log.error(">>>>>>>>>>>>>>>>>>>>>>>>>> 预入库消息推送失败~ 请联系管理员！ ", e);
}
List<TrunklineAdvanceDetailEntity> updateAdvanceDetailList = new ArrayList<>();
advanceDetailEntities.forEach(advanceDetailEntity -> {
TrunklineAdvanceDetailEntity updateDetailEntity = new TrunklineAdvanceDetailEntity();
updateDetailEntity.setPackageStatus("1");
updateDetailEntity.setIncomingTime(new Date());
updateDetailEntity.setIncomingWarehouseId(warehouseId);
updateDetailEntity.setIncomingWarehouseName(finalWarehouseName);
updateAdvanceDetailList.add(updateDetailEntity);
});
advanceDetailService.updateBatchById(updateAdvanceDetailList);
} else if ("1".equals(packageStatus)) {
//已入库包件

5
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadScanServiceImpl.java
Unescape View File

@ -393,4 +393,9 @@ public class TrunklineCarsLoadScanServiceImpl extends BaseServiceImpl<TrunklineC
baseMapper.updateFinalNodeIdByLoadIdAndWarehouseIdAndOrderCodeAndWaybillNo(loadId,warehouseId,orderCode,waybillNo,finalNodeId,finalNodeName);
}
@Override
public List<TrunklineCarsLoadScanEntity> findAbnormalZeroScanList(Long loadId, Long warehouseId) {
return baseMapper.findAbnormalZeroScanList(loadId,warehouseId);
}
}

Write Preview
Loading…
Cancel
Save