UDI
/
udispssync-java
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

委托验收字段新增，

Browse Source 
单据流转
version1
anthonyywj2 3 years ago
parent b18b1796a9
commit 423e9749d0
7 changed files with 108 additions and 34 deletions
Show Stats Download Patch File Download Diff File

5
api-admin/src/main/java/com/glxp/sale/admin/controller/sync/BasicDowmloadController.java
Unescape Escape View File

@ -73,6 +73,11 @@ public class BasicDowmloadController {
} else if (basicExportStatusRequest.getType() == BasicProcessStatus.NEW_ALL_ORDER) {//单据
SpsSyncOrderResponse spsSyncDataResponse = (SpsSyncOrderResponse) redisUtil.get(basicExportStatusRequest.getId() + "");
return ResultVOUtils.success(spsSyncDataResponse);
} else if (basicExportStatusRequest.getType() == BasicProcessStatus.NEW_ALL_UDIS) {//单据
String data = (String) redisUtil.get(basicExportStatusRequest.getId() + "");
SpSyncUdiResponse spSyncUdiResponse = JSONObject.parseObject(data, new TypeReference<SpSyncUdiResponse>() {
});
return ResultVOUtils.success(spSyncUdiResponse);
}
return ResultVOUtils.error(500, "数据不存在！");

25
api-admin/src/main/java/com/glxp/sale/admin/entity/sync/BussinessChangeTypeEntity.java
Unescape Escape View File

@ -0,0 +1,25 @@
package com.glxp.sale.admin.entity.sync;
import lombok.Data;
@Data
public class BussinessChangeTypeEntity {
private Integer id;
private String intro;
private String action;
private String scAction;
private Integer index;
private Integer beforeTime;
private String remark;
private String name;
private Integer changeType;
public Integer getBeforeTime() {
if (beforeTime == null)
return 0;
return beforeTime;
}
}

21
api-admin/src/main/java/com/glxp/sale/admin/entity/sync/EntrustReceEntity.java
Unescape Escape View File

@ -0,0 +1,21 @@
package com.glxp.sale.admin.entity.sync;
import lombok.Data;
import java.util.Date;
@Data
public class EntrustReceEntity {
private Integer id;
private String action;
private String curInv;
private String entrustInv;
private String entrustUser;
private String userId;
private String entrustAction;
private Date updateTime;
private String remark;
private boolean finishRece;
}

6
api-admin/src/main/java/com/glxp/sale/admin/entity/sync/OrderEntity.java
Unescape Escape View File

