Browse Source

1.干线修复

visual
zhenghaoyu 4 months ago
parent
commit
cf43f66a91
  1. 2
      blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java
  2. 10
      blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java
  3. 2
      blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseWaybillClient.java
  4. 13
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java
  5. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java
  6. 8
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
  7. 3
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java
  8. 5
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java
  9. 7
      blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/DealWithDataHandler.java
  10. 4
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.java
  11. 18
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml
  12. 103
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml
  13. 4
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java
  14. 74
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
  15. 10
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java
  16. 18
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
  17. 5
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseWaybillClient.java
  18. 2
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.java
  19. 10
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml
  20. 2
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWaybillService.java
  21. 5
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java

2
blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java

@ -304,5 +304,7 @@ public interface IDistributionParcelListClient {
@PostMapping(API_PREFIX + "/findListByOrderPackageCodes")
List<DistributionParcelListEntity> findListByOrderPackageCodes(@RequestBody List<String> orderPackageCodes);
@PostMapping(API_PREFIX + "/deleteListByOrderPackageCodes")
R deleteListByOrderPackageCodes(@RequestBody FindParamterDTO findParamterDTO);
}

10
blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java

@ -137,6 +137,16 @@ public class LoadCarsDTO implements Serializable {
private String customerTrain;
private String remark;
private String firsts;
private String senconds;
private String thirds;
private String materialCode;
private String materialName;
private String url;
private Integer incomingType;

2
blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseWaybillClient.java

@ -95,4 +95,6 @@ public interface IWarehouseWaybillClient {
@GetMapping(API_PREFIX+"/deleteByWaybillNo")
void deleteByWaybillNo(String waybillNo);
@PostMapping(API_PREFIX + "/deleteByWaybillIds")
void deleteByWaybillIds(@RequestBody List<Long> waybillIds);
}

13
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java

@ -641,4 +641,17 @@ public class DistributionParcelListClient implements IDistributionParcelListClie
return distributionParcelListService.findListByOrderPackageCodes(orderPackageCodes);
}
@Override
public R deleteListByOrderPackageCodes(FindParamterDTO findParamterDTO) {
List<String> orderPackageCodeList = findParamterDTO.getOrderPackageCodeList();
Long warehouseId = findParamterDTO.getWarehouseId();
try{
distributionParcelListService.deleteListByOrderPackageCodes(orderPackageCodeList,warehouseId);
}catch (Exception e){
return R.fail("删除失败");
}
return R.success("删除成功");
}
}

2
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java

@ -338,4 +338,6 @@ public interface DistributionParcelListMapper extends BaseMapper<DistributionPar
List<DistributionParcelListEntity> findListByOrderPackageCodes(@Param("orderPackageCodes") List<String> orderPackageCodes);
List<DistributionStockArticleEntity> findWaybillNoByOrderIds(@Param("stockArticleIds") Set<Long> stockArticleIds);
void deleteListByOrderPackageCodes(@Param("orderPackageCodeList") List<String> orderPackageCodeList,@Param("warehouseId") Long warehouseId);
}

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

@ -2267,5 +2267,13 @@
</select>
<delete id="deleteListByOrderPackageCodes" >
delete from logpm_distribution_parcel_list
where order_package_code in
<foreach collection="orderPackageCodeList" item="item" separator="," open="(" close=")">
#{item}
</foreach>
and warehouse_id = #{warehouseId}
</delete>
</mapper>

3
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java

@ -310,4 +310,7 @@ public interface IDistributionParcelListService extends BaseService<Distribution
List<DistributionParcelListEntity> findListByOrderPackageCodes(List<String> orderPackageCodes);
List<DistributionStockArticleEntity> findWaybillNoByOrderIds(Set<Long> stockArticleIds);
void deleteListByOrderPackageCodes(List<String> orderPackageCodeList,Long warehouseId);
}

5
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java

