1.新增第三方仓库信息接口

2.仓库信息新增关联第三方仓库信息数据接口

api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvWarehouseController.java

@@ -1,9 +1,15 @@
 package com.glxp.api.admin.controller.inventory;
 
+import cn.hutool.core.util.StrUtil;
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.admin.annotation.AuthRuleAnnotation;
 import com.glxp.api.admin.entity.inventory.InvWarehouseEntity;
+import com.glxp.api.admin.req.basic.FilterBasicThirdSysRequest;
 import com.glxp.api.admin.req.inout.DeleteRequest;
 import com.glxp.api.admin.req.inventory.FilterInvWarehouseRequest;
+import com.glxp.api.admin.res.PageSimpleResponse;
 import com.glxp.api.admin.res.inventory.InvWarehouseResponse;
+import com.glxp.api.admin.res.inventory.InvWarehouseThirdSysResponse;
 import com.glxp.api.admin.service.inventory.InvWarehouseService;
 import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
@@ -112,5 +118,60 @@ public class InvWarehouseController {
         return ResultVOUtils.success();
     }
 
+    /**
+     * 绑定第三方仓库ID
+     *
+     * @param id
+     * @param thridWarehouseId
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/spms/inv/warehouse/bindThrWarehouse")
+    public BaseResponse bindThrWarehouse(Integer id, Integer thridWarehouseId, String sysId) {
+        if (null == id || null == thridWarehouseId || StrUtil.isBlank(sysId)) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
+        }
+        invWarehouseService.bindThrWarehouse(id, thridWarehouseId, sysId);
+        return ResultVOUtils.success();
+    }
+
+    /**
+     * 解绑第三方仓库ID
+     *
+     * @param id
+     * @param thridWarehouseId
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/spms/inv/warehouse/unbindThrWarehouse")
+    public BaseResponse unbindThrWarehouse(Integer id, String sysId) {
+        if (null == id || StrUtil.isBlank(sysId)) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
+        }
+        invWarehouseService.unbindThrWarehouse(id, sysId);
+        return ResultVOUtils.success();
+    }
+
+    /**
+     * 查询第三方系统和仓库数据关联信息
+     *
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @GetMapping("/spms/inv/warehouse/thridSys/detail")
+    public BaseResponse getThirdSysDetail(FilterInvWarehouseRequest request) {
+        if (null == request || null == request.getId()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
+        }
+        FilterBasicThirdSysRequest sysRequest = new FilterBasicThirdSysRequest();
+        sysRequest.setEnabled(true);
+        List<InvWarehouseThirdSysResponse> list = invWarehouseService.getThirdSysDetail(sysRequest, request.getId());
+        PageInfo<InvWarehouseThirdSysResponse> pageInfo;
+        pageInfo = new PageInfo<>(list);
+        PageSimpleResponse<InvWarehouseThirdSysResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(list);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
 
 }

api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrInvWarehouseController.java

@@ -0,0 +1,115 @@
+package com.glxp.api.admin.controller.thrsys;
+
+import com.glxp.api.admin.entity.thrsys.ThrInvWarehouseEntity;
+import com.glxp.api.admin.req.inout.DeleteRequest;
+import com.glxp.api.admin.req.thrsys.FilterThrInvWarehouseRequest;
+import com.glxp.api.admin.res.thrsys.ThrInvWarehouseResponse;
+import com.glxp.api.admin.service.thrsys.ThrInvWarehouseService;
+import com.glxp.api.common.enums.ResultEnum;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 第三方仓库信息接口
+ */
+@Slf4j
+@RestController
+public class ThrInvWarehouseController {
+
+    @Resource
+    ThrInvWarehouseService thrInvWarehouseService;
+
+    @GetMapping("spms/thrsys/warehouse/filter")
+    public BaseResponse filterInvWarehouse(FilterThrInvWarehouseRequest filterThrInvWarehouseRequest) {
+        List<ThrInvWarehouseEntity> thrInvWarehouseEntities = thrInvWarehouseService.filterThrInvWarehouse(filterThrInvWarehouseRequest);
+        List<ThrInvWarehouseResponse> merge = merge(thrInvWarehouseEntities, 0);
+
+        Map<String, Object> restMap = new HashMap<>();
+        restMap.put("list", merge);
+        return ResultVOUtils.success(restMap);
+    }
+
+    public List<ThrInvWarehouseResponse> merge(List<ThrInvWarehouseEntity> thrInvWarehouseEntities, Integer pid) {
+        List<ThrInvWarehouseResponse> thrInvWarehouseResponses = new ArrayList<>();
+        for (ThrInvWarehouseEntity thrInvWarehouseEntity : thrInvWarehouseEntities) {
+            ThrInvWarehouseResponse thrInvWarehouseResponse = new ThrInvWarehouseResponse();
+            BeanUtils.copyProperties(thrInvWarehouseEntity, thrInvWarehouseResponse);
+            if (pid.equals(thrInvWarehouseEntity.getPid())) {
+                thrInvWarehouseResponse.setChildren(merge(thrInvWarehouseEntities, thrInvWarehouseEntity.getId()));
+                thrInvWarehouseResponses.add(thrInvWarehouseResponse);
+            }
+        }
+        return thrInvWarehouseResponses;
+    }
+
+    @GetMapping("spms/thrsys/warehouse/filterAll")
+    public BaseResponse filterAllInvWarehouse(FilterThrInvWarehouseRequest filterThrInvWarehouseRequest) {
+        filterThrInvWarehouseRequest.setPid(0);
+        List<ThrInvWarehouseEntity> thrInvWarehouseEntities = thrInvWarehouseService.filterThrInvWarehouse(filterThrInvWarehouseRequest);
+        return ResultVOUtils.success(thrInvWarehouseEntities);
+    }
+
+    @PostMapping("/spms/thrsys/warehouse/save")
+    public BaseResponse save(@RequestBody @Valid ThrInvWarehouseEntity thrInvWarehouseEntity,
+                             BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+
+        if (thrInvWarehouseEntity.getPid() == null) {
+            thrInvWarehouseEntity.setPid(0); // 默认设置
+        }
+        boolean b = thrInvWarehouseService.insertInvWarehouse(thrInvWarehouseEntity);
+        if (!b) {
+            return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
+        }
+        return ResultVOUtils.success("添加成功！");
+    }
+
+    @PostMapping("/spms/thrsys/warehouse/edit")
+    public BaseResponse edit(@RequestBody @Valid ThrInvWarehouseEntity thrInvWarehouseEntity,
+                             BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        if (thrInvWarehouseEntity.getId() == null) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
+        }
+        thrInvWarehouseEntity.setPid(null); // 不能修改父级 pid
+        boolean b = thrInvWarehouseService.updateInvWarehouse(thrInvWarehouseEntity);
+        if (!b) {
+            return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
+        }
+        return ResultVOUtils.success();
+    }
+
+    @PostMapping("/spms/thrsys/warehouse/delete")
+    public BaseResponse delete(@RequestBody DeleteRequest deleteRequest) {
+
+        if (deleteRequest.getId() == null) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
+        }
+        boolean b = thrInvWarehouseService.deleteById(deleteRequest.getId());
+        if (!b) {
+            return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
+        }
+        return ResultVOUtils.success();
+    }
+
+}

