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

bug修改,单据同步过滤自助平台,

Browse Source
master
anthonyywj2 3 years ago
parent 6c98fd4146
commit f2d12b3cb2
5 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File

27
api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java
Unescape Escape View File

@ -259,20 +259,17 @@ public class StockOrderDetailController {
companyProductRelevanceRequest.setDiType(1); companyProductRelevanceRequest.setDiType(1);
companyProductRelevanceRequest.setCustomerId(getCustomerId()); companyProductRelevanceRequest.setCustomerId(getCustomerId());
List<CompanyProductRelevanceResponse> companyProductRelevanceResponses = new ArrayList<>(); List<CompanyProductRelevanceResponse> companyProductRelevanceResponses = new ArrayList<>();
if (companyProductRelevanceRequest.getCustomerId().equals(Constant.SYSTEM_CUSTOMER_ID)) { FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); filterUdiInfoRequest.setId(stockSelectDataEntity.getRelId());
filterUdiInfoRequest.setId(stockSelectDataEntity.getRelId()); filterUdiInfoRequest.setDiType(1);
filterUdiInfoRequest.setDiType(1); List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiInfoRequest);
List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiInfoRequest); if (udiRelevanceResponses.size() > 0) {
if (udiRelevanceResponses.size() > 0) { CompanyProductRelevanceResponse companyProductRelevanceResponse = new CompanyProductRelevanceResponse();
CompanyProductRelevanceResponse companyProductRelevanceResponse = new CompanyProductRelevanceResponse(); BeanUtils.copyProperties(udiRelevanceResponses.get(0), companyProductRelevanceResponse);
BeanUtils.copyProperties(udiRelevanceResponses.get(0), companyProductRelevanceResponse); companyProductRelevanceResponse.setRlId(udiRelevanceResponses.get(0).getId());
companyProductRelevanceResponse.setRlId(udiRelevanceResponses.get(0).getId()); companyProductRelevanceResponse.setPrice(udiRelevanceResponses.get(0).getPrice());
companyProductRelevanceResponse.setPrice(udiRelevanceResponses.get(0).getPrice()); companyProductRelevanceResponses.add(companyProductRelevanceResponse);
companyProductRelevanceResponses.add(companyProductRelevanceResponse); }
}
} else
companyProductRelevanceResponses = companyProductRelevanceService.filterUdiGp(companyProductRelevanceRequest);
if (companyProductRelevanceResponses != null && companyProductRelevanceResponses.size() > 0) { if (companyProductRelevanceResponses != null && companyProductRelevanceResponses.size() > 0) {
CompanyProductRelevanceResponse udiInfoEntity = companyProductRelevanceResponses.get(0); CompanyProductRelevanceResponse udiInfoEntity = companyProductRelevanceResponses.get(0);
StockOrderDetailEntity stockOrderDetailEntity = new StockOrderDetailEntity(); StockOrderDetailEntity stockOrderDetailEntity = new StockOrderDetailEntity();
@ -288,7 +285,7 @@ public class StockOrderDetailController {
stockOrderDetailEntity.setManufactory(udiInfoEntity.getManufactory()); stockOrderDetailEntity.setManufactory(udiInfoEntity.getManufactory());
stockOrderDetailEntity.setYlqxzcrbarmc(udiInfoEntity.getYlqxzcrbarmc()); stockOrderDetailEntity.setYlqxzcrbarmc(udiInfoEntity.getYlqxzcrbarmc());
stockOrderDetailEntity.setZczbhhzbapzbh(udiInfoEntity.getZczbhhzbapzbh()); stockOrderDetailEntity.setZczbhhzbapzbh(udiInfoEntity.getZczbhhzbapzbh());
if(StrUtil.isNotEmpty(udiInfoEntity.getPrice())){ if (StrUtil.isNotEmpty(udiInfoEntity.getPrice())) {
stockOrderDetailEntity.setPrice(new BigDecimal(udiInfoEntity.getPrice())); stockOrderDetailEntity.setPrice(new BigDecimal(udiInfoEntity.getPrice()));
} }
if (stockOrderIdsRequest.getUdiEntity() != null) { if (stockOrderIdsRequest.getUdiEntity() != null) {

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

@ -44,16 +44,17 @@ public class ErpBasicClient {
BeanUtils.copyProperties(unitMaintainFilterRequest, udiwmsUnitRequest); BeanUtils.copyProperties(unitMaintainFilterRequest, udiwmsUnitRequest);
udiwmsUnitRequest.setUnitId(unitMaintainFilterRequest.getErpId()); udiwmsUnitRequest.setUnitId(unitMaintainFilterRequest.getErpId());
BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(unitMaintainFilterRequest.getThirdSys()); BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(unitMaintainFilterRequest.getThirdSys());
String url = basicThirdSysEntity.getThridUrl() + "/udiwms/erp/getUnits";
String response = HttpClient.uCloudPost(url, udiwmsUnitRequest, basicThirdSysEntity);
try { try {
String url = basicThirdSysEntity.getThridUrl() + "/udiwms/erp/getUnits";
String response = HttpClient.uCloudPost(url, udiwmsUnitRequest, basicThirdSysEntity);
BaseResponse<PageSimpleResponse<ErpUnitsResponse>> udiDlDeviceResponse = BaseResponse<PageSimpleResponse<ErpUnitsResponse>> udiDlDeviceResponse =
JSONObject.parseObject(response, new TypeReference<BaseResponse<PageSimpleResponse<ErpUnitsResponse>>>() { JSONObject.parseObject(response, new TypeReference<BaseResponse<PageSimpleResponse<ErpUnitsResponse>>>() {
}); });
return udiDlDeviceResponse; return udiDlDeviceResponse;
} catch (Exception e) { } catch (Exception e) {
log.error("获取往来单位异常", e); log.error("获取往来单位异常", e);
return ResultVOUtils.error(500, "连接ERP服务出错！"); return ResultVOUtils.error(500, "连接第三方系统接口服务出错！");
} }
} }
@ -62,15 +63,16 @@ public class ErpBasicClient {
BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(filterErpGoodsRequest.getThirdSys()); BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(filterErpGoodsRequest.getThirdSys());
String url = basicThirdSysEntity.getThridUrl() + "/udiwms/erp/getProducts"; String url = basicThirdSysEntity.getThridUrl() + "/udiwms/erp/getProducts";
String response = HttpClient.uCloudPost(url, filterErpGoodsRequest, basicThirdSysEntity);
try { try {
String response = HttpClient.uCloudPost(url, filterErpGoodsRequest, basicThirdSysEntity);
BaseResponse<PageSimpleResponse<ErpProductsResponse>> udiDlDeviceResponse = BaseResponse<PageSimpleResponse<ErpProductsResponse>> udiDlDeviceResponse =
JSONObject.parseObject(response, new TypeReference<BaseResponse<PageSimpleResponse<ErpProductsResponse>>>() { JSONObject.parseObject(response, new TypeReference<BaseResponse<PageSimpleResponse<ErpProductsResponse>>>() {
}); });
return udiDlDeviceResponse; return udiDlDeviceResponse;
} catch (Exception e) { } catch (Exception e) {
log.error("获取产品信息异常", e); log.error("获取产品信息异常", e);
return ResultVOUtils.error(500, "连接ERP服务出错！"); return ResultVOUtils.error(500, "连接第三方系统接口服务出错！");
} }
} }
@ -82,16 +84,16 @@ public class ErpBasicClient {
udiwmsBusTypeRequest.setThirdSys(filterBasicThirdSysDetailRequest.getThirdSysFk()); udiwmsBusTypeRequest.setThirdSys(filterBasicThirdSysDetailRequest.getThirdSysFk());
udiwmsBusTypeRequest.setPage(filterBasicThirdSysDetailRequest.getPage()); udiwmsBusTypeRequest.setPage(filterBasicThirdSysDetailRequest.getPage());
udiwmsBusTypeRequest.setLimit(filterBasicThirdSysDetailRequest.getLimit()); udiwmsBusTypeRequest.setLimit(filterBasicThirdSysDetailRequest.getLimit());
String response = HttpClient.uCloudPost(url, udiwmsBusTypeRequest, basicThirdSysEntity);
log.info(response);
try { try {
String response = HttpClient.uCloudPost(url, udiwmsBusTypeRequest, basicThirdSysEntity);
log.info(response);
BaseResponse<PageSimpleResponse<BasicThirdSysBusApiEntity>> udiDlDeviceResponse = BaseResponse<PageSimpleResponse<BasicThirdSysBusApiEntity>> udiDlDeviceResponse =
JSONObject.parseObject(response, new TypeReference<BaseResponse<PageSimpleResponse<BasicThirdSysBusApiEntity>>>() { JSONObject.parseObject(response, new TypeReference<BaseResponse<PageSimpleResponse<BasicThirdSysBusApiEntity>>>() {
}); });
return udiDlDeviceResponse; return udiDlDeviceResponse;
} catch (Exception e) { } catch (Exception e) {
log.error("获取单据类型异常", e); log.error("获取单据类型异常", e);
return ResultVOUtils.error(500, "连接ERP服务出错！"); return ResultVOUtils.error(500, "连接第三方系统接口服务出错！");
} }
} }
@ -99,9 +101,8 @@ public class ErpBasicClient {
public BaseResponse<PageSimpleResponse<UdiwmsWarehouseDetail>> getWarehouse(UdiwmsWarehouseRequest udiwmsWarehouseRequest) { public BaseResponse<PageSimpleResponse<UdiwmsWarehouseDetail>> getWarehouse(UdiwmsWarehouseRequest udiwmsWarehouseRequest) {
BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(udiwmsWarehouseRequest.getThirdSys()); BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(udiwmsWarehouseRequest.getThirdSys());
String url = basicThirdSysEntity.getThridUrl() + "/udiwms/erp/getWarehouse"; String url = basicThirdSysEntity.getThridUrl() + "/udiwms/erp/getWarehouse";
String response = HttpClient.uCloudPost(url, udiwmsWarehouseRequest);
try { try {
String response = HttpClient.uCloudPost(url, udiwmsWarehouseRequest);
BaseResponse<PageSimpleResponse<UdiwmsWarehouseDetail>> listBaseResponse = BaseResponse<PageSimpleResponse<UdiwmsWarehouseDetail>> listBaseResponse =
JSONObject.parseObject(response, new TypeReference<BaseResponse<PageSimpleResponse<UdiwmsWarehouseDetail>>>() { JSONObject.parseObject(response, new TypeReference<BaseResponse<PageSimpleResponse<UdiwmsWarehouseDetail>>>() {
}); });
@ -109,7 +110,7 @@ public class ErpBasicClient {
return listBaseResponse; return listBaseResponse;
} catch (Exception e) { } catch (Exception e) {
log.error("获取第三方系统的仓库货位码异常", e); log.error("获取第三方系统的仓库货位码异常", e);
return ResultVOUtils.error(500, "下载失败"); return ResultVOUtils.error(500, "连接第三方系统接口服务出错");
} }
} }

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

@ -346,7 +346,7 @@ public class DlBasicService {
orderEntity.setFromType(ConstantStatus.FROM_UDISP); orderEntity.setFromType(ConstantStatus.FROM_UDISP);
orderEntity.setReceiveStatus(0); orderEntity.setReceiveStatus(0);
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) {

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

@ -1,6 +1,7 @@
package com.glxp.api.admin.thread; package com.glxp.api.admin.thread;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.db.sql.Order;
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;
@ -307,7 +308,11 @@ public class UpBasicService {
orderFilterRequest.setReceiveStatus(ConstantStatus.RECEIVE_ED); orderFilterRequest.setReceiveStatus(ConstantStatus.RECEIVE_ED);
List<OrderEntity> temps = orderService.findAllByTime(orderFilterRequest); List<OrderEntity> temps = orderService.findAllByTime(orderFilterRequest);
if (CollUtil.isNotEmpty(temps)) { if (CollUtil.isNotEmpty(temps)) {
orderEntities.addAll(temps); for(OrderEntity orderEntity:temps){
if(orderEntity.getFromType() != ConstantStatus.FROM_UDISP){
orderEntities.add(orderEntity);
}
}
} }
} }
} }

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

@ -47,8 +47,8 @@
<if test="corpType != ''and corpType != null"> <if test="corpType != ''and corpType != null">
AND basic_bussiness_type.corpType = #{corpType} AND basic_bussiness_type.corpType = #{corpType}
</if> </if>
</where>
</where>
GROUP BY basic_bustype_origin.action; GROUP BY basic_bustype_origin.action;
</select> </select>
<select id="filterEnableList" parameterType="com.glxp.api.admin.req.basic.BussinessOriginTypeFilterRequest" <select id="filterEnableList" parameterType="com.glxp.api.admin.req.basic.BussinessOriginTypeFilterRequest"

Write Preview
Loading…
Cancel
Save