@ -1578,4 +1578,9 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
public List<DistributionStockArticleEntity> findWaybillNoByOrderIds(Set<Long> stockArticleIds) {
return baseMapper.findWaybillNoByOrderIds(stockArticleIds);
}
@Override
public void deleteListByOrderPackageCodes(List<String> orderPackageCodeList, Long warehouseId) {
baseMapper.deleteListByOrderPackageCodes(orderPackageCodeList,warehouseId);
}
}

7
blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/DealWithDataHandler.java

@ -1,10 +1,8 @@
package com.logpm.factory.receiver;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.logpm.factory.comfac.dto.OrderStatusDTO;
import com.logpm.factory.comfac.mapper.OrderPackageStatusPushFailLogMapper;
import com.logpm.factory.comfac.service.IFactoryCommonService;
import com.logpm.factory.entity.OrderPackageStatusPushFailLogEntity;
import com.rabbitmq.client.Channel;
import lombok.extern.slf4j.Slf4j;
import org.springblade.common.constant.RabbitConstant;
@ -16,7 +14,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.io.IOException;
import java.util.List;
import java.util.Map;
@ -44,7 +41,7 @@ public class DealWithDataHandler {
// 如果手动ACK,消息会被监听消费,但是消息在队列中依旧存在,如果 未配置 acknowledge-mode 默认是会在消费完毕后自动ACK掉
OrderStatusDTO orderStatusDTO = (OrderStatusDTO) map.get("messageData");
log.info("############dealWithDataHandler: 处理在库订单数据到新系统 {}",orderStatusDTO);
log.info("############dealWithDataHandler: 处理在库订单数据到新系统 2024-10-26-14-53关闭 {}",orderStatusDTO);
String status = orderStatusDTO.getStatus();
String unitNo = orderStatusDTO.getUnitNo();
String operationTime = orderStatusDTO.getOperationTime();
@ -57,7 +54,7 @@ public class DealWithDataHandler {
}
log.info("##################dealWithDataHandler: 处理在库订单数据到新系统 来源:{} 品牌:{}",sourceName,orderStatusDTO.getBrandName());
if("汇通".equals(sourceName)){
factoryCommonService.extracted(status, unitNo, currentWarehouseId, operationTime, trayId);
// factoryCommonService.extracted(status, unitNo, currentWarehouseId, operationTime, trayId);
}else{
log.warn(">>>> 不是汇通的数据 不进入汇通入库数据");
}

4
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.java

@ -89,4 +89,8 @@ public interface TrunklineAdvanceDetailMapper extends BaseMapper<TrunklineAdvanc
List<TrunklineAdvanceDetailVO> findListByAdvanceIds(@Param("advanceIds") List<Long> advanceIds);
void deleteByAdvanceIds(@Param("advanceIds") List<Long> advanceIds);
Integer findIncomingNumByAdvanceIds(@Param("advanceIds") List<Long> advanceIds);
List<String> findOrderPackageCodesByAdvanceIds(@Param("advanceIds") List<Long> advanceIds);
}

18
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml

@ -573,4 +573,22 @@
</foreach>
</delete>
<select id="findIncomingNumByAdvanceIds" resultType="int">
select sum(quantity)
from logpm_trunkline_advance_detail
where advance_id in
<foreach collection="advanceIds" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</select>
<select id="findOrderPackageCodesByAdvanceIds" resultType="string">
select order_package_code
from logpm_trunkline_advance_detail
where advance_id in
<foreach collection="advanceIds" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</select>
</mapper>

103
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml

@ -157,6 +157,21 @@
<if test="param.destinationWarehouseName != null and param.destinationWarehouseName != ''">
and Locate(#{param.destinationWarehouseName},lww.destination_warehouse_name) > 0
</if>
<if test="param.firsts != null and param.firsts != ''">
and cls.firsts like concat('%',#{param.firsts},'%')
</if>
<if test="param.senconds != null and param.senconds != ''">
and cls.senconds like concat('%',#{param.senconds},'%')
</if>
<if test="param.thirds != null and param.thirds != ''">
and cls.thirds like concat('%',#{param.thirds},'%')
</if>
<if test="param.materialCode != null and param.materialCode != ''">
and cls.material_code like concat('%',#{param.materialCode},'%')
</if>
<if test="param.materialName != null and param.materialName != ''">
and cls.material_name like concat('%',#{param.materialName},'%')
</if>
order by cls.loading_abnormal desc,cls.unload_abnormal desc,cls.create_time asc
</select>
@ -738,6 +753,94 @@
from logpm_trunkline_cars_load_scan ltcls
left join logpm_warehouse_waybill lww on ltcls.waybill_id = lww.id
where ltcls.load_id = #{param.loadId}
<if test="param.waybillNo != null and param.waybillNo != ''">
and Locate(#{param.waybillNo},ltcls.waybill_no) > 0
</if>
<if test="param.orderCode != null and param.orderCode != ''">
and Locate(#{param.orderCode},ltcls.order_code) > 0
</if>
<if test="param.scanCode != null and param.scanCode != ''">
and Locate(#{param.scanCode},ltcls.scan_code) > 0
</if>
<if test="param.loadingUserName != null and param.loadingUserName != ''">
and Locate(#{param.loadingUserName},ltcls.loading_user_name) > 0
</if>
<if test="param.warehouseName != null and param.warehouseName != ''">
and Locate(#{param.warehouseName},ltcls.warehouse_name) > 0
</if>
<if test="param.finalNodeName != null and param.finalNodeName != ''">
and Locate(#{param.finalNodeName},ltcls.final_node_name) > 0
</if>
<if test="param.finalNodeName != null and param.finalNodeName != ''">
and Locate(#{param.finalNodeName},ltcls.final_node_name) > 0
</if>
<if test="param.scanStatus != null">
and ltcls.scan_status = #{param.scanStatus}
</if>
<if test="param.trayName != null and param.trayName != ''">
and Locate(#{param.trayName},ltcls.tray_name) > 0
</if>
<if test="param.trayCode != null and param.trayCode != ''">
and Locate(#{param.trayCode},ltcls.tray_code) > 0
</if>
<if test="param.unloadTrayName != null and param.unloadTrayName != ''">
and Locate(#{param.unloadTrayName},ltcls.unload_tray_name) > 0
</if>
<if test="param.unloadTrayCode != null and param.unloadTrayCode != ''">
and Locate(#{param.unloadTrayCode},ltcls.unload_tray_code) > 0
</if>
<if test="param.unloadNodeName != null and param.unloadNodeName != ''">
and Locate(#{param.unloadNodeName},ltcls.unload_node_name) > 0
</if>
<if test="param.unloadUserName != null and param.unloadUserName != ''">
and Locate(#{param.unloadUserName},ltcls.unload_user_name) > 0
</if>
<if test="param.type != null">
and ltcls.`type` = #{param.type}
</if>
<if test="param.isData != null">
and ltcls.is_data = #{param.isData}
</if>
<if test="param.loadingAbnormal != null">
and ltcls.loading_abnormal = #{param.loadingAbnormal}
</if>
<if test="param.unloadAbnormal != null">
and ltcls.unload_abnormal = #{param.unloadAbnormal}
</if>
<if test="param.isSupple != null">
and ltcls.is_supple = #{param.isSupple}
</if>
<if test="param.createTimeStart != null">
and ltcls.create_time &gt;= #{param.createTimeStart}
</if>
<if test="param.createTimeEnd != null">
and ltcls.create_time &lt;= #{param.createTimeEnd}
</if>
<if test="param.unloadTimeStart != null">
and ltcls.unload_time &gt;= #{param.unloadTimeStart}
</if>
<if test="param.unloadTimeEnd != null">
and ltcls.unload_time &lt;= #{param.unloadTimeEnd}
</if>
<if test="param.destinationWarehouseName != null and param.destinationWarehouseName != ''">
and Locate(#{param.destinationWarehouseName},lww.destination_warehouse_name) > 0
</if>
<if test="param.firsts != null and param.firsts != ''">
and ltcls.firsts like concat('%',#{param.firsts},'%')
</if>
<if test="param.senconds != null and param.senconds != ''">
and ltcls.senconds like concat('%',#{param.senconds},'%')
</if>
<if test="param.thirds != null and param.thirds != ''">
and ltcls.thirds like concat('%',#{param.thirds},'%')
</if>
<if test="param.materialCode != null and param.materialCode != ''">
and ltcls.material_code like concat('%',#{param.materialCode},'%')
</if>
<if test="param.materialName != null and param.materialName != ''">
and ltcls.material_name like concat('%',#{param.materialName},'%')
</if>
order by ltcls.loading_abnormal desc,ltcls.unload_abnormal desc,ltcls.create_time asc
</select>

4
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java

@ -106,4 +106,8 @@ public interface ITrunklineAdvanceDetailService extends BaseService<TrunklineAdv
List<TrunklineAdvanceDetailVO> findListByAdvanceIds(List<Long> advanceIds);
void deleteByAdvanceIds(List<Long> advanceIds);
Integer findIncomingNumByAdvanceIds(List<Long> advanceIds);
List<String> findOrderPackageCodesByAdvanceIds(List<Long> advanceIds);
}

74
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java

@ -16,6 +16,8 @@ import com.logpm.basicdata.entity.*;
import com.logpm.basicdata.feign.*;
import com.logpm.basicdata.vo.BasicdataClientVO;
import com.logpm.basicdata.vo.BasicdataFreightApiVO;
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;
@ -1144,11 +1146,13 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
advanceService.updateBatchById(listByIds);
}
@Transactional(rollbackFor = Exception.class)
@Override
public void deletedAdvance(AdvanceDTO advanceDTO) {
List<Long> advanceIds = advanceDTO.getAdvanceIds();
Long warehouseId = advanceDTO.getWarehouseId();
//查询包件是否已经不在库
List<DistributionParcelListEntity> parcelListEntities = distributionParcelListClient.findPackagesByAdvanceIdsAndNoStock(advanceIds, warehouseId);
if (!parcelListEntities.isEmpty()) {
@ -1157,12 +1161,32 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
}
QueryWrapper<TrunklineAdvanceDetailEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.in("advance_id",advanceIds);
List<TrunklineAdvanceDetailEntity> detailEntityList = advanceDetailService.list(queryWrapper);
//把detailEntityList所有的orderPackageCode放入一个List
List<String> orderPackageCodeList = detailEntityList.stream().map(TrunklineAdvanceDetailEntity::getOrderPackageCode).collect(Collectors.toList());
Set<String> orderCodeList = detailEntityList.stream().map(TrunklineAdvanceDetailEntity::getOrderCode).collect(Collectors.toSet());
FindParamterDTO findParamterDTO = new FindParamterDTO();
findParamterDTO.setOrderPackageCodeList(orderPackageCodeList);
findParamterDTO.setWarehouseId(warehouseId);
R r = distributionParcelListClient.deleteListByOrderPackageCodes(findParamterDTO);
int code = r.getCode();
if(code != 200){
log.warn("############deletedAdvance: 删除订单失败");
throw new CustomerException(405, "删除订单失败");
}
OrderPackageDTO orderPackageDTO = new OrderPackageDTO();
orderPackageDTO.setStrings(new ArrayList<>(orderCodeList));
orderPackageDTO.setWarehouseId(warehouseId);
distributionStockArticleClient.updateOrdersInfo(orderPackageDTO);
advanceDetailService.deleteByAdvanceIds(advanceIds);
advanceService.deletedAdvance(advanceIds);
//删除所有在库包件,并更新订单信息
distributionParcelListClient.findAllOrderCodesAndDeleteByAdvanceIds(advanceIds, warehouseId);
}
@Override
@ -2447,26 +2471,34 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
advanceDetailModel.setQuantity(1);
advanceDetailModel.setServiceNum(advanceEntity.getServiceNum());
advanceDetailModel.setPackageStatus("0");
String volume1 = importStandardOuPaiDTO.getVolume();
if(StringUtil.isBlank(volume1)){
volume1 = "0";
}
advanceDetailModel.setVolume(new BigDecimal(volume1));
String materialName = StringUtil.isNotBlank(importStandardOuPaiDTO.getMaterialName())?importStandardOuPaiDTO.getMaterialName():"";
String materialCode = StringUtil.isNotBlank(importStandardOuPaiDTO.getMaterialCode())?importStandardOuPaiDTO.getMaterialCode():"";
BasicMaterialEntity basicMaterialEntity = materialEntityMap.get(materialCode + "&&" + materialName);
if(!Objects.isNull(basicMaterialEntity)){
advanceDetailModel.setMaterialId(basicMaterialEntity.getId());
advanceDetailModel.setMaterialCode(materialCode);
advanceDetailModel.setMaterialName(materialName);
String weight = basicMaterialEntity.getWeight();
if(StringUtil.isBlank(weight)){
weight = "0";
}
String volume1 = basicMaterialEntity.getVolume();
if(StringUtil.isBlank(volume1)){
volume1 = "0";
}
advanceDetailModel.setWeight(new BigDecimal(weight));
advanceDetailModel.setVolume(new BigDecimal(volume1));
}
// BasicMaterialEntity basicMaterialEntity = materialEntityMap.get(materialCode + "&&" + materialName);
//
// if(!Objects.isNull(basicMaterialEntity)){
// advanceDetailModel.setMaterialId(basicMaterialEntity.getId());
// advanceDetailModel.setMaterialCode(materialCode);
// advanceDetailModel.setMaterialName(materialName);
// String weight = basicMaterialEntity.getWeight();
// if(StringUtil.isBlank(weight)){
// weight = "0";
// }
// String volume1 = basicMaterialEntity.getVolume();
// if(StringUtil.isBlank(volume1)){
// volume1 = "0";
// }
// advanceDetailModel.setWeight(new BigDecimal(weight));
// advanceDetailModel.setVolume(new BigDecimal(volume1));
// }
// if (StringUtil.isNotBlank(materialCode) && StringUtil.isNotBlank(materialName)) {
// Long materialId = materialMap.get(materialCode);
@ -4146,7 +4178,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
openOrderAsyncService.saveLog(waybillEntity.getId(), waybillEntity.getWaybillNo(), "1000", "作废运单", createOperationRemark+" 原因:"+abolishReson, AuthUtil.getNickName(), AuthUtil.getUserId(), warehouseId, warehouseName);
});
warehouseWaybillClient.updateList(waybillList);
warehouseWaybillClient.deleteByWaybillIds(waybillIds);
if(CollUtil.isNotEmpty(clearWaybillInfoParceListIds)){
distributionParcelListClient.clearWaybillInfoByParceListIds(clearWaybillInfoParceListIds);
}

10
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java

@ -557,4 +557,14 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl<Trunkline
public void deleteByAdvanceIds(List<Long> advanceIds) {
baseMapper.deleteByAdvanceIds(advanceIds);
}
@Override
public Integer findIncomingNumByAdvanceIds(List<Long> advanceIds) {
return baseMapper.findIncomingNumByAdvanceIds(advanceIds);
}
@Override
public List<String> findOrderPackageCodesByAdvanceIds(List<Long> advanceIds) {
return baseMapper.findOrderPackageCodesByAdvanceIds(advanceIds);
}
}

18
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

@ -7681,6 +7681,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
carsLoadScanEntity.setWaybillNo(waybillNo);
carsLoadScanEntity.setOrderCode(orderCode);
carsLoadScanEntity.setIsData(1);
carsLoadScanEntity.setIsSupple(1);
trunklineCarsLoadScanService.updateById(carsLoadScanEntity);
return R.success("同步成功");
}
} else {
@ -7694,9 +7696,18 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
newStockArticle.setHandQuantity(0);
Long orderId = distributionStockArticleClient.addData(newStockArticle);
BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(unloadNodeId);
DistributionParcelListEntity newParcelList = new DistributionParcelListEntity();
BeanUtil.copy(parcelListEntity, newParcelList);
newParcelList.setId(null);
newParcelList.setWarehouseId(unloadNodeId);
newParcelList.setWarehouse(warehouseEntity.getName());
Long acceptWarehouseId = newParcelList.getAcceptWarehouseId();
if(NumberUtil.equals(unloadNodeId,acceptWarehouseId)){
newParcelList.setIsTransfer(0);
}else{
newParcelList.setIsTransfer(1);
}
newParcelList.setTrainNumber(loadCode);
newParcelList.setStockArticleId(orderId);
distributionParcelListClient.add(newParcelList);
@ -7705,6 +7716,13 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
// distributionStockArticleClient.saveOrUpdate(stockArticleEntity);
parcelListEntity.setOrderPackageStatus("60");
distributionParcelListClient.update(parcelListEntity);
carsLoadScanEntity.setWaybillNo(waybillNo);
carsLoadScanEntity.setOrderCode(orderCode);
carsLoadScanEntity.setIsData(1);
carsLoadScanEntity.setIsSupple(1);
trunklineCarsLoadScanService.updateById(carsLoadScanEntity);
return R.success("同步成功");
} else {
log.warn("###############syncIncomingPackage: 同步失败");

5
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseWaybillClient.java

@ -119,4 +119,9 @@ public class WarehouseWaybillClient implements IWarehouseWaybillClient {
public void deleteByWaybillNo(String waybillNo) {
warehouseWaybillService.deleteByWaybillNo(waybillNo);
}
@Override
public void deleteByWaybillIds(List<Long> waybillIds) {
warehouseWaybillService.deleteByWaybillIds(waybillIds);
}
}

2
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.java

@ -74,4 +74,6 @@ public interface WarehouseWaybillMapper extends BaseMapper<WarehouseWaybillEntit
void deleteByWaybillNo(@Param("waybillNo") String waybillNo);
List<FinanceWaybillExportVO> financeWaybillListExport(@Param("param") WarehouseWaybillDTO waybillDTO);
void deleteByWaybillIds(@Param("waybillIds") List<Long> waybillIds);
}

10
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml

@ -184,6 +184,7 @@
lww.cancle_check_user_name cancleCheckUserName,
lww.cancle_check_time cancleCheckTime,
lww.waybill_status waybillStatus,
lww.agent agent,
lww.waybill_type waybillType,
lww.document_making_time documentMakingTime,
lww.create_time createTime,
@ -942,6 +943,7 @@
lww.departure departure,
lww.departure_warehouse_name departureWarehouseName,
lww.destination_warehouse_name destinationWarehouseName,
lww.agent agent,
lww.delivery_way deliveryWay,
lww.customer_train customerTrain,
IFNULL(lww.return_status,0) returnStatus,
@ -1153,4 +1155,12 @@
order by lww.create_time desc
</select>
<delete id="deleteByWaybillIds" >
delete from logpm_warehouse_waybill
where id in
<foreach collection="waybillIds" item="item" separator="," open="(" close=")">
#{item}
</foreach>
</delete>
</mapper>

2
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWaybillService.java

@ -86,4 +86,6 @@ public interface IWarehouseWaybillService extends BaseService<WarehouseWaybillEn
void deleteByWaybillNo(String waybillNo);
List<FinanceWaybillExportVO> financeWaybillListExport(WarehouseWaybillDTO waybillDTO);
void deleteByWaybillIds(List<Long> waybillIds);
}

5
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java

@ -1172,4 +1172,9 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
return list;
}
@Override
public void deleteByWaybillIds(List<Long> waybillIds) {
baseMapper.deleteByWaybillIds(waybillIds);
}
}

Loading…
Cancel
Save