api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvWarehouseDao.java

@@ -20,4 +20,22 @@ public interface InvWarehouseDao {
 
     boolean deleteById(@Param("id") String id);
 
+    /**
+     * 更新第三方仓库ID
+     *
+     * @param id
+     * @param thridWarehouseId
+     * @return
+     */
+    boolean updateThridId(@Param("id") Integer id, @Param("thridWarehouseId") Integer thridWarehouseId);
+
+    /**
+     * 更新第三方仓库ID
+     *
+     * @param id
+     * @param thridWarehouseId
+     * @param sysId
+     * @return
+     */
+    boolean updateThridId(Integer id, Integer thridWarehouseId, String sysId);
 }

api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InvWarehouseEntity.java

@@ -18,5 +18,13 @@ public class InvWarehouseEntity {
     private Date updateTime;
     private String remark;
 
+    /**
+     * 第三方仓库ID
+     */
+    private String thirdId;
+    private String thirdId1;
+    private String thirdId2;
+    private String thirdId3;
+    private String thirdId4;
 
 }

api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrInvWarehouseEntity.java

@@ -0,0 +1,32 @@
+package com.glxp.api.admin.entity.thrsys;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 第三方仓库信息
+ */
+@Data
+public class ThrInvWarehouseEntity {
+
+    private Integer id;
+    private Integer pid;
+    private String code;
+    private String name;
+    private Boolean advanceType;
+    private Boolean isDefault;
+    private Integer status;
+    private Date updateTime;
+    private String remark;
+
+    /**
+    * 仓库等级
+    */
+    private Integer level;
+
+    /**
+    * 父级仓库编码
+    */
+    private String pcode;
+}

