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

1.干线bug修复 

2.同步老系统数据逻辑优化
dist.1.3.0
zhenghaoyu 8 months ago
parent
c48c80df9d
commit
f8c1fc4778
6 changed files with 83 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
  2. 28
      blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java
  3. 18
      blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java
  4. 9
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/BillladingController.java
  5. 26
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
  6. 22
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java

2
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
Unescape View File

@ -2599,7 +2599,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
map.put("consigneeUnit",warehouseWaybill.getConsignee());
map.put("consigneePerson",warehouseWaybill.getConsigneeName());
map.put("consigneeMobile",warehouseWaybill.getConsigneeMobile());
map.put("product", warehouseWaybill.getGoodsCode() + "（" + warehouseWaybill.getTotalCount() + "）");
map.put("product", warehouseWaybill.getGoodsName() + "（" + warehouseWaybill.getTotalCount() + "）");
map.put("remark",warehouseWaybill.getRemark());
}

28
blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java
Unescape View File

@ -9,14 +9,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.logpm.basic.entity.BasicMaterialEntity;
import com.logpm.basic.feign.IBasicMaterialClient;
import com.logpm.basicdata.entity.BasicdataCategoryEntity;
import com.logpm.basicdata.entity.BasicdataClientEntity;
import com.logpm.basicdata.entity.BasicdataStoreBusinessEntity;
import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
import com.logpm.basicdata.feign.IBasicdataCategoryClient;
import com.logpm.basicdata.feign.IBasicdataClientClient;
import com.logpm.basicdata.feign.IBasicdataStoreBusinessClient;
import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
import com.logpm.basicdata.entity.*;
import com.logpm.basicdata.feign.*;
import com.logpm.distribution.entity.DistributionParcelListEntity;
import com.logpm.distribution.entity.DistributionStockArticleEntity;
import com.logpm.distribution.feign.IDistributionParcelListClient;
@ -117,6 +111,9 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
private final BladeRedis redis;
private final IRegionFeign regionFeign;
private final IBasicdataBrandClient basicdataBrandClient;
// @Override
// public FactoryTokenVO getToken(String corpId, String appKey, String appSecret) throws NoSuchAlgorithmException {
@ -809,7 +806,20 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
entity.setOrderCode(distributionStockArticleEntity.getOrderCode());
entity.setServiceNumber(distributionStockArticleEntity.getServiceNumber());
entity.setWaybillNumber(waybillNo);
entity.setBrandName(distributionStockArticleEntity.getBrand());
WarehouseWaybillEntity warehouseWaybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNo);
if(!Objects.isNull(warehouseWaybillEntity)){
entity.setWaybillId(warehouseWaybillEntity.getId());
entity.setWaybillNumber(waybillNo);
}
String brand = distributionStockArticleEntity.getBrand();
entity.setBrandName(brand);
BasicdataBrandEntity basicdataBrand = basicdataBrandClient.findEntityByName(brand);
if(!Objects.isNull(basicdataBrand)){
entity.setBrandId(basicdataBrand.getId());
entity.setBrandName(brand);
}
// if(ObjectUtil.isNotEmpty(warehouseWaybill)){
// entity.setWarehouseId(warehouseWaybill.getId());
// }

18
blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java
Unescape View File