@ -6,7 +6,6 @@ import java.util.Date;
@Data
public class OrderEntity {
private String id;
private String corpOrderId;
private String action;
@ -46,7 +45,10 @@ public class OrderEntity {
private boolean isError;
private boolean outChangeEnable;
private String originUllageSupNo;
private Date updateTime;
private boolean preCheck;
//审核时间
private Date auditTime;
}

6
api-admin/src/main/java/com/glxp/sale/admin/res/sync/SpsSyncBusResponse.java
Unescape Escape View File

@ -1,8 +1,6 @@
package com.glxp.sale.admin.res.sync;
import com.glxp.sale.admin.entity.sync.BussinessLocalTypeEntity;
import com.glxp.sale.admin.entity.sync.BussinessOriginTypeEntity;
import com.glxp.sale.admin.entity.sync.BussinessTypeEntity;
import com.glxp.sale.admin.entity.sync.*;
import lombok.Data;
import java.util.List;
@ -15,4 +13,6 @@ public class SpsSyncBusResponse {
private List<BussinessTypeEntity> bussinessTypeEntities;
private List<BussinessOriginTypeEntity> bussinessOriginTypeEntities;
private List<BussinessLocalTypeEntity> bussinessLocalTypeEntities;
private List<BussinessChangeTypeEntity> bussinessChangeTypeEntities;
private List<EntrustReceEntity> entrustReceEntities;
}

74
api-admin/src/main/java/com/glxp/sale/admin/thread/DlAllDataService.java
Unescape Escape View File

@ -308,13 +308,33 @@ public class DlAllDataService {
if (lastUpdateTime.equals("1949-01-01 00:00:00")) {
lastUpdateTime = DateUtil.getBeforeDay(1);
}
List<ProductInfoEntity> mProductInfoEntities = new ArrayList<>();
//更新产品信息
int page = 1;
int limit = 300;
int limit = 2000;
while (true) {
List<ProductInfoEntity> productInfoEntityList = asyncDiDlHelper.dlByTime(page, limit, lastUpdateTime);
if (productInfoEntityList != null && productInfoEntityList.size() > 0) {
mProductInfoEntities.addAll(productInfoEntityList);
SpSyncUdiResponse spSyncUdiResponse = new SpSyncUdiResponse();
spSyncUdiResponse.setProductInfoEntityList(productInfoEntityList);
if (CollUtil.isNotEmpty(spSyncUdiResponse.getProductInfoEntityList()) || CollUtil.isNotEmpty(spSyncUdiResponse.getUdiCompanyEntities())) {
String key = "UdiPrdoucts" + System.currentTimeMillis();
if (downstream.getParamValue().equals("1")) {
String datas = JSON.toJSON(spSyncUdiResponse).toString();
redisUtil.set(key, datas);
BasicExportStatusEntity myEntity = new BasicExportStatusEntity();
myEntity.setId(key);
myEntity.setStatus(0);
myEntity.setUpdateTime(new Date());
myEntity.setType(BasicProcessStatus.NEW_ALL_UDIS);
basicExportService.insertExportStatus(myEntity);
} else {
String path = getPath();
String fileName = path + FileConstant.upWaitCopy_products + "UdiPrdoucts_" + key + ".LowerIn";
String datas = JSON.toJSON(spSyncUdiResponse).toString();
FileUtils.SaveFileAs(datas, fileName);
}
}
if (productInfoEntityList.size() < limit) {
break;
} else {
@ -324,14 +344,36 @@ public class DlAllDataService {
break;
}
}
//更新企业信息
List<UdiCompanyEntity> mUdiCompanyEntities = new ArrayList<>();
int page1 = 1;
int limit1 = 300;
int limit1 = 2000;
while (true) {
List<UdiCompanyEntity> udiCompanyEntities = asyncDiDlHelper.dlCompanyByTime(page1, limit1, lastUpdateTime);
if (udiCompanyEntities != null && udiCompanyEntities.size() > 0) {
mUdiCompanyEntities.addAll(udiCompanyEntities);
SpSyncUdiResponse spSyncUdiResponse = new SpSyncUdiResponse();
spSyncUdiResponse.setUdiCompanyEntities(udiCompanyEntities);
if (CollUtil.isNotEmpty(spSyncUdiResponse.getUdiCompanyEntities()) || CollUtil.isNotEmpty(spSyncUdiResponse.getUdiCompanyEntities())) {
String key = "UdiPrdoucts" + System.currentTimeMillis();
if (downstream.getParamValue().equals("1")) {
String datas = JSON.toJSON(spSyncUdiResponse).toString();
redisUtil.set(key, datas);
BasicExportStatusEntity myEntity = new BasicExportStatusEntity();
myEntity.setId(key);
myEntity.setStatus(0);
myEntity.setUpdateTime(new Date());
myEntity.setType(BasicProcessStatus.NEW_ALL_UDIS);
basicExportService.insertExportStatus(myEntity);
} else {
String path = getPath();
String fileName = path + FileConstant.upWaitCopy_products + "UdiPrdoucts_" + key + ".LowerIn";
String datas = JSON.toJSON(spSyncUdiResponse).toString();
FileUtils.SaveFileAs(datas, fileName);
}
}
if (udiCompanyEntities.size() < limit1) {
break;
} else {
@ -343,25 +385,6 @@ public class DlAllDataService {
}
SpSyncUdiResponse spSyncUdiResponse = new SpSyncUdiResponse();
spSyncUdiResponse.setUdiCompanyEntities(mUdiCompanyEntities);
spSyncUdiResponse.setProductInfoEntityList(mProductInfoEntities);
if (CollUtil.isNotEmpty(spSyncUdiResponse.getProductInfoEntityList()) || CollUtil.isNotEmpty(spSyncUdiResponse.getUdiCompanyEntities())) {
String key = "UdiPrdoucts" + System.currentTimeMillis();
String datas = JSON.toJSON(spSyncUdiResponse).toString();
if (downstream.getParamValue().equals("1")) {
redisUtil.set(key, datas);
BasicExportStatusEntity myEntity = new BasicExportStatusEntity();
myEntity.setId(key);
basicExportService.insertExportStatus(myEntity);
} else {
String path = getPath();
String fileName = path + FileConstant.upWaitCopy_products + "UdiPrdoucts_" + key + ".LowerIn";
FileUtils.SaveFileAs(datas, fileName);
}
}
BasicExportStatusEntity basicExportStatusEntity1 = basicExportStatusEntities.get(0);
basicExportStatusEntity1.setStatus(1);
spGetHttp.postUpdateBasicStatus(basicExportStatusEntity1);
@ -386,7 +409,6 @@ public class DlAllDataService {
String fileName = path + FileConstant.upWaitCopy_products + "UdiPrdoucts_" + DateUtil.formatDate(new Date(), "yyyyMMddHHmmss") + ".LowerIn";
String datas = JSON.toJSONString(baseResponse.getData());
FileUtils.SaveFileAs(datas, fileName);
}
spGetHttp.postDeleteBasicStatus(basicExportStatusEntity.getId());

5
pom.xml
Unescape Escape View File

@ -37,14 +37,13 @@
</dependency>
<!--Json 操作-->
<!--Json 操作-->
<!-- https://mvnrepository.com/artifact/com.alibaba/fastjson -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>2.0.4</version>
<version>1.2.83</version>
</dependency>
<!--common-->
<dependency>
<groupId>org.apache.commons</groupId>

Write Preview
Loading…
Cancel
Save