api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrInvWarehouseRequest.java

@@ -0,0 +1,19 @@
+package com.glxp.api.admin.req.thrsys;
+
+import com.glxp.api.admin.req.ListPageRequest;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class FilterThrInvWarehouseRequest extends ListPageRequest {
+
+    private Integer id;
+    private Integer pid;
+    private String code;
+    private String name;
+    private Boolean advanceType;
+    private Boolean isDefault;
+    private Date updateTime;
+    private String key;
+}

api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvWarehouseService.java

@@ -2,7 +2,9 @@ package com.glxp.api.admin.service.inventory;
 
 
 import com.glxp.api.admin.entity.inventory.InvWarehouseEntity;
+import com.glxp.api.admin.req.basic.FilterBasicThirdSysRequest;
 import com.glxp.api.admin.req.inventory.FilterInvWarehouseRequest;
+import com.glxp.api.admin.res.inventory.InvWarehouseThirdSysResponse;
 
 import java.util.List;
 
@@ -25,4 +27,28 @@ public interface InvWarehouseService {
 
     boolean deleteById(String id);
 
+    /**
+     * 绑定第三方仓库
+     *
+     * @param id
+     * @param thridWarehouseId
+     */
+    boolean bindThrWarehouse(Integer id, Integer thridWarehouseId, String sysId);
+
+    /**
+     * 解绑第三方仓库
+     *
+     * @param id
+     * @param thridWarehouseId
+     */
+    boolean unbindThrWarehouse(Integer id, String sysId);
+
+    /**
+     * 查询第三方系统和仓库信息关联数据
+     *
+     * @param request
+     * @param id
+     * @return
+     */
+    List<InvWarehouseThirdSysResponse> getThirdSysDetail(FilterBasicThirdSysRequest request, Integer id);
 }

api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvWarehouseServiceImpl.java

@@ -1,13 +1,22 @@
 package com.glxp.api.admin.service.inventory.impl;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ReflectUtil;
 import com.github.pagehelper.PageHelper;
+import com.glxp.api.admin.dao.basic.BasicThirdSysDao;
 import com.glxp.api.admin.dao.inventory.InvWarehouseDao;
+import com.glxp.api.admin.dao.thrsys.ThrInvWarehouseDao;
+import com.glxp.api.admin.entity.basic.BasicThirdSysEntity;
 import com.glxp.api.admin.entity.inventory.InvWarehouseEntity;
+import com.glxp.api.admin.entity.thrsys.ThrInvWarehouseEntity;
+import com.glxp.api.admin.req.basic.FilterBasicThirdSysRequest;
 import com.glxp.api.admin.req.inventory.FilterInvWarehouseRequest;
