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

同步数据修改,界面修改

Browse Source
master
anthonyywj2 3 years ago
parent 67e16c3248
commit c7a6f4ab41
68 changed files with 996 additions and 303 deletions
Show Stats Download Patch File Download Diff File

8
api-admin/pom.xml
Unescape Escape View File

@ -367,6 +367,14 @@
</dependencies> </dependencies>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>9</source>
<target>9</target>
</configuration>
</plugin>
</plugins> </plugins>
</build> </build>

3
api-admin/src/main/java/com/glxp/api/admin/constant/Constant.java
Unescape Escape View File

@ -15,4 +15,7 @@ public class Constant {
public static final String dlThrInvProducts = "THR_DOWNLOAD_INV_PRODUCTS"; public static final String dlThrInvProducts = "THR_DOWNLOAD_INV_PRODUCTS";
public static final String dlThrOrders = "THR_DOWNLOAD_ORDERS"; public static final String dlThrOrders = "THR_DOWNLOAD_ORDERS";
public static final String dlThrCorps = "THR_DOWNLOAD_CORPS"; public static final String dlThrCorps = "THR_DOWNLOAD_CORPS";
public static String SPTM_TO_DI = "sptm_to_di";
} }

9
api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicThirdSysController.java
Unescape Escape View File

@ -6,6 +6,7 @@ import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.entity.basic.BasicThirdSysBusApiEntity; import com.glxp.api.admin.entity.basic.BasicThirdSysBusApiEntity;
import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity;
import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; import com.glxp.api.admin.entity.basic.BasicThirdSysEntity;
import com.glxp.api.admin.httpclient.ErpBasicClient;
import com.glxp.api.admin.req.basic.FilterBasicThirdSysDetailRequest; import com.glxp.api.admin.req.basic.FilterBasicThirdSysDetailRequest;
import com.glxp.api.admin.req.basic.FilterBasicThirdSysRequest; import com.glxp.api.admin.req.basic.FilterBasicThirdSysRequest;
import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.res.PageSimpleResponse;
@ -276,4 +277,12 @@ public class BasicThirdSysController {
return basicThirdSysDetailService.testThirdService(basicThirdSysEntity); return basicThirdSysDetailService.testThirdService(basicThirdSysEntity);
} }
@Resource
ErpBasicClient erpBasicClient;
@PostMapping("/udiwms/basic/thirdsys/testThirdInter")
public BaseResponse testThirdInter(@RequestBody BasicThirdSysEntity basicThirdSysEntity) {
return erpBasicClient.testThridConnect(basicThirdSysEntity);
}
} }

4
api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicUnitMaintainController.java
Unescape Escape View File

@ -262,7 +262,7 @@ public class BasicUnitMaintainController {
basicUnitImportService.selectAllUnit(basicThirdSysDetailEntity, unitMaintainFilterRequest); basicUnitImportService.selectAllUnit(basicThirdSysDetailEntity, unitMaintainFilterRequest);
} else { } else {
return ResultVOUtils.error(500, "第三方往来单位服务未启用"); return ResultVOUtils.error(500, "第三方系统往来单位接口服务未启用");
} }
@ -414,7 +414,7 @@ public class BasicUnitMaintainController {
return ResultVOUtils.success(pageSimpleResponse); return ResultVOUtils.success(pageSimpleResponse);
} }
} else { } else {
return ResultVOUtils.error(500, "第三方往来单位服务未启用"); return ResultVOUtils.error(500, "第三方系统往来单位服务接口未启用");
} }

6
api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessChangeTypeController.java
Unescape Escape View File

@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.Date;
import java.util.List; import java.util.List;
@RestController @RestController
@ -132,6 +133,11 @@ public class BussinessChangeTypeController {
} }
if (bussinessTypeEntity != null) { if (bussinessTypeEntity != null) {
bussinessChangeTypeService.updateBusChangeType(bussinessTypeEntity); bussinessChangeTypeService.updateBusChangeType(bussinessTypeEntity);
BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findByAction(bussinessTypeEntity.getAction());
bussinessLocalTypeEntity.setUpdateTime(new Date());
bussinessLocalTypeService.updateBusLocalType(bussinessLocalTypeEntity);
} else { } else {
ResultVOUtils.error(999, "参数错误"); ResultVOUtils.error(999, "参数错误");
} }

1
api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessOriginTypeController.java
Unescape Escape View File

@ -104,6 +104,7 @@ public class BussinessOriginTypeController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
} }
if (bussinessTypeEntity != null) { if (bussinessTypeEntity != null) {
bussinessTypeEntity.setUpdateTime(new Date());
bussinessOriginTypeService.insertBusOriginType(bussinessTypeEntity); bussinessOriginTypeService.insertBusOriginType(bussinessTypeEntity);
} else { } else {
return ResultVOUtils.error(999, "参数错误"); return ResultVOUtils.error(999, "参数错误");

3
api-admin/src/main/java/com/glxp/api/admin/controller/basic/SpsSyncExportStatusController.java
Unescape Escape View File

@ -180,7 +180,8 @@ public class SpsSyncExportStatusController {
spsSyncDataRequest.setLimit(1); spsSyncDataRequest.setLimit(1);
if (StrUtil.isEmpty(syncTime)) { if (StrUtil.isEmpty(syncTime)) {
BasicExportStatusTimeEntity basicExportStatusTimeEntity = basicExportTimeService.findByKey(type); BasicExportStatusTimeEntity basicExportStatusTimeEntity = basicExportTimeService.findByKey(type);
spsSyncDataRequest.setLastUpdateTime(basicExportStatusTimeEntity.getLastUpdateTime()); if (basicExportStatusTimeEntity != null)
spsSyncDataRequest.setLastUpdateTime(basicExportStatusTimeEntity.getLastUpdateTime());
} else { } else {
spsSyncDataRequest.setLastUpdateTime(syncTime); spsSyncDataRequest.setLastUpdateTime(syncTime);
} }

2
api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoController.java
Unescape Escape View File

@ -194,7 +194,7 @@ public class UdiInfoController {
return ResultVOUtils.success(pageSimpleResponse); return ResultVOUtils.success(pageSimpleResponse);
} }
} else { } else {
return ResultVOUtils.error(500, "第三方产品信息服务未启用"); return ResultVOUtils.error(500, "第三方系统产品信息接口服务未启用");
} }

2
api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java
Unescape Escape View File

@ -373,7 +373,7 @@ public class OrderController {
String supplementOrderNo = orderNo; String supplementOrderNo = orderNo;
supplementOrder.setOriginUllageSupNo(orderEntity.getId()); supplementOrder.setOriginUllageSupNo(orderEntity.getId());
supplementOrder.setId(supplementOrderNo); supplementOrder.setId(supplementOrderNo);
supplementOrder.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); supplementOrder.setStatus(ConstantStatus.ORDER_STATUS_ADDITIONAL);
supplementOrder.setExportStatus(0); //设置导出状态为未导出 supplementOrder.setExportStatus(0); //设置导出状态为未导出

16
api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java
Unescape Escape View File

