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

Merge branch 'dev' into pre-production

master
zhaoqiaobo 9 months ago
parent
362e94a01b 04fe6c0862
commit
ee2002780e
9 changed files with 192 additions and 3 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-biz-common/src/main/java/org/springblade/common/constant/WorkNodeEnums.java
  2. 1
      blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/StatisticsChangesRecordEntity.java
  3. 4
      blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesAppealDTO.java
  4. 4
      blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAppealMapper.xml
  5. 2
      blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAppealServiceImpl.java
  6. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
  7. 75
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
  8. 92
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
  9. 13
      blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsOrderInfoServiceImpl.java

2
blade-biz-common/src/main/java/org/springblade/common/constant/WorkNodeEnums.java
Unescape View File

@ -40,7 +40,9 @@ public enum WorkNodeEnums implements Serializable {
DELIST(250, "下架"),
STOCKING_OPERATION(260, "备货作业"),
DISTRIBUTION_LOADING(270, "配送装车"),
DISTRIBUTION_ABNORMAL_LOADING(271, "异常装车"),
DISTRIBUTION_SIGN_FOR(280, "配送签收"),
DISTRIBUTION_ABNORMAL_SIGN_FOR(281, "异常签收"),
CLERK_REVIEW(290, "文员复核");
private Integer code;

1
blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/entity/StatisticsChangesRecordEntity.java
Unescape View File

@ -69,6 +69,7 @@ public class StatisticsChangesRecordEntity extends TenantEntity {
private BigDecimal thirdOprationFee;//三方操作费
private Date changesTime;//异动时间
private String changesUserName;//异动人
private Long statisticsWarehouseId;
private String statisticsWarehouseName;

4
blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/dto/AftersalesAppealDTO.java
Unescape View File

@ -61,6 +61,10 @@ public class AftersalesAppealDTO extends AftersalesAppealEntity {
* 标识 1 仓库 2 总部客服
*/
private String identifying;
/**
* 标识 1 仓库 2 总部客服
*/
private Long createUserId;
}

4
blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAppealMapper.xml
Unescape View File

@ -57,7 +57,9 @@
LEFT JOIN logpm_aftersales_completion_record lacr on laa.work_order_id = lacr.work_order_id
LEFT JOIN logpm_aftersales_work_order lawo ON lawo.id = lacr.work_order_id
<where> laa.is_deleted = 0
<if test="param.warehouseId != null and param.warehouseId != '' "> and lacr.warehouse_id = #{param.warehouseId } </if>
<if test="param.warehouseId != null and param.warehouseId != '' ">
and (lacr.warehouse_id = #{param.warehouseId } or laa.create_user = #{param.createUserId})
</if>
<if test="param.appealPeopleName != null and param.appealPeopleName != ''">and laa.appeal_people_name = #{param.appealPeopleName}</if>
<if test="param.claimant != null and param.claimant != ''">and laa.claimant = #{param.claimant}</if>
<if test="param.workOrderNumber != null and param.workOrderNumber != ''">and lawo.work_order_number = #{param.workOrderNumber}</if>

2
blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAppealServiceImpl.java
Unescape View File

@ -163,7 +163,9 @@ public class AftersalesAppealServiceImpl extends BaseServiceImpl<AftersalesAppea
if(ObjectUtils.isNotNull(myCurrentWarehouse)){
aftersalesAppeal.put("warehouse_id",myCurrentWarehouse.getId());
}
Long userId = AuthUtil.getUserId();
AftersalesAppealDTO aftersalesAppealDTO = JSONObject.parseObject(JSONObject.toJSONString(aftersalesAppeal), AftersalesAppealDTO.class);
aftersalesAppealDTO.setCreateUserId(userId);
IPage<AftersalesAppealVO> iPage = baseMapper.getListAppeal(page,aftersalesAppealDTO);
iPage.getRecords().forEach( i ->{
i.setWorkOrderTypeName(DictBizCache.getValue(DictBizConstant.PC_WORK_ORDER,i.getWorkOrderType()));

2
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
Unescape View File

@ -810,7 +810,7 @@
<where>
lds.id = #{param.stockupId}
</where>
GROUP BY ldsa.id,ldsa.id,ldbs.bill_lading_id,lds.stockup_status,lds.type_service,ldsi.reservation_id
GROUP BY ldsa.id,ldsa.id,ldbs.bill_lading_id,lds.stockup_status,lds.type_service
</select>

75
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
Unescape View File

@ -49,6 +49,7 @@ import com.logpm.distribution.vo.app.DistributionAppParcelListVO;
import com.logpm.distribution.vo.app.DistributionAppReservationVO;
import com.logpm.distribution.vo.print.PrintPreviewVO;
import com.logpm.distribution.wrapper.*;
import com.logpm.trunkline.feign.ITrunklinePackageTrackLogClient;
import com.logpm.factorydata.enums.BrandEnums;
import com.logpm.factorydata.util.FactoryDataMessageSender;
import com.logpm.factorydata.vo.NodePushMsg;
@ -240,6 +241,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
@Autowired
private IWarehouseUpdownStockUpAreaClient warehouseUpdownStockUpAreaClient;
@Autowired
private ITrunklinePackageTrackLogClient trunklinePackageTrackLogClient;
@Autowired
private FactoryDataMessageSender factoryDataMessageSender;
// private final IWarehouseRetentionScanClient warehouseRetentionScanClient;
@ -610,6 +614,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
// distributionAsyncService.changeOrderSignforStatus(distrilbutionloadingscanDTO.getBarcode());
List<Long> packageLockIds = new ArrayList<>();
List<JSONObject> jsonObjects = new ArrayList<>();
List<JSONObject> aaa = new ArrayList<>();
List<String> orderPackageCodes = new ArrayList<>();
DistributionDeliverySelfEntity distributionDeliverySelfEntity = new DistributionDeliverySelfEntity();
if ("1".equals(distributionDeliveryListEntity.getKind())) {
@ -765,6 +771,24 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
.setHeader("x-delay", 3000);
return message;
});
String content = "包件在"+myCurrentWarehouse.getName()+"由"+loadscanEntity.getScanUser()+"扫描装车，配送车次号:"+distributionDeliveryListEntity.getTrainNumber()+"预约任务号:"+reservationEntity.getReservationCode();
JSONObject trunklinePackageTrackLog= new JSONObject();
trunklinePackageTrackLog.put("tenantId",loadscanEntity.getTenantId());
trunklinePackageTrackLog.put("createTime",loadscanEntity.getCreateTime());
trunklinePackageTrackLog.put("createUser",loadscanEntity.getCreateUser());
trunklinePackageTrackLog.put("updateUser",loadscanEntity.getUpdateUser());
trunklinePackageTrackLog.put("updateTime",loadscanEntity.getUpdateTime());
trunklinePackageTrackLog.put("isDeleted",loadscanEntity.getIsDeleted());
trunklinePackageTrackLog.put("status",loadscanEntity.getStatus());
trunklinePackageTrackLog.put("createDept",loadscanEntity.getCreateDept());
trunklinePackageTrackLog.put("orderPackageCode",loadscanEntity.getOrderPackageCode());
trunklinePackageTrackLog.put("warehouseId",loadscanEntity.getWarehouseId()==null?myCurrentWarehouse.getId():loadscanEntity.getWarehouseId());
trunklinePackageTrackLog.put("warehouseId",loadscanEntity.getWarehouseName()==null?myCurrentWarehouse.getName():loadscanEntity.getWarehouseName());
trunklinePackageTrackLog.put("workNode",WorkNodeEnums.DISTRIBUTION_LOADING.getCode());
trunklinePackageTrackLog.put("content",content);
trunklinePackageTrackLog.put("operator",loadscanEntity.getScanUser());
aaa.add(trunklinePackageTrackLog);
orderPackageCodes.add(loadscanEntity.getOrderPackageCode());
pushList.add(parcelListEntity);
@ -866,9 +890,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
log.error("#################货物下架错误：{}", distrilbutionloadingscanDTO.getBarcode());
// return Resp.scanFail("装车失败", "装车失败");
}
DistributionReservationEntity reservationEntity = distributionReservationService.getById(distrilbutionloadingscanDTO.getReservationId());
List<DistributionLoadscanEntity> reservationLoadscanEntities = new ArrayList<>();
List<String> orderCodes = new ArrayList<>();
List<String> orderPackageCodes = new ArrayList<>();
for (DistributionParcelListEntity parcelListEntity : parcelListEntities) {
log.info("#########!!!!!!!!!!!!!!!!!--------- 88888888888 parcelListEntities={}", parcelListEntities);
if (parcelListEntity.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.weizhuancghe.getValue())) {
@ -921,6 +945,25 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
parcelListEntity.setOrderPackageLoadingStatus(OrderPackageLoadingStatusConstant.yizhuangche.getValue());
distributionParcelListService.updateById(parcelListEntity);
packageLockIds.add(loadscanEntity.getPackageId());
String content = "包件在"+myCurrentWarehouse.getName()+"由"+loadscanEntity.getScanUser()+"扫描托盘:"+loadscanEntity.getTrayNo()+"装车，配送车次号:"+distributionDeliveryListEntity.getTrainNumber()+"预约任务号:"+reservationEntity.getReservationCode();
JSONObject trunklinePackageTrackLog= new JSONObject();
trunklinePackageTrackLog.put("tenantId",loadscanEntity.getTenantId());
trunklinePackageTrackLog.put("createTime",loadscanEntity.getCreateTime());
trunklinePackageTrackLog.put("createUser",loadscanEntity.getCreateUser());
trunklinePackageTrackLog.put("updateUser",loadscanEntity.getUpdateUser());
trunklinePackageTrackLog.put("updateTime",loadscanEntity.getUpdateTime());
trunklinePackageTrackLog.put("isDeleted",loadscanEntity.getIsDeleted());
trunklinePackageTrackLog.put("status",loadscanEntity.getStatus());
trunklinePackageTrackLog.put("createDept",loadscanEntity.getCreateDept());
trunklinePackageTrackLog.put("orderPackageCode",loadscanEntity.getOrderPackageCode());
trunklinePackageTrackLog.put("warehouseId",loadscanEntity.getWarehouseId()==null?myCurrentWarehouse.getId():loadscanEntity.getWarehouseId());
trunklinePackageTrackLog.put("warehouseId",loadscanEntity.getWarehouseName()==null?myCurrentWarehouse.getName():loadscanEntity.getWarehouseName());
trunklinePackageTrackLog.put("workNode",WorkNodeEnums.DISTRIBUTION_LOADING.getCode());
trunklinePackageTrackLog.put("content",content);
trunklinePackageTrackLog.put("operator",loadscanEntity.getScanUser());
aaa.add(trunklinePackageTrackLog);
orderPackageCodes.add(loadscanEntity.getOrderPackageCode());
pushList.add(parcelListEntity);
}
}
@ -1005,6 +1048,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
warehouseUpdownStockUpAreaClient.downStockUpShelf(jsonObjects);
//查询已装车件数
// String str = getLoadingMsg(distrilbutionloadingscanDTO);
trunklinePackageTrackLogClient.addPackageTrackLog(aaa,orderPackageCodes,WorkNodeEnums.DISTRIBUTION_LOADING.getCode());
Integer carLaodNum = getCarLaodNum(distrilbutionloadingscanDTO.getDeliveryId());
return Resp.scanSuccessWithData("装车成功", carLaodNum + "件", carLaodNum);
@ -5327,6 +5371,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
.eq(DistributionParcelListEntity::getOrderPackageCode, distrilbutionloadingscanDTO.getBarcode())
.eq(DistributionParcelListEntity::getWarehouseId, myCurrentWarehouse.getId())
);
List<String> orderPackageCodes = new ArrayList<>();
List<JSONObject> aaa = new ArrayList<>();
if (Func.isNotEmpty(parcelListEntities) && parcelListEntities.size() == 1) {
DistributionParcelListEntity parcelListEntity = parcelListEntities.get(0);
if (OrderPackageLoadingStatusConstant.yizhuangche.getValue().equals(parcelListEntity.getOrderPackageLoadingStatus())) {
@ -5359,6 +5405,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
if (Func.isNotEmpty(loadscanAbnormalEntityList) && loadscanAbnormalEntityList.size() > 1) {
return Resp.scanFail("操作失败", "重复添加");
}
String now = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
BladeUser user = AuthUtil.getUser();
DistributionLoadscanEntity loadscanEntity = new DistributionLoadscanEntity();
@ -5442,6 +5489,27 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
loadscanEntity.setLoadingId(distrilbutionloadingscanDTO.getLoadingId());
loadscanEntity.setIsAbnormalLoading(2);
distributionLoadscanService.save(loadscanEntity);
orderPackageCodes.add(loadscanEntity.getOrderPackageCode());
String content = "包件在"+myCurrentWarehouse.getName()+"由"+loadscanEntity.getScanUser()+"扫描异常装车,配送车次号:"+deliveryListEntity.getTrainNumber()+"预约任务号:"+reservationEntity.getReservationCode();
JSONObject trunklinePackageTrackLog= new JSONObject();
trunklinePackageTrackLog.put("tenantId",loadscanEntity.getTenantId());
trunklinePackageTrackLog.put("createTime",loadscanEntity.getCreateTime());
trunklinePackageTrackLog.put("createUser",loadscanEntity.getCreateUser());
trunklinePackageTrackLog.put("updateUser",loadscanEntity.getUpdateUser());
trunklinePackageTrackLog.put("updateTime",loadscanEntity.getUpdateTime());
trunklinePackageTrackLog.put("isDeleted",loadscanEntity.getIsDeleted());
trunklinePackageTrackLog.put("status",loadscanEntity.getStatus());
trunklinePackageTrackLog.put("createDept",loadscanEntity.getCreateDept());
trunklinePackageTrackLog.put("orderPackageCode",loadscanEntity.getOrderPackageCode());
trunklinePackageTrackLog.put("warehouseId",loadscanEntity.getWarehouseId()==null?myCurrentWarehouse.getId():loadscanEntity.getWarehouseId());
trunklinePackageTrackLog.put("warehouseId",loadscanEntity.getWarehouseName()==null?myCurrentWarehouse.getName():loadscanEntity.getWarehouseName());
trunklinePackageTrackLog.put("workNode", WorkNodeEnums.DISTRIBUTION_SIGN_FOR.getCode());
trunklinePackageTrackLog.put("content",content);
trunklinePackageTrackLog.put("operator",loadscanEntity.getScanUser());
aaa.add(trunklinePackageTrackLog);
orderPackageCodes.add(loadscanEntity.getOrderPackageCode());
List<JSONObject> jsonObjects = new ArrayList<>();
JSONObject jsonObject = new JSONObject();
jsonObject.put("code",loadscanEntity.getOrderPackageCode());
@ -5475,6 +5543,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
signforEntity.setIsHaveAbnormalPackage(2);
distributionSignforService.updateById(signforEntity);
}
} else {
log.error("#################出现相同的包件信息:{}", parcelListEntities);
return Resp.scanFail("操作失败", "服务器正忙...");
@ -5505,6 +5575,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
}
}
trunklinePackageTrackLogClient.addPackageTrackLog(aaa,orderPackageCodes,WorkNodeEnums.DISTRIBUTION_ABNORMAL_SIGN_FOR.getCode());
return Resp.scanSuccess("操作成功", "异常" + abnormalTotal + "件");
}

