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

1.增加对工厂推送数据的修改和历史记录

dev-warehouse
pref_mail@163.com 2 years ago
parent
b42275b706
commit
fe3f61dcfd
7 changed files with 627 additions and 20 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. 72
      blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/entity/MtPushData.java
  2. 7
      blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtPushDataMapper.java
  3. 9
      blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtPushDataMapper.xml
  4. 7
      blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/IMtPushDataService.java
  5. 13
      blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtPushDataServiceImpl.java
  6. 42
      blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/UnloadCarComHandler.java
  7. 497
      doc/dpm/物流租户系统.pdma.json

72
blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/entity/MtPushData.java
Unescape View File

@ -0,0 +1,72 @@
package com.logpm.factory.mt.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.mp.base.BaseEntity;
import java.util.Date;
@Data
@TableName("mt_push_data")
@ApiModel(value = "MtPushData对象", description = "梦天工厂数据推送关联表")
@EqualsAndHashCode(callSuper = true)
public class MtPushData extends BaseEntity {
/**
* 预留1
*/
@ApiModelProperty(name = "预留1", notes = "")
private String reserve1;
/**
* 预留2
*/
@ApiModelProperty(name = "预留2", notes = "")
private String reserve2;
/**
* 预留3
*/
@ApiModelProperty(name = "预留3", notes = "")
private String reserve3;
/**
* 预留4
*/
@ApiModelProperty(name = "预留4", notes = "")
private String reserve4;
/**
* 预留5
*/
@ApiModelProperty(name = "预留5", notes = "")
private String reserve5;
/**
* 关联主键
*/
@ApiModelProperty(name = "关联主键", notes = "")
private Double refId;
/**
* 关联编码
*/
@ApiModelProperty(name = "关联编码", notes = "")
private String refCode;
/**
* 关联类型 1 订单主表 2 包件
*/
@ApiModelProperty(name = "关联类型 1 订单主表 2 包件", notes = "")
private Integer refType;
/**
* 关联父级编码
*/
@ApiModelProperty(name = "关联父级编码", notes = "")
private String refParentCode;
/**
* 推送状态
*/
@ApiModelProperty(name = "推送状态", notes = " 1 已推送 0 未推送 默认未推送")
private Integer pushStatus;
/** 推送时间 */
@ApiModelProperty(name = "推送时间", notes = "")
private Date pushTime ;
}

7
blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtPushDataMapper.java
Unescape View File

@ -0,0 +1,7 @@
package com.logpm.factory.mt.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.logpm.factory.mt.entity.MtPushData;
public interface MtPushDataMapper extends BaseMapper<MtPushData> {
}

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

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.logpm.factory.mt.mapper.MtPushDataMapper">
</mapper>

7
blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/IMtPushDataService.java
Unescape View File

@ -0,0 +1,7 @@
package com.logpm.factory.mt.service;
import com.logpm.factory.mt.entity.MtPushData;
import org.springblade.core.mp.base.BaseService;
public interface IMtPushDataService extends BaseService<MtPushData> {
}

13
blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtPushDataServiceImpl.java
Unescape View File

@ -0,0 +1,13 @@
package com.logpm.factory.mt.service.impl;
import com.logpm.factory.mt.entity.MtPushData;
import com.logpm.factory.mt.mapper.MtPushDataMapper;
import com.logpm.factory.mt.service.IMtPushDataService;
import lombok.AllArgsConstructor;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springframework.stereotype.Service;
@AllArgsConstructor
@Service
public class MtPushDataServiceImpl extends BaseServiceImpl<MtPushDataMapper, MtPushData> implements IMtPushDataService {
}

42
blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/UnloadCarComHandler.java
Unescape View File

