From ef0ae7356408770237bcc67faa5a57954fb16992 Mon Sep 17 00:00:00 2001 From: x_z Date: Thu, 21 Jul 2022 10:46:20 +0800 Subject: [PATCH 1/3] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E4=B8=AD=E7=BB=A7=E6=9C=8D=E5=8A=A1=E8=BF=9E=E9=80=9A=E6=80=A7?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/glxp/api/admin/httpclient/ErpBasicClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpBasicClient.java b/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpBasicClient.java index 5ab0c7ea..d82a7783 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpBasicClient.java +++ b/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpBasicClient.java @@ -115,7 +115,7 @@ public class ErpBasicClient { //测试连通性 public BaseResponse testConnection(BasicThirdSysEntity basicThirdSysEntity) { - String response = httpOkClient.uCloudPost(basicThirdSysEntity.getThridUrl() + "/udiwms/erp/testConnection", "{}"); + String response = httpOkClient.uCloudPost(basicThirdSysEntity.getThridUrl() + "/udispsync/sync/testConnection", "{}"); log.info(response); if (StrUtil.isBlank(response)) { return ResultVOUtils.error(500, "连接失败"); From 4d8520d4e723cd4084018225156f2f2fef78a8c2 Mon Sep 17 00:00:00 2001 From: x_z Date: Thu, 21 Jul 2022 18:20:35 +0800 Subject: [PATCH 2/3] =?UTF-8?q?1.=E6=9F=A5=E8=AF=A2=E5=88=86=E5=BA=93?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=EF=BC=8C=E8=BF=94=E5=9B=9E=E4=B8=BB=E4=BB=93?= =?UTF-8?q?=E5=BA=93=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventory/InvSubWarehouseController.java | 5 ++-- .../dao/inventory/InvSubWarehouseDao.java | 10 ++++++- .../inventory/InvSubWarehouseResponse.java | 23 ++++++++++++++++ .../inventory/InvSubWarehouseService.java | 9 ++++++- .../impl/InvSubWarehouseServiceImpl.java | 15 ++++++++++- .../mapper/inventory/InvSubWarehouseDao.xml | 27 +++++++++++++++++-- 6 files changed, 82 insertions(+), 7 deletions(-) create mode 100644 api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvSubWarehouseResponse.java diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java index 7550b3ec..51276fb5 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java @@ -13,6 +13,7 @@ import com.glxp.api.admin.req.inout.DeleteRequest; import com.glxp.api.admin.req.inventory.FilterInvSubWarehouseRequest; import com.glxp.api.admin.req.inventory.FilterInvWarehouseRequest; import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.res.inventory.InvSubWarehouseResponse; import com.glxp.api.admin.res.inventory.InvWarehouseThirdSysResponse; import com.glxp.api.admin.service.auth.CustomerService; import com.glxp.api.admin.service.inout.WarehouseBussinessTypeService; @@ -49,8 +50,8 @@ public class InvSubWarehouseController { @AuthRuleAnnotation("") @GetMapping("spms/sub/inv/warehouse/filter") public BaseResponse filterInvWarehouse(FilterInvSubWarehouseRequest filterInvSubWarehouseRequest) { - List invSubWarehouseEntities = invSubWarehouseService.filterInvSubWarehouse(filterInvSubWarehouseRequest); - return ResultVOUtils.success(invSubWarehouseEntities); + List responses = invSubWarehouseService.filterInvSubWarehouseResponse(filterInvSubWarehouseRequest); + return ResultVOUtils.success(responses); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvSubWarehouseDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvSubWarehouseDao.java index 86597db6..70a6cfa9 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvSubWarehouseDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvSubWarehouseDao.java @@ -1,9 +1,9 @@ package com.glxp.api.admin.dao.inventory; import com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity; -import com.glxp.api.admin.req.basic.FilterBasicThirdSysRequest; import com.glxp.api.admin.req.inventory.FilterInvSubWarehouseRequest; import com.glxp.api.admin.req.inventory.FilterInvWarehouseRequest; +import com.glxp.api.admin.res.inventory.InvSubWarehouseResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -51,4 +51,12 @@ public interface InvSubWarehouseDao { boolean updateThridId(@Param("id") String id, @Param("thridWarehouseId") String thridWarehouseId, @Param("sysId") String sysId); + /** + * 查询分仓数据 + * + * @param filterInvSubWarehouseRequest + * @return + */ + List filterInvSubWarehouseResponse(FilterInvSubWarehouseRequest filterInvSubWarehouseRequest); + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvSubWarehouseResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvSubWarehouseResponse.java new file mode 100644 index 00000000..d598f3c4 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvSubWarehouseResponse.java @@ -0,0 +1,23 @@ +package com.glxp.api.admin.res.inventory; + +import lombok.Data; + +/** + * 分仓接口响应类 + */ +@Data +public class InvSubWarehouseResponse { + + private String id; + //分仓编码 + private String code; + //分仓编码 + private String name; + //主仓库编码 + private String parentId; + //主仓库名称 + private String parentName; + private String remark; + private boolean defaultInv; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvSubWarehouseService.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvSubWarehouseService.java index 473bb359..50bb460b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvSubWarehouseService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvSubWarehouseService.java @@ -2,9 +2,9 @@ package com.glxp.api.admin.service.inventory; import com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity; -import com.glxp.api.admin.req.basic.FilterBasicThirdSysRequest; import com.glxp.api.admin.req.inventory.FilterInvSubWarehouseRequest; import com.glxp.api.admin.req.inventory.FilterInvWarehouseRequest; +import com.glxp.api.admin.res.inventory.InvSubWarehouseResponse; import com.glxp.api.admin.res.inventory.InvWarehouseThirdSysResponse; import java.util.List; @@ -47,5 +47,12 @@ public interface InvSubWarehouseService { boolean unbindThrWarehouse(String id, String sysId); + /** + * 查询分仓数据 + * + * @param filterInvSubWarehouseRequest + * @return + */ + List filterInvSubWarehouseResponse(FilterInvSubWarehouseRequest filterInvSubWarehouseRequest); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvSubWarehouseServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvSubWarehouseServiceImpl.java index 9352df49..1e83c74f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvSubWarehouseServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvSubWarehouseServiceImpl.java @@ -1,7 +1,6 @@ package com.glxp.api.admin.service.inventory.impl; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; import com.glxp.api.admin.dao.basic.BasicThirdSysDao; @@ -11,6 +10,7 @@ import com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity; import com.glxp.api.admin.req.basic.FilterBasicThirdSysRequest; import com.glxp.api.admin.req.inventory.FilterInvSubWarehouseRequest; import com.glxp.api.admin.req.inventory.FilterInvWarehouseRequest; +import com.glxp.api.admin.res.inventory.InvSubWarehouseResponse; import com.glxp.api.admin.res.inventory.InvWarehouseThirdSysResponse; import com.glxp.api.admin.service.inventory.InvSubWarehouseService; import org.springframework.stereotype.Service; @@ -177,4 +177,17 @@ public class InvSubWarehouseServiceImpl implements InvSubWarehouseService { return invSubWarehouseDao.updateThridId(id, null, sysId); } + + @Override + public List filterInvSubWarehouseResponse(FilterInvSubWarehouseRequest filterInvSubWarehouseRequest) { + if (filterInvSubWarehouseRequest == null) { + return Collections.emptyList(); + } + if (filterInvSubWarehouseRequest.getPage() != null) { + int offset = (filterInvSubWarehouseRequest.getPage() - 1) * filterInvSubWarehouseRequest.getLimit(); + PageHelper.offsetPage(offset, filterInvSubWarehouseRequest.getLimit()); + } + List data = invSubWarehouseDao.filterInvSubWarehouseResponse(filterInvSubWarehouseRequest); + return data; + } } diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml index cb8e36b6..8967d150 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml @@ -158,12 +158,35 @@ where code = #{code} - - update inv_warehouse_sub set ${sysId} = #{thridWarehouseId,jdbcType=VARCHAR} where id = #{id} + + \ No newline at end of file From d727ed48197081490c42bbfac3bb868db5151771 Mon Sep 17 00:00:00 2001 From: x_z Date: Thu, 21 Jul 2022 22:19:14 +0800 Subject: [PATCH 3/3] =?UTF-8?q?1.=E4=BA=A7=E5=93=81=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB=E5=AD=97=E6=AE=B5=E8=A1=A5=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/basic/UdiRelevanceEntity.java | 27 +++++++++++++++++++ .../basic/impl/UdiRelevanceServiceImpl.java | 6 ++--- .../mybatis/mapper/basic/UdiInfoDao.xml | 10 +++++++ 3 files changed, 39 insertions(+), 4 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiRelevanceEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiRelevanceEntity.java index 8eba1df8..bf9e6518 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiRelevanceEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiRelevanceEntity.java @@ -40,6 +40,33 @@ public class UdiRelevanceEntity { private boolean allowNoExpire; private boolean allowNoProduct; + //规格型号 + private String ggxh; + + //器械类别 + private String qxlb; + + //产品类别 + private String cplb; + + //分类编码 + private String flbm; + + //医疗器械注册人 + private String ylqxzcrbarmc; + + //注册人英文名称 + private String ylqxzcrbarywmc; + + //统一社会信用号 + private String tyshxydm; + + //注册证/备案号 + private String zczbhhzbapzbh; + + //产品描述 + private String cpms; + public Integer getLockStatus() { if (lockStatus == null) return 1; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiRelevanceServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiRelevanceServiceImpl.java index de28d4fe..7040843c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiRelevanceServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiRelevanceServiceImpl.java @@ -1,5 +1,6 @@ package com.glxp.api.admin.service.basic.impl; +import cn.hutool.core.bean.BeanUtil; import com.github.pagehelper.PageHelper; import com.glxp.api.admin.constant.ConstantStatus; import com.glxp.api.admin.dao.basic.UdiInfoDao; @@ -282,10 +283,7 @@ public class UdiRelevanceServiceImpl implements UdiRelevanceService { } UdiInfoEntity udiInfoEntity = new UdiInfoEntity(); - udiInfoEntity.setAllowNoBatch(udiRelevanceEntity.isAllowNoBatch()); - udiInfoEntity.setAllowNoExpire(udiRelevanceEntity.isAllowNoExpire()); - udiInfoEntity.setAllowNoProduct(udiRelevanceEntity.isAllowNoProduct()); - udiInfoEntity.setUuid(udiRelevanceEntity.getUuid()); + BeanUtil.copyProperties(udiRelevanceEntity, udiInfoEntity); udiInfoDao.updateUdiInfoByUuid(udiInfoEntity); return udiRelevanceDao.updateUdiRelevance(udiRelevanceEntity); } diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml index dbb638fb..a173d598 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml @@ -271,6 +271,16 @@ update basic_products + ggxh=#{ggxh}, + qxlb=#{qxlb}, + cplb=#{cplb}, + flbm=#{flbm}, + ylqxzcrbarmc=#{ylqxzcrbarmc}, + ylqxzcrbarywmc=#{ylqxzcrbarywmc}, + tyshxydm=#{tyshxydm}, + zczbhhzbapzbh=#{zczbhhzbapzbh}, + cpms=#{cpms}, + measname=#{measname}, allowNoBatch=#{allowNoBatch}, allowNoExpire=#{allowNoExpire}, allowNoProduct=#{allowNoProduct},