+import com.glxp.api.admin.res.inventory.InvWarehouseThirdSysResponse;
 import com.glxp.api.admin.service.inventory.InvWarehouseService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -17,6 +26,10 @@ public class InvWarehouseServiceImpl implements InvWarehouseService {
 
     @Resource
     InvWarehouseDao invWarehouseDao;
+    @Resource
+    private BasicThirdSysDao basicThirdSysDao;
+    @Resource
+    private ThrInvWarehouseDao thrInvWarehouseDao;
 
     @Override
     public InvWarehouseEntity findDefault(Boolean advaceType, Boolean isDefault) {
@@ -85,4 +98,92 @@ public class InvWarehouseServiceImpl implements InvWarehouseService {
     public boolean deleteById(String id) {
         return invWarehouseDao.deleteById(id);
     }
+
+    @Override
+    public boolean bindThrWarehouse(Integer id, Integer thridWarehouseId, String sysId) {
+        return invWarehouseDao.updateThridId(id, thridWarehouseId, sysId);
+    }
+
+    @Override
+    public boolean unbindThrWarehouse(Integer id,String sysId) {
+        return invWarehouseDao.updateThridId(id, null, sysId);
+    }
+
+    @Override
+    public List<InvWarehouseThirdSysResponse> getThirdSysDetail(FilterBasicThirdSysRequest request, Integer id) {
+        //查询第三方系统数据
+        if (request == null) {
+            return Collections.emptyList();
+        }
+        if (request.getPage() != null) {
+            int offset = (request.getPage() - 1) * request.getLimit();
+            PageHelper.offsetPage(offset, request.getLimit());
+        }
+        List<BasicThirdSysEntity> data = basicThirdSysDao.filterBasicThiSys(request);
+        if (CollUtil.isEmpty(data)) {
+            return Collections.emptyList();
+        }
+        List<InvWarehouseThirdSysResponse> result = new ArrayList<>(data.size());
+        InvWarehouseEntity invWarehouseEntity = invWarehouseDao.selectById(String.valueOf(id));
+        for (BasicThirdSysEntity sys : data) {
+            if (sys.getThirdId().equals("thirdId")) {
+                InvWarehouseThirdSysResponse response = new InvWarehouseThirdSysResponse();
+                response.setSysId(sys.getThirdId());
+                response.setSysName(sys.getThirdName());
+                Object thirdId = ReflectUtil.getFieldValue(invWarehouseEntity, sys.getThirdId());
+                if (null != thirdId) {
+                    ThrInvWarehouseEntity thrInvWarehouseEntity = thrInvWarehouseDao.selectByCode(String.valueOf(thirdId));
+                    response.setThirdId(thrInvWarehouseEntity.getCode());
+                    response.setThirdName(thrInvWarehouseEntity.getName());
+                }
+                result.add(response);
+            } else if (sys.getThirdId().equals("thirdId1")) {
+                InvWarehouseThirdSysResponse response = new InvWarehouseThirdSysResponse();
+                response.setSysId(sys.getThirdId());
+                response.setSysName(sys.getThirdName());
+                Object thirdId = ReflectUtil.getFieldValue(invWarehouseEntity, sys.getThirdId());
+                if (null != thirdId) {
+                    ThrInvWarehouseEntity thrInvWarehouseEntity = thrInvWarehouseDao.selectByCode(String.valueOf(thirdId));
+                    response.setThirdId(thrInvWarehouseEntity.getCode());
+                    response.setThirdName(thrInvWarehouseEntity.getName());
+                }
+                result.add(response);
+            }else if (sys.getThirdId().equals("thirdId2")) {
+                InvWarehouseThirdSysResponse response = new InvWarehouseThirdSysResponse();
+                response.setSysId(sys.getThirdId());
+                response.setSysName(sys.getThirdName());
+                Object thirdId = ReflectUtil.getFieldValue(invWarehouseEntity, sys.getThirdId());
+                if (null != thirdId) {
+                    ThrInvWarehouseEntity thrInvWarehouseEntity = thrInvWarehouseDao.selectByCode(String.valueOf(thirdId));
+                    response.setThirdId(thrInvWarehouseEntity.getCode());
+                    response.setThirdName(thrInvWarehouseEntity.getName());
+                }
+                result.add(response);
+            }else if (sys.getThirdId().equals("thirdId3")) {
+                InvWarehouseThirdSysResponse response = new InvWarehouseThirdSysResponse();
+                response.setSysId(sys.getThirdId());
+                response.setSysName(sys.getThirdName());
+                Object thirdId = ReflectUtil.getFieldValue(invWarehouseEntity, sys.getThirdId());
+                if (null != thirdId) {
+                    ThrInvWarehouseEntity thrInvWarehouseEntity = thrInvWarehouseDao.selectByCode(String.valueOf(thirdId));
+                    response.setThirdId(thrInvWarehouseEntity.getCode());
+                    response.setThirdName(thrInvWarehouseEntity.getName());
+                }
+                result.add(response);
+            }else if (sys.getThirdId().equals("thirdId4")) {
+                InvWarehouseThirdSysResponse response = new InvWarehouseThirdSysResponse();
+                response.setSysId(sys.getThirdId());
+                response.setSysName(sys.getThirdName());
+                Object thirdId = ReflectUtil.getFieldValue(invWarehouseEntity, sys.getThirdId());
+                if (null != thirdId) {
+                    ThrInvWarehouseEntity thrInvWarehouseEntity = thrInvWarehouseDao.selectByCode(String.valueOf(thirdId));
+                    response.setThirdId(thrInvWarehouseEntity.getCode());
+                    response.setThirdName(thrInvWarehouseEntity.getName());
+                }
+                result.add(response);
+            }
+        }
+        return result;
+    }
+
 }

api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrInvWarehouseService.java

@@ -0,0 +1,28 @@
+package com.glxp.api.admin.service.thrsys;
+
+
+import com.glxp.api.admin.entity.thrsys.ThrInvWarehouseEntity;
+import com.glxp.api.admin.req.thrsys.FilterThrInvWarehouseRequest;
+
+import java.util.List;
+
+public interface ThrInvWarehouseService {
+
+
+    ThrInvWarehouseEntity findDefault(Boolean advaceType, Boolean isDefault);
+
+    List<ThrInvWarehouseEntity> filterThrInvWarehouse(FilterThrInvWarehouseRequest filterThrInvWarehouseRequest);
+
+    List<ThrInvWarehouseEntity> filterGroupInvWarehouse(FilterThrInvWarehouseRequest filterThrInvWarehouseRequest);
+
+    boolean insertInvWarehouse(ThrInvWarehouseEntity thrInvWarehouseEntity);
+
+    boolean updateInvWarehouse(ThrInvWarehouseEntity thrInvWarehouseEntity);
+
+    ThrInvWarehouseEntity selectById(String id);
+
+    ThrInvWarehouseEntity selectByCode(String code);
+
+    boolean deleteById(String id);
+
+}

api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrInvWarehouseServiceImpl.java

@@ -0,0 +1,86 @@
+package com.glxp.api.admin.service.thrsys.impl;
+
+import com.github.pagehelper.PageHelper;
+import com.glxp.api.admin.dao.thrsys.ThrInvWarehouseDao;
+import com.glxp.api.admin.entity.thrsys.ThrInvWarehouseEntity;
+import com.glxp.api.admin.req.thrsys.FilterThrInvWarehouseRequest;
+import com.glxp.api.admin.service.thrsys.ThrInvWarehouseService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Collections;
+import java.util.List;
+
+@Service
+public class ThrInvWarehouseServiceImpl implements ThrInvWarehouseService {
+
+
+    @Resource
+    ThrInvWarehouseDao thrInvWarehouseDao;
+
+    @Override
+    public ThrInvWarehouseEntity findDefault(Boolean advaceType, Boolean isDefault) {
+
+        FilterThrInvWarehouseRequest filterThrInvWarehouseRequest = new FilterThrInvWarehouseRequest();
+        filterThrInvWarehouseRequest.setIsDefault(isDefault);
+        filterThrInvWarehouseRequest.setAdvanceType(advaceType);
+        List<ThrInvWarehouseEntity> thrInvWarehouseEntities = thrInvWarehouseDao.filterThrInvWarehouse(filterThrInvWarehouseRequest);
+        if (thrInvWarehouseEntities != null && thrInvWarehouseEntities.size() > 0)
+            return thrInvWarehouseEntities.get(0);
+        return null;
+    }
+
+    @Override
+    public List<ThrInvWarehouseEntity> filterThrInvWarehouse(FilterThrInvWarehouseRequest FilterThrInvWarehouseRequest) {
+        if (FilterThrInvWarehouseRequest == null) {
+            return Collections.emptyList();
+        }
+        if (FilterThrInvWarehouseRequest.getPage() != null) {
+            int offset = (FilterThrInvWarehouseRequest.getPage() - 1) * FilterThrInvWarehouseRequest.getLimit();
+            PageHelper.offsetPage(offset, FilterThrInvWarehouseRequest.getLimit());
+        }
+        return thrInvWarehouseDao.filterThrInvWarehouse(FilterThrInvWarehouseRequest);
+    }
+
+    @Override
+    public List<ThrInvWarehouseEntity> filterGroupInvWarehouse(FilterThrInvWarehouseRequest filterThrInvWarehouseRequest) {
+        if (filterThrInvWarehouseRequest == null) {
+            return Collections.emptyList();
+        }
+        if (filterThrInvWarehouseRequest.getPage() != null) {
+            int offset = (filterThrInvWarehouseRequest.getPage() - 1) * filterThrInvWarehouseRequest.getLimit();
+            PageHelper.offsetPage(offset, filterThrInvWarehouseRequest.getLimit());
+        }
+        return thrInvWarehouseDao.filterThrGroupInvWarehouse(filterThrInvWarehouseRequest);
+    }
+
+    @Override
+    public boolean insertInvWarehouse(ThrInvWarehouseEntity thrInvWarehouseEntity) {
+        return thrInvWarehouseDao.insertThrInvWarehouse(thrInvWarehouseEntity);
+    }
+
+    @Override
+    public boolean updateInvWarehouse(ThrInvWarehouseEntity thrInvWarehouseEntity) {
+        return thrInvWarehouseDao.updateThrInvWarehouse(thrInvWarehouseEntity);
+    }
+
+    @Override
+    public ThrInvWarehouseEntity selectById(String id) {
+        return thrInvWarehouseDao.selectById(id);
+    }
+
+    @Override
+    public ThrInvWarehouseEntity selectByCode(String code) {
+        FilterThrInvWarehouseRequest thrInvWarehouseRequest = new FilterThrInvWarehouseRequest();
+        thrInvWarehouseRequest.setCode(code);
+        List<ThrInvWarehouseEntity> invWarehouseEntities = thrInvWarehouseDao.filterThrInvWarehouse(thrInvWarehouseRequest);
+        if (invWarehouseEntities != null && invWarehouseEntities.size() > 0)
+            return invWarehouseEntities.get(0);
+        return null;
+    }
+
+    @Override
+    public boolean deleteById(String id) {
+        return thrInvWarehouseDao.deleteById(id);
+    }
+}

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

@@ -69,12 +69,13 @@
     <insert id="insertInvWarehouse" keyProperty="id"
             parameterType="com.glxp.api.admin.entity.inventory.InvWarehouseEntity">
         insert INTO inv_warehouse
-        (pid, code, name, advanceType, isDefault,
+                (pid, code, name, advanceType, isDefault,
-         status, updateTime, remark)
+                 status, updateTime, remark, thirdId, thirdId1, thirdId2, thirdId3, thirdId4)
         values (#{pid}, #{code},
                 #{name}, #{advanceType}, #{isDefault},
                 #{status}, #{updateTime},
-                #{remark})
+                #{remark}, #{thirdId}, #{thirdId1},
+                #{thirdId2}, #{thirdId3}, #{thirdId4})
     </insert>
 
 
@@ -95,8 +96,16 @@
             <if test="status != null">status=#{status},</if>
             <if test="updateTime != null">updateTime=#{updateTime},</if>
             <if test="remark != null">remark=#{remark},</if>
+            <if test="thirdId != null">remark=#{thirdId},</if>
+            <if test="thirdId1 != null">remark=#{thirdId1},</if>
+            <if test="thirdId2 != null">remark=#{thirdId2},</if>
+            <if test="thirdId3 != null">remark=#{thirdId3},</if>
+            <if test="thirdId4 != null">remark=#{thirdId4},</if>
         </trim>
         WHERE id = #{id}
     </update>
 
+    <update id="updateThridId">
+        update inv_warehouse set thirdId = #{thridWarehouseId} where id = #{id}
+    </update>
 </mapper>