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

Merge branch 'dev' into pre-production

master
zhaoqiaobo 6 months ago
parent
ea7e256e44 c48c80df9d
commit
17a9121762
3 changed files with 17 additions and 13 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. 4
      blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/dto/MtPushDataDTO.java
  2. 21
      blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/mq/NodeDataPushListener.java
  3. 5
      blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtFactoryOrderMainMapper.xml

4
blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/dto/MtPushDataDTO.java
Unescape View File

@ -9,8 +9,10 @@ public class MtPushDataDTO implements Serializable {
/** 发货单编号 */
private String senderCode;
/** 发货单编号 */
/** 订单编号 */
private String orderCode;
/** 包件码 */
private String packageCode;
/** 工厂出库方式 */
private String outWarehouseType;
/** 经销商名称 */

21
blade-service/logpm-factory-data/logpm-factory-data-mengtian/src/main/java/com/logpm/factorydata/mengtian/mq/NodeDataPushListener.java
Unescape View File

@ -96,15 +96,15 @@ public class NodeDataPushListener {
// 2 获取业务数据
List<PushData> content = entries.getBeanList("content", PushData.class);
FactoryNodeEnums factoryByNodeAndStatus = NodeMappingEnums.getFactoryByNodeAndStatus(workNodeEnums);
List<MtPushDataDTO> mtPushDataDTOS = mtFactoryDataClient.orderPushData(content.stream().map(m -> m.getOrderCode()).collect(Collectors.toSet()));
List<MtPushDataDTO> mtPushDataDTOS = mtFactoryDataClient.orderPushData(content.stream().map(m -> m.getPackageCode()).collect(Collectors.toSet()));
// 收货
if (factoryByNodeAndStatus.equals(FactoryNodeEnums.CENTRAL_STK_IN)) {
if (CollUtil.isNotEmpty(mtPushDataDTOS)) {
// 转map
Map<String, MtPushDataDTO> mtPushDataDTOMap = mtPushDataDTOS.stream().collect(Collectors.toMap(MtPushDataDTO::getOrderCode, mtPushDataDTO -> mtPushDataDTO));
Map<String, MtPushDataDTO> mtPushDataDTOMap = mtPushDataDTOS.stream().collect(Collectors.toMap(MtPushDataDTO::getPackageCode, mtPushDataDTO -> mtPushDataDTO));
String finalInWarehouseType = inWarehouseType;
List<CentralStkInVO> collect = content.stream().map(pushData -> {
MtPushDataDTO mtPushDataDTO = mtPushDataDTOMap.get(pushData.getOrderCode());
MtPushDataDTO mtPushDataDTO = mtPushDataDTOMap.get(pushData.getPackageCode());
if (ObjectUtil.isNotEmpty(mtPushDataDTO)) {
return CentralStkInVO.builder()
.dealerName(mtPushDataDTO.getDealerName())
@ -151,13 +151,14 @@ public class NodeDataPushListener {
for (Map.Entry<String, List<MtPushDataDTO>> stringListEntry : collect.entrySet()) {
String senderCode = stringListEntry.getKey();
List<MtPushDataDTO> mtPushDataDTOS1 = stringListEntry.getValue();
Map<String, MtPushDataDTO> mtPushDataDTOMap = mtPushDataDTOS1.stream().collect(Collectors.toMap(MtPushDataDTO::getOrderCode, mtPushDataDTO -> mtPushDataDTO));
CentralStkInConfirmVO confirmVO = CentralStkInConfirmVO.builder()
.senderCode(senderCode)
.operatingTime(operatorTime)
.operatingWarehouseName(warehouse)
.inWarehouseType(inWarehouseType)
.orderVOS(
mtPushDataDTOS1.stream().map(mtPushDataDTO -> {
mtPushDataDTOMap.values().stream().map(mtPushDataDTO -> {
return CentralStkInConfirmOrderVO.builder()
.orderCode(mtPushDataDTO.getOrderCode())
.outWarehouseType(mtPushDataDTO.getOutWarehouseType())
@ -202,12 +203,12 @@ public class NodeDataPushListener {
}
// 签收扫描
if (factoryByNodeAndStatus.equals(FactoryNodeEnums.SIGN_FOR)) {
Map<String, MtPushDataDTO> mtPushDataDTOMap = mtPushDataDTOS.stream().collect(Collectors.toMap(MtPushDataDTO::getOrderCode, mtPushDataDTO -> mtPushDataDTO));
Map<String, MtPushDataDTO> mtPushDataDTOMap = mtPushDataDTOS.stream().collect(Collectors.toMap(MtPushDataDTO::getPackageCode, mtPushDataDTO -> mtPushDataDTO));
// 表单数据
String main = entries.getStr("main");
JSONObject entries1 = JSONUtil.parseObj(main);
List<SignForVO> signForVOS = content.stream().map(pushData -> {
MtPushDataDTO mtPushDataDTO = mtPushDataDTOMap.get(pushData.getOrderCode());
MtPushDataDTO mtPushDataDTO = mtPushDataDTOMap.get(pushData.getPackageCode());
if (ObjectUtil.isNotEmpty(mtPushDataDTO)) {
return SignForVO.builder()
.sendTaskId(entries1.getStr("boId"))
@ -263,7 +264,7 @@ public class NodeDataPushListener {
.map(m -> {
return SignForConfirmImageVO.builder().image(m.toString()).build();
}).collect(Collectors.toList());
Map<String, MtPushDataDTO> mtPushDataDTOMap = mtPushDataDTOS.stream().collect(Collectors.toMap(MtPushDataDTO::getOrderCode, mtPushDataDTO -> mtPushDataDTO));
Map<String, MtPushDataDTO> mtPushDataDTOMap = mtPushDataDTOS.stream().collect(Collectors.toMap(MtPushDataDTO::getPackageCode, mtPushDataDTO -> mtPushDataDTO));
SignForConfirmVO confirmVO = SignForConfirmVO.builder()
.sendTaskId(entries1.getStr("boId"))
.consignee(entries1.getStr("consignee"))
@ -272,12 +273,12 @@ public class NodeDataPushListener {
pushData -> {
return SignForConfirmPackageVO.builder()
.orderCode(pushData.getOrderCode())
.outWarehouseType(mtPushDataDTOMap.get(pushData.getOrderCode()).getOutWarehouseType())
.outWarehouseType(mtPushDataDTOMap.get(pushData.getPackageCode()).getOutWarehouseType())
.packageCode(pushData.getPackageCode())
.operatingTime(operatorTime)
.warehouseCode(mtPushDataDTOMap.get(pushData.getOrderCode()).getWarehouseCode())
.warehouseCode(mtPushDataDTOMap.get(pushData.getPackageCode()).getWarehouseCode())
.operatingWarehouseName(warehouse)
.senderCode(mtPushDataDTOMap.get(pushData.getOrderCode()).getSenderCode())
.senderCode(mtPushDataDTOMap.get(pushData.getPackageCode()).getSenderCode())
.build();
}
).collect(Collectors.toList()))

5
blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtFactoryOrderMainMapper.xml
Unescape View File

@ -102,14 +102,15 @@
</select>
<select id="orderPushData" resultType="com.logpm.factory.mt.dto.MtPushDataDTO">
select t.order_code orderCode,
select t.order_code orderCode,pi.package_code,
m.invoice_order_code senderCode,
t.outbound_type outWarehouseType,
t.dealer_name dealerName,
m.center_warehouse_code warehouseCode
from mt_factory_order t
left join mt_factory_order_main m on m.id = t.main_id
where t.order_code in (
left join mt_package_info pi on pi.order_id = t.id
where pi.package_code in (
<foreach collection="orderCodes" item="orderCode" separator=",">
#{orderCode}
</foreach>

Write Preview
Loading…
Cancel
Save