92
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
Unescape View File

@ -49,6 +49,7 @@ import com.logpm.oldproject.dto.SignPushDataUnitDTO;
import com.logpm.oldproject.entity.WarehouseEntity;
import com.logpm.oldproject.feign.IOldSignPushClient;
import com.logpm.oldproject.feign.IWarehouseClient;
import com.logpm.trunkline.feign.ITrunklinePackageTrackLogClient;
import com.logpm.warehouse.feign.IWarehouseUpdownStockUpAreaClient;
import com.logpm.warehouse.feign.IWarehouseUpdownTypeClient;
import lombok.extern.slf4j.Slf4j;
@ -59,6 +60,7 @@ import org.springblade.common.constant.Inventory.InventoryLoadingStatusConstant;
import org.springblade.common.constant.Inventory.InventorySigningStatusConstant;
import org.springblade.common.constant.RabbitConstant;
import org.springblade.common.constant.RedisKeyConstant;
import org.springblade.common.constant.WorkNodeEnums;
import org.springblade.common.constant.billLading.BillLadingStatusConstant;
import org.springblade.common.constant.common.IsOrNoConstant;
import org.springblade.common.constant.delivery.DeliveryLoadingStatusConstant;
@ -230,6 +232,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
@Autowired
private IWarehouseUpdownStockUpAreaClient warehouseUpdownStockUpAreaClient;
@Autowired
private ITrunklinePackageTrackLogClient trunklinePackageTrackLogClient;
@Override
public IPage<DistributionSignforVO> selectDistributionSignforPage(IPage<DistributionSignforVO> page, DistributionSignforVO distributionSignfor) {
@ -2428,6 +2433,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
return Resp.scanFail("此码不是订制品", "此码不是订制品");
}
List<String> orderPackageCodes = new ArrayList<>();
List<JSONObject> aaa = new ArrayList<>();
List<DistributionParcelListEntity> parcelListEntityList = distributionReservationMapper.selectPackageListByReservationId(distrilbutionloadingscanDTO.getReservationId());
//查询该客户是否存在该包件信息
List<DistributionParcelListEntity> collect = parcelListEntityList.stream().filter(p -> p.getOrderPackageCode().equals(distrilbutionloadingscanDTO.getBarcode())).collect(Collectors.toList());
@ -2483,6 +2489,24 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
//下架解托
warehouseUpdownTypeClient.downPackageOrDelTray(loadscanEntity.getOrderPackageCode(), myCurrentWarehouse.getId(), "签收下架解托");
//维护订单状态
String content = "包件在"+myCurrentWarehouse.getName()+"由"+loadscanEntity.getScanUser()+"扫描签收,装车方式:扫描装车,配送车次号:"+deliveryListEntity.getTrainNumber()+"预约任务号:"+distributionReservationEntity.getReservationCode();
JSONObject trunklinePackageTrackLog= new JSONObject();
trunklinePackageTrackLog.put("tenantId",loadscanEntity.getTenantId());
trunklinePackageTrackLog.put("createTime",loadscanEntity.getCreateTime());
trunklinePackageTrackLog.put("createUser",loadscanEntity.getCreateUser());
trunklinePackageTrackLog.put("updateUser",loadscanEntity.getUpdateUser());
trunklinePackageTrackLog.put("updateTime",loadscanEntity.getUpdateTime());
trunklinePackageTrackLog.put("isDeleted",loadscanEntity.getIsDeleted());
trunklinePackageTrackLog.put("status",loadscanEntity.getStatus());
trunklinePackageTrackLog.put("createDept",loadscanEntity.getCreateDept());
trunklinePackageTrackLog.put("orderPackageCode",loadscanEntity.getOrderPackageCode());
trunklinePackageTrackLog.put("warehouseId",loadscanEntity.getWarehouseId()==null?myCurrentWarehouse.getId():loadscanEntity.getWarehouseId());
trunklinePackageTrackLog.put("warehouseId",loadscanEntity.getWarehouseName()==null?myCurrentWarehouse.getName():loadscanEntity.getWarehouseName());
trunklinePackageTrackLog.put("workNode", WorkNodeEnums.DISTRIBUTION_SIGN_FOR.getCode());
trunklinePackageTrackLog.put("content",content);
trunklinePackageTrackLog.put("operator",loadscanEntity.getScanUser());
aaa.add(trunklinePackageTrackLog);
orderPackageCodes.add(loadscanEntity.getOrderPackageCode());
} else {
//这里装车的数据需要进行补录
// DistributionDeliveryListEntity deliveryListEntity = distributionDeliveryListMapper.selectById(distrilbutionloadingscanDTO.getDeliveryId());
@ -2553,6 +2577,28 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
//包件解托下架
warehouseUpdownTypeClient.downPackageOrDelTray(collect.get(0).getOrderPackageCode(), myCurrentWarehouse.getId(), "签收下架解托");
packageLockIds.add(distributionLoadscanEntity.getPackageId());
String content = "包件在"+myCurrentWarehouse.getName()+"由"+loadscanEntity.getScanUser()+"扫描签收,装车方式:补录装车,配送车次号:"+deliveryListEntity.getTrainNumber()+"预约任务号:"+distributionReservationEntity.getReservationCode();
JSONObject trunklinePackageTrackLog= new JSONObject();
trunklinePackageTrackLog.put("tenantId",distributionLoadscanEntity.getTenantId());
trunklinePackageTrackLog.put("createTime",distributionLoadscanEntity.getCreateTime());
trunklinePackageTrackLog.put("createUser",distributionLoadscanEntity.getCreateUser());
trunklinePackageTrackLog.put("updateUser",distributionLoadscanEntity.getUpdateUser());
trunklinePackageTrackLog.put("updateTime",distributionLoadscanEntity.getUpdateTime());
trunklinePackageTrackLog.put("isDeleted",distributionLoadscanEntity.getIsDeleted());
trunklinePackageTrackLog.put("status",distributionLoadscanEntity.getStatus());
trunklinePackageTrackLog.put("createDept",distributionLoadscanEntity.getCreateDept());
trunklinePackageTrackLog.put("orderPackageCode",distributionLoadscanEntity.getOrderPackageCode());
trunklinePackageTrackLog.put("warehouseId",distributionLoadscanEntity.getWarehouseId()==null?myCurrentWarehouse.getId():loadscanEntity.getWarehouseId());
trunklinePackageTrackLog.put("warehouseId",distributionLoadscanEntity.getWarehouseName()==null?myCurrentWarehouse.getName():loadscanEntity.getWarehouseName());
trunklinePackageTrackLog.put("workNode", WorkNodeEnums.DISTRIBUTION_SIGN_FOR.getCode());
trunklinePackageTrackLog.put("content",content);
trunklinePackageTrackLog.put("operator",loadscanEntity.getScanUser());
aaa.add(trunklinePackageTrackLog);
orderPackageCodes.add(loadscanEntity.getOrderPackageCode());
}
//修改包件状态为装车、签收
DistributionParcelListEntity updatePackage = collect.get(0);
@ -2637,6 +2683,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
distributionReservationService.maintenanceReservationInfo(distrilbutionloadingscanDTO.getReservationId());
//维护配送任务
distributionDeliveryListService.maintenanceDeliveryInfo(distrilbutionloadingscanDTO.getDeliveryId());
trunklinePackageTrackLogClient.addPackageTrackLog(aaa,orderPackageCodes,WorkNodeEnums.DISTRIBUTION_SIGN_FOR.getCode());
return Resp.scanSuccessWithData("签收成功", str, orderPackageCodes);
} catch (Exception e) {
log.error(">>>>> 签收异常报错", e);
@ -3091,6 +3139,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
return R.fail(403, "配送错误!!!");
}
List<Long> packageLockIds = new ArrayList<>();
List<String> orderPackageCodes = new ArrayList<>();
List<JSONObject> aaa = new ArrayList<>();
if (Func.isNotEmpty(parcelListEntityList) && parcelListEntityList.size() == 1) {
DistributionParcelListEntity parcelListEntity = parcelListEntityList.get(0);
if (parcelListEntity.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue())) {
@ -3151,6 +3201,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
return Resp.scanFail("重复操作!!", "重复操作");
}
}
String content = "包件在"+myCurrentWarehouse.getName()+"由"+loadscanEntity.getScanUser()+"扫描异常签收,装车方式:补录装车,配送车次号:"+distributionDeliveryListEntity.getTrainNumber()+"预约任务号:"+reservationEntity.getReservationCode();
JSONObject trunklinePackageTrackLog= new JSONObject();
switch (reservationEntity.getDeliveryType()) {
case "1":
//商配
@ -3223,12 +3275,31 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
distributionLoadscanService.save(distributionLoadscanEntity);
Integer j = distributionSignforMapper.updateSignforByReservationId(distributionLoadscanEntity.getDeliveryId(), distributionLoadscanEntity.getReservationId(), distributionLoadscanEntity.getPackageNub());
} else {
content = "包件在"+myCurrentWarehouse.getName()+"由"+loadscanEntity.getScanUser()+"扫描异常签收,装车方式:扫描装车,配送车次号:"+distributionDeliveryListEntity.getTrainNumber()+"预约任务号:"+reservationEntity.getReservationCode();
distributionLoadscanService.updateById(distributionLoadscanEntity);
distributionSignforMapper.updateSignforNum(distributionLoadscanEntity.getDeliveryId(), distributionLoadscanEntity.getReservationId(), distributionLoadscanEntity.getPackageNub());
}
trunklinePackageTrackLog.put("tenantId",distributionLoadscanEntity.getTenantId());
trunklinePackageTrackLog.put("createTime",distributionLoadscanEntity.getCreateTime());
trunklinePackageTrackLog.put("createUser",distributionLoadscanEntity.getCreateUser());
trunklinePackageTrackLog.put("updateUser",distributionLoadscanEntity.getUpdateUser());
trunklinePackageTrackLog.put("updateTime",distributionLoadscanEntity.getUpdateTime());
trunklinePackageTrackLog.put("isDeleted",distributionLoadscanEntity.getIsDeleted());
trunklinePackageTrackLog.put("status",distributionLoadscanEntity.getStatus());
trunklinePackageTrackLog.put("createDept",distributionLoadscanEntity.getCreateDept());
trunklinePackageTrackLog.put("orderPackageCode",distributionLoadscanEntity.getOrderPackageCode());
trunklinePackageTrackLog.put("warehouseId",distributionLoadscanEntity.getWarehouseId()==null?myCurrentWarehouse.getId():distributionLoadscanEntity.getWarehouseId());
trunklinePackageTrackLog.put("warehouseId",distributionLoadscanEntity.getWarehouseName()==null?myCurrentWarehouse.getName():distributionLoadscanEntity.getWarehouseName());
trunklinePackageTrackLog.put("workNode", WorkNodeEnums.DISTRIBUTION_SIGN_FOR.getCode());
trunklinePackageTrackLog.put("content",content);
trunklinePackageTrackLog.put("operator",distributionLoadscanEntity.getScanUser());
aaa.add(trunklinePackageTrackLog);
orderPackageCodes.add(loadscanEntity.getOrderPackageCode());
} else {
return Resp.scanFail("操作失败", "不属于该客户");
}
break;
case "2":
//市配
@ -3286,6 +3357,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
if (Func.isEmpty(loadscanEntity)) {
distributionLoadscanService.save(distributionLoadscanEntity);
} else {
content = "包件在"+myCurrentWarehouse.getName()+"由"+loadscanEntity.getScanUser()+"扫描异常签收,装车方式:扫描装车,配送车次号:"+distributionDeliveryListEntity.getTrainNumber()+"预约任务号:"+reservationEntity.getReservationCode();
distributionLoadscanService.updateById(distributionLoadscanEntity);
}
Integer j = distributionSignforMapper.updateSignforNum(distributionLoadscanEntity.getDeliveryId(), distributionLoadscanEntity.getReservationId(), distributionLoadscanEntity.getPackageNub());
@ -3293,6 +3365,24 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
Integer i = distributionDeliveryListMapper.updateloadingTimeById(distrilbutionloadingscanDTO.getDeliveryId());
//修改包件装车、签收状态
packageLockIds.add(distributionLoadscanEntity.getPackageId());
trunklinePackageTrackLog.put("tenantId",distributionLoadscanEntity.getTenantId());
trunklinePackageTrackLog.put("createTime",distributionLoadscanEntity.getCreateTime());
trunklinePackageTrackLog.put("createUser",distributionLoadscanEntity.getCreateUser());
trunklinePackageTrackLog.put("updateUser",distributionLoadscanEntity.getUpdateUser());
trunklinePackageTrackLog.put("updateTime",distributionLoadscanEntity.getUpdateTime());
trunklinePackageTrackLog.put("isDeleted",distributionLoadscanEntity.getIsDeleted());
trunklinePackageTrackLog.put("status",distributionLoadscanEntity.getStatus());
trunklinePackageTrackLog.put("createDept",distributionLoadscanEntity.getCreateDept());
trunklinePackageTrackLog.put("orderPackageCode",distributionLoadscanEntity.getOrderPackageCode());
trunklinePackageTrackLog.put("warehouseId",distributionLoadscanEntity.getWarehouseId()==null?myCurrentWarehouse.getId():distributionLoadscanEntity.getWarehouseId());
trunklinePackageTrackLog.put("warehouseId",distributionLoadscanEntity.getWarehouseName()==null?myCurrentWarehouse.getName():distributionLoadscanEntity.getWarehouseName());
trunklinePackageTrackLog.put("workNode", WorkNodeEnums.DISTRIBUTION_SIGN_FOR.getCode());
trunklinePackageTrackLog.put("content",content);
trunklinePackageTrackLog.put("operator",distributionLoadscanEntity.getScanUser());
aaa.add(trunklinePackageTrackLog);
orderPackageCodes.add(loadscanEntity.getOrderPackageCode());
} else {
return Resp.scanFail("操作失败", "不属于该客户");
}
@ -3304,6 +3394,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
distributionParcelListService.updateById(parcelListEntity);
//维护订单信息
distributionStockArticleService.maintenanceOrderInfo(parcelListEntity.getOrderCode(), parcelListEntity.getWarehouseId());
//构建异常签收
break;
}
//查询一次是否进行了异常装车,如果没有进行异常装车数据进行审核
@ -3340,6 +3431,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
distributionParcelListMapper.updateOrderPackageCodeById(parcelListEntity.getId(), OrderPackageStatusConstant.yiqianshou.getValue());
//还需要维护包件状态
distributionAsyncService.maintenanceOrderStatus(parcelListEntity.getOrderCode(), parcelListEntity.getWarehouseId());
trunklinePackageTrackLogClient.addPackageTrackLog(aaa,orderPackageCodes,WorkNodeEnums.DISTRIBUTION_ABNORMAL_SIGN_FOR.getCode());
} else {
log.error("############出现相同的包件码:{}", distrilbutionloadingscanDTO.getBarcode());
return Resp.scanFail("操作失败", "包件信息有误");

13
blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsOrderInfoServiceImpl.java
Unescape View File

@ -1,5 +1,6 @@
package com.logpm.statistics.service.impl;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@ -80,6 +81,10 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
List<StatisticsChangesRecordEntity> list = changesRecordService.list(queryWrapper);
if(list.isEmpty()){
return CollUtil.newArrayList();
}
//获取list中所有元素的id
List<Long> changesRecordIdList = list.stream().map(StatisticsChangesRecordEntity::getId).collect(Collectors.toList());
@ -112,6 +117,7 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
changesRecordEntity.setItemRecord(itemRecord);
changesRecordEntity.setChangesTime(CommonUtil.StringToDate(changesRecordDTO.getChangesTimeStr()));
changesRecordEntity.setChangesUserName(AuthUtil.getNickName());
changesRecordService.save(changesRecordEntity);
List<String> changesPhotoUrls = changesRecordDTO.getChangesPhotoUrls();
@ -197,6 +203,13 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
list.forEach(statisticsOrderInfoVO -> {
Long orderInfoId = statisticsOrderInfoVO.getOrderInfoId();
Integer confirmStatisticsOrder = statisticsOrderInfoVO.getConfirmStatisticsOrder();
if(confirmStatisticsOrder.equals(1)){
log.warn("############checkBalance: 订单id={} 已经确认对账",orderInfoId);
throw new CustomerException(405,"存在已经确认对账的订单");
}
brands.add(statisticsOrderInfoVO.getBrand());
waybillNos.add(statisticsOrderInfoVO.getWaybillNo());
orderCodes.add(statisticsOrderInfoVO.getOrderNo());

Write Preview
Loading…
Cancel
Save