|
|
|
@ -317,7 +317,8 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
|
|
|
|
|
String status = orderStatusDTO.getStatus(); |
|
|
|
|
String unitNo = orderStatusDTO.getUnitNo(); |
|
|
|
|
String operationTime = orderStatusDTO.getOperationTime(); |
|
|
|
|
if ("1".equals(status) || "2".equals(status) || "3".equals(status) || "5".equals(status) || "6".equals(status) || "7".equals(status) || "8".equals(status) || "9".equals(status)) { |
|
|
|
|
// || "7".equals(status) 增加签收状态推送
|
|
|
|
|
if ("1".equals(status) || "2".equals(status) || "3".equals(status) || "5".equals(status) || "6".equals(status) || "8".equals(status) || "9".equals(status)) { |
|
|
|
|
log.warn("#############oupai-handleStatusData: 当前数据的状态不推送 status={}", status); |
|
|
|
|
return Resp.fail(400, "当前数据的状态不推送"); |
|
|
|
|
} |
|
|
|
@ -377,7 +378,14 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
|
|
|
|
|
detailObject.put("WarehouseBelong", "oppein"); |
|
|
|
|
detailObject.put("Creator", orderStatusDTO.getUsername()); |
|
|
|
|
detailObject.put("PackageCode", unitNo); |
|
|
|
|
detailObject.put("Operate", "收货"); |
|
|
|
|
if("4".equals(status)){ |
|
|
|
|
detailObject.put("Operate", "收货"); |
|
|
|
|
}else if("7".equals(status)){ |
|
|
|
|
detailObject.put("Operate", "发货"); |
|
|
|
|
}else{ |
|
|
|
|
log.info(" 该包件的状态不正确 status={} ", status); |
|
|
|
|
return Resp.fail(400, "该包件的状态不正确"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// 查询系统的包件对象
|
|
|
|
|
LambdaQueryWrapper<FactoryPackageEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>(); |
|
|
|
|