From 70c07845843efec81c0a529b40b97cfff4c0874d Mon Sep 17 00:00:00 2001 From: anthonywj Date: Sat, 3 Jun 2023 18:30:37 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=94=B3=E8=B4=AD=EF=BC=8C=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/IoOrderDetailBizController.java | 10 +- .../basic/CompanyProductRelevanceRequest.java | 2 +- .../FilterCompanyProductRelevanceRequest.java | 1 + .../service/basic/UdiRelevanceService.java | 3 +- .../basic/impl/UdiRelevanceServiceImpl.java | 12 +- .../glxp/api/service/sync/HeartService.java | 76 +++-- .../java/com/glxp/api/task/SyncHeartTask.java | 4 +- .../mybatis/mapper/basic/UdiRlSupDao.xml | 262 +++++++++--------- 8 files changed, 188 insertions(+), 182 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java index 89dc47d1b..3d96ab344 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java @@ -33,6 +33,7 @@ import com.glxp.api.req.inv.FilterInvoiceRequest; import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.UdiRelevanceResponse; +import com.glxp.api.res.basic.UdiRlSupResponse; import com.glxp.api.res.inout.IoOrderDetailBizResponse; import com.glxp.api.res.inout.IoOrderDetailCodeResponse; import com.glxp.api.res.inout.IoOrderInvoiceResponse; @@ -291,9 +292,9 @@ public class IoOrderDetailBizController extends BaseController { for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) { thrOrderDetailEntity.getProductId(); - List udiRelevanceEntities = udiRelevanceService.selectListByThirdId(thrOrderDetailEntity.getProductId(), thrOrderEntity.getThirdSysFk()); + List udiRelevanceEntities = udiRelevanceService.selectListByThirdId(thrOrderDetailEntity.getProductId(), thrOrderEntity.getThirdSysFk()); IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity(); - UdiRelevanceResponse udiRelevanceResponse = null; + UdiRlSupResponse udiRelevanceResponse = null; if (udiRelevanceEntities.size() == 1) { udiRelevanceResponse = udiRelevanceEntities.get(0); ioOrderDetailBizEntity.setBindRlFk(udiRelevanceResponse.getId()); @@ -305,7 +306,8 @@ public class IoOrderDetailBizController extends BaseController { ioOrderDetailBizEntity.setManufacturer(udiRelevanceResponse.getManufactory()); ioOrderDetailBizEntity.setMeasname(udiRelevanceResponse.getMeasname()); ioOrderDetailBizEntity.setSpec(udiRelevanceResponse.getGgxh()); - ioOrderDetailBizEntity.setPrice(udiRelevanceResponse.getPrice()); + ioOrderDetailBizEntity.setPrice(BigDecimal.valueOf(Double.valueOf(udiRelevanceResponse.getPrice()))); + ioOrderDetailBizEntity.setSupId(udiRelevanceResponse.getCustomerId() + ""); } else { ioOrderDetailBizEntity.setCoName(thrOrderDetailEntity.getCorpName()); ioOrderDetailBizEntity.setCertCode(thrOrderDetailEntity.getZczbhhzbapzbh()); @@ -316,7 +318,7 @@ public class IoOrderDetailBizController extends BaseController { if (udiRelevanceEntities.size() > 1) { String bindRlIds = ""; - for (UdiRelevanceResponse temp : udiRelevanceEntities) { + for (UdiRlSupResponse temp : udiRelevanceEntities) { bindRlIds = bindRlIds + "," + temp.getId(); } ioOrderDetailBizEntity.setBindRlIds(bindRlIds.substring(1)); diff --git a/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java b/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java index 660258bb8..af69a4e51 100644 --- a/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java +++ b/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java @@ -35,7 +35,6 @@ public class CompanyProductRelevanceRequest extends ListPageRequest { private String thrPiId; - private Boolean isCheck; private Integer filterType; //0:全部，1.对照完成，2.未对照DI，3.未对照产品编码，4.未对照其他产品编码 @@ -52,5 +51,6 @@ public class CompanyProductRelevanceRequest extends ListPageRequest { private String corpId; private String billType; + private String flbm; private List uuids; } diff --git a/src/main/java/com/glxp/api/req/basic/FilterCompanyProductRelevanceRequest.java b/src/main/java/com/glxp/api/req/basic/FilterCompanyProductRelevanceRequest.java index 31467b965..3a93d2df0 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterCompanyProductRelevanceRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterCompanyProductRelevanceRequest.java @@ -13,4 +13,5 @@ public class FilterCompanyProductRelevanceRequest extends ListPageRequest { private String unitFk; private String lastUpdateTime; private String key; + private String flbm; } diff --git a/src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java b/src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java index decf0ac92..24980fd0e 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.basic.UdiRelevanceEntity; import com.glxp.api.req.basic.FilterUdiRelRequest; import com.glxp.api.res.basic.UdiRelevanceResponse; +import com.glxp.api.res.basic.UdiRlSupResponse; import java.util.List; @@ -71,7 +72,7 @@ public interface UdiRelevanceService extends IService { UdiRelevanceEntity selectByThirdId(String thirdId, String thirdSys); - List selectListByThirdId(String thirdId, String thirdSys); + List selectListByThirdId(String thirdId, String thirdSys); boolean insertUdiRelevance(UdiRelevanceEntity udiRelevanceEntity); diff --git a/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java index 0fc11ca77..8ab21f504 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java @@ -9,9 +9,12 @@ import com.glxp.api.dao.basic.UdiRelevanceDao; import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.basic.UdiRelevanceEntity; import com.glxp.api.entity.thrsys.ThrSystemEntity; +import com.glxp.api.req.basic.CompanyProductRelevanceRequest; import com.glxp.api.req.basic.FilterUdiRelRequest; import com.glxp.api.res.basic.UdiRelevanceResponse; +import com.glxp.api.res.basic.UdiRlSupResponse; import com.glxp.api.service.basic.UdiRelevanceService; +import com.glxp.api.service.basic.UdiRlSupService; import com.glxp.api.service.thrsys.ThrSystemService; import com.glxp.api.util.udi.FilterUdiUtils; import org.springframework.stereotype.Service; @@ -27,6 +30,8 @@ public class UdiRelevanceServiceImpl extends ServiceImpl selectListByThirdId(String thirdId, String thirdSys) { + public List selectListByThirdId(String thirdId, String thirdSys) { if (StrUtil.isEmpty(thirdId) || StrUtil.isEmpty(thirdSys)) { return null; } - FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); + CompanyProductRelevanceRequest filterUdiRelRequest = new CompanyProductRelevanceRequest(); if ("thirdId".equals(thirdSys)) { filterUdiRelRequest.setThirdId(thirdId); } else if ("thirdId1".equals(thirdSys)) { @@ -337,7 +342,8 @@ public class UdiRelevanceServiceImpl extends ServiceImpl data = udiRelevanceDao.filterUdiGp(filterUdiRelRequest); + filterUdiRelRequest.setDiType(1); + List data = udiRlSupService.filterUdiGp(filterUdiRelRequest); return data; } diff --git a/src/main/java/com/glxp/api/service/sync/HeartService.java b/src/main/java/com/glxp/api/service/sync/HeartService.java index 20bf45edc..c910cc422 100644 --- a/src/main/java/com/glxp/api/service/sync/HeartService.java +++ b/src/main/java/com/glxp/api/service/sync/HeartService.java @@ -1327,7 +1327,6 @@ public class HeartService { }); if (response.getCode() == 20000 && response.getData() != null) { - JSONArray fileJson = JSONUtil.parseObj(response.getData()).getJSONArray("syncFiles"); SpsSyncOrderResponse syncDataResponse = JSONObject.parseObject(response.getData(), new TypeReference() { }); @@ -1342,54 +1341,47 @@ public class HeartService { basicDownloadStatusEntity.setRemark(syncDataResponse.getSyncRemark()); basicDownloadStatusEntity.setScheduleType(1); basicDownloadService.insertDownloadStatus(basicDownloadStatusEntity); - if (CollUtil.isNotEmpty(syncDataResponse.getOrderEntities())) { - try { - List orderEntities = syncDataResponse.getOrderEntities(); - for (IoOrderEntity orderEntity : orderEntities) { - SyncDataBustypeEntity syncDataBustypeEntity = syncDataBustypeService.findByAction(orderEntity.getAction(), 2); - orderEntity.setUpdateTime(null); - orderEntity.setFromType(ConstantStatus.FROM_UDISP); - orderEntity.setProcessStatus(ConstantStatus.ORDER_DEAL_POST); - orderEntity.setOrderType(ConstantStatus.ORDER_TYPE_SCAN); - orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); - if (syncDataBustypeEntity != null) { - if (syncDataBustypeEntity.getSyncStatus() != null && syncDataBustypeEntity.getSyncStatus().compareTo(1) == 0) { - orderEntity.setProcessStatus(ConstantStatus.ORDER_DEAL_DRAFT); - orderEntity.setStatus(ConstantStatus.ORDER_STATUS_TEMP_SAVE); - } - if (syncDataBustypeEntity.isSyncChange()) { - orderEntity.setOutChangeEnable(syncDataBustypeEntity.isSyncChange()); - } + List orderEntities = syncDataResponse.getOrderEntities(); + for (IoOrderEntity orderEntity : orderEntities) { + SyncDataBustypeEntity syncDataBustypeEntity = syncDataBustypeService.findByAction(orderEntity.getAction(), 2); + orderEntity.setUpdateTime(null); + orderEntity.setFromType(ConstantStatus.FROM_UDISP); + orderEntity.setProcessStatus(ConstantStatus.ORDER_DEAL_POST); + orderEntity.setOrderType(ConstantStatus.ORDER_TYPE_SCAN); + orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); + if (syncDataBustypeEntity != null) { + if (syncDataBustypeEntity.getSyncStatus() != null && syncDataBustypeEntity.getSyncStatus().compareTo(1) == 0) { + orderEntity.setProcessStatus(ConstantStatus.ORDER_DEAL_DRAFT); + orderEntity.setStatus(ConstantStatus.ORDER_STATUS_TEMP_SAVE); + } + if (syncDataBustypeEntity.isSyncChange()) { + orderEntity.setOutChangeEnable(syncDataBustypeEntity.isSyncChange()); } - IoOrderEntity temp = orderService.findByBillNo(orderEntity.getBillNo()); - if (temp == null) { - orderEntity.setId(null); - orderService.insertOrder(orderEntity); - insetOrderDb(syncDataResponse, orderEntity); + } + IoOrderEntity temp = orderService.findByBillNo(orderEntity.getBillNo()); + if (temp == null) { + orderEntity.setId(null); + orderService.insertOrder(orderEntity); + insetOrderDb(syncDataResponse, orderEntity); + orderEntity = orderService.findByBillNo(orderEntity.getBillNo()); + if (orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_TEMP_SAVE) { + addInoutService.dealProcess(orderEntity); orderEntity = orderService.findByBillNo(orderEntity.getBillNo()); - if (orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_TEMP_SAVE) { - addInoutService.dealProcess(orderEntity); - orderEntity = orderService.findByBillNo(orderEntity.getBillNo()); - if (orderEntity.getStatus() != ConstantStatus.ORDER_STATS_ERROR && !ioCheckInoutService.checkManual(orderEntity.getBillNo())) { - ioCheckInoutService.check(orderEntity.getBillNo()); - } + if (orderEntity.getStatus() != ConstantStatus.ORDER_STATS_ERROR && !ioCheckInoutService.checkManual(orderEntity.getBillNo())) { + ioCheckInoutService.check(orderEntity.getBillNo()); } - } else { - updateOrderDb(syncDataResponse, orderEntity); } + } else { + updateOrderDb(syncDataResponse, orderEntity); } - if (fileJson != null && fileJson.size() > 0) { - List syncFiles = fileJson.toList(String.class); - if (CollUtil.isNotEmpty(syncFiles)) { - idcService.batchDownloadFile(spGetHttp.getIpUrl(), syncFiles.toArray(new String[syncFiles.size()])); - } + } + if (fileJson != null && fileJson.size() > 0) { + List syncFiles = fileJson.toList(String.class); + if (CollUtil.isNotEmpty(syncFiles)) { + idcService.batchDownloadFile(spGetHttp.getIpUrl(), syncFiles.toArray(new String[syncFiles.size()])); } - } catch (Exception e) { - e.printStackTrace(); } - - } spGetHttp.finishTask(basicExportStatusEntity.getId()); basicDownloadStatusEntity.setUpdateTime(new Date()); @@ -1867,7 +1859,7 @@ public class HeartService { List orderInvoiceEntities = syncDataResponse.getOrderInvoiceEntities(); for (IoOrderInvoiceEntity orderInvoiceEntity : orderInvoiceEntities) { if (orderInvoiceEntity.getOrderIdFk().equals(orderEntity.getBillNo())) { - orderInvoiceService.insertInvoice(orderInvoiceEntity); + ioOrderInvoiceMapper.insertOrUpdate(orderInvoiceEntity); } } } diff --git a/src/main/java/com/glxp/api/task/SyncHeartTask.java b/src/main/java/com/glxp/api/task/SyncHeartTask.java index 221619653..3c288962a 100644 --- a/src/main/java/com/glxp/api/task/SyncHeartTask.java +++ b/src/main/java/com/glxp/api/task/SyncHeartTask.java @@ -20,8 +20,8 @@ import javax.annotation.Resource; import java.util.Arrays; -//@Component -//@EnableScheduling +@Component +@EnableScheduling public class SyncHeartTask implements SchedulingConfigurer { final Logger logger = LoggerFactory.getLogger(SyncHeartTask.class); diff --git a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml index 7d42be1e4..f4a92c765 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml @@ -30,88 +30,88 @@ @@ -239,7 +243,7 @@ SELECT * FROM company_product_relevance where udiRlIdFk = #{udiRlIdFk} - and customerId = #{customerId} + and customerId = #{customerId} @@ -289,45 +293,45 @@ replace - INTO company_product_relevance(id,customerId, productId, enterpriseId, registrationId, - createTime, updateTime, auditStatus, productUuid, udiRlIdFk, unitFk, - price, createUser, updateUser) - values (#{id},#{customerId}, - #{productId}, - #{enterpriseId}, - #{registrationId}, - #{createTime}, - #{updateTime}, - #{auditStatus}, - #{productUuid}, - #{udiRlIdFk}, - #{unitFk}, - #{price}, - #{createUser}, - #{updateUser}) + INTO company_product_relevance(id, customerId, productId, enterpriseId, registrationId, + createTime, updateTime, auditStatus, productUuid, udiRlIdFk, unitFk, + price, createUser, updateUser) + values (#{id}, #{customerId}, + #{productId}, + #{enterpriseId}, + #{registrationId}, + #{createTime}, + #{updateTime}, + #{auditStatus}, + #{productUuid}, + #{udiRlIdFk}, + #{unitFk}, + #{price}, + #{createUser}, + #{updateUser}) replace - INTO company_product_relevance(id, customerId, productId, enterpriseId, registrationId, - createTime, updateTime, auditStatus, productUuid, udiRlIdFk, unitFk, - price, createUser, updateUser) + INTO company_product_relevance(id, customerId, productId, enterpriseId, registrationId, + createTime, updateTime, auditStatus, productUuid, udiRlIdFk, unitFk, + price, createUser, updateUser) values (#{id}, - #{customerId}, - #{productId}, - #{enterpriseId}, - #{registrationId}, - #{createTime}, - #{updateTime}, - #{auditStatus}, - #{productUuid}, - #{udiRlIdFk}, - #{unitFk}, - #{price}, - #{createUser}, - #{updateUser}) + #{customerId}, + #{productId}, + #{enterpriseId}, + #{registrationId}, + #{createTime}, + #{updateTime}, + #{auditStatus}, + #{productUuid}, + #{udiRlIdFk}, + #{unitFk}, + #{price}, + #{createUser}, + #{updateUser}) @@ -358,9 +362,9 @@