|
|
|
@ -40,6 +40,7 @@ import com.logpm.trunkline.mapper.TrunklineCarsLoadMapper; |
|
|
|
import com.logpm.trunkline.service.*; |
|
|
|
import com.logpm.trunkline.service.*; |
|
|
|
import com.logpm.trunkline.vo.*; |
|
|
|
import com.logpm.trunkline.vo.*; |
|
|
|
import com.logpm.warehouse.entity.WarehousePackageTrackLogEntity; |
|
|
|
import com.logpm.warehouse.entity.WarehousePackageTrackLogEntity; |
|
|
|
|
|
|
|
import com.logpm.warehouse.entity.WarehouseTrayTypeEntity; |
|
|
|
import com.logpm.warehouse.entity.WarehouseWayBillDetail; |
|
|
|
import com.logpm.warehouse.entity.WarehouseWayBillDetail; |
|
|
|
import com.logpm.warehouse.entity.WarehouseWaybillEntity; |
|
|
|
import com.logpm.warehouse.entity.WarehouseWaybillEntity; |
|
|
|
import com.logpm.warehouse.feign.IWarehouseTrayTypeClient; |
|
|
|
import com.logpm.warehouse.feign.IWarehouseTrayTypeClient; |
|
|
|
@ -349,7 +350,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL |
|
|
|
//更新关联订单数据的发车数量
|
|
|
|
//更新关联订单数据的发车数量
|
|
|
|
trunklineCarsOrderService.updateStartNumByLoadIdAndWarehouseId(loadId, warehouseId); |
|
|
|
trunklineCarsOrderService.updateStartNumByLoadIdAndWarehouseId(loadId, warehouseId); |
|
|
|
//生成直发商家签收单
|
|
|
|
//生成直发商家签收单
|
|
|
|
createCustomerSignOrder(loadId, warehouseId); |
|
|
|
// createCustomerSignOrder(loadId, warehouseId);
|
|
|
|
//生成异常列表
|
|
|
|
//生成异常列表
|
|
|
|
carsLoadAsyncService.abnormalListStartCarByLoadIdAndWarehouseId(loadId, warehouseId, AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getNickName(), AuthUtil.getTenantId(), loadCarsDTO.getWarehouseName()); |
|
|
|
carsLoadAsyncService.abnormalListStartCarByLoadIdAndWarehouseId(loadId, warehouseId, AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getNickName(), AuthUtil.getTenantId(), loadCarsDTO.getWarehouseName()); |
|
|
|
} catch (Exception e) { |
|
|
|
} catch (Exception e) { |
|
|
|
@ -541,17 +542,16 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL |
|
|
|
nextCarsLoadLineEntity.setArriveUserId(AuthUtil.getUserId()); |
|
|
|
nextCarsLoadLineEntity.setArriveUserId(AuthUtil.getUserId()); |
|
|
|
nextCarsLoadLineEntity.setArriveUserName(AuthUtil.getNickName()); |
|
|
|
nextCarsLoadLineEntity.setArriveUserName(AuthUtil.getNickName()); |
|
|
|
trunklineCarsLoadLineService.updateById(nextCarsLoadLineEntity); |
|
|
|
trunklineCarsLoadLineService.updateById(nextCarsLoadLineEntity); |
|
|
|
Integer workNode = null; |
|
|
|
WorkNodeEnums workNodeEnums = WorkNodeEnums.NET_ARRIVE_CAR; |
|
|
|
if (!nodeId.equals(endNodeId)) { |
|
|
|
if (!nodeId.equals(endNodeId)) { |
|
|
|
carsLoadEntity.setLoadStatus("20"); |
|
|
|
carsLoadEntity.setLoadStatus("20"); |
|
|
|
carsLoadEntity.setArriveTime(date); |
|
|
|
carsLoadEntity.setArriveTime(date); |
|
|
|
carsLoadEntity.setNowWarehouseId(warehouseId); |
|
|
|
carsLoadEntity.setNowWarehouseId(warehouseId); |
|
|
|
workNode = WorkNodeEnums.NET_ARRIVE_CAR.getCode(); |
|
|
|
|
|
|
|
} else { |
|
|
|
} else { |
|
|
|
carsLoadEntity.setLoadStatus("40"); |
|
|
|
carsLoadEntity.setLoadStatus("40"); |
|
|
|
carsLoadEntity.setArriveTime(date); |
|
|
|
carsLoadEntity.setArriveTime(date); |
|
|
|
carsLoadEntity.setNowWarehouseId(warehouseId); |
|
|
|
carsLoadEntity.setNowWarehouseId(warehouseId); |
|
|
|
workNode = WorkNodeEnums.FINAL_NET_ARRIVE_CAR.getCode(); |
|
|
|
workNodeEnums = WorkNodeEnums.FINAL_NET_ARRIVE_CAR; |
|
|
|
} |
|
|
|
} |
|
|
|
updateById(carsLoadEntity); |
|
|
|
updateById(carsLoadEntity); |
|
|
|
|
|
|
|
|
|
|
|
@ -568,12 +568,55 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL |
|
|
|
List<String> orderPackageCodes = trunklineCarsLoadScanService.findPackageListByLoadId(loadId); |
|
|
|
List<String> orderPackageCodes = trunklineCarsLoadScanService.findPackageListByLoadId(loadId); |
|
|
|
|
|
|
|
|
|
|
|
String content = "包件在 " + warehouseEntity.getName() + "到车"; |
|
|
|
String content = "包件在 " + warehouseEntity.getName() + "到车"; |
|
|
|
packageTrackLogAsyncService.addPackageTrackLog(AuthUtil.getTenantId(), AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getNickName(), orderPackageCodes, warehouseId, warehouseEntity.getName(), workNode, content); |
|
|
|
packageTrackLogAsyncService.addPackageTrackLog(AuthUtil.getTenantId(), AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getNickName(), orderPackageCodes, warehouseId, warehouseEntity.getName(), workNodeEnums.getCode(), content); |
|
|
|
|
|
|
|
try { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
FindParamterDTO param = new FindParamterDTO(); |
|
|
|
|
|
|
|
param.setWarehouseId(warehouseId); |
|
|
|
|
|
|
|
param.setOrderPackageCodeList(orderPackageCodes); |
|
|
|
|
|
|
|
List<DistributionParcelListEntity> listByOrderPackageCodeList = distributionParcelListClient.findListByOrderPackageCodeList(param); |
|
|
|
|
|
|
|
Map<Long, List<DistributionParcelListEntity>> map = listByOrderPackageCodeList.stream().collect(Collectors.groupingBy(DistributionParcelListEntity::getStockArticleId)); |
|
|
|
|
|
|
|
JSONObject js = new JSONObject(); |
|
|
|
|
|
|
|
js.put("carNumber", carsLoadEntity.getCarNumber()); |
|
|
|
|
|
|
|
js.put("driverName", carsLoadEntity.getDriverName()); |
|
|
|
|
|
|
|
js.put("driverMobile", carsLoadEntity.getDriverMobile()); |
|
|
|
|
|
|
|
for (Map.Entry<Long, List<DistributionParcelListEntity>> entry : map.entrySet()) { |
|
|
|
|
|
|
|
List<DistributionParcelListEntity> value = entry.getValue(); |
|
|
|
|
|
|
|
DistributionParcelListEntity parcelListEntity = value.get(0); |
|
|
|
|
|
|
|
js.put("orderCode", parcelListEntity.getOrderCode()); |
|
|
|
|
|
|
|
js.put("serviceNumber", parcelListEntity.getServiceNumber()); |
|
|
|
|
|
|
|
js.put("waybillNumber", parcelListEntity.getWaybillNumber()); |
|
|
|
|
|
|
|
js.put("sendWarehouseName", parcelListEntity.getSendWarehouseName()); |
|
|
|
|
|
|
|
js.put("acceptWarehouseName", parcelListEntity.getAcceptWarehouseName()); |
|
|
|
|
|
|
|
// 分割字符串得到仓库名称列表
|
|
|
|
|
|
|
|
List<String> warehouseNames = StrUtil.split(carsLoadEntity.getEndWarehouseNames(), ","); |
|
|
|
|
|
|
|
// 获取最后一个仓库名称
|
|
|
|
|
|
|
|
String lastWarehouseName = CollUtil.isNotEmpty(warehouseNames) ? warehouseNames.get(warehouseNames.size() - 1): ""; |
|
|
|
|
|
|
|
// 将最后一个仓库名称放入js对象
|
|
|
|
|
|
|
|
js.put("warehouseName", lastWarehouseName); |
|
|
|
|
|
|
|
NodePushMsg msg = new NodePushMsg(); |
|
|
|
|
|
|
|
msg.setNode(workNodeEnums); |
|
|
|
|
|
|
|
msg.setBrand(BrandEnums.getByValue(parcelListEntity.getBrandName())); |
|
|
|
|
|
|
|
msg.setOperator(AuthUtil.getNickName()); |
|
|
|
|
|
|
|
msg.setOperatorTime(new Date()); |
|
|
|
|
|
|
|
msg.setMain(js.toString()); |
|
|
|
|
|
|
|
msg.setContent(value.stream().map(item -> { |
|
|
|
|
|
|
|
return PushData.builder() |
|
|
|
|
|
|
|
.packageCode(item.getOrderPackageCode()) |
|
|
|
|
|
|
|
.orderCode(item.getOrderCode()) |
|
|
|
|
|
|
|
.warehouseName(warehouseEntity.getName()) |
|
|
|
|
|
|
|
.waybillNumber(item.getWaybillNumber()).build(); |
|
|
|
|
|
|
|
}).collect(Collectors.toList())); |
|
|
|
|
|
|
|
log.info("推送工厂数据：{}", JSONUtil.toJsonStr(msg)); |
|
|
|
|
|
|
|
factoryDataMessageSender.sendNodeDataByBrand(msg); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} catch (Exception e){ |
|
|
|
|
|
|
|
log.warn("推送工厂失败：{}", e); |
|
|
|
|
|
|
|
} |
|
|
|
} catch (Exception e) { |
|
|
|
} catch (Exception e) { |
|
|
|
log.warn("#############arriveCarByLoadId: 存入日志失败"); |
|
|
|
log.warn("#############arriveCarByLoadId: 存入日志失败"); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
@ -686,10 +729,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL |
|
|
|
//更新关联订单数据的发车数量
|
|
|
|
//更新关联订单数据的发车数量
|
|
|
|
trunklineCarsOrderService.updateStartNumToPlanNumByLoadIdAndWarehouseId(loadId, warehouseId); |
|
|
|
trunklineCarsOrderService.updateStartNumToPlanNumByLoadIdAndWarehouseId(loadId, warehouseId); |
|
|
|
|
|
|
|
|
|
|
|
//取消节点的签收单
|
|
|
|
// //取消节点的签收单
|
|
|
|
cancleCustomerSignOrder(loadId, warehouseId); |
|
|
|
// cancleCustomerSignOrder(loadId, warehouseId);
|
|
|
|
carsLoadEntity.setIsCustomer("2"); |
|
|
|
// carsLoadEntity.setIsCustomer("2");
|
|
|
|
updateById(carsLoadEntity); |
|
|
|
// updateById(carsLoadEntity);
|
|
|
|
} catch (Exception e) { |
|
|
|
} catch (Exception e) { |
|
|
|
log.error("#############cancelStartCarByLoadId: 处理取消节点签收单 和 发车数量失败", e); |
|
|
|
log.error("#############cancelStartCarByLoadId: 处理取消节点签收单 和 发车数量失败", e); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -3396,6 +3439,11 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL |
|
|
|
|
|
|
|
|
|
|
|
Map<String, Object> map = new HashMap<>(); |
|
|
|
Map<String, Object> map = new HashMap<>(); |
|
|
|
map.put("orders", orders); |
|
|
|
map.put("orders", orders); |
|
|
|
|
|
|
|
WarehouseTrayTypeEntity trayTypeEntity = trayTypeClient.findTrayTypeEntity(trayCode); |
|
|
|
|
|
|
|
if(!Objects.isNull(trayTypeEntity)){ |
|
|
|
|
|
|
|
Integer totalNum = trayTypeEntity.getTotalNum(); |
|
|
|
|
|
|
|
return Resp.scanData("打托成功", totalNum+"件",map); |
|
|
|
|
|
|
|
} |
|
|
|
return R.data(map); |
|
|
|
return R.data(map); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -3626,8 +3674,13 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL |
|
|
|
JSONObject jsonObject = trunklineCarsLoadScanService.findUnloadNumAudio(loadId, warehouseId); |
|
|
|
JSONObject jsonObject = trunklineCarsLoadScanService.findUnloadNumAudio(loadId, warehouseId); |
|
|
|
Integer totalUnloadNum = jsonObject.getInteger("totalUnloadNum"); |
|
|
|
Integer totalUnloadNum = jsonObject.getInteger("totalUnloadNum"); |
|
|
|
Integer abnormalUnloadNum = jsonObject.getInteger("abnormalUnloadNum"); |
|
|
|
Integer abnormalUnloadNum = jsonObject.getInteger("abnormalUnloadNum"); |
|
|
|
|
|
|
|
StringBuilder audio = new StringBuilder(); |
|
|
|
|
|
|
|
audio.append("卸车").append(totalUnloadNum).append("件"); |
|
|
|
|
|
|
|
if(!Objects.isNull(abnormalUnloadNum) && !abnormalUnloadNum.equals(0)){ |
|
|
|
|
|
|
|
audio.append("异常卸车").append(abnormalUnloadNum).append("件"); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
return Resp.scanSuccess("卸车成功","卸车"+totalUnloadNum+"件,异常卸车"+abnormalUnloadNum+"件"); |
|
|
|
return Resp.scanSuccess("卸车成功",audio.toString()); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
@ -3708,7 +3761,16 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL |
|
|
|
|
|
|
|
|
|
|
|
updateNumByLoadId(loadId); |
|
|
|
updateNumByLoadId(loadId); |
|
|
|
|
|
|
|
|
|
|
|
return R.success("卸车成功"); |
|
|
|
JSONObject jsonObject = trunklineCarsLoadScanService.findUnloadNumAudio(loadId, warehouseId); |
|
|
|
|
|
|
|
Integer totalUnloadNum = jsonObject.getInteger("totalUnloadNum"); |
|
|
|
|
|
|
|
Integer abnormalUnloadNum = jsonObject.getInteger("abnormalUnloadNum"); |
|
|
|
|
|
|
|
StringBuilder audio = new StringBuilder(); |
|
|
|
|
|
|
|
audio.append("卸车").append(totalUnloadNum).append("件"); |
|
|
|
|
|
|
|
if(!Objects.isNull(abnormalUnloadNum) && !abnormalUnloadNum.equals(0)){ |
|
|
|
|
|
|
|
audio.append("异常卸车").append(abnormalUnloadNum).append("件"); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return Resp.scanSuccess("卸车成功",audio.toString()); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
@ -3738,7 +3800,16 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL |
|
|
|
//处理托盘的入库和货物的入库
|
|
|
|
//处理托盘的入库和货物的入库
|
|
|
|
trayTypeClient.changeTrayWarehouseInfo(trayCode, warehouseId); |
|
|
|
trayTypeClient.changeTrayWarehouseInfo(trayCode, warehouseId); |
|
|
|
|
|
|
|
|
|
|
|
return R.success("卸车成功"); |
|
|
|
JSONObject jsonObject = trunklineCarsLoadScanService.findUnloadNumAudio(loadId, warehouseId); |
|
|
|
|
|
|
|
Integer totalUnloadNum = jsonObject.getInteger("totalUnloadNum"); |
|
|
|
|
|
|
|
Integer abnormalUnloadNum = jsonObject.getInteger("abnormalUnloadNum"); |
|
|
|
|
|
|
|
StringBuilder audio = new StringBuilder(); |
|
|
|
|
|
|
|
audio.append("卸车").append(totalUnloadNum).append("件"); |
|
|
|
|
|
|
|
if(!Objects.isNull(abnormalUnloadNum) && !abnormalUnloadNum.equals(0)){ |
|
|
|
|
|
|
|
audio.append("异常卸车").append(abnormalUnloadNum).append("件"); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return Resp.scanSuccess("卸车成功",audio.toString()); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
@ -4143,6 +4214,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL |
|
|
|
.content(Collections.singletonList(PushData.builder() |
|
|
|
.content(Collections.singletonList(PushData.builder() |
|
|
|
.packageCode(entity.getOrderPackageCode()) |
|
|
|
.packageCode(entity.getOrderPackageCode()) |
|
|
|
.warehouseName(warehouseName) |
|
|
|
.warehouseName(warehouseName) |
|
|
|
|
|
|
|
.waybillNumber(entity.getWaybillNumber()) |
|
|
|
.orderCode(entity.getOrderCode()) |
|
|
|
.orderCode(entity.getOrderCode()) |
|
|
|
.build())) |
|
|
|
.build())) |
|
|
|
.build(); |
|
|
|
.build(); |
|
|
|
@ -4241,21 +4313,43 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL |
|
|
|
return R.data(pageList); |
|
|
|
return R.data(pageList); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public R updateWaybillOrderIsCustemer(LoadCarsDTO loadCarsDTO) { |
|
|
|
public R updateWaybillOrderIsCustemer(LoadCarsDTO loadCarsDTO) { |
|
|
|
|
|
|
|
|
|
|
|
String carsOrderIds = loadCarsDTO.getCarsOrderIds(); |
|
|
|
String carsOrderIds = loadCarsDTO.getCarsOrderIds(); |
|
|
|
String isCustomer = loadCarsDTO.getIsCustomer(); |
|
|
|
String isCustomer = loadCarsDTO.getIsCustomer(); |
|
|
|
|
|
|
|
Long loadId = loadCarsDTO.getLoadId(); |
|
|
|
|
|
|
|
Long warehouseId = loadCarsDTO.getWarehouseId(); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
String[] split = carsOrderIds.split(","); |
|
|
|
String[] split = carsOrderIds.split(","); |
|
|
|
List<Long> carsOrderIdList = new ArrayList<>(); |
|
|
|
List<Long> carsOrderIdList = new ArrayList<>(); |
|
|
|
for (String s : split) { |
|
|
|
for (String s : split) { |
|
|
|
carsOrderIdList.add(Long.parseLong(s)); |
|
|
|
carsOrderIdList.add(Long.parseLong(s)); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
Long carsOrderId = carsOrderIdList.get(0); |
|
|
|
|
|
|
|
TrunklineCarsOrderEntity carsOrder = trunklineCarsOrderService.getById(carsOrderId); |
|
|
|
|
|
|
|
loadId = carsOrder.getLoadId(); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
TrunklineCarsLoadEntity carsLoadEntity = baseMapper.selectById(loadId); |
|
|
|
|
|
|
|
if(Objects.isNull(carsLoadEntity)){ |
|
|
|
|
|
|
|
log.warn("###########updateWaybillOrderIsCustemer: 配载计划不存在 loadId={}",loadId); |
|
|
|
|
|
|
|
return R.fail(405,"配载计划不存在"); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
baseMapper.updateWaybillOrderIsCustemer(carsOrderIdList, isCustomer); |
|
|
|
baseMapper.updateWaybillOrderIsCustemer(carsOrderIdList, isCustomer); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//取消节点的签收单
|
|
|
|
|
|
|
|
cancleCustomerSignOrder(loadId, warehouseId); |
|
|
|
|
|
|
|
carsLoadEntity.setIsCustomer("2"); |
|
|
|
|
|
|
|
updateById(carsLoadEntity); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//生成直发商家签收单
|
|
|
|
|
|
|
|
createCustomerSignOrder(loadId, warehouseId); |
|
|
|
|
|
|
|
|
|
|
|
return R.success("更新成功"); |
|
|
|
return R.success("更新成功"); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -4605,6 +4699,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL |
|
|
|
|
|
|
|
|
|
|
|
carsLoadScanEntity.setScanStatus("3"); |
|
|
|
carsLoadScanEntity.setScanStatus("3"); |
|
|
|
carsLoadScanEntity.setUnloadNum(enterNum); |
|
|
|
carsLoadScanEntity.setUnloadNum(enterNum); |
|
|
|
|
|
|
|
carsLoadScanEntity.setUnloadAbnormal(0); |
|
|
|
carsLoadScanEntity.setSignTime(date); |
|
|
|
carsLoadScanEntity.setSignTime(date); |
|
|
|
carsLoadScanEntity.setSignAbnormal(0); |
|
|
|
carsLoadScanEntity.setSignAbnormal(0); |
|
|
|
carsLoadScanEntity.setSignUserName(AuthUtil.getNickName()); |
|
|
|
carsLoadScanEntity.setSignUserName(AuthUtil.getNickName()); |
|
|
|
@ -4612,6 +4707,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL |
|
|
|
carsLoadScanEntity.setUnloadUserName(AuthUtil.getNickName()); |
|
|
|
carsLoadScanEntity.setUnloadUserName(AuthUtil.getNickName()); |
|
|
|
carsLoadScanEntity.setUnloadNodeId(warehouseId); |
|
|
|
carsLoadScanEntity.setUnloadNodeId(warehouseId); |
|
|
|
carsLoadScanEntity.setUnloadNodeName(warehouseEntity.getName()); |
|
|
|
carsLoadScanEntity.setUnloadNodeName(warehouseEntity.getName()); |
|
|
|
|
|
|
|
carsLoadScanEntity.setUnloadCheck(0); |
|
|
|
|
|
|
|
carsLoadScanEntity.setSignOrderId(signOrderId); |
|
|
|
trunklineCarsLoadScanService.updateById(carsLoadScanEntity); |
|
|
|
trunklineCarsLoadScanService.updateById(carsLoadScanEntity); |
|
|
|
|
|
|
|
|
|
|
|
//生成签收记录
|
|
|
|
//生成签收记录
|
|
|
|
@ -4622,7 +4719,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL |
|
|
|
//重新计算签收单的数量
|
|
|
|
//重新计算签收单的数量
|
|
|
|
updateSignOrderNumBySignOrderId(signOrderId); |
|
|
|
updateSignOrderNumBySignOrderId(signOrderId); |
|
|
|
|
|
|
|
|
|
|
|
return R.success("签收成功"); |
|
|
|
return Resp.scanSuccess("签收成功",enterNum+"件"); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
@ -5050,6 +5147,12 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL |
|
|
|
return R.fail(405, "车辆还未发车"); |
|
|
|
return R.fail(405, "车辆还未发车"); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(!"40".equals(loadStatus)){ |
|
|
|
|
|
|
|
log.warn("############signLoadScanByIds: 车辆还未到达 loadStatus={}", loadStatus); |
|
|
|
|
|
|
|
return R.fail(405, "车辆还未到达"); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Integer realLoadingNumber = carsLoadEntity.getRealLoadingNumber(); |
|
|
|
Integer realLoadingNumber = carsLoadEntity.getRealLoadingNumber(); |
|
|
|
|
|
|
|
|
|
|
|
BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId); |
|
|
|
BasicdataWarehouseEntity warehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId); |
|
|
|
|
