From e4e94c311843ef02cb28d640bb8ac431ea4d2560 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 21 Apr 2023 14:17:00 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E8=B5=84=E5=AD=97=E5=85=B8=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E8=BF=81=E7=A7=BB=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=9B=BD?= =?UTF-8?q?=E5=AE=B6=E5=BA=93=E5=90=8C=E6=AD=A5=E5=88=B0=E5=A4=96=E7=BD=91?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/basic/UdiSyncController.java | 56 +++++++++++++++++-- .../glxp/api/http/sync/SpGetHttpClient.java | 22 ++++++++ .../glxp/api/req/basic/UdiInfoRequest.java | 6 +- 3 files changed, 79 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/basic/UdiSyncController.java b/src/main/java/com/glxp/api/controller/basic/UdiSyncController.java index e67389994..c4e5ad8c6 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiSyncController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiSyncController.java @@ -1,16 +1,17 @@ package com.glxp.api.controller.basic; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.entity.basic.*; -import com.glxp.api.req.basic.FilterUdiRelRequest; -import com.glxp.api.req.basic.ProductInfoFilterRequest; -import com.glxp.api.req.basic.UdiCompanyRequest; +import com.glxp.api.http.sync.SpGetHttpClient; +import com.glxp.api.req.basic.*; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.service.basic.*; +import com.glxp.api.util.OkHttpCli; import com.glxp.api.util.udi.FilterUdiUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.List; /** @@ -33,6 +35,11 @@ public class UdiSyncController { UdiProductService udiProductService; @Resource SyncUdiService syncUdiService; + @Resource + ProductInfoService productInfoService; + @Resource + UdiCompanyService udiCompanyService; + //获取同步库UDI信息 @AuthRuleAnnotation("") @@ -105,7 +112,30 @@ public class UdiSyncController { } } + @Resource + SpGetHttpClient spGetHttpClient; + + @AuthRuleAnnotation("") + @GetMapping("udiwms/udiinfo/superSearch") + public BaseResponse superSearch(FilterUdiInfoRequest filterUdiInfoRequest) { + + if (StrUtil.isEmpty(filterUdiInfoRequest.getNameCode()) && StrUtil.isEmpty(filterUdiInfoRequest.getUdiCode())) { + return ResultVOUtils.error(500, "DI不能为空！"); + } + + if (StrUtil.isNotEmpty(filterUdiInfoRequest.getUdiCode())) { + UdiEntity udiEntity = FilterUdiUtils.getUdi(filterUdiInfoRequest.getUdiCode()); + if (udiEntity == null) + return ResultVOUtils.error(500, "UDI码格式错误！"); + filterUdiInfoRequest.setNameCode(udiEntity.getUdi()); + } + ProductInfoFilterRequest productInfoFilterRequest = new ProductInfoFilterRequest(); + productInfoFilterRequest.setNameCode(filterUdiInfoRequest.getNameCode()); + productInfoFilterRequest.setPage(filterUdiInfoRequest.getPage()); + productInfoFilterRequest.setLimit(filterUdiInfoRequest.getLimit()); + return spGetHttpClient.getSyncDi(productInfoFilterRequest); + } @AuthRuleAnnotation("") @GetMapping("/udiwms/basic/instrument/maintain/filterProduct") @@ -131,4 +161,22 @@ public class UdiSyncController { } -} \ No newline at end of file + //出入库同步下载 + @GetMapping("udidl/udiwms/syncUdi") + public BaseResponse syncUdi(ProductInfoFilterRequest productInfoFilterRequest) { + + List productInfoEntityList = productInfoService.syncDlUdi(productInfoFilterRequest); + return ResultVOUtils.success(productInfoEntityList); + + } + + + //出入库同步下载 + @GetMapping("udidl/udiwms/syncCompany") + public BaseResponse syncCompany(UdiCompanyRequest udiCompanyRequest) { + + List udiCompanyEntities = udiCompanyService.syncDlCompany(udiCompanyRequest); + return ResultVOUtils.success(udiCompanyEntities); + + } +} diff --git a/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java b/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java index be720400d..b90d358f0 100644 --- a/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java +++ b/src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java @@ -6,9 +6,11 @@ import com.alibaba.fastjson.TypeReference; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BasicExportTypeEnum; +import com.glxp.api.entity.basic.ProductInfoEntity; import com.glxp.api.entity.sync.BasicExportStatusEntity; import com.glxp.api.entity.sync.IOOrderStatusEntity; import com.glxp.api.entity.system.SyncDataSetEntity; +import com.glxp.api.req.basic.ProductInfoFilterRequest; import com.glxp.api.req.inout.ReviewFinishRequest; import com.glxp.api.req.inout.ReviewSpmsRequest; import com.glxp.api.req.sync.BasicExportStatusRequest; @@ -115,6 +117,26 @@ public class SpGetHttpClient { return response; } + + // 最小销售标识获取国家库信息 + public BaseResponse> getSyncDi(ProductInfoFilterRequest productInfoFilterRequest) { + Map paramMap = new HashMap<>(16); + paramMap.put("nameCode", productInfoFilterRequest.getNameCode()); + paramMap.put("page", productInfoFilterRequest.getPage() + ""); + paramMap.put("limit", productInfoFilterRequest.getLimit() + ""); + String response = okHttpCli.doGet(getIpUrl() + "/directToSpms" + "/udiwms/udiinfo/superSearch", paramMap, buildHeader()); + try { + BaseResponse> data = + JSONObject.parseObject(response, new TypeReference>>() { + }); + return data; + + } catch (Exception e) { + e.printStackTrace(); + return ResultVOUtils.error(500, "下载失败！"); + } + } + public BaseResponse updateSynsSet(SyncDataSetResponse syncDataSetResponse) { String json = JSONUtil.toJsonStr(syncDataSetResponse); String result = okHttpCli.doPostJson(getIpUrl() + "/directToSpms" + "/system/param/syncData/save", json, buildHeader()); diff --git a/src/main/java/com/glxp/api/req/basic/UdiInfoRequest.java b/src/main/java/com/glxp/api/req/basic/UdiInfoRequest.java index 5fb73dad8..d00ed478a 100644 --- a/src/main/java/com/glxp/api/req/basic/UdiInfoRequest.java +++ b/src/main/java/com/glxp/api/req/basic/UdiInfoRequest.java @@ -62,7 +62,7 @@ public class UdiInfoRequest { private boolean allowNoBatch; private boolean allowNoExpire; private boolean allowNoProduct; - + private boolean allowNoSerial; private String price; private String cplx; private String hchzsb; @@ -80,4 +80,8 @@ public class UdiInfoRequest { private String basicPrductRemak7; private String basicPrductRemak8; + public void setCheck(Boolean check) { + isCheck = check; + } + }