@ -295,7 +295,7 @@ public class OrderDetailController {
BasicThirdSysDetailEntity basicThirdSysDetailEntity = bussinessOriginTypeService.findSysByAction(filterErpOrderRequest.getBillAction(), "orderQueryUrl"); BasicThirdSysDetailEntity basicThirdSysDetailEntity = bussinessOriginTypeService.findSysByAction(filterErpOrderRequest.getBillAction(), "orderQueryUrl");
filterErpOrderRequest.setThirdOrderFk(basicThirdSysDetailEntity.getThirdSysFk()); filterErpOrderRequest.setThirdOrderFk(basicThirdSysDetailEntity.getThirdSysFk());
if (basicThirdSysDetailEntity == null || !basicThirdSysDetailEntity.getEnabled()) { if (basicThirdSysDetailEntity == null || !basicThirdSysDetailEntity.getEnabled()) {
return ResultVOUtils.error(500, "第三方业务单据服务未启用"); return ResultVOUtils.error(500, "第三方系统业务单据接口服务未启用");
} }
if (basicThirdSysDetailEntity.getThirdSysFk() == null) { if (basicThirdSysDetailEntity.getThirdSysFk() == null) {
@ -592,20 +592,6 @@ public class OrderDetailController {
return ResultVOUtils.success("导入成功"); return ResultVOUtils.success("导入成功");
} }
// @PostMapping("/warehouse/repeatCheck")//TODO 重新校验
// public BaseResponse repeatCheck(@RequestBody FilterErpOrderRequest filterErpOrderRequest, BindingResult bindingResult) {
//
// if (bindingResult.hasErrors()) {
// return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
// }
// OrderFilterRequest orderFilterRequest = new OrderFilterRequest();
// orderFilterRequest.setId(filterErpOrderRequest.getOrderId());
// OrderEntity orderEntity = orderService.findOne(orderFilterRequest);
// transInoutService.repeatCheck(orderEntity.getId());
// return ResultVOUtils.success("后台已开始校验，请稍后刷新重试！");
// }
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/warehouse/repeatPrintCheck")//TODO 重新校验 @PostMapping("/warehouse/repeatPrintCheck")//TODO 重新校验
public BaseResponse repeatPrintCheck(@RequestBody FilterErpOrderRequest filterErpOrderRequest, BindingResult bindingResult) { public BaseResponse repeatPrintCheck(@RequestBody FilterErpOrderRequest filterErpOrderRequest, BindingResult bindingResult) {

59
api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java
Unescape Escape View File

@ -440,6 +440,19 @@ public class WareHouseController {
UdiEntity udiEntity = FilterUdiUtils.getUdi(code); UdiEntity udiEntity = FilterUdiUtils.getUdi(code);
if (udiEntity == null) { if (udiEntity == null) {
String sptmtodi = systemParamConfigService.selectValueByParamKey(Constant.SPTM_TO_DI);
if (sptmtodi.equals("1")) {
if (code.length() == 13) {
UdiInfoEntity udiInfoEntity = udiInfoService.findBySptm(code);
if (udiInfoEntity != null) {
BaseResponse baseResponse = ResultVOUtils.error(508, "商品条码");
baseResponse.setData(udiInfoEntity);
return baseResponse;
}
}
}
BaseResponse baseResponse = ResultVOUtils.error(501, "UDI码格式错误"); BaseResponse baseResponse = ResultVOUtils.error(501, "UDI码格式错误");
baseResponse.setData(originCode); baseResponse.setData(originCode);
return baseResponse; return baseResponse;
@ -956,17 +969,41 @@ public class WareHouseController {
if (bindingResult.hasErrors()) { if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
} }
Integer userId = customerService.getUserId(); Integer userId = customerService.getUserId();
try { try {
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("sps_sync_upload_order"); PostOrderRequest inPostOrder = new PostOrderRequest();
if (systemParamConfigEntity.getParamValue().equals("1")) { List<PostOrderRequest.PostOrder> inPostOrders = new ArrayList<>();
postOrderRequest.setWmsUserId(userId + ""); PostOrderRequest outPostOrder = new PostOrderRequest();
return spsDirectClient.uploadPdaOrder(postOrderRequest); List<PostOrderRequest.PostOrder> outPostOrders = new ArrayList<>();
} else {
List<PostOrderRequest.PostOrder> postOrders = postOrderRequest.getPostOrders();
if (postOrders != null && postOrders.size() > 0) {
for (PostOrderRequest.PostOrder postOrder : postOrders) {
BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(postOrder.getCodes().get(0).getAction());
if (bussinessTypeEntity.isOutTospms()) {
outPostOrders.add(postOrder);
} else {
inPostOrders.add(postOrder);
}
}
}
BeanUtils.copyProperties(postOrderRequest, inPostOrder);
BeanUtils.copyProperties(postOrderRequest, outPostOrder);
inPostOrder.setPostOrders(inPostOrders);
outPostOrder.setPostOrders(outPostOrders);
if (CollUtil.isNotEmpty(outPostOrders)) {
outPostOrder.setWmsUserId(userId + "");
return spsDirectClient.uploadPdaOrder(outPostOrder);
}
if (CollUtil.isNotEmpty(inPostOrders)) {
String customerId = getCustomerId(); String customerId = getCustomerId();
postOrderRequest.setCustomerId(customerId); inPostOrder.setCustomerId(customerId);
postOrderRequest.setUserId(userId); inPostOrder.setUserId(userId);
ioTransInoutService.creatOrder(postOrderRequest, null); ioTransInoutService.creatOrder(inPostOrder, null);
} }
@ -974,7 +1011,7 @@ public class WareHouseController {
return ResultVOUtils.error(ResultEnum.NOT_NETWORK); return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
} }
return ResultVOUtils.success("导入成功"); return ResultVOUtils.success("上传成功，等待后台处理");
} }
@ -1050,6 +1087,7 @@ public class WareHouseController {
if (StrUtil.isBlank(code) || StrUtil.isBlank(userListJson)) if (StrUtil.isBlank(code) || StrUtil.isBlank(userListJson))
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
warehouseUserService.saveWarehouseUser(code, JSONUtil.toList(userListJson, AuthAdmin.class)); warehouseUserService.saveWarehouseUser(code, JSONUtil.toList(userListJson, AuthAdmin.class));
invWarehouseService.updateTime(code, new Date());
return ResultVOUtils.success(); return ResultVOUtils.success();
} }
@ -1061,6 +1099,8 @@ public class WareHouseController {
if (StrUtil.isBlank(code) || StrUtil.isBlank(bussinessTypeJson)) if (StrUtil.isBlank(code) || StrUtil.isBlank(bussinessTypeJson))
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
warehouseBussinessTypeService.saveWarehouseBussinessType(code, JSONUtil.toList(bussinessTypeJson, BussinessTypResponse.class)); warehouseBussinessTypeService.saveWarehouseBussinessType(code, JSONUtil.toList(bussinessTypeJson, BussinessTypResponse.class));
invWarehouseService.updateTime(code, new Date());
return ResultVOUtils.success(); return ResultVOUtils.success();
} }
@ -1070,6 +1110,7 @@ public class WareHouseController {
if (warehouseUserEntity == null) if (warehouseUserEntity == null)
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
warehouseUserService.updateDirector(warehouseUserEntity); warehouseUserService.updateDirector(warehouseUserEntity);
invWarehouseService.updateTime(warehouseUserEntity.getCode(), new Date());
return ResultVOUtils.success(); return ResultVOUtils.success();
} }

2
api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvErpOnhandController.java
Unescape Escape View File

@ -69,7 +69,7 @@ public class InvErpOnhandController {
else else
onHandUrl = basicThirdSysDetailEntity.getValue(); onHandUrl = basicThirdSysDetailEntity.getValue();
if (!basicThirdSysDetailEntity.getEnabled()) { if (!basicThirdSysDetailEntity.getEnabled()) {
return ResultVOUtils.error(500, "第三方库存信息服务未启用！"); return ResultVOUtils.error(500, "第三方系统库存信息接口服务未启用！");
} }
if (basicThirdSysDetailEntity.getFromType() == 0 || (onhandQueryRequest.getIsDownThrSys() != null && onhandQueryRequest.getIsDownThrSys())) { if (basicThirdSysDetailEntity.getFromType() == 0 || (onhandQueryRequest.getIsDownThrSys() != null && onhandQueryRequest.getIsDownThrSys())) {

2
api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrCorpExportLogController.java
Unescape Escape View File

@ -216,7 +216,7 @@ public class ThrCorpExportLogController {
return ResultVOUtils.success(pageSimpleResponse); return ResultVOUtils.success(pageSimpleResponse);
} }
} else { } else {
return ResultVOUtils.error(500, "第三方往来单位服务未启用"); return ResultVOUtils.error(500, "第三方系统往来单位接口服务未启用");
} }

2
api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrInvProductsExportLogController.java
Unescape Escape View File

@ -155,7 +155,7 @@ public class ThrInvProductsExportLogController {
else else
onHandUrl = basicThirdSysDetailEntity.getValue(); onHandUrl = basicThirdSysDetailEntity.getValue();
if (!basicThirdSysDetailEntity.getEnabled()) { if (!basicThirdSysDetailEntity.getEnabled()) {
return ResultVOUtils.error(500, "第三方库存信息服务未启用！"); return ResultVOUtils.error(500, "第三方系统库存信息接口服务未启用！");
} }
if (basicThirdSysDetailEntity.getFromType() == 0 ) { if (basicThirdSysDetailEntity.getFromType() == 0 ) {

6
api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrInvWarehouseController.java
Unescape Escape View File

@ -24,10 +24,7 @@ import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.validation.Valid; import javax.validation.Valid;
import java.util.ArrayList; import java.util.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/** /**
* 第三方仓库信息接口 * 第三方仓库信息接口
@ -105,6 +102,7 @@ public class ThrInvWarehouseController {
thrInvWarehouseEntity.setLevel(pEntity.getLevel()); thrInvWarehouseEntity.setLevel(pEntity.getLevel());
thrInvWarehouseEntity.setPcode(pEntity.getPcode()); thrInvWarehouseEntity.setPcode(pEntity.getPcode());
} }
thrInvWarehouseEntity.setUpdateTime(new Date());
boolean b = thrInvWarehouseService.insertInvWarehouse(thrInvWarehouseEntity); boolean b = thrInvWarehouseService.insertInvWarehouse(thrInvWarehouseEntity);
if (!b) { if (!b) {
return ResultVOUtils.error(ResultEnum.NOT_NETWORK); return ResultVOUtils.error(ResultEnum.NOT_NETWORK);

2
api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderExportLogController.java
Unescape Escape View File

@ -177,7 +177,7 @@ public class ThrOrderExportLogController {
BasicThirdSysDetailEntity basicThirdSysDetailEntity = bussinessTypeService.findByActionKey(filterErpOrderRequest.getBillAction(), "orderQueryUrl"); BasicThirdSysDetailEntity basicThirdSysDetailEntity = bussinessTypeService.findByActionKey(filterErpOrderRequest.getBillAction(), "orderQueryUrl");
if (!basicThirdSysDetailEntity.getEnabled() || basicThirdSysDetailEntity.getThirdSysFk() == null) { if (!basicThirdSysDetailEntity.getEnabled() || basicThirdSysDetailEntity.getThirdSysFk() == null) {
return ResultVOUtils.error(500, "第三方业务单据服务未启用"); return ResultVOUtils.error(500, "第三方系统业务单据接口服务未启用");
} }
if (basicThirdSysDetailEntity.getValue() == null) { if (basicThirdSysDetailEntity.getValue() == null) {
return ResultVOUtils.error(500, "业务单据查询接口未定义"); return ResultVOUtils.error(500, "业务单据查询接口未定义");

2
api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrProductsExportLogController.java
Unescape Escape View File

@ -191,7 +191,7 @@ public class ThrProductsExportLogController {
return ResultVOUtils.success(pageSimpleResponse); return ResultVOUtils.success(pageSimpleResponse);
} }
} else { } else {
return ResultVOUtils.error(500, "第三方产品信息服务未启用"); return ResultVOUtils.error(500, "第三方系统产品信息接口服务未启用");
} }
} }
} }

1
api-admin/src/main/java/com/glxp/api/admin/entity/basic/BussinessLocalTypeEntity.java
Unescape Escape View File

@ -28,5 +28,6 @@ public class BussinessLocalTypeEntity {
private String prefix; private String prefix;
private String localPrefix; private String localPrefix;
private boolean preIn; private boolean preIn;
private boolean outTospms;
} }

1
api-admin/src/main/java/com/glxp/api/admin/entity/basic/BussinessTypeEntity.java
Unescape Escape View File

@ -56,5 +56,6 @@ public class BussinessTypeEntity {
private String prefix; private String prefix;
private String localPrefix; private String localPrefix;
private boolean preIn; private boolean preIn;
private boolean outTospms;
} }

2
api-admin/src/main/java/com/glxp/api/admin/entity/basic/SpsBusLoclTypeResponse.java
Unescape Escape View File

@ -27,5 +27,7 @@ public class SpsBusLoclTypeResponse {
private String prefix; private String prefix;
private String localPrefix; private String localPrefix;
private boolean preIn; private boolean preIn;
private boolean changeEnable;
} }

1
api-admin/src/main/java/com/glxp/api/admin/entity/info/SyncDataSetEntity.java
Unescape Escape View File

@ -26,4 +26,5 @@ public class SyncDataSetEntity {
private boolean orderUnCheck; //待校验单据 private boolean orderUnCheck; //待校验单据
private String busTypes; //单据类型 private String busTypes; //单据类型
private String syncIp; private String syncIp;
private boolean sysUser;
} }

13
api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpBasicClient.java
Unescape Escape View File

@ -125,4 +125,17 @@ public class ErpBasicClient {
} }
} }
//测试连通性
public BaseResponse testThridConnect(BasicThirdSysEntity basicThirdSysEntity) {
String response = HttpClient.uCloudPost(basicThirdSysEntity.getThridUrl() + "/udiwms/erp/testThirdSys", "{}");
log.info(response);
try {
return JSONObject.parseObject(response, BaseResponse.class);
} catch (Exception e) {
log.info("测试第三方服务接口连通性失败");
return ResultVOUtils.error(500, "连接失败");
}
}
} }

39
api-admin/src/main/java/com/glxp/api/admin/httpclient/SpGetHttpClient.java
Unescape Escape View File

@ -3,6 +3,7 @@ package com.glxp.api.admin.httpclient;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference; import com.alibaba.fastjson.TypeReference;
import com.glxp.api.admin.entity.basic.BasicExportStatusEntity; import com.glxp.api.admin.entity.basic.BasicExportStatusEntity;
import com.glxp.api.admin.entity.info.SyncDataSetEntity;
import com.glxp.api.admin.entity.inout.IOOrderStatusEntity; import com.glxp.api.admin.entity.inout.IOOrderStatusEntity;
import com.glxp.api.admin.httpclient.UHttpClient; import com.glxp.api.admin.httpclient.UHttpClient;
import com.glxp.api.admin.req.basic.BasicExportStatusRequest; import com.glxp.api.admin.req.basic.BasicExportStatusRequest;
@ -14,11 +15,13 @@ import com.glxp.api.admin.res.basic.SpsSyncDataResponse;
import com.glxp.api.admin.res.basic.SpsSyncOrderResponse; import com.glxp.api.admin.res.basic.SpsSyncOrderResponse;
import com.glxp.api.admin.res.basic.SpsSyncScheduleResponse; import com.glxp.api.admin.res.basic.SpsSyncScheduleResponse;
import com.glxp.api.admin.res.inout.DlOrderResponse; import com.glxp.api.admin.res.inout.DlOrderResponse;
import com.glxp.api.admin.service.info.SyncDataSetService;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -26,13 +29,21 @@ import java.util.Map;
@Service @Service
public class SpGetHttpClient { public class SpGetHttpClient {
@Value("${SPSYNC_IP}") // @Value("${SPSYNC_IP}")
private String spsSyncUrl; // private String spsSyncUrl;
@Resource
SyncDataSetService syncDataSetService;
public String getIpUrl() {
SyncDataSetEntity syncDataSetEntity = syncDataSetService.findSet();
return syncDataSetEntity.getSyncIp();
}
public BaseResponse<PageSimpleResponse<IOOrderStatusEntity>> getOrderStatus() { public BaseResponse<PageSimpleResponse<IOOrderStatusEntity>> getOrderStatus() {
Map<String, Object> paramMap = new HashMap<>(16); Map<String, Object> paramMap = new HashMap<>(16);
paramMap.put("status", 1); paramMap.put("status", 1);
String response = UHttpClient.mipsGet(spsSyncUrl + "/spms/inout/order/status", paramMap); String response = UHttpClient.mipsGet(getIpUrl() + "/spms/inout/order/status", paramMap);
try { try {
BaseResponse<PageSimpleResponse<IOOrderStatusEntity>> data = BaseResponse<PageSimpleResponse<IOOrderStatusEntity>> data =
JSONObject.parseObject(response, new TypeReference<BaseResponse<PageSimpleResponse<IOOrderStatusEntity>>>() { JSONObject.parseObject(response, new TypeReference<BaseResponse<PageSimpleResponse<IOOrderStatusEntity>>>() {
@ -49,7 +60,7 @@ public class SpGetHttpClient {
public BaseResponse<List<DlOrderResponse>> getOrders(String orderId) { public BaseResponse<List<DlOrderResponse>> getOrders(String orderId) {
Map<String, Object> paramMap = new HashMap<>(16); Map<String, Object> paramMap = new HashMap<>(16);
paramMap.put("orderId", orderId); paramMap.put("orderId", orderId);
String response = UHttpClient.mipsGet(spsSyncUrl + "/spms/inout/order/dlByStatus", paramMap); String response = UHttpClient.mipsGet(getIpUrl() + "/spms/inout/order/dlByStatus", paramMap);
try { try {
BaseResponse<List<DlOrderResponse>> data = BaseResponse<List<DlOrderResponse>> data =
JSONObject.parseObject(response, new TypeReference<BaseResponse<List<DlOrderResponse>>>() { JSONObject.parseObject(response, new TypeReference<BaseResponse<List<DlOrderResponse>>>() {
@ -66,7 +77,7 @@ public class SpGetHttpClient {
OrderStatusFilterRequest orderStatusFilterRequest = new OrderStatusFilterRequest(); OrderStatusFilterRequest orderStatusFilterRequest = new OrderStatusFilterRequest();
orderStatusFilterRequest.setOrderId(orderId); orderStatusFilterRequest.setOrderId(orderId);
orderStatusFilterRequest.setStatus(2); orderStatusFilterRequest.setStatus(2);
String result = UHttpClient.postJson(spsSyncUrl + "/spms/inout/order/updateStatus", orderStatusFilterRequest); String result = UHttpClient.postJson(getIpUrl() + "/spms/inout/order/updateStatus", orderStatusFilterRequest);
BaseResponse<String> response = BaseResponse<String> response =
JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() { JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() {
}); });
@ -77,7 +88,7 @@ public class SpGetHttpClient {
public BaseResponse<List<BasicExportStatusEntity>> getBasicStatus(String type) { public BaseResponse<List<BasicExportStatusEntity>> getBasicStatus(String type) {
Map<String, Object> paramMap = new HashMap<>(16); Map<String, Object> paramMap = new HashMap<>(16);
paramMap.put("type", type); paramMap.put("type", type);
String response = UHttpClient.mipsGet(spsSyncUrl + "/spssync/basic/udiinfo/getStatus", paramMap); String response = UHttpClient.mipsGet(getIpUrl() + "/spssync/basic/udiinfo/getStatus", paramMap);
try { try {
BaseResponse<List<BasicExportStatusEntity>> data = BaseResponse<List<BasicExportStatusEntity>> data =
JSONObject.parseObject(response, new TypeReference<BaseResponse<List<BasicExportStatusEntity>>>() { JSONObject.parseObject(response, new TypeReference<BaseResponse<List<BasicExportStatusEntity>>>() {
@ -92,7 +103,7 @@ public class SpGetHttpClient {
public BaseResponse<String> testConnect() { public BaseResponse<String> testConnect() {
Map<String, Object> paramMap = new HashMap<>(16); Map<String, Object> paramMap = new HashMap<>(16);
String response = UHttpClient.mipsGet(spsSyncUrl + "/sps/sync/connect/test", paramMap); String response = UHttpClient.mipsGet(getIpUrl() + "/sps/sync/connect/test", paramMap);
try { try {
BaseResponse<String> data = BaseResponse<String> data =
JSONObject.parseObject(response, new TypeReference<BaseResponse<String>>() { JSONObject.parseObject(response, new TypeReference<BaseResponse<String>>() {
@ -115,7 +126,7 @@ public class SpGetHttpClient {
paramMap.put("id", basicExportStatusRequest.getId()); paramMap.put("id", basicExportStatusRequest.getId());
if (basicExportStatusRequest.getScheduleType() != null) if (basicExportStatusRequest.getScheduleType() != null)
paramMap.put("scheduleType", basicExportStatusRequest.getScheduleType()); paramMap.put("scheduleType", basicExportStatusRequest.getScheduleType());
String response = UHttpClient.mipsGet(spsSyncUrl + "/spssync/basic/udiinfo/getStatus", paramMap); String response = UHttpClient.mipsGet(getIpUrl() + "/spssync/basic/udiinfo/getStatus", paramMap);
try { try {
BaseResponse<List<BasicExportStatusEntity>> data = BaseResponse<List<BasicExportStatusEntity>> data =
JSONObject.parseObject(response, new TypeReference<BaseResponse<List<BasicExportStatusEntity>>>() { JSONObject.parseObject(response, new TypeReference<BaseResponse<List<BasicExportStatusEntity>>>() {
@ -133,7 +144,7 @@ public class SpGetHttpClient {
BasicExportStatusRequest basicExportStatusRequest = new BasicExportStatusRequest(); BasicExportStatusRequest basicExportStatusRequest = new BasicExportStatusRequest();
basicExportStatusRequest.setId(id); basicExportStatusRequest.setId(id);
basicExportStatusRequest.setType(type); basicExportStatusRequest.setType(type);
String result = UHttpClient.postJson(spsSyncUrl + "/spssync/basic/udiinfo/downloadByStatus", basicExportStatusRequest); String result = UHttpClient.postJson(getIpUrl() + "/spssync/basic/udiinfo/downloadByStatus", basicExportStatusRequest);
return result; return result;
} }
@ -141,7 +152,7 @@ public class SpGetHttpClient {
public BaseResponse<String> postBasicStatus(String id) { public BaseResponse<String> postBasicStatus(String id) {
BasicExportStatusRequest basicStatusFilterRequest = new BasicExportStatusRequest(); BasicExportStatusRequest basicStatusFilterRequest = new BasicExportStatusRequest();
basicStatusFilterRequest.setId(id); basicStatusFilterRequest.setId(id);
String result = UHttpClient.postJson(spsSyncUrl + "/spssync/basic/udiinfo/deleteByStatus", basicStatusFilterRequest); String result = UHttpClient.postJson(getIpUrl() + "/spssync/basic/udiinfo/deleteByStatus", basicStatusFilterRequest);
BaseResponse<String> response = BaseResponse<String> response =
JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() { JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() {
}); });
@ -150,7 +161,7 @@ public class SpGetHttpClient {
public BaseResponse<String> postAllBaseData(SpsSyncDataResponse syncDataResponse) { public BaseResponse<String> postAllBaseData(SpsSyncDataResponse syncDataResponse) {
String result = UHttpClient.postJson(spsSyncUrl + "/sps/sync/basic/upload", syncDataResponse); String result = UHttpClient.postJson(getIpUrl() + "/sps/sync/basic/upload", syncDataResponse);
BaseResponse<String> response = BaseResponse<String> response =
JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() { JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() {
}); });
@ -159,7 +170,7 @@ public class SpGetHttpClient {
public BaseResponse<String> postAllBus(SpsSyncBusResponse spsSyncBusResponse) { public BaseResponse<String> postAllBus(SpsSyncBusResponse spsSyncBusResponse) {
String result = UHttpClient.postJson(spsSyncUrl + "/sps/sync/busType/upload", spsSyncBusResponse); String result = UHttpClient.postJson(getIpUrl() + "/sps/sync/busType/upload", spsSyncBusResponse);
BaseResponse<String> response = BaseResponse<String> response =
JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() { JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() {
}); });
@ -168,7 +179,7 @@ public class SpGetHttpClient {
public BaseResponse<String> postAllOrder(SpsSyncOrderResponse spsSyncOrderResponse) { public BaseResponse<String> postAllOrder(SpsSyncOrderResponse spsSyncOrderResponse) {
String result = UHttpClient.postJson(spsSyncUrl + "/sps/sync/order/upload", spsSyncOrderResponse); String result = UHttpClient.postJson(getIpUrl() + "/sps/sync/order/upload", spsSyncOrderResponse);
BaseResponse<String> response = BaseResponse<String> response =
JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() { JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() {
}); });
@ -176,7 +187,7 @@ public class SpGetHttpClient {
} }
public BaseResponse<String> postAllSchedule(SpsSyncScheduleResponse spsSyncScheduleResponse) { public BaseResponse<String> postAllSchedule(SpsSyncScheduleResponse spsSyncScheduleResponse) {
String result = UHttpClient.postJson(spsSyncUrl + "/sps/sync/schedule/upload", spsSyncScheduleResponse); String result = UHttpClient.postJson(getIpUrl() + "/sps/sync/schedule/upload", spsSyncScheduleResponse);
BaseResponse<String> response = BaseResponse<String> response =
JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() { JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() {
}); });

24
api-admin/src/main/java/com/glxp/api/admin/httpclient/SpsDirectClient.java
Unescape Escape View File

@ -2,25 +2,33 @@ package com.glxp.api.admin.httpclient;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference; import com.alibaba.fastjson.TypeReference;
import com.glxp.api.admin.entity.info.SyncDataSetEntity;
import com.glxp.api.admin.req.inout.OrderFilterRequest; import com.glxp.api.admin.req.inout.OrderFilterRequest;
import com.glxp.api.admin.req.inout.PostOrderRequest; import com.glxp.api.admin.req.inout.PostOrderRequest;
import com.glxp.api.admin.service.info.SyncDataSetService;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@Service @Service
public class SpsDirectClient { public class SpsDirectClient {
@Value("${SPSYNC_IP}") // @Value("${SPSYNC_IP}")
private String spsSyncUrl; // private String spsSyncUrl;
@Resource
SyncDataSetService syncDataSetService;
public String getIpUrl() {
SyncDataSetEntity syncDataSetEntity = syncDataSetService.findSet();
return syncDataSetEntity.getSyncIp();
}
//单据验收 //单据验收
public BaseResponse reviewOrder(OrderFilterRequest orderFilterRequest) { public BaseResponse reviewOrder(OrderFilterRequest orderFilterRequest) {
String result = UHttpClient.postJson(spsSyncUrl + "/sps/review/download/order/finsih", orderFilterRequest); String result = UHttpClient.postJson(getIpUrl() + "/sps/review/download/order/finsih", orderFilterRequest);
BaseResponse<String> response = BaseResponse<String> response =
JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() { JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() {
}); });
@ -34,7 +42,7 @@ public class SpsDirectClient {
paramMap.put("wmsUserId", wmsUserId); paramMap.put("wmsUserId", wmsUserId);
paramMap.put("orderId", orderId); paramMap.put("orderId", orderId);
paramMap.put("action", action); paramMap.put("action", action);
String response = UHttpClient.mipsGet(spsSyncUrl + "/sps/review/download/order", paramMap); String response = UHttpClient.mipsGet(getIpUrl() + "/sps/review/download/order", paramMap);
try { try {
BaseResponse data = JSONObject.parseObject(response, new TypeReference<BaseResponse>() { BaseResponse data = JSONObject.parseObject(response, new TypeReference<BaseResponse>() {
}); });
@ -50,7 +58,7 @@ public class SpsDirectClient {
Map<String, Object> paramMap = new HashMap<>(16); Map<String, Object> paramMap = new HashMap<>(16);
paramMap.put("wmsUserId", wmsUserId); paramMap.put("wmsUserId", wmsUserId);
paramMap.put("orderId", orderId); paramMap.put("orderId", orderId);
String response = UHttpClient.mipsGet(spsSyncUrl + "/sps/review/download/orderDetail", paramMap); String response = UHttpClient.mipsGet(getIpUrl() + "/sps/review/download/orderDetail", paramMap);
try { try {
BaseResponse data = JSONObject.parseObject(response, new TypeReference<BaseResponse>() { BaseResponse data = JSONObject.parseObject(response, new TypeReference<BaseResponse>() {
}); });
@ -67,7 +75,7 @@ public class SpsDirectClient {
Map<String, Object> paramMap = new HashMap<>(16); Map<String, Object> paramMap = new HashMap<>(16);
paramMap.put("wmsUserId", wmsUserId); paramMap.put("wmsUserId", wmsUserId);
paramMap.put("orderId", orderId); paramMap.put("orderId", orderId);
String response = UHttpClient.mipsGet(spsSyncUrl + "/sps/review/download/codes", paramMap); String response = UHttpClient.mipsGet(getIpUrl() + "/sps/review/download/codes", paramMap);
try { try {
BaseResponse data = JSONObject.parseObject(response, new TypeReference<BaseResponse>() { BaseResponse data = JSONObject.parseObject(response, new TypeReference<BaseResponse>() {
}); });
@ -81,7 +89,7 @@ public class SpsDirectClient {
//单据上传 //单据上传
public BaseResponse uploadPdaOrder(PostOrderRequest postOrderRequest) { public BaseResponse uploadPdaOrder(PostOrderRequest postOrderRequest) {
String result = UHttpClient.postJson(spsSyncUrl + "/sps/pda/upload/orders", postOrderRequest); String result = UHttpClient.postJson(getIpUrl() + "/sps/pda/upload/orders", postOrderRequest);
BaseResponse<String> response = BaseResponse<String> response =
JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() { JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() {
}); });

2
api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthAdminQueryRequest.java
Unescape Escape View File

@ -18,4 +18,6 @@ public class AuthAdminQueryRequest extends ListPageRequest {
private List<Long> ids; private List<Long> ids;
private String lastUpdateTime;
} }

8
api-admin/src/main/java/com/glxp/api/admin/req/inout/PostOrderRequest.java
Unescape Escape View File

@ -16,14 +16,6 @@ public class PostOrderRequest {
private String wmsUserId; private String wmsUserId;
private String wmsUserName; private String wmsUserName;
public List<PostOrder> getPostOrder() {
return postOrders;
}
public void setPostOrder(List<PostOrder> postOrder) {
this.postOrders = postOrder;
}
public int getSubmitType() { public int getSubmitType() {
return submitType; return submitType;
} }

1
api-admin/src/main/java/com/glxp/api/admin/res/basic/BussinessTypResponse.java
Unescape Escape View File

@ -59,5 +59,6 @@ public class BussinessTypResponse {
private String prefix; private String prefix;
private String localPrefix; private String localPrefix;
private boolean preIn; private boolean preIn;
private boolean outTospms;
} }

7
api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncBusResponse.java
Unescape Escape View File

@ -1,9 +1,6 @@
package com.glxp.api.admin.res.basic; package com.glxp.api.admin.res.basic;
import com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity; import com.glxp.api.admin.entity.basic.*;
import com.glxp.api.admin.entity.basic.BussinessOriginTypeEntity;
import com.glxp.api.admin.entity.basic.BussinessTypeEntity;
import com.glxp.api.admin.entity.basic.SpsBusLoclTypeResponse;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;
@ -14,4 +11,6 @@ public class SpsSyncBusResponse {
private List<BussinessTypeEntity> bussinessTypeEntities; private List<BussinessTypeEntity> bussinessTypeEntities;
private List<BussinessOriginTypeEntity> bussinessOriginTypeEntities; private List<BussinessOriginTypeEntity> bussinessOriginTypeEntities;
private List<SpsBusLoclTypeResponse> bussinessLocalTypeEntities; private List<SpsBusLoclTypeResponse> bussinessLocalTypeEntities;
private List<BussinessChangeTypeEntity> bussinessChangeTypeEntities;
} }

1
api-admin/src/main/java/com/glxp/api/admin/res/info/SyncDataSetResponse.java
Unescape Escape View File

@ -26,5 +26,6 @@ public class SyncDataSetResponse {
private Integer syncTime; private Integer syncTime;
private String syncIp; private String syncIp;
private Integer syncDownloadTime; //定时下载时间 private Integer syncDownloadTime; //定时下载时间
private boolean sysUser;
} }

13
api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/AuthAdminServiceImpl.java
Unescape Escape View File

@ -26,8 +26,11 @@ public class AuthAdminServiceImpl implements AuthAdminService {
if (authAdminQueryRequest == null) { if (authAdminQueryRequest == null) {
return Collections.emptyList(); return Collections.emptyList();
} }
int offset = (authAdminQueryRequest.getPage() - 1) * authAdminQueryRequest.getLimit(); if (authAdminQueryRequest.getPage() != null) {
PageHelper.offsetPage(offset, authAdminQueryRequest.getLimit()); int offset = (authAdminQueryRequest.getPage() - 1) * authAdminQueryRequest.getLimit();
PageHelper.offsetPage(offset, authAdminQueryRequest.getLimit());
}
return authAdminDao.listAdminPage(authAdminQueryRequest); return authAdminDao.listAdminPage(authAdminQueryRequest);
} }
@ -38,6 +41,7 @@ public class AuthAdminServiceImpl implements AuthAdminService {
/** /**
* 根据id 获取需要的info * 根据id 获取需要的info
*
* @param id * @param id
* @return * @return
*/ */
@ -48,6 +52,7 @@ public class AuthAdminServiceImpl implements AuthAdminService {
/** /**
* 根据 id 获取密码字段 * 根据 id 获取密码字段
*
* @param id * @param id
* @return * @return
*/ */
@ -58,6 +63,7 @@ public class AuthAdminServiceImpl implements AuthAdminService {
/** /**
* 新增 * 新增
*
* @param authAdmin * @param authAdmin
* @return * @return
*/ */
@ -76,6 +82,7 @@ public class AuthAdminServiceImpl implements AuthAdminService {
/** /**
* 更新 * 更新
*
* @param authAdmin * @param authAdmin
* @return * @return
*/ */
@ -99,6 +106,7 @@ public class AuthAdminServiceImpl implements AuthAdminService {
/** /**
* 根据id删除 * 根据id删除
*
* @param id * @param id
* @return * @return
*/ */
@ -106,6 +114,7 @@ public class AuthAdminServiceImpl implements AuthAdminService {
public boolean deleteById(Long id) { public boolean deleteById(Long id) {
return authAdminDao.deleteById(id); return authAdminDao.deleteById(id);
} }
@Override @Override
public List<AuthAdmin> getHospitalUserList() { public List<AuthAdmin> getHospitalUserList() {
List<AuthAdmin> userList = authAdminDao.selectHospitalUser(); List<AuthAdmin> userList = authAdminDao.selectHospitalUser();

2
api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessLocalTypeService.java
Unescape Escape View File

@ -27,6 +27,8 @@ public interface BussinessLocalTypeService {
BussinessOriginTypeResponse findOriginJoinByAction(String action); BussinessOriginTypeResponse findOriginJoinByAction(String action);
BussinessLocalTypeEntity findByAction(String action);
BussinessLocalTypeEntity findBTByAction(String action); BussinessLocalTypeEntity findBTByAction(String action);
BussinessLocalTypeEntity findBTByName(String name); BussinessLocalTypeEntity findBTByName(String name);

2
api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiInfoService.java
Unescape Escape View File

@ -11,6 +11,8 @@ import java.util.List;
public interface UdiInfoService { public interface UdiInfoService {
List<UdiInfoEntity> filterUdiInfo(FilterUdiInfoRequest filterUdiInfoRequest); List<UdiInfoEntity> filterUdiInfo(FilterUdiInfoRequest filterUdiInfoRequest);
UdiInfoEntity findBySptm(String sptm);
List<UdiRelevanceResponse> filterUdiInfo2(FilterUdiInfoRequest filterUdiInfoRequest); List<UdiRelevanceResponse> filterUdiInfo2(FilterUdiInfoRequest filterUdiInfoRequest);
List<UdiInfoEntity> filterAllUdiInfo(FilterUdiInfoRequest filterUdiInfoRequest); List<UdiInfoEntity> filterAllUdiInfo(FilterUdiInfoRequest filterUdiInfoRequest);

12
api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessLocalTypeServiceImpl.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.admin.service.basic.impl; package com.glxp.api.admin.service.basic.impl;
import cn.hutool.core.collection.CollUtil;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.glxp.api.admin.dao.basic.BussinessLocalTypeDao; import com.glxp.api.admin.dao.basic.BussinessLocalTypeDao;
import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity;
@ -119,6 +120,17 @@ public class BussinessLocalTypeServiceImpl implements BussinessLocalTypeService
return null; return null;
} }
@Override
public BussinessLocalTypeEntity findByAction(String action) {
BussinessLocalTypeFilterRequest bussinessLocalTypeFilterRequest = new BussinessLocalTypeFilterRequest();
bussinessLocalTypeFilterRequest.setAction(action);
List<BussinessLocalTypeEntity> data = bussinessLocalTypeDao.filterAllList(bussinessLocalTypeFilterRequest);
if (CollUtil.isNotEmpty(data)) {
data.get(0);
}
return null;
}
@Override @Override
public BussinessLocalTypeEntity findBTByAction(String action) { public BussinessLocalTypeEntity findBTByAction(String action) {
BussinessLocalTypeFilterRequest bussinessTypeFilterRequest = new BussinessLocalTypeFilterRequest(); BussinessLocalTypeFilterRequest bussinessTypeFilterRequest = new BussinessLocalTypeFilterRequest();

13
api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiInfoServiceImpl.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.admin.service.basic.impl; package com.glxp.api.admin.service.basic.impl;
import cn.hutool.core.collection.CollUtil;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.glxp.api.admin.dao.basic.UdiInfoDao; import com.glxp.api.admin.dao.basic.UdiInfoDao;
import com.glxp.api.admin.entity.basic.UdiInfoEntity; import com.glxp.api.admin.entity.basic.UdiInfoEntity;
@ -33,6 +34,18 @@ public class UdiInfoServiceImpl implements UdiInfoService {
return data; return data;
} }
@Override
public UdiInfoEntity findBySptm(String sptm) {
FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
filterUdiInfoRequest.setSptm(sptm);
List<UdiInfoEntity> data = udiInfoDao.filterUdiInfo(filterUdiInfoRequest);
if (CollUtil.isNotEmpty(data)) {
return data.get(0);
}
return null;
}
@Override @Override
public List<UdiRelevanceResponse> filterUdiInfo2(FilterUdiInfoRequest filterUdiInfoRequest) { public List<UdiRelevanceResponse> filterUdiInfo2(FilterUdiInfoRequest filterUdiInfoRequest) {
if (filterUdiInfoRequest == null) { if (filterUdiInfoRequest == null) {

2
api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrDataService.java
Unescape Escape View File

@ -52,7 +52,7 @@ public class ThrDataService {
BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("piQueryUrl", thirdSys); BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("piQueryUrl", thirdSys);
if (basicThirdSysDetailEntity == null || !basicThirdSysDetailEntity.getEnabled()) { if (basicThirdSysDetailEntity == null || !basicThirdSysDetailEntity.getEnabled()) {
logger.info("第三方产品信息服务未启用"); logger.info("第三方系统产品信息接口服务未启用");
return null; return null;
} }

22
api-admin/src/main/java/com/glxp/api/admin/thread/BasicGenExcelService.java
Unescape Escape View File

@ -5,6 +5,7 @@ import com.alibaba.fastjson.TypeReference;
import com.glxp.api.admin.constant.BasicProcessStatus; import com.glxp.api.admin.constant.BasicProcessStatus;
import com.glxp.api.admin.constant.ConstantStatus; import com.glxp.api.admin.constant.ConstantStatus;
import com.glxp.api.admin.entity.basic.*; import com.glxp.api.admin.entity.basic.*;
import com.glxp.api.admin.entity.info.SyncDataSetEntity;
import com.glxp.api.admin.entity.info.SystemParamConfigEntity; import com.glxp.api.admin.entity.info.SystemParamConfigEntity;
import com.glxp.api.admin.req.basic.*; import com.glxp.api.admin.req.basic.*;
import com.glxp.api.admin.res.basic.BasicUnitMaintainExportResponse; import com.glxp.api.admin.res.basic.BasicUnitMaintainExportResponse;
@ -14,6 +15,7 @@ import com.glxp.api.admin.service.basic.BasicUnitMaintainService;
import com.glxp.api.admin.service.basic.CorpExportLogService; import com.glxp.api.admin.service.basic.CorpExportLogService;
import com.glxp.api.admin.service.basic.UdiInfoExportLogService; import com.glxp.api.admin.service.basic.UdiInfoExportLogService;
import com.glxp.api.admin.service.basic.UdiRelevanceService; import com.glxp.api.admin.service.basic.UdiRelevanceService;
import com.glxp.api.admin.service.info.SyncDataSetService;
import com.glxp.api.admin.service.info.SystemParamConfigService; import com.glxp.api.admin.service.info.SystemParamConfigService;
import com.glxp.api.admin.util.ExcelUtil; import com.glxp.api.admin.util.ExcelUtil;
import com.glxp.api.admin.util.HttpClient; import com.glxp.api.admin.util.HttpClient;
@ -33,8 +35,15 @@ import java.util.List;
@Service @Service
public class BasicGenExcelService { public class BasicGenExcelService {
@Value("${SPSYNC_IP}") // @Value("${SPSYNC_IP}")
private String spsSyncUrl; // private String spsSyncUrl;
@Resource
SyncDataSetService syncDataSetService;
public String getIpUrl() {
SyncDataSetEntity syncDataSetEntity = syncDataSetService.findSet();
return syncDataSetEntity.getSyncIp();
}
@Resource @Resource
CorpExportLogService corpExportLogService; CorpExportLogService corpExportLogService;
@ -155,7 +164,7 @@ public class BasicGenExcelService {
//todo 上传SMP //todo 上传SMP
// SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("smp_service_ip"); // SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("smp_service_ip");
// if (systemParamConfigEntity != null) { // if (systemParamConfigEntity != null) {
String response = HttpClient.uCloudPost(spsSyncUrl + "/udiwms/basic/corps/upload", postCorpsRequest); String response = HttpClient.uCloudPost(getIpUrl() + "/udiwms/basic/corps/upload", postCorpsRequest);
BaseResponse baseResponse = JSONObject.parseObject(response, new TypeReference<BaseResponse>() { BaseResponse baseResponse = JSONObject.parseObject(response, new TypeReference<BaseResponse>() {
}); });
if (baseResponse.getCode() == 20000) { if (baseResponse.getCode() == 20000) {
@ -173,12 +182,11 @@ public class BasicGenExcelService {
} }
@Async @Async
public void uploadCorpSmpJson(String genKey, BasicUnitMaintainExportResponse exportData) { public void uploadCorpSmpJson(String genKey, BasicUnitMaintainExportResponse exportData) {
CorpExportLogEntity corpExportLogEntity = corpExportLogService.selectByGenKey(genKey); CorpExportLogEntity corpExportLogEntity = corpExportLogService.selectByGenKey(genKey);
String response = HttpClient.uCloudPost(spsSyncUrl + "/spssync/basic/corp/upload", exportData); String response = HttpClient.uCloudPost(getIpUrl() + "/spssync/basic/corp/upload", exportData);
BaseResponse baseResponse = JSONObject.parseObject(response, new TypeReference<BaseResponse>() { BaseResponse baseResponse = JSONObject.parseObject(response, new TypeReference<BaseResponse>() {
}); });
if (baseResponse.getCode() == 20000) { if (baseResponse.getCode() == 20000) {
@ -247,7 +255,7 @@ public class BasicGenExcelService {
public void uploadProductsSmpJson(String genKey, UdiRelevanceExportJsonResponse exportData) { public void uploadProductsSmpJson(String genKey, UdiRelevanceExportJsonResponse exportData) {
UdiInfoExportLogEntity udiInfoExportLogEntity = udiInfoExportLogService.selectByGenKey(genKey); UdiInfoExportLogEntity udiInfoExportLogEntity = udiInfoExportLogService.selectByGenKey(genKey);
// String response = HttpClient.uCloudPost(spsSyncUrl + "/udiwms/basic/products/upload", exportData); // String response = HttpClient.uCloudPost(spsSyncUrl + "/udiwms/basic/products/upload", exportData);
String response = HttpClient.uCloudPost(spsSyncUrl + "/spssync/basic/udiinfo/upload", exportData); String response = HttpClient.uCloudPost(getIpUrl() + "/spssync/basic/udiinfo/upload", exportData);
BaseResponse baseResponse = JSONObject.parseObject(response, new TypeReference<BaseResponse>() { BaseResponse baseResponse = JSONObject.parseObject(response, new TypeReference<BaseResponse>() {
}); });
if (baseResponse.getCode() == 20000) { if (baseResponse.getCode() == 20000) {
@ -286,7 +294,7 @@ public class BasicGenExcelService {
//todo 上传SMP //todo 上传SMP
// SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("smp_service_ip"); // SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("smp_service_ip");
// if (systemParamConfigEntity != null) { // if (systemParamConfigEntity != null) {
String response = HttpClient.uCloudPost(spsSyncUrl + "/udiwms/basic/products/upload", postUdiInfoRequest); String response = HttpClient.uCloudPost(getIpUrl() + "/udiwms/basic/products/upload", postUdiInfoRequest);
BaseResponse baseResponse = JSONObject.parseObject(response, new TypeReference<BaseResponse>() { BaseResponse baseResponse = JSONObject.parseObject(response, new TypeReference<BaseResponse>() {
}); });
if (baseResponse.getCode() == 20000) { if (baseResponse.getCode() == 20000) {

47
api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java
Unescape Escape View File

@ -20,6 +20,7 @@ import com.glxp.api.admin.entity.thrsys.*;
import com.glxp.api.admin.req.basic.BasicExportStatusRequest; import com.glxp.api.admin.req.basic.BasicExportStatusRequest;
import com.glxp.api.admin.res.basic.*; import com.glxp.api.admin.res.basic.*;
import com.glxp.api.admin.service.auth.AuthAdminService; import com.glxp.api.admin.service.auth.AuthAdminService;
import com.glxp.api.admin.service.basic.BussinessChangeTypeService;
import com.glxp.api.admin.service.basic.UdiInfoImportDetailService; import com.glxp.api.admin.service.basic.UdiInfoImportDetailService;
import com.glxp.api.admin.service.inout.OrderService; import com.glxp.api.admin.service.inout.OrderService;
import com.glxp.api.admin.service.inventory.InvWarehouseService; import com.glxp.api.admin.service.inventory.InvWarehouseService;
@ -47,10 +48,6 @@ public class DlBasicService {
@Resource @Resource
SpGetHttpClient spGetHttp; SpGetHttpClient spGetHttp;
@Resource @Resource
UdiInfoImportDetailService udiInfoImportDetailService;
@Resource
BasicCorpImportService basicCorpImportService;
@Resource
InvWarehouseService invWarehouseService; InvWarehouseService invWarehouseService;
@Resource @Resource
SqlSessionFactory sqlSessionFactory; SqlSessionFactory sqlSessionFactory;
@ -69,6 +66,8 @@ public class DlBasicService {
@Resource @Resource
ThrInvWarehouseService thrInvWarehouseService; ThrInvWarehouseService thrInvWarehouseService;
@Resource
BussinessChangeTypeService bussinessChangeTypeService;
private static final Logger logger = LoggerFactory.getLogger(DlBasicService.class); private static final Logger logger = LoggerFactory.getLogger(DlBasicService.class);
//------------------------------------------------------------ //------------------------------------------------------------
@ -218,13 +217,6 @@ public class DlBasicService {
thrInvWarehouseService.insertInvWarehouses(syncDataResponse.getThrInvWarehouseEntities()); thrInvWarehouseService.insertInvWarehouses(syncDataResponse.getThrInvWarehouseEntities());
} }
//用户表
if (CollUtil.isNotEmpty(syncDataResponse.getAuthAdminList())) {
for (AuthAdmin authAdmin : syncDataResponse.getAuthAdminList()) {
authAdmin.setLastModifyTime(null);
authAdminService.replaceAuthAdmin(authAdmin);
}
}
//仓库用户表 //仓库用户表
if (CollUtil.isNotEmpty(syncDataResponse.getWarehouseUserEntities())) { if (CollUtil.isNotEmpty(syncDataResponse.getWarehouseUserEntities())) {
@ -282,6 +274,7 @@ public class DlBasicService {
} }
batchSession.commit(); batchSession.commit();
} catch (Exception e) { } catch (Exception e) {
logger.error(e.getMessage());
} }
} }
//业务单据 //业务单据
@ -293,10 +286,18 @@ public class DlBasicService {
BussinessLocalTypeEntity bussinessTypeEntity = new BussinessLocalTypeEntity(); BussinessLocalTypeEntity bussinessTypeEntity = new BussinessLocalTypeEntity();
BeanUtils.copyProperties(spsBusLoclTypeResponse, bussinessTypeEntity); BeanUtils.copyProperties(spsBusLoclTypeResponse, bussinessTypeEntity);
bussinessTypeEntity.setUpdateTime(null); bussinessTypeEntity.setUpdateTime(null);
bussinessChangeTypeService.deleteByAction(spsBusLoclTypeResponse.getAction());
mapper.insertBussinessType(bussinessTypeEntity); mapper.insertBussinessType(bussinessTypeEntity);
} }
batchSession.commit(); batchSession.commit();
List<BussinessChangeTypeEntity> bussinessChangeTypeEntities = syncDataResponse.getBussinessChangeTypeEntities();
if (CollUtil.isNotEmpty(bussinessChangeTypeEntities)) {
for (BussinessChangeTypeEntity bussinessChangeTypeEntity : bussinessChangeTypeEntities) {
bussinessChangeTypeService.insertBusChangeTypee(bussinessChangeTypeEntity);
}
}
} catch (Exception e) { } catch (Exception e) {
logger.error(e.getMessage());
} }
} }
//原始单据 //原始单据
@ -310,6 +311,7 @@ public class DlBasicService {
} }
batchSession.commit(); batchSession.commit();
} catch (Exception e) { } catch (Exception e) {
logger.error(e.getMessage());
} }
} }
batchSession.close(); batchSession.close();
@ -346,17 +348,15 @@ public class DlBasicService {
orderEntity.setErpFk(null); orderEntity.setErpFk(null);
orderEntity.setOutChangeEnable(false); orderEntity.setOutChangeEnable(false);
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS);
OrderEntity temp = orderService.findById(orderEntity.getId()); OrderEntity temp = orderService.findById(orderEntity.getId());
if(temp == null){ if (temp == null) {
mapper.importOrder(orderEntity); mapper.importOrder(orderEntity);
if (CollUtil.isNotEmpty(syncDataResponse.getWarehouseEntityList())) { if (CollUtil.isNotEmpty(syncDataResponse.getWarehouseEntityList())) {
try { try {
CodesTempDao codeMappert = batchSession.getMapper(CodesTempDao.class); CodesTempDao codeMappert = batchSession.getMapper(CodesTempDao.class);
List<WarehouseEntity> warehouseEntityList = syncDataResponse.getWarehouseEntityList(); List<WarehouseEntity> warehouseEntityList = syncDataResponse.getWarehouseEntityList();
for (WarehouseEntity warehouseEntity:warehouseEntityList){ for (WarehouseEntity warehouseEntity : warehouseEntityList) {
if(warehouseEntity.getOrderId().equals(orderEntity.getId())){ if (warehouseEntity.getOrderId().equals(orderEntity.getId())) {
codeMappert.replaceCodesTempSingle(warehouseEntity); codeMappert.replaceCodesTempSingle(warehouseEntity);
} }
} }
@ -364,7 +364,6 @@ public class DlBasicService {
} catch (Exception e) { } catch (Exception e) {
} }
} }
} }
} }
@ -372,18 +371,6 @@ public class DlBasicService {
} catch (Exception e) { } catch (Exception e) {
} }
} }
// if (CollUtil.isNotEmpty(syncDataResponse.getOrderDetailEntityList())) {
// try {
// List<ErpOrderEntity> erpOrderEntities = syncDataResponse.getOrderDetailEntityList();
// OrderDetailDao mapper = batchSession.getMapper(OrderDetailDao.class);
// for (ErpOrderEntity erpOrderEntity : erpOrderEntities) {
// mapper.insertErpOrder(erpOrderEntity);
// }
// batchSession.commit();
// } catch (Exception e) {
// }
// }
batchSession.close(); batchSession.close();
spGetHttp.postBasicStatus(basicExportStatusEntity.getId()); spGetHttp.postBasicStatus(basicExportStatusEntity.getId());
} }
@ -406,8 +393,8 @@ public class DlBasicService {
if (basicExportStatusEntity.getId().equals("AsyncUploadAllData")) { if (basicExportStatusEntity.getId().equals("AsyncUploadAllData")) {
heartService.uploadAllBus(null); heartService.uploadAllBus(null);
heartService.uploadAllData(null); heartService.uploadAllData(null);
heartService.uploadScheduleList();
heartService.uploadAllOrder(null); heartService.uploadAllOrder(null);
heartService.uploadScheduleList();
redisUtil.set("SPS_SYNC_UPLOAD_DATA", System.currentTimeMillis()); redisUtil.set("SPS_SYNC_UPLOAD_DATA", System.currentTimeMillis());
} }
} }

6
api-admin/src/main/java/com/glxp/api/admin/thread/DownloadThirdSysDataTask.java
Unescape Escape View File

@ -90,6 +90,7 @@ public class DownloadThirdSysDataTask implements SchedulingConfigurer {
List<String> thirdIds = basicThirdSysDao.selectEnabledThirdId(); List<String> thirdIds = basicThirdSysDao.selectEnabledThirdId();
if (CollUtil.isNotEmpty(thirdIds)) { if (CollUtil.isNotEmpty(thirdIds)) {
for (String thirdId : thirdIds) { for (String thirdId : thirdIds) {
log.info("自动下载第三方系统为：{} 的基础数据", thirdId); log.info("自动下载第三方系统为：{} 的基础数据", thirdId);
log.info("开始下载第三方系统的仓库数据"); log.info("开始下载第三方系统的仓库数据");
BaseResponse baseResponse = thrInvWarehouseService.downloadThirdWarehouse(thirdId); BaseResponse baseResponse = thrInvWarehouseService.downloadThirdWarehouse(thirdId);
@ -100,7 +101,6 @@ public class DownloadThirdSysDataTask implements SchedulingConfigurer {
log.error(JSONUtil.toJsonStr(baseResponse)); log.error(JSONUtil.toJsonStr(baseResponse));
} }
log.info("开始下载第三方系统的往来单位数据"); log.info("开始下载第三方系统的往来单位数据");
ThrCorpImportLogEntity thrCorpImportLogEntity = new ThrCorpImportLogEntity(); ThrCorpImportLogEntity thrCorpImportLogEntity = new ThrCorpImportLogEntity();
String genKey = CustomUtil.getId(); String genKey = CustomUtil.getId();
@ -130,8 +130,7 @@ public class DownloadThirdSysDataTask implements SchedulingConfigurer {
thrProductsDlService.importProducrs(genKey1, filterThrProductsRequest); thrProductsDlService.importProducrs(genKey1, filterThrProductsRequest);
log.info("第三方系统往来产品信息数据下载完成"); log.info("第三方系统往来产品信息数据下载完成");
log.info("开始下载第三方系统单据类型");
log.info("开始下载第三方系统的产品信息数据");
FilterBasicThirdSysDetailRequest filterBasicThirdSysDetailRequest = new FilterBasicThirdSysDetailRequest(); FilterBasicThirdSysDetailRequest filterBasicThirdSysDetailRequest = new FilterBasicThirdSysDetailRequest();
filterBasicThirdSysDetailRequest.setThirdSysFk(thirdId); filterBasicThirdSysDetailRequest.setThirdSysFk(thirdId);
int page = 1; int page = 1;
@ -163,6 +162,7 @@ public class DownloadThirdSysDataTask implements SchedulingConfigurer {
} }
} else { } else {
log.error("第三方系统单据类型数据下载失败"); log.error("第三方系统单据类型数据下载失败");
break;
} }
log.info("第三方系统往来产品信息数据下载完成"); log.info("第三方系统往来产品信息数据下载完成");
} }

40
api-admin/src/main/java/com/glxp/api/admin/thread/HeartService.java
Unescape Escape View File

@ -42,9 +42,8 @@ public class HeartService {
if (basicExportStatusTimeEntity == null) { if (basicExportStatusTimeEntity == null) {
basicExportStatusTimeEntity = new BasicExportStatusTimeEntity(); basicExportStatusTimeEntity = new BasicExportStatusTimeEntity();
basicExportStatusTimeEntity.setLastUpdateTime("1949-10-01 09:00:00"); basicExportStatusTimeEntity.setLastUpdateTime("1949-10-01 09:00:00");
basicExportTimeService.insertExportStatus(basicExportStatusTimeEntity);
spsSyncDataRequest.setLastUpdateTime(basicExportStatusTimeEntity.getLastUpdateTime());
} }
spsSyncDataRequest.setLastUpdateTime(basicExportStatusTimeEntity.getLastUpdateTime());
} else { } else {
spsSyncDataRequest.setLastUpdateTime(syncTime); spsSyncDataRequest.setLastUpdateTime(syncTime);
} }
@ -94,7 +93,16 @@ public class HeartService {
public BaseResponse uploadAllBus(String syncTime) { public BaseResponse uploadAllBus(String syncTime) {
SpsSyncDataRequest spsSyncDataRequest = new SpsSyncDataRequest(); SpsSyncDataRequest spsSyncDataRequest = new SpsSyncDataRequest();
spsSyncDataRequest.setLastUpdateTime(syncTime); if (syncTime == null) {
BasicExportStatusTimeEntity basicExportStatusTimeEntity = basicExportTimeService.findByKey(ConstantStatus.SYNC_BUS_TYPE);
if (basicExportStatusTimeEntity == null) {
basicExportStatusTimeEntity = new BasicExportStatusTimeEntity();
basicExportStatusTimeEntity.setLastUpdateTime("1949-10-01 09:00:00");
}
spsSyncDataRequest.setLastUpdateTime(basicExportStatusTimeEntity.getLastUpdateTime());
} else {
spsSyncDataRequest.setLastUpdateTime(syncTime);
}
SpsSyncBusResponse spsSyncBusResponse = upBasicService.upAllBus(spsSyncDataRequest); SpsSyncBusResponse spsSyncBusResponse = upBasicService.upAllBus(spsSyncDataRequest);
if (CollUtil.isEmpty(spsSyncBusResponse.getBussinessOriginTypeEntities()) if (CollUtil.isEmpty(spsSyncBusResponse.getBussinessOriginTypeEntities())
&& CollUtil.isEmpty(spsSyncBusResponse.getBussinessLocalTypeEntities()) && CollUtil.isEmpty(spsSyncBusResponse.getBussinessLocalTypeEntities())
@ -139,7 +147,18 @@ public class HeartService {
public BaseResponse uploadAllData(String syncTime) { public BaseResponse uploadAllData(String syncTime) {
SpsSyncDataRequest spsSyncDataRequest = new SpsSyncDataRequest(); SpsSyncDataRequest spsSyncDataRequest = new SpsSyncDataRequest();
spsSyncDataRequest.setLastUpdateTime(syncTime); if (syncTime == null) {
BasicExportStatusTimeEntity basicExportStatusTimeEntity = basicExportTimeService.findByKey(ConstantStatus.SYNC_BASIC_DATA);
if (basicExportStatusTimeEntity == null) {
basicExportStatusTimeEntity = new BasicExportStatusTimeEntity();
basicExportStatusTimeEntity.setLastUpdateTime("1949-10-01 09:00:00");
}
spsSyncDataRequest.setLastUpdateTime(basicExportStatusTimeEntity.getLastUpdateTime());
} else {
spsSyncDataRequest.setLastUpdateTime(syncTime);
}
SpsSyncDataResponse syncDataResponse = upBasicService.upAllData(spsSyncDataRequest); SpsSyncDataResponse syncDataResponse = upBasicService.upAllData(spsSyncDataRequest);
if (CollUtil.isEmpty(syncDataResponse.getInvWarehouseEntities()) if (CollUtil.isEmpty(syncDataResponse.getInvWarehouseEntities())
&& CollUtil.isEmpty(syncDataResponse.getUdiInfoEntities()) && CollUtil.isEmpty(syncDataResponse.getUdiInfoEntities())
@ -150,7 +169,10 @@ public class HeartService {
&& CollUtil.isEmpty(syncDataResponse.getThrOrderEntities()) && CollUtil.isEmpty(syncDataResponse.getThrOrderEntities())
&& CollUtil.isEmpty(syncDataResponse.getThrOrderDetailEntities()) && CollUtil.isEmpty(syncDataResponse.getThrOrderDetailEntities())
&& CollUtil.isEmpty(syncDataResponse.getCompanyProductRelevanceEntities()) && CollUtil.isEmpty(syncDataResponse.getCompanyProductRelevanceEntities())
&& CollUtil.isEmpty(syncDataResponse.getUdiRelevanceEntities())) { && CollUtil.isEmpty(syncDataResponse.getUdiRelevanceEntities())
&& CollUtil.isEmpty(syncDataResponse.getAuthAdminList())
&& CollUtil.isEmpty(syncDataResponse.getWarehouseBussinessTypeEntities())
&& CollUtil.isEmpty(syncDataResponse.getWarehouseUserEntities())) {
//数据不记录日志 //数据不记录日志
return ResultVOUtils.success("无数据"); return ResultVOUtils.success("无数据");
} }
@ -181,8 +203,6 @@ public class HeartService {
String logs = ""; String logs = "";
if (CollUtil.isNotEmpty(syncDataResponse.getUdiRelevanceEntities())) if (CollUtil.isNotEmpty(syncDataResponse.getUdiRelevanceEntities()))
logs = logs + "耗材字典：" + syncDataResponse.getUdiRelevanceEntities().size() + "条\n"; logs = logs + "耗材字典：" + syncDataResponse.getUdiRelevanceEntities().size() + "条\n";
if (CollUtil.isNotEmpty(syncDataResponse.getUdiInfoEntities()))
logs = logs + "耗材字典：" + syncDataResponse.getUdiInfoEntities().size() + "条\n";
if (CollUtil.isNotEmpty(syncDataResponse.getBasicUnitMaintainEntities())) if (CollUtil.isNotEmpty(syncDataResponse.getBasicUnitMaintainEntities()))
logs = logs + "往来单位：" + syncDataResponse.getBasicUnitMaintainEntities().size() + "条\n"; logs = logs + "往来单位：" + syncDataResponse.getBasicUnitMaintainEntities().size() + "条\n";
if (CollUtil.isNotEmpty(syncDataResponse.getCompanyProductRelevanceEntities())) if (CollUtil.isNotEmpty(syncDataResponse.getCompanyProductRelevanceEntities()))
@ -193,12 +213,12 @@ public class HeartService {
logs = logs + "第三方仓库字典：" + syncDataResponse.getThrInvWarehouseEntities().size() + "条\n"; logs = logs + "第三方仓库字典：" + syncDataResponse.getThrInvWarehouseEntities().size() + "条\n";
if (CollUtil.isNotEmpty(syncDataResponse.getThrOrderEntities())) if (CollUtil.isNotEmpty(syncDataResponse.getThrOrderEntities()))
logs = logs + "第三方业务单据：" + syncDataResponse.getThrOrderEntities().size() + "条\n"; logs = logs + "第三方业务单据：" + syncDataResponse.getThrOrderEntities().size() + "条\n";
if (CollUtil.isNotEmpty(syncDataResponse.getThrOrderDetailEntities())) if (CollUtil.isNotEmpty(syncDataResponse.getThrProductsEntities()))
logs = logs + "第三方业务单据详情：" + syncDataResponse.getThrOrderDetailEntities().size() + "条\n";
if (CollUtil.isNotEmpty(syncDataResponse.getThrOrderEntities()))
logs = logs + "第三方产品信息：" + syncDataResponse.getThrProductsEntities().size() + "条\n"; logs = logs + "第三方产品信息：" + syncDataResponse.getThrProductsEntities().size() + "条\n";
if (CollUtil.isNotEmpty(syncDataResponse.getThrCorpEntities())) if (CollUtil.isNotEmpty(syncDataResponse.getThrCorpEntities()))
logs = logs + "第三方往来单位：" + syncDataResponse.getThrCorpEntities().size() + "条\n"; logs = logs + "第三方往来单位：" + syncDataResponse.getThrCorpEntities().size() + "条\n";
if (CollUtil.isNotEmpty(syncDataResponse.getAuthAdminList()))
logs = logs + "系统用户信息：" + syncDataResponse.getAuthAdminList().size() + "条\n";
basicExportStatusEntity3.setRemark(logs); basicExportStatusEntity3.setRemark(logs);
basicExportStatusEntity3.setUpdateTime(new Date()); basicExportStatusEntity3.setUpdateTime(new Date());
basicExportService.updateExportStatus(basicExportStatusEntity3); basicExportService.updateExportStatus(basicExportStatusEntity3);

116
api-admin/src/main/java/com/glxp/api/admin/thread/IoModifyErpTask.java
Unescape Escape View File

@ -69,122 +69,6 @@ public class IoModifyErpTask implements SchedulingConfigurer {
// modifyErp(); // modifyErp();
} }
public void modifyErp() {
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("erpSaleOutModify");
String isErpSaleOutModify = systemParamConfigEntity.getParamValue();
systemParamConfigEntity = systemParamConfigService.selectByParamKey("erpPruchaseModify");
String isErpPruchaseModify = systemParamConfigEntity.getParamValue();
if ("1".equals(isErpSaleOutModify) || "1".equals(isErpPruchaseModify)) {
logger.info("定时修改ERP单，定时签字");
OrderFilterRequest orderFilterRequest = new OrderFilterRequest();
orderFilterRequest.setExportStatus(ConstantStatus.ORDER_EXPORT_UN);
orderFilterRequest.setContrastStatus(ConstantStatus.ORDER_CHECK_SUCCESS);
List<OrderEntity> orderEntities = orderService.findAllOrders(orderFilterRequest);
if (orderEntities != null && orderEntities.size() > 0) {
for (OrderEntity orderEntity : orderEntities) {
FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest();
filterErpOrderRequest.setPage(1);
filterErpOrderRequest.setLimit(100);
filterErpOrderRequest.setOrderId(orderEntity.getId());
List<ErpOrderEntity> erpOrderEntities = myErpOrderService.filterMyErpOrder(filterErpOrderRequest);
BasicThirdSysDetailEntity basicThirdSysDetailEntity = bussinessTypeService.findByActionKey(filterErpOrderRequest.getBillAction(), "orderQueryUrl");
if (basicThirdSysDetailEntity.getEnabled() && basicThirdSysDetailEntity.getFromType() == 0) {
if (basicThirdSysDetailEntity.getValue() != null) {
String url = basicThirdSysDetailEntity.getValue();
if (erpOrderEntities != null && !erpOrderEntities.isEmpty()) {
Map<String, List<ErpOrderEntity>> listMap = erpOrderEntities.stream().collect(Collectors.groupingBy(ErpOrderEntity::getErpOrderId));
if (orderEntity.getMainAction().equals(ConstantType.TYPE_OUT)) {
if ("1".equals(isErpSaleOutModify)) {
BaseResponse baseResponse = erpOrderClient.postBill(listMap, orderEntity.getAction(), url, basicThirdSysDetailEntity.getThirdSysFk());
if (baseResponse != null && baseResponse.getCode() == 20000) {
orderService.updateExportStatus(orderEntity.getId(), ConstantStatus.ORDER_EXPORT_ED);
}
}
} else {
if ("1".equals(isErpPruchaseModify)) {
BaseResponse baseResponse = erpOrderClient.postBill(listMap, orderEntity.getAction(), url, basicThirdSysDetailEntity.getThirdSysFk());
if (baseResponse != null && baseResponse.getCode() == 20000) {
orderService.updateExportStatus(orderEntity.getId(), ConstantStatus.ORDER_EXPORT_ED);
}
}
}
}
} else {
logger.error("ERP单据修改接口地址未定义");
}
} else {
logger.error("ERP单据修改未启用");
}
}
}
SystemParamConfigEntity saleOutSign = systemParamConfigService.selectByParamKey("erpSaleOutSign");
String isSaleOutSign = saleOutSign.getParamValue();
saleOutSign = systemParamConfigService.selectByParamKey("erpPruchaseSign");
String isPruchaseSign = saleOutSign.getParamValue();
OrderFilterRequest signFilterRequest = new OrderFilterRequest();
signFilterRequest.setSignStatus(ConstantStatus.ORDER_SIGN_UN);
signFilterRequest.setContrastStatus(ConstantStatus.ORDER_CHECK_SUCCESS);
List<OrderEntity> signsOrderEntities = orderService.findAllOrders(signFilterRequest);
if (signsOrderEntities != null && signsOrderEntities.size() > 0) {
for (OrderEntity orderEntity : signsOrderEntities) {
BasicThirdSysDetailEntity basicThirdSysDetailEntity = bussinessTypeService.findByActionKey(orderEntity.getAction(), "orderQueryUrl");
if (basicThirdSysDetailEntity.getEnabled() && basicThirdSysDetailEntity.getFromType() == 0) {
if (basicThirdSysDetailEntity.getValue() != null) {
String url = basicThirdSysDetailEntity.getValue();
FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest();
filterErpOrderRequest.setOrderId(orderEntity.getId());
List<ErpOrderEntity> erpOrderEntities = myErpOrderService.filterMyErpOrder(filterErpOrderRequest);
if (erpOrderEntities != null && !erpOrderEntities.isEmpty()) {
Map<String, List<ErpOrderEntity>> listMap = erpOrderEntities.stream().collect(Collectors.groupingBy(ErpOrderEntity::getErpOrderId));
if (orderEntity.getMainAction().equals(ConstantType.TYPE_OUT)) {
if ("1".equals(isSaleOutSign)) {
if (listMap != null && listMap.size() > 0) {
for (String key : listMap.keySet()) {
ERPPostBillRequest signRequest = new ERPPostBillRequest();
signRequest.setBillNo(key);
signRequest.setBillAction(orderEntity.getAction());
signRequest.setModifyType("sign");
BaseResponse baseResponse = new ErpOrderClient().postBill(signRequest, url);
if (baseResponse != null && baseResponse.getCode() == 20000) {
orderService.updateSignStatus(orderEntity.getId(), ConstantStatus.ORDER_SIGN_ED + "");
}
}
}
}
} else {
if ("1".equals(isPruchaseSign)) {
if (listMap != null && listMap.size() > 0) {
for (String key : listMap.keySet()) {
ERPPostBillRequest signRequest = new ERPPostBillRequest();
signRequest.setBillNo(key);
signRequest.setBillAction(orderEntity.getAction());
signRequest.setModifyType("sign");
BaseResponse baseResponse = new ErpOrderClient().postBill(signRequest, url);
if (baseResponse != null && baseResponse.getCode() == 20000) {
orderService.updateSignStatus(orderEntity.getId(), ConstantStatus.ORDER_SIGN_ED + "");
}
}
}
}
}
}
} else {
logger.error("ERP单据修改接口地址未定义");
}
} else {
logger.error("ERP单据修改未启用");
}
}
}
}
}
} }

4
api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java
Unescape Escape View File

@ -125,7 +125,7 @@ public class IoTransInoutService {
//手持终端生成订单，插入零时表 //手持终端生成订单，插入零时表
public void creatOrder(PostOrderRequest postOrderRequest, Integer fromType) { public void creatOrder(PostOrderRequest postOrderRequest, Integer fromType) {
List<PostOrderRequest.PostOrder> postOrders = postOrderRequest.getPostOrder(); List<PostOrderRequest.PostOrder> postOrders = postOrderRequest.getPostOrders();
if (postOrders != null && postOrders.size() > 0) { if (postOrders != null && postOrders.size() > 0) {
for (int i = 0; i < postOrders.size(); i++) { for (int i = 0; i < postOrders.size(); i++) {
PostOrderRequest.PostOrder postOrder = postOrders.get(i); PostOrderRequest.PostOrder postOrder = postOrders.get(i);
@ -190,7 +190,7 @@ public class IoTransInoutService {
//web端新增订单， //web端新增订单，
@Async @Async
public void creatOrderWeb(PostOrderRequest postOrderRequest) { public void creatOrderWeb(PostOrderRequest postOrderRequest) {
List<PostOrderRequest.PostOrder> postOrders = postOrderRequest.getPostOrder(); List<PostOrderRequest.PostOrder> postOrders = postOrderRequest.getPostOrders();
if (postOrders != null && postOrders.size() > 0) { if (postOrders != null && postOrders.size() > 0) {
for (int i = 0; i < postOrders.size(); i++) { for (int i = 0; i < postOrders.size(); i++) {
PostOrderRequest.PostOrder postOrder = postOrders.get(i); PostOrderRequest.PostOrder postOrder = postOrders.get(i);

21
api-admin/src/main/java/com/glxp/api/admin/thread/ThrCorpsDlService.java
Unescape Escape View File

@ -8,6 +8,7 @@ import com.glxp.api.admin.config.WebSocketServer;
import com.glxp.api.admin.constant.BasicProcessStatus; import com.glxp.api.admin.constant.BasicProcessStatus;
import com.glxp.api.admin.constant.Constant; import com.glxp.api.admin.constant.Constant;
import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity;
import com.glxp.api.admin.entity.info.SyncDataSetEntity;
import com.glxp.api.admin.entity.thrsys.*; import com.glxp.api.admin.entity.thrsys.*;
import com.glxp.api.admin.httpclient.ErpBasicClient; import com.glxp.api.admin.httpclient.ErpBasicClient;
import com.glxp.api.admin.req.basic.BasicUnitMaintainFilterRequest; import com.glxp.api.admin.req.basic.BasicUnitMaintainFilterRequest;
@ -18,6 +19,7 @@ import com.glxp.api.admin.req.thrsys.ThrCorpExportRequest;
import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.basic.ErpUnitsResponse; import com.glxp.api.admin.res.basic.ErpUnitsResponse;
import com.glxp.api.admin.service.basic.BasicThirdSysDetailService; import com.glxp.api.admin.service.basic.BasicThirdSysDetailService;
import com.glxp.api.admin.service.info.SyncDataSetService;
import com.glxp.api.admin.service.thrsys.ThrCorpExportLogService; import com.glxp.api.admin.service.thrsys.ThrCorpExportLogService;
import com.glxp.api.admin.service.thrsys.ThrCorpImportDetailService; import com.glxp.api.admin.service.thrsys.ThrCorpImportDetailService;
import com.glxp.api.admin.service.thrsys.ThrCorpImportLogService; import com.glxp.api.admin.service.thrsys.ThrCorpImportLogService;
@ -50,10 +52,17 @@ public class ThrCorpsDlService {
ThrCorpExportLogService thrCorpExportLogService; ThrCorpExportLogService thrCorpExportLogService;
@Resource @Resource
private ThrCorpImportDetailService thrCorpImportDetailService; private ThrCorpImportDetailService thrCorpImportDetailService;
@Value("${SPSYNC_IP}") // @Value("${SPSYNC_IP}")
private String spsSyncUrl; // private String spsSyncUrl;
@Resource @Resource
ErpBasicClient erpBasicClient; ErpBasicClient erpBasicClient;
@Resource
SyncDataSetService syncDataSetService;
public String getIpUrl() {
SyncDataSetEntity syncDataSetEntity = syncDataSetService.findSet();
return syncDataSetEntity.getSyncIp();
}
@Async @Async
public void importSelectCorps(String genKey, List<ErpUnitsResponse> erpUnitsResponses, String thirdSys) { public void importSelectCorps(String genKey, List<ErpUnitsResponse> erpUnitsResponses, String thirdSys) {
@ -180,7 +189,7 @@ public class ThrCorpsDlService {
if (!basicThirdSysDetailEntity.getEnabled()) { if (!basicThirdSysDetailEntity.getEnabled()) {
thrCorpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); thrCorpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL);
thrCorpExportLogEntity.setRemark("第三方往来单位服务未启用"); thrCorpExportLogEntity.setRemark("第三方接口往来单位服务接口未启用");
thrCorpExportLogService.updateThrCorpExportLog(thrCorpExportLogEntity); thrCorpExportLogService.updateThrCorpExportLog(thrCorpExportLogEntity);
return; return;
} }
@ -381,7 +390,7 @@ public class ThrCorpsDlService {
if (!basicThirdSysDetailEntity.getEnabled()) { if (!basicThirdSysDetailEntity.getEnabled()) {
thrCorpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); thrCorpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL);
thrCorpExportLogEntity.setRemark("第三方往来单位服务未启用"); thrCorpExportLogEntity.setRemark("第三方接口往来单位服务接口未启用");
thrCorpExportLogService.updateThrCorpExportLog(thrCorpExportLogEntity); thrCorpExportLogService.updateThrCorpExportLog(thrCorpExportLogEntity);
return; return;
} }
@ -428,7 +437,7 @@ public class ThrCorpsDlService {
if (!basicThirdSysDetailEntity.getEnabled()) { if (!basicThirdSysDetailEntity.getEnabled()) {
thrCorpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); thrCorpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL);
thrCorpExportLogEntity.setRemark("第三方往来单位服务未启用"); thrCorpExportLogEntity.setRemark("第三方接口往来单位服务接口未启用");
thrCorpExportLogService.updateThrCorpExportLog(thrCorpExportLogEntity); thrCorpExportLogService.updateThrCorpExportLog(thrCorpExportLogEntity);
return; return;
} }
@ -451,7 +460,7 @@ public class ThrCorpsDlService {
postThrCorpRequest.setGenKey(genKey); postThrCorpRequest.setGenKey(genKey);
postThrCorpRequest.setThirdSys(thrCorpExportRequest.getThirdSys()); postThrCorpRequest.setThirdSys(thrCorpExportRequest.getThirdSys());
postThrCorpRequest.setUploadType("接口上传"); postThrCorpRequest.setUploadType("接口上传");
String response = HttpClient.uCloudPost(spsSyncUrl + "/spssync/thirdsys/corp/upload", postThrCorpRequest); String response = HttpClient.uCloudPost(getIpUrl() + "/spssync/thirdsys/corp/upload", postThrCorpRequest);
BaseResponse baseResponse = JSONObject.parseObject(response, new TypeReference<BaseResponse>() { BaseResponse baseResponse = JSONObject.parseObject(response, new TypeReference<BaseResponse>() {
}); });
if (baseResponse.getCode() == 20000) { if (baseResponse.getCode() == 20000) {

25
api-admin/src/main/java/com/glxp/api/admin/thread/ThrOrdersDlService.java
Unescape Escape View File

@ -10,6 +10,7 @@ import com.glxp.api.admin.constant.Constant;
import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity;
import com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity; import com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity;
import com.glxp.api.admin.entity.basic.BussinessTypeEntity; import com.glxp.api.admin.entity.basic.BussinessTypeEntity;
import com.glxp.api.admin.entity.info.SyncDataSetEntity;
import com.glxp.api.admin.entity.thrsys.*; import com.glxp.api.admin.entity.thrsys.*;
import com.glxp.api.admin.httpclient.ErpOrderClient; import com.glxp.api.admin.httpclient.ErpOrderClient;
import com.glxp.api.admin.req.inout.FilterOrderRequest; import com.glxp.api.admin.req.inout.FilterOrderRequest;
@ -24,6 +25,7 @@ import com.glxp.api.admin.res.thrsys.ThrOrderExportJsonResponse;
import com.glxp.api.admin.service.basic.BasicThirdSysDetailService; import com.glxp.api.admin.service.basic.BasicThirdSysDetailService;
import com.glxp.api.admin.service.basic.BasicUnitMaintainService; import com.glxp.api.admin.service.basic.BasicUnitMaintainService;
import com.glxp.api.admin.service.basic.BussinessTypeService; import com.glxp.api.admin.service.basic.BussinessTypeService;
import com.glxp.api.admin.service.info.SyncDataSetService;
import com.glxp.api.admin.service.thrsys.*; import com.glxp.api.admin.service.thrsys.*;
import com.glxp.api.admin.util.ExcelUtil; import com.glxp.api.admin.util.ExcelUtil;
import com.glxp.api.admin.util.HttpClient; import com.glxp.api.admin.util.HttpClient;
@ -42,8 +44,8 @@ import java.util.List;
@Service @Service
public class ThrOrdersDlService { public class ThrOrdersDlService {
@Value("${SPSYNC_IP}") // @Value("${SPSYNC_IP}")
private String spsSyncUrl; // private String spsSyncUrl;
@Resource @Resource
ThrOrderService thrOrderService; ThrOrderService thrOrderService;
@Resource @Resource
@ -67,6 +69,13 @@ public class ThrOrdersDlService {
@Resource @Resource
private ErpOrderClient erpOrderClient; private ErpOrderClient erpOrderClient;
@Resource
SyncDataSetService syncDataSetService;
public String getIpUrl() {
SyncDataSetEntity syncDataSetEntity = syncDataSetService.findSet();
return syncDataSetEntity.getSyncIp();
}
@Async @Async
public void importOrders(String genKey, String action, FilterThrOrderRequest filterThrProductsRequest) { public void importOrders(String genKey, String action, FilterThrOrderRequest filterThrProductsRequest) {
@ -194,7 +203,7 @@ public class ThrOrdersDlService {
} }
if (!basicThirdSysDetailEntity.getEnabled() || basicThirdSysDetailEntity.getThirdSysFk() == null) { if (!basicThirdSysDetailEntity.getEnabled() || basicThirdSysDetailEntity.getThirdSysFk() == null) {
thrOrderExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); thrOrderExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL);
thrOrderExportLogEntity.setRemark("第三方业务单据服务未启用"); thrOrderExportLogEntity.setRemark("第三方系统业务单据接口服务未启用");
thrOrderExportLogService.updateThrOrderExportLog(thrOrderExportLogEntity); thrOrderExportLogService.updateThrOrderExportLog(thrOrderExportLogEntity);
return; return;
} }
@ -261,7 +270,7 @@ public class ThrOrdersDlService {
} }
if (!basicThirdSysDetailEntity.getEnabled() || basicThirdSysDetailEntity.getThirdSysFk() == null) { if (!basicThirdSysDetailEntity.getEnabled() || basicThirdSysDetailEntity.getThirdSysFk() == null) {
thrOrderExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); thrOrderExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL);
thrOrderExportLogEntity.setRemark("第三方业务单据服务未启用"); thrOrderExportLogEntity.setRemark("第三方系统业务单据接口服务未启用");
thrOrderExportLogService.updateThrOrderExportLog(thrOrderExportLogEntity); thrOrderExportLogService.updateThrOrderExportLog(thrOrderExportLogEntity);
return; return;
} }
@ -354,7 +363,7 @@ public class ThrOrdersDlService {
} }
if (!basicThirdSysDetailEntity.getEnabled() || basicThirdSysDetailEntity.getThirdSysFk() == null) { if (!basicThirdSysDetailEntity.getEnabled() || basicThirdSysDetailEntity.getThirdSysFk() == null) {
thrOrderExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); thrOrderExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL);
thrOrderExportLogEntity.setRemark("第三方业务单据服务未启用"); thrOrderExportLogEntity.setRemark("第三方系统业务单据接口服务未启用");
thrOrderExportLogService.updateThrOrderExportLog(thrOrderExportLogEntity); thrOrderExportLogService.updateThrOrderExportLog(thrOrderExportLogEntity);
return; return;
} }
@ -403,7 +412,7 @@ public class ThrOrdersDlService {
} }
thrOrderExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); thrOrderExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS);
thrOrderExportLogService.updateThrOrderExportLog(thrOrderExportLogEntity); thrOrderExportLogService.updateThrOrderExportLog(thrOrderExportLogEntity);
String response = HttpClient.uCloudPost(spsSyncUrl + "/spssync/thirdsys/order/upload", thrOrderExportJsonResponse); String response = HttpClient.uCloudPost(getIpUrl() + "/spssync/thirdsys/order/upload", thrOrderExportJsonResponse);
BaseResponse baseResponse = JSONObject.parseObject(response, new TypeReference<BaseResponse>() { BaseResponse baseResponse = JSONObject.parseObject(response, new TypeReference<BaseResponse>() {
}); });
if (baseResponse.getCode() == 20000) { if (baseResponse.getCode() == 20000) {
@ -444,7 +453,7 @@ public class ThrOrdersDlService {
} }
if (!basicThirdSysDetailEntity.getEnabled()) { if (!basicThirdSysDetailEntity.getEnabled()) {
thrOrderExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); thrOrderExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL);
thrOrderExportLogEntity.setRemark("第三方往来单位服务未启用"); thrOrderExportLogEntity.setRemark("第三方接口往来单位服务接口未启用");
thrOrderExportLogService.updateThrOrderExportLog(thrOrderExportLogEntity); thrOrderExportLogService.updateThrOrderExportLog(thrOrderExportLogEntity);
return; return;
} }
@ -484,7 +493,7 @@ public class ThrOrdersDlService {
postThrOrderRequest.setThirdSys(thrOrderExportRequest.getThirdSysFk()); postThrOrderRequest.setThirdSys(thrOrderExportRequest.getThirdSysFk());
// SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("smp_service_ip"); // SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("smp_service_ip");
// if (systemParamConfigEntity != null) { // if (systemParamConfigEntity != null) {
String response = HttpClient.uCloudPost(spsSyncUrl + "/udiwms/thrsys/postOrderDetail", postThrOrderRequest); String response = HttpClient.uCloudPost(getIpUrl() + "/udiwms/thrsys/postOrderDetail", postThrOrderRequest);
BaseResponse baseResponse = JSONObject.parseObject(response, new TypeReference<BaseResponse>() { BaseResponse baseResponse = JSONObject.parseObject(response, new TypeReference<BaseResponse>() {
}); });
if (baseResponse.getCode() == 20000) { if (baseResponse.getCode() == 20000) {

25
api-admin/src/main/java/com/glxp/api/admin/thread/ThrProductsDlService.java
Unescape Escape View File

@ -8,6 +8,7 @@ import com.glxp.api.admin.config.WebSocketServer;
import com.glxp.api.admin.constant.BasicProcessStatus; import com.glxp.api.admin.constant.BasicProcessStatus;
import com.glxp.api.admin.constant.Constant; import com.glxp.api.admin.constant.Constant;
import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity;
import com.glxp.api.admin.entity.info.SyncDataSetEntity;
import com.glxp.api.admin.entity.thrsys.ThrProductsEntity; import com.glxp.api.admin.entity.thrsys.ThrProductsEntity;
import com.glxp.api.admin.entity.thrsys.ThrProductsExportLogEntity; import com.glxp.api.admin.entity.thrsys.ThrProductsExportLogEntity;
import com.glxp.api.admin.entity.thrsys.ThrProductsImportDetailEntity; import com.glxp.api.admin.entity.thrsys.ThrProductsImportDetailEntity;
@ -21,6 +22,7 @@ import com.glxp.api.admin.req.thrsys.ThrProductsExportRequest;
import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.basic.ErpProductsResponse; import com.glxp.api.admin.res.basic.ErpProductsResponse;
import com.glxp.api.admin.service.basic.BasicThirdSysDetailService; import com.glxp.api.admin.service.basic.BasicThirdSysDetailService;
import com.glxp.api.admin.service.info.SyncDataSetService;
import com.glxp.api.admin.service.thrsys.ThrProductsExportLogService; import com.glxp.api.admin.service.thrsys.ThrProductsExportLogService;
import com.glxp.api.admin.service.thrsys.ThrProductsImportDetailService; import com.glxp.api.admin.service.thrsys.ThrProductsImportDetailService;
import com.glxp.api.admin.service.thrsys.ThrProductsImportLogService; import com.glxp.api.admin.service.thrsys.ThrProductsImportLogService;
@ -41,8 +43,15 @@ import java.util.stream.Collectors;
@Service @Service
public class ThrProductsDlService { public class ThrProductsDlService {
@Value("${SPSYNC_IP}") // @Value("${SPSYNC_IP}")
private String spsSyncUrl; // private String spsSyncUrl;
@Resource
SyncDataSetService syncDataSetService;
public String getIpUrl() {
SyncDataSetEntity syncDataSetEntity = syncDataSetService.findSet();
return syncDataSetEntity.getSyncIp();
}
@Resource @Resource
ThrProductsService thrProductsService; ThrProductsService thrProductsService;
@ -171,7 +180,7 @@ public class ThrProductsDlService {
if (!basicThirdSysDetailEntity.getEnabled()) { if (!basicThirdSysDetailEntity.getEnabled()) {
thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL);
thrProductsExportLogEntity.setRemark("第三方产品信息服务未启用！"); thrProductsExportLogEntity.setRemark("第三方系统产品信息接口服务未启用！");
thrProductsExportLogService.updateThrProductsExportLog(thrProductsExportLogEntity); thrProductsExportLogService.updateThrProductsExportLog(thrProductsExportLogEntity);
return; return;
} }
@ -235,7 +244,7 @@ public class ThrProductsDlService {
if (!basicThirdSysDetailEntity.getEnabled()) { if (!basicThirdSysDetailEntity.getEnabled()) {
thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL);
thrProductsExportLogEntity.setRemark("第三方产品信息服务未启用！"); thrProductsExportLogEntity.setRemark("第三方系统产品信息接口服务未启用！");
thrProductsExportLogService.updateThrProductsExportLog(thrProductsExportLogEntity); thrProductsExportLogService.updateThrProductsExportLog(thrProductsExportLogEntity);
return; return;
} }
@ -265,7 +274,7 @@ public class ThrProductsDlService {
} }
String response = HttpClient.uCloudPost(spsSyncUrl + "/udiwms/thrsys/postThrProducts", postThrProductsRequest); String response = HttpClient.uCloudPost(getIpUrl() + "/udiwms/thrsys/postThrProducts", postThrProductsRequest);
BaseResponse baseResponse = JSONObject.parseObject(response, new TypeReference<BaseResponse>() { BaseResponse baseResponse = JSONObject.parseObject(response, new TypeReference<BaseResponse>() {
}); });
if (baseResponse.getCode() == 20000) { if (baseResponse.getCode() == 20000) {
@ -314,7 +323,7 @@ public class ThrProductsDlService {
if (!basicThirdSysDetailEntity.getEnabled()) { if (!basicThirdSysDetailEntity.getEnabled()) {
thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL);
thrProductsExportLogEntity.setRemark("第三方产品信息服务未启用！"); thrProductsExportLogEntity.setRemark("第三方系统产品信息接口服务未启用！");
thrProductsExportLogService.updateThrProductsExportLog(thrProductsExportLogEntity); thrProductsExportLogService.updateThrProductsExportLog(thrProductsExportLogEntity);
return; return;
} }
@ -345,7 +354,7 @@ public class ThrProductsDlService {
} }
String response = HttpClient.uCloudPost(spsSyncUrl + "/spssync/thirdsys/products/upload", postThrProductsRequest); String response = HttpClient.uCloudPost(getIpUrl() + "/spssync/thirdsys/products/upload", postThrProductsRequest);
BaseResponse baseResponse = JSONObject.parseObject(response, new TypeReference<BaseResponse>() { BaseResponse baseResponse = JSONObject.parseObject(response, new TypeReference<BaseResponse>() {
}); });
if (baseResponse.getCode() == 20000) { if (baseResponse.getCode() == 20000) {
@ -547,7 +556,7 @@ public class ThrProductsDlService {
if (!basicThirdSysDetailEntity.getEnabled()) { if (!basicThirdSysDetailEntity.getEnabled()) {
thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL);
thrProductsExportLogEntity.setRemark("第三方产品信息服务未启用！"); thrProductsExportLogEntity.setRemark("第三方系统产品信息接口服务未启用！");
thrProductsExportLogService.updateThrProductsExportLog(thrProductsExportLogEntity); thrProductsExportLogService.updateThrProductsExportLog(thrProductsExportLogEntity);
return; return;
} }

60
api-admin/src/main/java/com/glxp/api/admin/thread/UpBasicService.java
Unescape Escape View File

@ -4,16 +4,17 @@ import cn.hutool.core.collection.CollUtil;
import com.glxp.api.admin.constant.ConstantStatus; import com.glxp.api.admin.constant.ConstantStatus;
import com.glxp.api.admin.dao.basic.UdiInfoDao; import com.glxp.api.admin.dao.basic.UdiInfoDao;
import com.glxp.api.admin.dao.info.SyncDataSetDao; import com.glxp.api.admin.dao.info.SyncDataSetDao;
import com.glxp.api.admin.entity.auth.AuthAdmin;
import com.glxp.api.admin.entity.basic.*; import com.glxp.api.admin.entity.basic.*;
import com.glxp.api.admin.entity.info.SyncDataSetEntity; import com.glxp.api.admin.entity.info.SyncDataSetEntity;
import com.glxp.api.admin.entity.inout.ErpOrderEntity; import com.glxp.api.admin.entity.inout.*;
import com.glxp.api.admin.entity.inout.OrderEntity;
import com.glxp.api.admin.entity.inout.WarehouseEntity;
import com.glxp.api.admin.entity.inventory.InvWarehouseEntity; import com.glxp.api.admin.entity.inventory.InvWarehouseEntity;
import com.glxp.api.admin.entity.thrsys.*; import com.glxp.api.admin.entity.thrsys.*;
import com.glxp.api.admin.req.auth.AuthAdminQueryRequest;
import com.glxp.api.admin.req.basic.*; import com.glxp.api.admin.req.basic.*;
import com.glxp.api.admin.req.inout.OrderFilterRequest; import com.glxp.api.admin.req.inout.OrderFilterRequest;
import com.glxp.api.admin.req.inout.OrderQueryRequest; import com.glxp.api.admin.req.inout.OrderQueryRequest;
import com.glxp.api.admin.req.inventory.FilterInvUserRequest;
import com.glxp.api.admin.req.inventory.FilterInvWarehouseRequest; import com.glxp.api.admin.req.inventory.FilterInvWarehouseRequest;
import com.glxp.api.admin.req.receipt.BussinessTypeFilterRequest; import com.glxp.api.admin.req.receipt.BussinessTypeFilterRequest;
import com.glxp.api.admin.req.thrsys.*; import com.glxp.api.admin.req.thrsys.*;
@ -21,12 +22,11 @@ import com.glxp.api.admin.res.basic.SpsSyncBusResponse;
import com.glxp.api.admin.res.basic.SpsSyncDataResponse; import com.glxp.api.admin.res.basic.SpsSyncDataResponse;
import com.glxp.api.admin.res.basic.SpsSyncOrderResponse; import com.glxp.api.admin.res.basic.SpsSyncOrderResponse;
import com.glxp.api.admin.res.info.SyncDataSetResponse; import com.glxp.api.admin.res.info.SyncDataSetResponse;
import com.glxp.api.admin.service.auth.AuthAdminService;
import com.glxp.api.admin.service.basic.*; import com.glxp.api.admin.service.basic.*;
import com.glxp.api.admin.service.info.CompanyProductRelevanceService; import com.glxp.api.admin.service.info.CompanyProductRelevanceService;
import com.glxp.api.admin.service.info.SyncDataSetService; import com.glxp.api.admin.service.info.SyncDataSetService;
import com.glxp.api.admin.service.inout.CodesService; import com.glxp.api.admin.service.inout.*;
import com.glxp.api.admin.service.inout.OrderDetailService;
import com.glxp.api.admin.service.inout.OrderService;
import com.glxp.api.admin.service.inventory.InvWarehouseService; import com.glxp.api.admin.service.inventory.InvWarehouseService;
import com.glxp.api.admin.service.thrsys.*; import com.glxp.api.admin.service.thrsys.*;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
@ -62,10 +62,14 @@ public class UpBasicService {
@Resource @Resource
private CompanyProductRelevanceService companyProductRelevanceService; private CompanyProductRelevanceService companyProductRelevanceService;
@Resource @Resource
private BasicExportTimeService basicExportTimeService;
@Resource
SyncDataSetService syncDataSetService; SyncDataSetService syncDataSetService;
@Resource
AuthAdminService authAdminService;
@Resource
WarehouseBussinessTypeService warehouseBussinessTypeService;
@Resource
WarehouseUserService warehouseUserService;
public SpsSyncDataResponse upAllData(SpsSyncDataRequest spsSyncDataRequest) { public SpsSyncDataResponse upAllData(SpsSyncDataRequest spsSyncDataRequest) {
SpsSyncDataResponse syncDataResponse = new SpsSyncDataResponse(); SpsSyncDataResponse syncDataResponse = new SpsSyncDataResponse();
@ -83,8 +87,24 @@ public class UpBasicService {
if (syncDataSetEntity.isBasicInv()) { if (syncDataSetEntity.isBasicInv()) {
FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest(); FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest();
BeanUtils.copyProperties(spsSyncDataRequest, filterInvWarehouseRequest); BeanUtils.copyProperties(spsSyncDataRequest, filterInvWarehouseRequest);
List<InvWarehouseEntity> invWarehouseEntities = invWarehouseService.filterInvWarehouse(filterInvWarehouseRequest); List<InvWarehouseEntity> invWarehouseEntities = invWarehouseService.filterGroupInvWarehouse(filterInvWarehouseRequest);
syncDataResponse.setInvWarehouseEntities(invWarehouseEntities); syncDataResponse.setInvWarehouseEntities(invWarehouseEntities);
if (CollUtil.isNotEmpty(invWarehouseEntities)) {
//仓库关联单据类型
FilterInvBusTypeRequest filterInvBusTypeRequest = new FilterInvBusTypeRequest();
BeanUtils.copyProperties(spsSyncDataRequest, filterInvBusTypeRequest);
List<WarehouseBussinessTypeEntity> warehouseBussinessTypeEntities = warehouseBussinessTypeService.filterList(filterInvBusTypeRequest);
syncDataResponse.setWarehouseBussinessTypeEntities(warehouseBussinessTypeEntities);
//仓库关联用户
FilterInvUserRequest filterInvUserRequest = new FilterInvUserRequest();
BeanUtils.copyProperties(spsSyncDataRequest, filterInvBusTypeRequest);
List<WarehouseUserEntity> warehouseUserEntities = warehouseUserService.filterWarehouseUsers(filterInvUserRequest);
syncDataResponse.setWarehouseUserEntities(warehouseUserEntities);
}
} }
//耗材字典 //耗材字典
@ -106,7 +126,6 @@ public class UpBasicService {
syncDataResponse.setUdiRelevanceEntities(udiRelevanceEntities); syncDataResponse.setUdiRelevanceEntities(udiRelevanceEntities);
//供应商产品信息关联表 //供应商产品信息关联表
FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest = new FilterCompanyProductRelevanceRequest(); FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest = new FilterCompanyProductRelevanceRequest();
BeanUtils.copyProperties(spsSyncDataRequest, filterCompanyProductRelevanceRequest); BeanUtils.copyProperties(spsSyncDataRequest, filterCompanyProductRelevanceRequest);
@ -123,7 +142,7 @@ public class UpBasicService {
} }
//第三方仓库信息 //第三方仓库信息
if (syncDataSetEntity.isBasicInv()) { if (syncDataSetEntity.isBasicThirdInv()) {
FilterThrInvWarehouseRequest filterThrInvWarehouseRequest = new FilterThrInvWarehouseRequest(); FilterThrInvWarehouseRequest filterThrInvWarehouseRequest = new FilterThrInvWarehouseRequest();
BeanUtils.copyProperties(spsSyncDataRequest, filterThrInvWarehouseRequest); BeanUtils.copyProperties(spsSyncDataRequest, filterThrInvWarehouseRequest);
List<ThrInvWarehouseEntity> thrInvWarehouseEntities = thrInvWarehouseService.filterThrInvWarehouse(filterThrInvWarehouseRequest); List<ThrInvWarehouseEntity> thrInvWarehouseEntities = thrInvWarehouseService.filterThrInvWarehouse(filterThrInvWarehouseRequest);
@ -166,6 +185,14 @@ public class UpBasicService {
} }
//系统用户信息
if (syncDataSetEntity.isSysUser()) {
AuthAdminQueryRequest authAdminQueryRequest = new AuthAdminQueryRequest();
BeanUtils.copyProperties(spsSyncDataRequest, authAdminQueryRequest);
List<AuthAdmin> authAdminList = authAdminService.listAdminPage(authAdminQueryRequest);
syncDataResponse.setAuthAdminList(authAdminList);
}
return syncDataResponse; return syncDataResponse;
} }
@ -176,6 +203,8 @@ public class UpBasicService {
BussinessLocalTypeService bussinessLocalTypeService; BussinessLocalTypeService bussinessLocalTypeService;
@Resource @Resource
BussinessOriginTypeService bussinessOriginTypeService; BussinessOriginTypeService bussinessOriginTypeService;
@Resource
private BussinessChangeTypeService bussinessChangeTypeService;
public SpsSyncBusResponse upAllBus(SpsSyncDataRequest spsSyncDataRequest) { public SpsSyncBusResponse upAllBus(SpsSyncDataRequest spsSyncDataRequest) {
SpsSyncBusResponse spsSyncBusResponse = new SpsSyncBusResponse(); SpsSyncBusResponse spsSyncBusResponse = new SpsSyncBusResponse();
@ -188,7 +217,7 @@ public class UpBasicService {
// } // }
//业务单据类型 //业务单据类型
if (syncDataSetEntity.isTypeBus()) { if (syncDataSetEntity.isTypeScan()) {
BussinessTypeFilterRequest bussinessTypeFilterRequest = new BussinessTypeFilterRequest(); BussinessTypeFilterRequest bussinessTypeFilterRequest = new BussinessTypeFilterRequest();
BeanUtils.copyProperties(spsSyncDataRequest, bussinessTypeFilterRequest); BeanUtils.copyProperties(spsSyncDataRequest, bussinessTypeFilterRequest);
List<BussinessTypeEntity> bussinessTypeEntities = bussinessTypeService.filterAllList(bussinessTypeFilterRequest); List<BussinessTypeEntity> bussinessTypeEntities = bussinessTypeService.filterAllList(bussinessTypeFilterRequest);
@ -196,18 +225,23 @@ public class UpBasicService {
} }
//扫码单据类型 //扫码单据类型
if (syncDataSetEntity.isTypeScan()) { if (syncDataSetEntity.isTypeBus()) {
BussinessLocalTypeFilterRequest bussinessLocalTypeFilterRequest = new BussinessLocalTypeFilterRequest(); BussinessLocalTypeFilterRequest bussinessLocalTypeFilterRequest = new BussinessLocalTypeFilterRequest();
BeanUtils.copyProperties(spsSyncDataRequest, bussinessLocalTypeFilterRequest); BeanUtils.copyProperties(spsSyncDataRequest, bussinessLocalTypeFilterRequest);
List<BussinessLocalTypeEntity> bussinessLocalTypeEntities = bussinessLocalTypeService.filterAllList(bussinessLocalTypeFilterRequest); List<BussinessLocalTypeEntity> bussinessLocalTypeEntities = bussinessLocalTypeService.filterAllList(bussinessLocalTypeFilterRequest);
List<SpsBusLoclTypeResponse> spsBusLoclTypeResponses = new ArrayList<>(); List<SpsBusLoclTypeResponse> spsBusLoclTypeResponses = new ArrayList<>();
List<BussinessChangeTypeEntity> allBussinessChanges = new ArrayList<>();
bussinessLocalTypeEntities.forEach(bussinessLocalTypeEntity -> bussinessLocalTypeEntities.forEach(bussinessLocalTypeEntity ->
{ {
SpsBusLoclTypeResponse spsBusLoclTypeResponse = new SpsBusLoclTypeResponse(); SpsBusLoclTypeResponse spsBusLoclTypeResponse = new SpsBusLoclTypeResponse();
BeanUtils.copyProperties(bussinessLocalTypeEntity, spsBusLoclTypeResponse); BeanUtils.copyProperties(bussinessLocalTypeEntity, spsBusLoclTypeResponse);
spsBusLoclTypeResponses.add(spsBusLoclTypeResponse); spsBusLoclTypeResponses.add(spsBusLoclTypeResponse);
List<BussinessChangeTypeEntity> bussinessChangeTypeEntities = bussinessChangeTypeService.findByAction(bussinessLocalTypeEntity.getAction());
allBussinessChanges.addAll(bussinessChangeTypeEntities);
}); });
spsSyncBusResponse.setBussinessLocalTypeEntities(spsBusLoclTypeResponses); spsSyncBusResponse.setBussinessLocalTypeEntities(spsBusLoclTypeResponses);
spsSyncBusResponse.setBussinessChangeTypeEntities(allBussinessChanges);
} }
//第三方单据类型 //第三方单据类型

34
api-admin/src/main/java/com/glxp/api/admin/util/FilterUdiUtils.java
Unescape Escape View File

@ -1,9 +1,16 @@
package com.glxp.api.admin.util; package com.glxp.api.admin.util;
import cn.hutool.core.util.StrUtil;
import com.glxp.api.admin.entity.basic.UdiInfoEntity; import com.glxp.api.admin.entity.basic.UdiInfoEntity;
import com.glxp.api.admin.entity.basic.UdiEntity; import com.glxp.api.admin.entity.basic.UdiEntity;
import com.glxp.api.admin.entity.inout.WarehouseEntity; import com.glxp.api.admin.entity.inout.WarehouseEntity;
import com.glxp.api.admin.util.gs1.AI;
import com.glxp.api.admin.util.gs1.AIs;
import com.glxp.api.admin.util.gs1.Gs1128Decoder;
import com.glxp.api.admin.util.gs1.Gs1128Engine;
import java.util.Map;
/** /**
* @author 彭于晏 * @author 彭于晏
@ -25,7 +32,7 @@ public class FilterUdiUtils {
return null; return null;
} }
public static UdiEntity getGS1Udi(String data) { public static UdiEntity getGS1UdiOld(String data) {
String batchNo = ""; String batchNo = "";
String produceDate = ""; String produceDate = "";
String expireDate = ""; String expireDate = "";
@ -164,6 +171,31 @@ public class FilterUdiUtils {
return udiEntity; return udiEntity;
} }
public static UdiEntity getGS1Udi(String data) {
Gs1128Engine engine = new Gs1128Engine();
Gs1128Decoder decoder = engine.decoder();
Map<AI, String> result = decoder.decode("]C1" + data);
UdiEntity udiEntity = new UdiEntity();
for (Map.Entry<AI, String> entry : result.entrySet()) {
if (entry.getKey() == AIs.GTIN) {
udiEntity.setUdi(entry.getValue());
} else if (entry.getKey() == AIs.BATCH_LOT) {
udiEntity.setBatchNo(entry.getValue());
} else if (entry.getKey() == AIs.EXPIRY) {
udiEntity.setExpireDate(entry.getValue());
} else if (entry.getKey() == AIs.PROD_DATE) {
udiEntity.setProduceDate(entry.getValue());
} else if (entry.getKey() == AIs.SERIAL) {
udiEntity.setSerialNo(entry.getValue());
}
}
if (StrUtil.isEmpty(udiEntity.getUdi())) {
return null;
} else
return udiEntity;
}
public static UdiEntity getZGCUdi(String data) { public static UdiEntity getZGCUdi(String data) {
String batchNo = ""; String batchNo = "";
String produceDate = ""; String produceDate = "";

14
api-admin/src/main/java/com/glxp/api/admin/util/gs1/AI.java
Unescape Escape View File

@ -0,0 +1,14 @@
package com.glxp.api.admin.util.gs1;
/**
* @author guilherme.pacheco
*/
public interface AI {
String getCode();
String getDescription();
String getFormat();
}

112
api-admin/src/main/java/com/glxp/api/admin/util/gs1/AIs.java
Unescape Escape View File

@ -0,0 +1,112 @@
package com.glxp.api.admin.util.gs1;
/**
* @author guilherme.pacheco
*/
public enum AIs implements AI {
SSCC("00", "Serial Shipping Container Code", "n2+n18"),
GTIN("01", "GTIN-14", "n2+n14"),
CONTENT("02", "Number of containers", "n2+n14"),
BATCH_LOT("10", "Batch Number", "n2+an..20"),
PROD_DATE("11", "Production Date", "n2+n6"),
DUE_DATE("12", "Production Date", "n2+n6"),
PACK_DATE("13", "Packaging Date", "n2+n6"),
BEST_BEFORE("15", "Sell by Date (Quality Control) ", "n2+n6"),
EXPIRY("17", "Expiration Date", "n2+n6"),
VARIANT("20", "Product Variant", "n2+n2"),
SERIAL("21", "Serial Number", "n2+an..20"),
INTERNAL("91", "Company Internal Information", "n2+an..30"),
ADDITIONAL_ID("240", "Additional Product Identification", "n3+an..30"),
CUSTOMER_PART("241", "Customer Part Number", "n3+an..30"),
VARIATION_NUMBER("242", "242 Made-to-Order variation no", "n2+n..30"),
SECONDARY_SERIAL("250", "Secondary Serial Number", "n3+an..30"),
REF_TO_SOURCE("251", "Reference to source entity", "n3+an..30"),
DOC_ID("253", "Global Document Type Identifier", "n3+n13+n..17"),
GLN_EXTENSION("254", "GLN extension component ", "n3+an..20"),
VAR_COUNT("30", "Quantity Each", "n2+n..8"),
NET_WEIGHT("310n", "Product Net Weight in kg", "n4+n6"),
LENGTH("311n", "Product Length/1st Dimension, in meters", "n4+n6"),
WIDTH("312n", "Product Width/Diameter/2nd Dimension, in meters", "n4+n6"),
HEIGHT("313n", "Product Depth/Thickness/3rd Dimension, in meters", "n4+n6"),
AREA("314n", "Product Area, in square meters", "n4+n6"),
NET_VOLUME_LITERS("315n", " Product Volume, in liters", "n4+n6"),
NET_VOLUME_CUBICS("316n", " product Volume, in cubic meters", "n4+n6"),
NET_WEIGHT_POUNDS("320n", "Product Net Weight, in pounds", "n4+n6"),
LENGTH_INCHES("321n", "Product Length/1st Dimension, in inches", "n4+n6"),
LENGTH_PES("322n", "Product Length/1st Dimension, in feet", "n4+n6"),
LENGTH_YARDS("323n", "Product Length/1st Dimension, in yards", "n4+n6"),
WIDTH_INCHES("324n", "Product Width/Diameter/2nd Dimension, in inches", "n4+n6"),
WIDTH_FEET("325n", "Product Width/Diameter/2nd Dimension, in feet", "n4+n6"),
WIDTH_YARDS("326n", "Product Width/Diameter/2nd Dimension, in yards", "n4+n6"),
HEIGHT_INCHES("327n", "Product Depth/Thickness/3rd Dimension, in inches", "n4+n6"),
HEIGHT_FEET("328n", "Product Depth/Thickness/3rd Dimension, in feet", "n4+n6"),
HEIGHT_YARDS("329n", "Product Depth/Thickness/3rd Dimension, in yards", "n4+n6"),
PRODUCT_AREA_INCHES("350n", "Product Area (Square Inches)", "n4+n6"),
PRODUCT_AREA_FEET("351n", "Product Area (Square Feet)", "n4+n6"),
PRODUCT_AREA_YARDS("352n", "Product Area (Square Yards)", "n4+n6"),
CONTAINER_AREA_INCHES("353n", "Container Area (Square Inches) ", "n4+n6"),
CONTAINER_AREA_FEET("354n", "Container Area (Square Feet) ", "n4+n6"),
CONTAINER_AREA_YARDS("355n", "Container Area (Square Yards) ", "n4+n6"),
NET_WEIGHT_OUNCES("356n", "Net Weight (Troy Ounces)", "n4+n6"),
PRODUCT_VOLUME_QUARTS("360n", " Product Volume (Quarts)", "n4+n6"),
PRODUCT_VOLUME_GALLONS("361n", " Product Volume (Gallons)", "n4+n6"),
CONTAINER_VOLUME_QUARTS("362n", " Container Gross Volume (Quarts)", "n4+n6"),
CONTAINER_VOLUME_GALLONS("363n", " Container Gross Volume (Gallons)", "n4+n6"),
PRODUCT_VOLUME_INCHES("364n", " Product Volume (Cubic Inches)", "n4+n6"),
PRODUCT_VOLUME_FEET("365n", " Product Volume (Cubic Feet)", "n4+n6"),
PRODUCT_VOLUME_YARDS("366n", " Product Volume (Cubic Yards)", "n4+n6"),
CONTAINER_VOLUME_INCHES("367n", " Container Gross Volume (Cubic Inches)", "n4+n6"),
CONTAINER_VOLUME_FEET("368n", " Container Gross Volume (Cubic Feet)", "n4+n6"),
CONTAINER_VOLUME_YARDS("369n", " Container Gross Volume (Cubic Yards)", "n4+n6"),
COUNT("37", " Number of Units Contained", "n2+n..8"),
ORDER_NUMBER("400", "Customer Purchase Order Number", "n3+an..30"),
SHIP_TO_DELIVER_TO_LOCATION_CODE("410", "Ship To/Deliver To Location Code (EAN13 or DUNS code)", "n3+n13"),
BILL_TO_INVOICEE_TO_LOCATION_CODE("411", "Bill To/Invoice Location Code (EAN13 or DUNS code)", "n3+n13"),
PURCHASE_FROM_LOCATION_CODE("412", "Purchase From Location Code (EAN13 or DUNS code)", "n3+n13"),
SHIP_TO_DELIVER_TO_POSTALCODE("420", "Ship To/Deliver To Postal Code (Single Postal Authority)", "n3+an..9"),
SHIP_TO_DELIVER_TO_MULTI_POSTALCODE("421", "Ship To/Deliver To Postal Code (Multiple Postal Authority)",
"n3+n3+an..9"),
ORIGIN("422", "Country orign", "n3+n3"),
COUNTRY_INITIAL_PROCESS("423", "County initial processing", "n3+n3+n..12"),
COUNTRY_PROCESS("424", "County processing", "n3+n3"),
COUNTRY_DISASSEMBLY("425", "Country disassembly", "n3+n3"),
COUNTRY_FULL_PROCESS("426", "Country pull processing", "n3+n3"),
ROLL_PRODUCTS("8001", "Roll Products – Width/Length/Core Diameter", "n4+n14"),
ESN("8002", "Electronic Serial Number (ESN) for Cellular Phone", "n4+an..20"),
UPC_EAN_RETURNABLE_ASSET("8003", "UPC/EAN Number and Serial Number of Returnable Asset", "n4+an..30"),
UPC_EAN_SERIAL_IDENTIFICATION("8004", "UPC/EAN Serial Identification", "n4+an..30"),
PRICE_UNIT_MEASURE("8005", "Price per Unit of Measure", "n4+n6"),
;
private final String code;
private final String description;
private final String format;
private AIs(String code, String description, String format) {
this.code = code;
this.description = description;
this.format = format;
}
@Override
public String getCode() {
return code;
}
@Override
public String getDescription() {
return description;
}
@Override
public String getFormat() {
return format;
}
@Override
public String toString() {
return description;
}
}

32
api-admin/src/main/java/com/glxp/api/admin/util/gs1/AiFactory.java
Unescape Escape View File

@ -0,0 +1,32 @@
package com.glxp.api.admin.util.gs1;
/**
* @author guilherme.pacheco
*/
public final class AiFactory {
private AiFactory() {
super();
}
public static AI create(String code, String description, String format) {
return new AI() {
@Override
public String getFormat() {
return format;
}
@Override
public String getDescription() {
return description;
}
@Override
public String getCode() {
return code;
}
};
}
}

71
api-admin/src/main/java/com/glxp/api/admin/util/gs1/Format.java
Unescape Escape View File

@ -0,0 +1,71 @@
package com.glxp.api.admin.util.gs1;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.Validate;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
/**
* @author guilherme.pacheco
*/
final class Format {
private static final String JOIN_SYMBOL = "+";
private final List<Session> sessions;
public Format(List<Session> sessions) {
this.sessions = Validate.notEmpty(sessions);
}
public Format(Session... sessions) {
this(Arrays.asList(sessions));
}
public Session getIdentifier() {
return sessions.get(0);
}
public List<Session> getDataSessions() {
return sessions.subList(1, sessions.size());
}
@Override
public String toString() {
return sessions.stream().map(String::valueOf).collect(Collectors.joining(JOIN_SYMBOL));
}
public boolean isValid(String value) {
if (StringUtils.isBlank(value)) {
return false;
}
if (!validLength(value)) {
return false;
}
return validate(value);
}
private boolean validate(String value) {
return getDataSessions().stream().allMatch(s -> s.getType().isValid(Gs1128Utils.value(s, value)));
}
private boolean validLength(String value) {
return isVaried() ? value.length() <= getLength() : value.length() == getLength();
}
public int getLength() {
return getDataSessions().stream().mapToInt(Session::getLength).sum();
}
public boolean isVaried() {
return getDataSessions().stream().anyMatch(Session::isVaried);
}
public static Format valueOf(String value) {
String[] split = StringUtils.split(value, JOIN_SYMBOL);
List<Session> list = Arrays.stream(split).map(Session::valueOf).collect(Collectors.toList());
return new Format(list);
}
}

57
api-admin/src/main/java/com/glxp/api/admin/util/gs1/Gs1128Decoder.java
Unescape Escape View File

@ -0,0 +1,57 @@
package com.glxp.api.admin.util.gs1;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.Validate;
import java.util.*;
import java.util.function.Function;
/**
* @author guilherme.pacheco
*/
public final class Gs1128Decoder {
private final Collection<AI> ais;
Gs1128Decoder(Collection<AI> ais) {
this.ais = ais;
}
public Map<AI, String> decode(final String barcode) {
validateBarcode(barcode);
String barcodeValue = StringUtils.remove(barcode, Gs1128Utils.PREFIX);
return extract(barcodeValue);
}
private Map<AI, String> extract(String barcode) {
final Iterator<Character> iterator = Gs1128Utils.iterator(barcode);
final Map<AI, String> result = new WeakHashMap<>(4);
StringBuilder builder = new StringBuilder();
while (iterator.hasNext()) {
builder.append(iterator.next());
Optional<Map<AI, String>> mapAi = mapAi(iterator, builder.toString());
if (mapAi.isPresent()) {
result.putAll(mapAi.get());
builder = new StringBuilder();
}
}
return result;
}
private Optional<Map<AI, String>> mapAi(Iterator<Character> iterator, String builder) {
return ais.stream().filter(v -> v.getCode().equals(builder)).findFirst().map(aiValue(iterator));
}
private Function<AI, Map<AI, String>> aiValue(Iterator<Character> iterator) {
return ai -> {
String value = Gs1128Utils.value(ai, iterator);
return Map.of(ai, value);
};
}
private void validateBarcode(String barcode) {
Validate.notBlank(barcode, "Barcode cannot be blank");
Validate.isTrue(StringUtils.startsWith(barcode, Gs1128Utils.PREFIX), "Barcode must start with prefix Gs1-128 \"]C1\"");
}
}

33
api-admin/src/main/java/com/glxp/api/admin/util/gs1/Gs1128Encoder.java
Unescape Escape View File

@ -0,0 +1,33 @@
package com.glxp.api.admin.util.gs1;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.Validate;
import java.util.Collection;
import java.util.stream.Collectors;
/**
* @author guilherme.pacheco
*/
public final class Gs1128Encoder {
Gs1128Encoder() {
super();
}
public String encode(Collection<Segment> segments) {
Validate.notEmpty(segments);
String barcode = joinSegments(segments);
return checkBarcode(barcode);
}
private String checkBarcode(String barcode) {
return StringUtils.removeEnd(barcode, String.valueOf(Gs1128Utils.END_AI_VARIED));
}
private String joinSegments(Collection<Segment> segments) {
String joinValue = segments.stream().map(Segment::encode).collect(Collectors.joining());
return Gs1128Utils.PREFIX.concat(joinValue);
}
}

35
api-admin/src/main/java/com/glxp/api/admin/util/gs1/Gs1128Engine.java
Unescape Escape View File

@ -0,0 +1,35 @@
package com.glxp.api.admin.util.gs1;
import java.util.Collections;
import java.util.EnumSet;
import java.util.HashSet;
import java.util.Set;
/**
* @author guilherme.pacheco
*/
public final class Gs1128Engine {
private final Set<AI> aisRegistred = new HashSet<>();
public Gs1128Engine() {
aisRegistred.addAll(EnumSet.allOf(AIs.class));
}
public void registerAi(AI ai) {
aisRegistred.add(ai);
}
public Set<AI> getAisRegistred() {
return Collections.unmodifiableSet(aisRegistred);
}
public Gs1128Encoder encoder() {
return new Gs1128Encoder();
}
public Gs1128Decoder decoder() {
return new Gs1128Decoder(aisRegistred);
}
}

59
api-admin/src/main/java/com/glxp/api/admin/util/gs1/Gs1128Utils.java
Unescape Escape View File

@ -0,0 +1,59 @@
package com.glxp.api.admin.util.gs1;
import java.util.Iterator;
/**
* @author guilherme.pacheco
*/
final class Gs1128Utils {
public static final String PREFIX = "]C1";
public static final char END_AI_VARIED = (char) 29;
private Gs1128Utils() {
super();
}
public static Iterator<Character> iterator(String value) {
return value.chars().mapToObj(c -> (char) c).iterator();
}
public static String value(AI ai, Iterator<Character> iterator) {
Format format = Format.valueOf(ai.getFormat());
if (format.isVaried()) {
return variedValue(iterator);
} else {
return fixedValue(format.getLength(), iterator);
}
}
public static String value(Session session, String value) {
Iterator<Character> iterator = iterator(value);
if (session.isVaried()) {
return variedValue(iterator);
} else {
return fixedValue(session.getLength(), iterator);
}
}
private static String fixedValue(int size, Iterator<Character> iterator) {
StringBuilder builder = new StringBuilder();
for (int i = 0; i < size; i++) {
builder.append(iterator.next());
}
return builder.toString();
}
private static String variedValue(Iterator<Character> iterator) {
StringBuilder builder = new StringBuilder();
while (iterator.hasNext()) {
char value = iterator.next();
if (value == END_AI_VARIED) {
break;
}
builder.append(value);
}
return builder.toString();
}
}

35
api-admin/src/main/java/com/glxp/api/admin/util/gs1/Segment.java
Unescape Escape View File

@ -0,0 +1,35 @@
package com.glxp.api.admin.util.gs1;
import org.apache.commons.lang3.Validate;
/**
* @author guilherme.pacheco
*/
public final class Segment {
private final AI ai;
private final String value;
private final Format format;
public Segment(AI ai, String value) {
this.ai = Validate.notNull(ai, "Invalid AI");
format = Format.valueOf(ai.getFormat());
this.value = validateValue(format, value);
}
private String validateValue(Format format, String value) {
Validate.notBlank(value, "Invalid segment value");
Validate.notNull(format, "Invalid format");
Validate.isTrue(format.isValid(value));
return value;
}
String encode() {
String codeValue = ai.getCode().concat(value);
if (format.isVaried()) {
return codeValue + Gs1128Utils.END_AI_VARIED;
}
return codeValue;
}
}

69
api-admin/src/main/java/com/glxp/api/admin/util/gs1/Session.java
Unescape Escape View File

@ -0,0 +1,69 @@
package com.glxp.api.admin.util.gs1;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.Validate;
/**
* @author guilherme.pacheco
*/
final class Session {
private static final String VARIED_CONSTANT = "..";
private final SessionType type;
private final boolean varied;
private final int length;
public Session(SessionType type, int length, boolean varied) {
this.type = Validate.notNull(type);
Validate.isTrue(length > 0, "Session invalid lenght");
this.length = length;
this.varied = varied;
}
public SessionType getType() {
return type;
}
public int getLength() {
return length;
}
public boolean isVaried() {
return varied;
}
public static Session valueOf(String value) {
Validate.notBlank(value, "Session cannot be blank");
SessionType type = sessionType(value);
String strLength = value.substring(type.length());
boolean varied = strLength.startsWith(VARIED_CONSTANT);
int length = createLength(strLength, varied);
return new Session(type, length, varied);
}
private static SessionType sessionType(String value) {
return SessionType.valueByPrefix(value).orElseThrow(() -> new IllegalArgumentException("Invalid session type"));
}
private static Integer createLength(String strLength, boolean varied) {
try {
if (varied) {
String lengthValue = StringUtils.substringAfter(strLength, VARIED_CONSTANT);
return Integer.parseInt(lengthValue);
}
return Integer.valueOf(strLength);
} catch (NumberFormatException ex) {
throw new IllegalArgumentException(String.format("Invalid length: '%s'", strLength), ex);
}
}
@Override
public String toString() {
return new StringBuilder(type.getSymbol())
.append(varied ? VARIED_CONSTANT : StringUtils.EMPTY)
.append(length)
.toString();
}
}

50
api-admin/src/main/java/com/glxp/api/admin/util/gs1/SessionType.java
Unescape Escape View File

@ -0,0 +1,50 @@
package com.glxp.api.admin.util.gs1;
import org.apache.commons.lang3.StringUtils;
import java.util.EnumSet;
import java.util.Optional;
import java.util.function.Predicate;
/**
* @author guilherme.pacheco
*/
enum SessionType {
ALPHANUMERIC("an", v -> Character.isAlphabetic(v) || Character.isDigit(v)),
ALPHABETIC("a", v -> Character.isAlphabetic(v)),
NUMERIC("n", v -> Character.isDigit(v));
private final String symbol;
private final Predicate<Character> validator;
private SessionType(String symbol, Predicate<Character> validator) {
this.symbol = symbol;
this.validator = validator;
}
public boolean isValid(String value) {
if (StringUtils.isBlank(value)) {
return false;
}
return value.chars().mapToObj(c -> (char) c).allMatch(validator::test);
}
public String getSymbol() {
return symbol;
}
public int length() {
return symbol.length();
}
public static Optional<SessionType> valueByPrefix(String value) {
if (StringUtils.isBlank(value)) {
return Optional.empty();
}
return EnumSet.allOf(SessionType.class).stream()
.filter(v -> StringUtils.startsWithIgnoreCase(value, v.symbol))
.findFirst();
}
}

2
api-admin/src/main/resources/application-pro.properties
Unescape Escape View File

@ -20,7 +20,7 @@ logging.path=output/logs
# 不指定的情况下默认生成在项目根目录，按照配置生成所需的日志名称 # 不指定的情况下默认生成在项目根目录，按照配置生成所需的日志名称
#logging.file=D:/udi.log #logging.file=D:/udi.log
file_path=D:/1s/udiwms/udiwmsfile/ file_path=D:/udi/udiwms/udiwmsfile/
#file_path=/home/glxp/udiwms #file_path=/home/glxp/udiwms
#UDI数据下载 #UDI数据下载
UDI_KEY=6b137c66-6286-46c6-8efa-c2f5dd9237df UDI_KEY=6b137c66-6286-46c6-8efa-c2f5dd9237df

4
api-admin/src/main/resources/logback-spring.xml
Unescape Escape View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<configuration scan="true" scanPeriod="60 seconds" debug="false"> <configuration scan="true" scanPeriod="60 seconds" debug="false">
<contextName>logback</contextName> <contextName>logback</contextName>
<property name="log.path" value="/home/glxpdata/udiwms/UDI_WMS_MC/" /> <property name="log.path" value="D:\\udi\\logs\\UDI_WMS_MC\\" />
<!--输出到控制台/home/glxpdata/udiwms/UDI_WMS_MC/--> <!--输出到控制台/home/glxpdata/udiwms/UDI_WMS_MC/-->
<!--D:\\wmslog\\UDI_WMS_MC\\--> <!--D:\\udi\\logs\\UDI_WMS_MC\\-->
<appender name="console" class="ch.qos.logback.core.ConsoleAppender"> <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
<!-- <filter class="ch.qos.logback.classic.filter.ThresholdFilter"> <!-- <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>ERROR</level> <level>ERROR</level>

3
api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml
Unescape Escape View File

@ -20,6 +20,9 @@
<if test="userName != null and '' != userName"> <if test="userName != null and '' != userName">
AND userName LIKE CONCAT(#{userName},'%') AND userName LIKE CONCAT(#{userName},'%')
</if> </if>
<if test="lastUpdateTime!=null and lastUpdateTime!=''">
<![CDATA[ and DATE_FORMAT(lastModifyTime, '%Y-%m-%d %H:%i:%S')>= DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') ]]>
</if>
</where> </where>
ORDER BY id ORDER BY id
DESC DESC

6
api-admin/src/main/resources/mybatis/mapper/basic/BussinessOriginTypeDao.xml
Unescape Escape View File

@ -77,7 +77,7 @@
parameterType="com.glxp.api.admin.entity.basic.BussinessOriginTypeEntity"> parameterType="com.glxp.api.admin.entity.basic.BussinessOriginTypeEntity">
replace replace
INTO basic_bustype_origin INTO basic_bustype_origin
(`action`, `name`, enable, remark, thirdSys, thirdSysName,inoutType) (`action`, `name`, enable, remark, thirdSys, thirdSysName,inoutType,updateTime)
values ( values (
#{action}, #{action},
#{name}, #{name},
@ -85,7 +85,7 @@
#{remark}, #{remark},
#{thirdSys}, #{thirdSys},
#{thirdSysName}, #{thirdSysName},
#{inoutType} #{inoutType},#{updateTime}
) )
</insert> </insert>
@ -99,7 +99,7 @@
<if test="thirdSysName != null">thirdSysName = #{thirdSysName},</if> <if test="thirdSysName != null">thirdSysName = #{thirdSysName},</if>
<if test="remark != null">remark = #{remark},</if> <if test="remark != null">remark = #{remark},</if>
<if test="inoutType != null">inoutType = #{inoutType},</if> <if test="inoutType != null">inoutType = #{inoutType},</if>
<if test="updateTime != null">updateTime = #{updateTime},</if>
</trim> </trim>
WHERE id = #{id} WHERE id = #{id}
</update> </update>

21
api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml
Unescape Escape View File

@ -14,7 +14,7 @@
basic_bussiness_type.secCheckUdims, basic_bussiness_type.secCheckPdaEd, basic_bussiness_type.secCheckPdaUn, basic_bussiness_type.secCheckUdims, basic_bussiness_type.secCheckPdaEd, basic_bussiness_type.secCheckPdaUn,
basic_bussiness_type.secCheckWebNew, basic_bussiness_type.secCheckChange, basic_bussiness_type.secCheckWebNew, basic_bussiness_type.secCheckChange,
basic_bustype_local.name localName,basic_bussiness_type.checkEnable, basic_bustype_local.advanceType, basic_bustype_local.name localName,basic_bussiness_type.checkEnable, basic_bustype_local.advanceType,
basic_bustype_local.changeEnable,basic_bussiness_type.genUnit,basic_bussiness_type.innerOrder, basic_bustype_local.changeEnable,basic_bussiness_type.genUnit,basic_bussiness_type.innerOrder,basic_bussiness_type.outTospms,
basic_bustype_local.spUse,corpType,basic_bussiness_type.storageCode,basic_bussiness_type.checkBalacne, basic_bustype_local.spUse,corpType,basic_bussiness_type.storageCode,basic_bussiness_type.checkBalacne,
basic_bussiness_type.secCheckBalacne, defaultUnit,basic_bustype_origin.action basic_bussiness_type.secCheckBalacne, defaultUnit,basic_bustype_origin.action
thirdAction,basic_bustype_origin.thirdSys,basic_bussiness_type.useDyCount,basic_bussiness_type.expireTip, thirdAction,basic_bustype_origin.thirdSys,basic_bussiness_type.useDyCount,basic_bussiness_type.expireTip,
@ -129,12 +129,13 @@
basic_bussiness_type.checkUdims,basic_bussiness_type.checkPdaEd,basic_bussiness_type.checkPdaUn,basic_bussiness_type.checkPc, basic_bussiness_type.checkUdims,basic_bussiness_type.checkPdaEd,basic_bussiness_type.checkPdaUn,basic_bussiness_type.checkPc,
basic_bussiness_type.checkWebNew,basic_bussiness_type.checkChange, basic_bussiness_type.checkWebNew,basic_bussiness_type.checkChange,
basic_bussiness_type.secCheckUdims, basic_bussiness_type.secCheckPdaEd, basic_bussiness_type.secCheckPdaUn, basic_bussiness_type.secCheckUdims, basic_bussiness_type.secCheckPdaEd, basic_bussiness_type.secCheckPdaUn,
basic_bussiness_type.secCheckWebNew, basic_bussiness_type.secCheckChange, basic_bussiness_type.secCheckWebNew, basic_bussiness_type.secCheckChange,basic_bussiness_type.outTospms,
basic_bustype_local.name localName,basic_bussiness_type.checkEnable, basic_bustype_local.advanceType, basic_bustype_local.name localName,basic_bussiness_type.checkEnable, basic_bustype_local.advanceType,
basic_bustype_local.changeEnable,basic_bussiness_type.genUnit,basic_bussiness_type.innerOrder, basic_bustype_local.changeEnable,basic_bussiness_type.genUnit,basic_bussiness_type.innerOrder,
basic_bustype_local.spUse,corpType,basic_bussiness_type.storageCode,basic_bussiness_type.checkBalacne,defaultUnit, basic_bustype_local.spUse,corpType,basic_bussiness_type.storageCode,basic_bussiness_type.checkBalacne,defaultUnit,
basic_bussiness_type.secCheckBalacne,basic_bustype_origin.action basic_bussiness_type.secCheckBalacne,basic_bustype_origin.action
thirdAction,basic_bustype_origin.thirdSys,useDyCount,basic_bussiness_type.expireTip,basic_bussiness_type.prefix,basic_bustype_local.prefix localPrefix thirdAction,basic_bustype_origin.thirdSys,useDyCount,basic_bussiness_type.expireTip,basic_bussiness_type.prefix,basic_bustype_local.prefix
localPrefix
,basic_bustype_local.preIn ,basic_bustype_local.preIn
FROM basic_bussiness_type LEFT JOIN basic_bustype_local FROM basic_bussiness_type LEFT JOIN basic_bustype_local
on basic_bussiness_type.localAction = basic_bustype_local.action on basic_bussiness_type.localAction = basic_bustype_local.action
@ -180,7 +181,7 @@
checkUdims,checkPdaEd,checkPdaUn,checkPc,checkWebNew,checkChange checkUdims,checkPdaEd,checkPdaUn,checkPc,checkWebNew,checkChange
,secCheckUdims,secCheckPdaEd,secCheckPdaUn,secCheckPc,secCheckWebNew, ,secCheckUdims,secCheckPdaEd,secCheckPdaUn,secCheckPc,secCheckWebNew,
secCheckChange,corpType,basic_bussiness_type.storageCode,checkBalacne, secCheckChange,corpType,basic_bussiness_type.storageCode,checkBalacne,
secCheckBalacne,supplementOrderType,defaultUnit,useDyCount,expireTip,updateTime,prefix) secCheckBalacne,supplementOrderType,defaultUnit,useDyCount,expireTip,updateTime,prefix,outTospms)
values values
( (
#{action}, #{action},
@ -214,7 +215,9 @@
#{defaultUnit}, #{defaultUnit},
#{useDyCount}, #{useDyCount},
#{expireTip}, #{expireTip},
#{updateTime},#{prefix} #{updateTime},
#{prefix},
#{outTospms}
) )
</insert> </insert>
@ -227,7 +230,7 @@
checkEnable,genUnit,innerOrder,secCheckEnable, checkEnable,genUnit,innerOrder,secCheckEnable,
checkUdims,checkPdaEd,checkPdaUn,checkPc,checkWebNew,checkChange checkUdims,checkPdaEd,checkPdaUn,checkPc,checkWebNew,checkChange
,secCheckUdims,secCheckPdaEd,secCheckPdaUn,secCheckPc,secCheckWebNew, ,secCheckUdims,secCheckPdaEd,secCheckPdaUn,secCheckPc,secCheckWebNew,
secCheckChange,corpType,storageCode,checkBalacne,secCheckBalacne,supplementOrderType,defaultUnit,useDyCount,expireTip,updateTime,prefix) secCheckChange,corpType,storageCode,checkBalacne,secCheckBalacne,supplementOrderType,defaultUnit,useDyCount,expireTip,updateTime,prefix,outTospms)
values values
( (
#{index}, #{index},
@ -262,7 +265,9 @@
#{defaultUnit}, #{defaultUnit},
#{useDyCount}, #{useDyCount},
#{expireTip}, #{expireTip},
#{updateTime},#{prefix} #{updateTime},
#{prefix},
#{outTospms}
) )
</insert> </insert>
@ -303,7 +308,7 @@
<if test="expireTip != null">expireTip=#{expireTip},</if> <if test="expireTip != null">expireTip=#{expireTip},</if>
<if test="updateTime != null">updateTime=#{updateTime},</if> <if test="updateTime != null">updateTime=#{updateTime},</if>
<if test="prefix != null">prefix=#{prefix},</if> <if test="prefix != null">prefix=#{prefix},</if>
<if test="outTospms != null">outTospms=#{outTospms},</if>
thirdSysFk=#{thirdSysFk}, thirdSysFk=#{thirdSysFk},
</trim> </trim>
WHERE id = #{id} WHERE id = #{id}

3
api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml
Unescape Escape View File

@ -22,6 +22,9 @@
<if test="originUuid != '' and originUuid != null"> <if test="originUuid != '' and originUuid != null">
AND originUuid = #{originUuid} AND originUuid = #{originUuid}
</if> </if>
<if test="sptm != '' and sptm != null">
AND sptm = #{sptm}
</if>
</where> </where>
</select> </select>

4
api-admin/src/main/resources/mybatis/mapper/info/SyncDataSetDao.xml
Unescape Escape View File

@ -16,7 +16,7 @@
INTO sync_data_set(id,typeBus, typeScan, INTO sync_data_set(id,typeBus, typeScan,
typeThird, basicProducts, basicCorp, basicInv, basicThirdProducts, basicThirdCorp, basicThirdInv typeThird, basicProducts, basicCorp, basicInv, basicThirdProducts, basicThirdCorp, basicThirdInv
, basicThirdBusOrder, orderScanFinish, dbDiProducts,downstreamEnable,syncTime, syncDownloadTime, , basicThirdBusOrder, orderScanFinish, dbDiProducts,downstreamEnable,syncTime, syncDownloadTime,
orderUnReceive,orderUnCheck,busTypes,syncIp) orderUnReceive,orderUnCheck,busTypes,syncIp,sysUser)
values ( values (
#{id}, #{id},
#{typeBus}, #{typeBus},
@ -31,7 +31,7 @@
#{basicThirdBusOrder}, #{basicThirdBusOrder},
#{orderScanFinish}, #{orderScanFinish},
#{dbDiProducts},#{downstreamEnable},#{syncTime},#{syncDownloadTime}, #{dbDiProducts},#{downstreamEnable},#{syncTime},#{syncDownloadTime},
#{orderUnReceive},#{orderUnCheck},#{busTypes},#{syncIp} #{orderUnReceive},#{orderUnCheck},#{busTypes},#{syncIp},#{sysUser}
) )
</insert> </insert>

8
api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml
Unescape Escape View File

@ -33,7 +33,7 @@
fromCorp, status, remark, exportStatus, fromType, contrastStatus, signStatus, fromCorp, status, remark, exportStatus, fromType, contrastStatus, signStatus,
receiveStatus, erpFk, stockCheckFk, supId, receiveStatus, erpFk, stockCheckFk, supId,
exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser, exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser,
outChangeEnable, originUllageSupNo, preCheck, thirdBillNo) outChangeEnable, originUllageSupNo, preCheck, thirdBillNo,updateTime)
values (#{id}, values (#{id},
#{action}, #{action},
#{corpOrderId}, #{corpOrderId},
@ -53,7 +53,7 @@
#{stockCheckFk}, #{stockCheckFk},
#{supId}, #{exportFilePath}, #{locStorageCode}, #{supplementNo} #{supId}, #{exportFilePath}, #{locStorageCode}, #{supplementNo}
, #{ullageSupNo}, #{createUser}, #{reviewUser}, #{outChangeEnable}, #{originUllageSupNo}, , #{ullageSupNo}, #{createUser}, #{reviewUser}, #{outChangeEnable}, #{originUllageSupNo},
#{preCheck}, #{thirdBillNo}) #{preCheck}, #{thirdBillNo},#{updateTime})
</insert> </insert>
<insert id="importOrder" keyProperty="id" parameterType="com.glxp.api.admin.entity.inout.OrderEntity"> <insert id="importOrder" keyProperty="id" parameterType="com.glxp.api.admin.entity.inout.OrderEntity">
@ -63,7 +63,7 @@
fromCorp, status, remark, exportStatus, fromType, contrastStatus, signStatus, fromCorp, status, remark, exportStatus, fromType, contrastStatus, signStatus,
receiveStatus, erpFk, stockCheckFk, supId, receiveStatus, erpFk, stockCheckFk, supId,
exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser, exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser,
outChangeEnable, originUllageSupNo,preCheck,thirdBillNo) outChangeEnable, originUllageSupNo,preCheck,thirdBillNo,updateTime)
values ( values (
#{id}, #{id},
#{action}, #{action},
@ -92,7 +92,7 @@
#{outChangeEnable}, #{outChangeEnable},
#{originUllageSupNo}, #{originUllageSupNo},
#{preCheck}, #{preCheck},
#{thirdBillNo} #{thirdBillNo},#{updateTime}
) )
</insert> </insert>

2
api-admin/src/main/resources/mybatis/mapper/inout/WarehouseBussinessTypeDao.xml
Unescape Escape View File

@ -245,7 +245,7 @@
<select id="filterList" parameterType="com.glxp.api.admin.req.basic.FilterInvBusTypeRequest" <select id="filterList" parameterType="com.glxp.api.admin.req.basic.FilterInvBusTypeRequest"
resultType="com.glxp.api.admin.entity.inout.WarehouseBussinessTypeEntity"> resultType="com.glxp.api.admin.entity.inout.WarehouseBussinessTypeEntity">
SELECT * FROM inv_warehouse_user SELECT * FROM inv_warehouse_bussiness_type
<where> <where>
<if test="id != '' and id != null"> <if test="id != '' and id != null">
AND id = #{id} AND id = #{id}

2
api-admin/src/main/resources/mybatis/mapper/inventory/InvWarehouseDao.xml
Unescape Escape View File

@ -127,7 +127,7 @@
<select id="filterGroupInvWarehouse" parameterType="com.glxp.api.admin.req.inventory.FilterInvWarehouseRequest" <select id="filterGroupInvWarehouse" parameterType="com.glxp.api.admin.req.inventory.FilterInvWarehouseRequest"
resultType="com.glxp.api.admin.res.inventory.InvProductResponse"> resultType="com.glxp.api.admin.entity.inventory.InvWarehouseEntity">
SELECT * FROM inv_warehouse SELECT * FROM inv_warehouse
<where> <where>
<if test="id != '' and id != null"> <if test="id != '' and id != null">

4
api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml
Unescape Escape View File

@ -95,7 +95,7 @@
</insert> </insert>
<insert id="insertThrInvWarehouses" parameterType="java.util.List"> <insert id="insertThrInvWarehouses" parameterType="java.util.List">
insert INTO thr_inv_warehouse replace INTO thr_inv_warehouse
(pid, code, name, advanceType, isDefault, (pid, code, name, advanceType, isDefault,
status, updateTime, remark, thirdSysFk) status, updateTime, remark, thirdSysFk)
VALUES VALUES
@ -170,7 +170,7 @@
</where> </where>
</select> </select>
<insert id="insertInvWarehouses"> <insert id="insertInvWarehouses">
replace into thr_inv_warehouse (pid, code, name, advanceType, isDefault, status, updateTime, remark, level, replace into thr_inv_warehouse (pid, code, `name`, advanceType, isDefault, status, updateTime, remark, `level`,
pcode, pcode,
thirdSysFk) thirdSysFk)
values values

Write Preview
Loading…
Cancel
Save