@ -98,6 +98,8 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService {
private final IRegionFeign regionFeign;
private final IBasicdataBrandClient basicdataBrandClient;
@Transactional(rollbackFor = Exception.class)
@Override
@ -1608,6 +1610,7 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService {
String orderCode = distributionStockArticleEntity.getOrderCode();
Long warehouseId = basicdataWarehouseEntity.getId();
//查询订单下的所有包件
List<OrderDetailEntity> orderDetailList = orderDetailClient.findByOrderCode(orderCode,oldWarehouseId);
for (OrderDetailEntity orderDetailEntity:orderDetailList){
@ -1650,6 +1653,12 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService {
entity.setConditions(1);
entity.setWarehouse(distributionStockArticleEntity.getWarehouse());
entity.setWarehouseId(distributionStockArticleEntity.getWarehouseId());
String brand = distributionStockArticleEntity.getBrand();
entity.setBrandName(brand);
BasicdataBrandEntity basicdataBrand = basicdataBrandClient.findEntityByName(brand);
if(!Objects.isNull(basicdataBrand)){
entity.setBrandId(basicdataBrand.getId());
}
entity.setStockArticleId(distributionStockArticleEntity.getId());
entity.setOrderPackageStatus(OrderPackageStatusConstant.yiruku.getValue());
entity.setBrandName(distributionStockArticleEntity.getBrand());
@ -1694,6 +1703,13 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService {
}
}
entity.setWaybillNumber(waybillNo);
WarehouseWaybillEntity warehouseWaybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNo);
if(!Objects.isNull(warehouseWaybillEntity)){
entity.setWaybillId(warehouseWaybillEntity.getId());
entity.setWaybillNumber(waybillNo);
}
entity.setOrderPackageFreezeStatus(OrderPackageFreezeStatusConstant.weidongjie.getValue());
entity.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.daiyuyue.getValue());
@ -1701,7 +1717,7 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService {
entity.setOrderPackageStockupStatus(OrderPackageStockupStatusConstant.daibeihuo.getValue());
entity.setOrderCode(distributionStockArticleEntity.getOrderCode());
entity.setServiceNumber(distributionStockArticleEntity.getServiceNumber());
entity.setWaybillNumber(waybillNo);
// 增加 进销商 名称 编码 发站仓
entity.setSendWarehouseName(distributionStockArticleEntity.getSendWarehouseName());

9
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/BillladingController.java
Unescape View File

@ -51,11 +51,12 @@ public class BillladingController {
//当前登录人选择的仓库
BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
if(Objects.isNull(myCurrentWarehouse)){
log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse);
return R.fail(403,"多仓权限无法操作，请选择仓库");
if(!Objects.isNull(myCurrentWarehouse)){
// log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse);
// return R.fail(403,"多仓权限无法操作，请选择仓库");
billladingDTO.setWarehouseId(myCurrentWarehouse.getId());
}
billladingDTO.setWarehouseId(myCurrentWarehouse.getId());
IPage<TrunklineBillladingVO> pages = trunklineBillladingService.pageList(billladingDTO);

26
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
Unescape View File

@ -1037,6 +1037,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
//修改已卸车数据为确认状态
trunklineCarsLoadScanService.updateUnloadCheckByLoadIdAndWarehouseId(loadId, warehouseId);
TrunklineCarsLoadLineEntity updateUnloadStatus = new TrunklineCarsLoadLineEntity();
WorkNodeEnums node = null;
if (unloadType == 1) {
node = WorkNodeEnums.TRANSFER_WAREHOUSE_UNLOADING;
@ -1045,10 +1046,11 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
log.warn("#############unloadByLoadId: 当前节点为终点 loadId={} loadStatus={}", loadId, loadStatus);
throw new CustomerException(400, "当前节点为终点");
}
updateUnloadStatus.setId(currentCarsLoadLineEntity.getId());
updateUnloadStatus.setUnloadStatus("1");
currentCarsLoadLineEntity.setUnloadStatus("1");
currentCarsLoadLineEntity.setUnloadUserId(AuthUtil.getUserId());
currentCarsLoadLineEntity.setUnloadUserName(AuthUtil.getUserName());
currentCarsLoadLineEntity.setUnloadUserName(AuthUtil.getNickName());
currentCarsLoadLineEntity.setUnloadDate(new Date());
trunklineCarsLoadLineService.updateById(currentCarsLoadLineEntity);
@ -1067,10 +1069,11 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
log.warn("#############unloadByLoadId: 当前节点未到车 nowWarehouseId={} nodeStatus={}", nowWarehouseId, nodeStatus);
throw new CustomerException(400, "当前节点未到车");
} else {
updateUnloadStatus.setId(currentCarsLoadLineEntity.getId());
updateUnloadStatus.setUnloadStatus("1");
currentCarsLoadLineEntity.setUnloadStatus("2");
currentCarsLoadLineEntity.setUnloadUserId(AuthUtil.getUserId());
currentCarsLoadLineEntity.setUnloadUserName(AuthUtil.getUserName());
currentCarsLoadLineEntity.setUnloadUserName(AuthUtil.getNickName());
currentCarsLoadLineEntity.setUnloadDate(new Date());
trunklineCarsLoadLineService.updateById(currentCarsLoadLineEntity);
carsLoadEntity.setLoadStatus("80");
@ -1237,6 +1240,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
} catch (Exception e) {
log.error("卸车确认推送工厂失败", e);
}
trunklineCarsLoadLineService.updateById(updateUnloadStatus);
}
@ -3597,7 +3601,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
return R.fail(405,"托盘信息不存在");
}
String palletName = basicdataTrayEntity.getPalletName();
String audio = null;
String orders = null;
if (0 == isZero) {
unloadPackage(loadId, orderPackageCode, warehouseId, 1, "卸分一体 卸车", incomingType,palletName,trayCode);
@ -3611,6 +3615,12 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
if (code != 200) {
log.warn("##########findNextNodeList: 打托失败 trayCode={} orderPackageCode={} msg={}", trayCode, orderPackageCode, r.getMsg());
return R.fail(code, r.getMsg());
}else{
String data = (String) r.getData();
if(StringUtil.isNotBlank(data)){
JSONObject jsonObject = JSONObject.parseObject(data);
audio = jsonObject.getString("audio");
}
}
DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode, warehouseId);
orders = parcelListEntity.getOrderCode();
@ -3634,8 +3644,14 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
orders = orderCode;
}
Map<String, Object> map = new HashMap<>();
map.put("orders", orders);
if(StringUtil.isNotBlank(audio)){
return Resp.scanData("串货", audio,map);
}
WarehouseTrayTypeEntity trayTypeEntity = trayTypeClient.findTrayTypeEntity(trayCode);
if(!Objects.isNull(trayTypeEntity)){
Integer totalNum = trayTypeEntity.getTotalNum();

22
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java
Unescape View File

@ -139,6 +139,8 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
private ISendFanoutService sendFanoutService;
@Autowired
private IWarehousePackageTrackLogService warehousePackageTrackLogService;
@Autowired
private IBasicdataBrandClient basicdataBrandClient;
@Override
@ -4390,6 +4392,12 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
entity.setConditions(1);
entity.setWarehouse(distributionStockArticleEntity.getWarehouse());
entity.setWarehouseId(distributionStockArticleEntity.getWarehouseId());
String brand = distributionStockArticleEntity.getBrand();
entity.setBrandName(brand);
BasicdataBrandEntity basicdataBrand = basicdataBrandClient.findEntityByName(brand);
if(!Objects.isNull(basicdataBrand)){
entity.setBrandId(basicdataBrand.getId());
}
entity.setStockArticleId(distributionStockArticleEntity.getId());
entity.setOrderPackageStatus(OrderPackageStatusConstant.yiruku.getValue());
//状态：1到货，2分拣，3装车，4卸货,5出库，6配送
@ -4417,13 +4425,22 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
}
}
}
entity.setWaybillNumber(waybillNo);
WarehouseWaybillEntity warehouseWaybillEntity = warehouseWaybillService.findByWaybillNo(waybillNo);
if(!Objects.isNull(warehouseWaybillEntity)){
entity.setWaybillId(warehouseWaybillEntity.getId());
entity.setWaybillNumber(waybillNo);
}
entity.setOrderPackageFreezeStatus(OrderPackageFreezeStatusConstant.weidongjie.getValue());
entity.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.daiyuyue.getValue());
entity.setOrderPackageGroundingStatus(OrderPackageGroundingStatusConstant.daishangjia.getValue());
entity.setOrderPackageStockupStatus(OrderPackageStockupStatusConstant.daibeihuo.getValue());
entity.setOrderCode(distributionStockArticleEntity.getOrderCode());
entity.setServiceNumber(distributionStockArticleEntity.getServiceNumber());
entity.setWaybillNumber(waybillNo);
// 增加 进销商 名称 编码 发站仓
entity.setSendWarehouseName(distributionStockArticleEntity.getSendWarehouseName());
@ -4501,7 +4518,8 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
distributionStockArticleEntity.setDescriptionGoods(advanceEntity.getFirstPackName());
// 品牌
distributionStockArticleEntity.setBrand(advanceEntity.getType());
String brandName = advanceEntity.getType();
distributionStockArticleEntity.setBrand(brandName);
distributionStockArticleEntity.setResource(advanceEntity.getSystemType());
}

Write Preview
Loading…
Cancel
Save