Merge remote-tracking branch 'origin/fengcang' into fengcang

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<InvSubWarehouseEntity> invSubWarehouseEntities = invSubWarehouseService.filterInvSubWarehouse(filterInvSubWarehouseRequest);
+        List<InvSubWarehouseResponse> responses = invSubWarehouseService.filterInvSubWarehouseResponse(filterInvSubWarehouseRequest);
-        return ResultVOUtils.success(invSubWarehouseEntities);
+        return ResultVOUtils.success(responses);
     }
 
 

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<InvSubWarehouseResponse> filterInvSubWarehouseResponse(FilterInvSubWarehouseRequest filterInvSubWarehouseRequest);
+
 }

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;

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, "连接失败");

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;
+
+}

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());
+        BeanUtil.copyProperties(udiRelevanceEntity, udiInfoEntity);
-        udiInfoEntity.setAllowNoExpire(udiRelevanceEntity.isAllowNoExpire());
-        udiInfoEntity.setAllowNoProduct(udiRelevanceEntity.isAllowNoProduct());
-        udiInfoEntity.setUuid(udiRelevanceEntity.getUuid());
         udiInfoDao.updateUdiInfoByUuid(udiInfoEntity);
         return udiRelevanceDao.updateUdiRelevance(udiRelevanceEntity);
     }

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<InvSubWarehouseResponse> filterInvSubWarehouseResponse(FilterInvSubWarehouseRequest filterInvSubWarehouseRequest);
 
 }

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<InvSubWarehouseResponse> 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<InvSubWarehouseResponse> data = invSubWarehouseDao.filterInvSubWarehouseResponse(filterInvSubWarehouseRequest);
+        return data;
+    }
 }

api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml

@@ -271,6 +271,16 @@
     <update id="updateUdiInfoByUuid" parameterType="com.glxp.api.admin.entity.basic.UdiInfoEntity">
         update basic_products
             <trim prefix="set" suffixOverrides=",">
+                <if test="ggxh != null">ggxh=#{ggxh},</if>
+                <if test="qxlb != null">qxlb=#{qxlb},</if>
+                <if test="cplb != null">cplb=#{cplb},</if>
+                <if test="flbm != null">flbm=#{flbm},</if>
+                <if test="ylqxzcrbarmc != null">ylqxzcrbarmc=#{ylqxzcrbarmc},</if>
+                <if test="ylqxzcrbarywmc != null">ylqxzcrbarywmc=#{ylqxzcrbarywmc},</if>
+                <if test="tyshxydm != null">tyshxydm=#{tyshxydm},</if>
+                <if test="zczbhhzbapzbh != null">zczbhhzbapzbh=#{zczbhhzbapzbh},</if>
+                <if test="cpms != null">cpms=#{cpms},</if>
+                <if test="measname != null">measname=#{measname},</if>
                 <if test="allowNoBatch != null">allowNoBatch=#{allowNoBatch},</if>
                 <if test="allowNoExpire != null">allowNoExpire=#{allowNoExpire},</if>
                 <if test="allowNoProduct != null">allowNoProduct=#{allowNoProduct},</if>

api-admin/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml

@@ -158,12 +158,35 @@
         where code = #{code}
     </select>
 
-
-
     <update id="updateThridId" parameterType="Map">
         update inv_warehouse_sub
         set ${sysId} = #{thridWarehouseId,jdbcType=VARCHAR}
         where id = #{id}
     </update>
 
+    <select id="filterInvSubWarehouseResponse"
+            resultType="com.glxp.api.admin.res.inventory.InvSubWarehouseResponse">
+        select  a.id, a.code, a.name, a.parentId, a.remark, a.defaultInv, a.thirdId, a.thirdId1, a.thirdId2,
+        a.thirdId3, a.thirdId4, b.name as parentName
+        FROM inv_warehouse_sub a
+        left join inv_warehouse b on a.parentId = b.code
+        <where>
+            <if test="id != '' and id != null">
+                AND a.id = #{id}
+            </if>
+            <if test="code != '' and code != null">
+                AND a.code = #{code}
+            </if>
+            <if test="name != '' and name != null">
+                AND a.name like concat('%',#{name},'%')
+            </if>
+            <if test="parentId != '' and parentId != null">
+                AND a.parentId = #{parentId}
+            </if>
+            <if test="defaultInv != '' and defaultInv != null">
+                AND a.defaultInv = #{defaultInv}
+            </if>
+        </where>
+    </select>
+
 </mapper>