@ -1,12 +1,14 @@
package com.logpm.factory.receiver;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.conditions.update.UpdateChainWrapper;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.logpm.factory.comfac.dto.UnloadCarDTO;
import com.logpm.factory.mt.entity.MtFactoryOrderMain;
import com.logpm.factory.mt.entity.MtPackageInfo;
import com.logpm.factory.mt.entity.MtPushData;
import com.logpm.factory.mt.service.IMtFactoryDataService;
import com.logpm.factory.mt.service.IMtFactoryOrderMainService;
import com.logpm.factory.mt.service.IMtPackageInfoService;
import com.logpm.factory.mt.service.IMtPushDataService;
import com.logpm.factory.snm.vo.MTOrderPackageRelationVO;
import com.logpm.oldproject.entity.AdvanceDetailEntity;
import com.logpm.oldproject.feign.IAdvanceDetailClient;
@ -47,6 +49,9 @@ public class UnloadCarComHandler {
@Autowired
private IMtFactoryDataService mtFactoryDataService;
@Autowired
private IMtPushDataService mtPushDataService;
@RabbitHandler
public void unloadCarComDataHandler(Map map, Message message, Channel channel) {
@ -59,7 +64,7 @@ public class UnloadCarComHandler {
4.查询包间对应的梦天发给我们的批次号
*/
UnloadCarDTO unloadCarDTO = (UnloadCarDTO) map.get("messageData");
log.info("##################unloadCarComDataHandler：消费内容{}",unloadCarDTO);
log.info("##################unloadCarComDataHandler：消费内容{}", unloadCarDTO);
/*
2.通过车次查询来系统中车次绑定的运单
@ -67,7 +72,7 @@ public class UnloadCarComHandler {
4.需要过滤出来 只要梦天的
*/
List<AdvanceDetailEntity> carNumList = advanceDetailClient.getByCarNum(unloadCarDTO.getUnloadCarNum());
log.info("##################unloadCarComDataHandler carNumList：{}",carNumList);
log.info("##################unloadCarComDataHandler carNumList：{}", carNumList);
/**
@ -94,7 +99,7 @@ public class UnloadCarComHandler {
Map<String, List<MTOrderPackageRelationVO>> stringListMap = allMtData.stream().collect(Collectors.groupingBy(MTOrderPackageRelationVO::getInvoiceOrderCode));
Set<String> set = stringListMap.keySet();
boolean isPush = false;
String carNum =null;
String carNum = null;
for (String s : set) {
// 得到某个工厂运输批次的集合
List<MTOrderPackageRelationVO> t = stringListMap.get(s);
@ -117,19 +122,20 @@ public class UnloadCarComHandler {
if (isPush) {
try {
R r = mtFactoryDataService.sendUnloadCarNum(carNum, unloadCarDTO.getCompleteDate());
log.info("##################{} 梦天确认签收数据推送1",carNum);
log.info("##################{} 梦天确认签收数据推送1", carNum);
if (r.getCode() == ResultCode.SUCCESS.getCode()) {
log.info("##################{} 梦天确认签收数据推送2", carNum);
if(r.getCode()== ResultCode.SUCCESS.getCode()){
log.info("##################{} 梦天确认签收数据推送2",carNum);
MtPushData mtPushData = new MtPushData();
mtPushData.setPushTime(new Date());
mtPushData.setPushStatus(1);// 推送状态
mtPushData.setRefCode(carNum);
mtPushData.setRefType(1);// 订单主表
// todo 这里需要查询主推送单的 ID
// 插入推送数据
mtPushDataService.save(mtPushData);
// 更新订单状态
List<MtFactoryOrderMain> res =mtFactoryOrderMainService.lambdaQuery().eq(MtFactoryOrderMain::getInvoiceOrderCode,carNum).list();
if(res.size()>0){
MtFactoryOrderMain mtFactoryOrderMain = res.get(0);
mtFactoryOrderMain.setPushStatus(1);
mtFactoryOrderMain.setPushTime(new Date());
mtFactoryOrderMainService.getBaseMapper().updateById(mtFactoryOrderMain);
}
}
@ -142,7 +148,7 @@ public class UnloadCarComHandler {
}
}else {
} else {
log.info("##################{} 车次 没有匹配需要推送的数据", unloadCarDTO.getUnloadCarNum());
}

497
doc/dpm/物流租户系统.pdma.json
Unescape View File

@ -4,7 +4,7 @@
"avatar": "",
"version": "4.5.1",
"createdTime": "2023-3-27 13:32:56",
"updatedTime": "2023-7-20 21:51:06",
"updatedTime": "2023-7-24 17:46:05",
"dbConns": [],
"profile": {
"default": {
@ -56617,6 +56617,498 @@
],
"correlations": [],
"indexes": []
},
{
"id": "BF5016EE-2FA1-459D-BCFE-070EE1CA1CB8",
"env": {
"base": {
"nameSpace": "",
"codeRoot": ""
}
},
"defKey": "mt_push_data",
"defName": "梦天工厂数据推送关联表",
"comment": "",
"properties": {
"partitioned by": "(date string)",
"row format delimited": "",
"fields terminated by ','": "",
"collection items terminated by '-'": "",
"map keys terminated by ':'": "",
"store as textfile;": ""
},
"nameTemplate": "{defKey}[{defName}]",
"notes": {},
"headers": [
{
"refKey": "hideInGraph",
"hideInGraph": true
},
{
"refKey": "defKey",
"freeze": false,
"hideInGraph": false
},
{
"refKey": "defName",
"freeze": false,
"hideInGraph": false
},
{
"refKey": "primaryKey",
"freeze": false,
"hideInGraph": false
},
{
"refKey": "notNull",
"freeze": false,
"hideInGraph": true
},
{
"refKey": "autoIncrement",
"freeze": false,
"hideInGraph": true
},
{
"refKey": "domain",
"freeze": false,
"hideInGraph": true
},
{
"refKey": "type",
"freeze": false,
"hideInGraph": false
},
{
"refKey": "len",
"freeze": false,
"hideInGraph": false
},
{
"refKey": "scale",
"freeze": false,
"hideInGraph": false
},
{
"refKey": "comment",
"freeze": false,
"hideInGraph": true
},
{
"refKey": "refDict",
"freeze": false,
"hideInGraph": true
},
{
"refKey": "defaultValue",
"freeze": false,
"hideInGraph": true
},
{
"refKey": "isStandard",
"freeze": false,
"hideInGraph": false
},
{
"refKey": "uiHint",
"freeze": false,
"hideInGraph": true
},
{
"refKey": "extProps",
"freeze": false,
"hideInGraph": true
},
{
"refKey": "attr1",
"freeze": false,
"hideInGraph": true
},
{
"refKey": "attr2",
"freeze": false,
"hideInGraph": true
},
{
"refKey": "attr3",
"freeze": false,
"hideInGraph": true
},
{
"refKey": "attr4",
"freeze": false,
"hideInGraph": true
},
{
"refKey": "attr5",
"freeze": false,
"hideInGraph": true
},
{
"refKey": "attr6",
"freeze": false,
"hideInGraph": true
},
{
"refKey": "attr7",
"freeze": false,
"hideInGraph": true
},
{
"refKey": "attr8",
"freeze": false,
"hideInGraph": true
},
{
"refKey": "attr9",
"freeze": false,
"hideInGraph": true
}
],
"fields": [
{
"defKey": "tenant_id",
"defName": "租户号",
"comment": "",
"type": "",
"len": 32,
"scale": "",
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
"defaultValue": "",
"hideInGraph": true,
"domain": "16120F75-6AA7-4483-868D-F07F511BB081",
"refDict": "",
"uiHint": "",
"id": "4122A30E-C153-47DF-985C-ABACB19511CE"
},
{
"defKey": "create_user",
"defName": "创建人",
"comment": "",
"domain": "16120F75-6AA7-4483-868D-F07F511BB081",
"type": "",
"len": 32,
"scale": "",
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
"defaultValue": "",
"hideInGraph": true,
"refDict": "",
"uiHint": "",
"id": "6E765D14-AC21-42A6-B267-B3B0187A02EB"
},
{
"defKey": "create_time",
"defName": "创建时间",
"comment": "",
"domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
"type": "",
"len": "",
"scale": "",
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
"defaultValue": "",
"hideInGraph": true,
"refDict": "",
"uiHint": "",
"id": "BABAD5EA-6422-4CB1-B20F-CC65560A2E47"
},
{
"defKey": "update_user",
"defName": "更新人",
"comment": "",
"domain": "16120F75-6AA7-4483-868D-F07F511BB081",
"type": "",
"len": 32,
"scale": "",
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
"defaultValue": "",
"hideInGraph": true,
"refDict": "",
"uiHint": "",
"id": "0F7FFCDC-81CC-4F06-8C94-D1161F0C2313"
},
{
"defKey": "update_time",
"defName": "更新时间",
"comment": "",
"domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
"type": "",
"len": "",
"scale": "",
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
"defaultValue": "",
"hideInGraph": true,
"refDict": "",
"uiHint": "",
"id": "902B7195-065E-4C40-B976-DFDCF0D98002"
},
{
"defKey": "status",
"defName": "状态",
"comment": "",
"type": "INT",
"len": 2,
"scale": "",
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
"defaultValue": "",
"hideInGraph": false,
"refDict": "",
"extProps": {},
"domain": "",
"id": "4794653D-9080-4B6C-BA65-A97EB1163BB2"
},
{
"defKey": "is_deleted",
"defName": "是否已删除",
"comment": "",
"type": "INT",
"len": 2,
"scale": "",
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
"defaultValue": "",
"hideInGraph": false,
"refDict": "",
"extProps": {},
"domain": "",
"id": "353A5A7B-E24A-435F-86D0-0BE467426E8A"
},
{
"defKey": "create_dept",
"defName": "创建部门",
"comment": "",
"type": "",
"len": "",
"scale": "",
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
"defaultValue": "",
"hideInGraph": false,
"refDict": "",
"extProps": {},
"domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
"id": "C4A0433B-B4AF-4B49-8148-B0BF49245F6A"
},
{
"defKey": "id",
"defName": "主键",
"comment": "",
"type": "INT",
"len": 20,
"scale": "",
"primaryKey": true,
"notNull": true,
"autoIncrement": false,
"defaultValue": "",
"hideInGraph": false,
"refDict": "",
"extProps": {},
"domain": "",
"id": "373D2CDC-EB3B-4ED6-AB3D-2FA52EB33916"
},
{
"defKey": "reserve1",
"defName": "预留1",
"comment": "",
"type": "",
"len": "",
"scale": "",
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
"defaultValue": "",
"hideInGraph": false,
"refDict": "",
"extProps": {},
"domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
"id": "65EFB63B-9DAB-47FA-A94D-F662D8E9F09C"
},
{
"defKey": "reserve2",
"defName": "预留2",
"comment": "",
"type": "",
"len": "",
"scale": "",
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
"defaultValue": "",
"hideInGraph": true,
"refDict": "",
"extProps": {},
"domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
"id": "B16B3FAE-DF0B-4555-A7C5-4DD46FEB6AF1"
},
{
"defKey": "reserve3",
"defName": "预留3",
"comment": "",
"type": "",
"len": "",
"scale": "",
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
"defaultValue": "",
"hideInGraph": false,
"refDict": "",
"extProps": {},
"domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
"id": "54209490-31CC-4159-BE53-F4296317446F"
},
{
"defKey": "reserve4",
"defName": "预留4",
"comment": "",
"type": "",
"len": "",
"scale": "",
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
"defaultValue": "",
"hideInGraph": false,
"refDict": "",
"extProps": {},
"domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
"id": "03AAB6BF-37E6-4714-AC8F-615CD78B691E"
},
{
"defKey": "reserve5",
"defName": "预留5",
"comment": "",
"type": "",
"len": "",
"scale": "",
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
"defaultValue": "",
"hideInGraph": false,
"refDict": "",
"extProps": {},
"domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
"id": "48461D86-D999-44CA-8B3C-A22E3EA73E08"
},
{
"defKey": "ref_id",
"defName": "关联主键",
"comment": "",
"type": "",
"len": "",
"scale": "",
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
"defaultValue": "",
"hideInGraph": false,
"refDict": "",
"extProps": {},
"domain": "FF4459C5-6B45-4DBF-8FC0-E06239BC05B4",
"id": "FB8AC122-C06D-42E8-9318-4BD461D332E6"
},
{
"defKey": "ref_code",
"defName": "关联编码",
"comment": "",
"type": "",
"len": "",
"scale": "",
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
"defaultValue": "",
"hideInGraph": false,
"refDict": "",
"extProps": {},
"domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
"id": "85813DD3-C0A5-44C0-B882-0E5443F6C641"
},
{
"defKey": "ref_type",
"defName": "关联类型 1 订单主表 2 包件",
"comment": "",
"type": "",
"len": "",
"scale": "",
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
"defaultValue": "",
"hideInGraph": false,
"refDict": "",
"extProps": {},
"domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
"id": "EDD50671-AB2B-4023-A981-19742C8D0461"
},
{
"defKey": "ref_parent_code",
"defName": "关联父级编码",
"comment": "",
"type": "",
"len": "",
"scale": "",
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
"defaultValue": "",
"hideInGraph": false,
"refDict": "",
"extProps": {},
"domain": "3E948CEC-3070-472C-AF92-F3CA11EC9D15",
"id": "C8A06907-D420-48EE-9EC0-5BB0B03B56E4"
},
{
"defKey": "push_status",
"defName": "推送状态",
"comment": "",
"type": "",
"len": "",
"scale": "",
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
"defaultValue": "",
"hideInGraph": false,
"refDict": "",
"extProps": {},
"domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
"id": "C895B00A-9032-4299-877E-7F91AC18BAA7"
},
{
"defKey": "push_time",
"defName": "推送时间",
"comment": "",
"type": "",
"len": "",
"scale": "",
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
"defaultValue": "",
"hideInGraph": false,
"refDict": "",
"extProps": {},
"domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
"id": "8D9B83B8-2BA4-47D2-9216-FBB15069F39C"
}
],
"correlations": [],
"indexes": []
}
],
"views": [],
@ -56629,7 +57121,8 @@
"1F07ADF1-1AB1-4F0A-88E5-C38CDF1CAF1B",
"DC3A3429-1810-4DA5-8481-637F81F56014",
"81FD17DB-AB10-4951-A961-B4A91390AE7E",
"F5A26939-CC4D-4A45-8C01-8BB798FF6910"
"F5A26939-CC4D-4A45-8C01-8BB798FF6910",
"BF5016EE-2FA1-459D-BCFE-070EE1CA1CB8"
],
"refViews": [],
"refDiagrams": [],

Write Preview
Loading…
Cancel
Save