代码备份，新增南靖，重构目录

pom.xml

@@ -75,6 +75,13 @@
             <version>8.0.21</version>
             <scope>runtime</scope>
         </dependency>
+
+        <dependency>
+            <groupId>com.oracle</groupId>
+            <artifactId>ojdbc8</artifactId>
+            <version>19.18.0.0</version>
+            <scope>runtime</scope>
+        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>

src/main/java/com/glxp/mipsdl/Application.java

@@ -11,7 +11,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @SpringBootApplication
 @ServletComponentScan
 @EnableTransactionManagement
-@MapperScan("com.glxp.mipsdl.dao")
+//@MapperScan("com.glxp.mipsdl.dao")
 public class Application extends SpringBootServletInitializer {
 
     public static void main(String[] args) {

src/main/java/com/glxp/mipsdl/client/CommonFileClient.java

@@ -1,12 +1,5 @@
 package com.glxp.mipsdl.client;
 
-import cn.hutool.core.thread.ThreadUtil;
-import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson2.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.glxp.mipsdl.config.ThirdSysConfig;
-import com.glxp.mipsdl.constant.ConstantType;
-import com.glxp.mipsdl.constant.Constants;
 import com.glxp.mipsdl.dao.auth.AuthWarehouseDao;
 import com.glxp.mipsdl.dao.basic.BasicBussinessTypeDao;
 import com.glxp.mipsdl.dao.basic.BasicCorpDao;
@@ -16,39 +9,14 @@ import com.glxp.mipsdl.dao.inout.IoOrderDetailBizDao;
 import com.glxp.mipsdl.dao.thrsys.ThrBustypeOriginDao;
 import com.glxp.mipsdl.dao.thrsys.ThrInvWarehouseDao;
 import com.glxp.mipsdl.dao.thrsys.ThrSystemBusApiDao;
-import com.glxp.mipsdl.entity.auth.AuthWarehouseEntity;
-import com.glxp.mipsdl.entity.basic.BasicBussinessTypeEntity;
-import com.glxp.mipsdl.entity.inout.IoCodeEntity;
-import com.glxp.mipsdl.entity.inout.IoOrderDetailBizEntity;
-import com.glxp.mipsdl.entity.inout.IoOrderEntity;
-import com.glxp.mipsdl.entity.thrsys.ThrCorpEntity;
-import com.glxp.mipsdl.entity.thrsys.ThrInvWarehouseEntity;
-import com.glxp.mipsdl.entity.thrsys.ThrSystemBusApiEntity;
-import com.glxp.mipsdl.http.HttpClient;
-import com.glxp.mipsdl.req.base.*;
-import com.glxp.mipsdl.req.post.PostFileThrOrderRequest;
-import com.glxp.mipsdl.req.post.PostThrCorpRequest;
-import com.glxp.mipsdl.req.post.PostThrInvProductsRequest;
-import com.glxp.mipsdl.req.post.PostThrProductsRequest;
 import com.glxp.mipsdl.res.BaseResponse;
-import com.glxp.mipsdl.res.udiwms.UdiwmsProductInfoResponse;
-import com.glxp.mipsdl.service.auth.AuthWarehouseService;
 import com.glxp.mipsdl.service.file.UdiInfoUploadService;
-import com.glxp.mipsdl.service.thrsys.ThrCorpService;
-import com.glxp.mipsdl.service.thrsys.ThrSystemDetailService;
 import com.glxp.mipsdl.util.*;
-import com.glxp.mipsdl.vo.file.yxzyy.YxzyyProductEntity;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.annotation.Resource;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 @Slf4j

src/main/java/com/glxp/mipsdl/client/CommonHttpClient.java

@@ -2,9 +2,7 @@ package com.glxp.mipsdl.client;
 
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson2.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.glxp.mipsdl.config.ThirdSysConfig;
-import com.glxp.mipsdl.constant.ConstantType;
 import com.glxp.mipsdl.constant.Constants;
 import com.glxp.mipsdl.dao.auth.AuthWarehouseDao;
 import com.glxp.mipsdl.dao.basic.BasicBussinessTypeDao;
@@ -15,14 +13,8 @@ import com.glxp.mipsdl.dao.inout.IoOrderDetailBizDao;
 import com.glxp.mipsdl.dao.thrsys.ThrBustypeOriginDao;
 import com.glxp.mipsdl.dao.thrsys.ThrInvWarehouseDao;
 import com.glxp.mipsdl.dao.thrsys.ThrSystemBusApiDao;
-import com.glxp.mipsdl.entity.auth.AuthWarehouseEntity;
-import com.glxp.mipsdl.entity.basic.BasicBussinessTypeEntity;
 import com.glxp.mipsdl.entity.inout.IoCodeEntity;
 import com.glxp.mipsdl.entity.inout.IoOrderDetailBizEntity;
-import com.glxp.mipsdl.entity.inout.IoOrderEntity;
-import com.glxp.mipsdl.entity.thrsys.ThrCorpEntity;
-import com.glxp.mipsdl.entity.thrsys.ThrInvWarehouseEntity;
-import com.glxp.mipsdl.entity.thrsys.ThrSystemBusApiEntity;
 import com.glxp.mipsdl.http.HttpClient;
 import com.glxp.mipsdl.req.base.*;
 import com.glxp.mipsdl.req.base.forthird.ForBasicProductsSearchFilter;
@@ -34,23 +26,16 @@ import com.glxp.mipsdl.req.ctqyy.GetSickPrescribeRequest;
 import com.glxp.mipsdl.req.ctqyy.GetSickRequest;
 import com.glxp.mipsdl.req.post.*;
 import com.glxp.mipsdl.res.BaseResponse;
-import com.glxp.mipsdl.res.udiwms.InvProductRequest;
 import com.glxp.mipsdl.service.auth.AuthWarehouseService;
 import com.glxp.mipsdl.service.thrsys.ThrCorpService;
 import com.glxp.mipsdl.service.thrsys.ThrSystemDetailService;
-import com.glxp.mipsdl.util.DateUtil;
 import com.glxp.mipsdl.util.DictUtl;
 import com.glxp.mipsdl.util.ResultVOUtils;
 import com.glxp.mipsdl.util.SubmitOrderUtil;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 @Slf4j

src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java

@@ -64,7 +64,6 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;

src/main/java/com/glxp/mipsdl/client/dsxyy/DsxyyClient.java

@@ -10,7 +10,6 @@ import com.alibaba.fastjson2.TypeReference;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.glxp.mipsdl.client.BaseHttpClient;
 import com.glxp.mipsdl.client.CommonHttpClient;
 import com.glxp.mipsdl.config.ThirdSysConfig;
 import com.glxp.mipsdl.constant.ConstantType;

src/main/java/com/glxp/mipsdl/client/njxyy/NjxyyClient.java

@@ -4,14 +4,16 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.exceptions.ExceptionUtil;
-import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.glxp.mipsdl.client.CommonHttpClient;
 import com.glxp.mipsdl.config.ThirdSysConfig;
 import com.glxp.mipsdl.constant.ConstantType;
@@ -23,16 +25,22 @@ import com.glxp.mipsdl.dao.basic.BasicUdirelDao;
 import com.glxp.mipsdl.dao.inout.IoCodeDao;
 import com.glxp.mipsdl.dao.inout.IoOrderDao;
 import com.glxp.mipsdl.dao.inout.IoOrderDetailBizDao;
+import com.glxp.mipsdl.entity.ctqyy.MaterialDictEntity;
+import com.glxp.mipsdl.entity.njxyy.ProductEntity;
+import com.glxp.mipsdl.entity.njxyy.SickerEntity;
+import com.glxp.mipsdl.req.ctqyy.CtqyyRequest;
+import com.glxp.mipsdl.req.ctqyy.GetSickRequest;
+import com.glxp.mipsdl.req.njxyy.PostThrProductRequest;
+import com.glxp.mipsdl.req.post.*;
+import com.glxp.mipsdl.res.ctqyy.CtBaseResponse;
+import com.glxp.mipsdl.thirddao.njxyy.ThrCorpMapper;
 import com.glxp.mipsdl.dao.thrsys.*;
 import com.glxp.mipsdl.entity.auth.AuthWarehouseEntity;
 import com.glxp.mipsdl.entity.basic.BasicBussinessTypeEntity;
 import com.glxp.mipsdl.entity.basic.BasicCorpEntity;
 import com.glxp.mipsdl.entity.basic.BasicUdirelEntity;
 import com.glxp.mipsdl.entity.inout.*;
-import com.glxp.mipsdl.entity.thrsys.ThrInvWarehouseEntity;
+import com.glxp.mipsdl.entity.thrsys.*;
-import com.glxp.mipsdl.entity.thrsys.ThrOrderUploadBustypesEntity;
-import com.glxp.mipsdl.entity.thrsys.ThrProductsEntity;
-import com.glxp.mipsdl.entity.thrsys.ThrSystemBusApiEntity;
 import com.glxp.mipsdl.http.HttpClient;
 import com.glxp.mipsdl.req.base.*;
 import com.glxp.mipsdl.req.base.forthird.*;
@@ -40,17 +48,14 @@ import com.glxp.mipsdl.req.phxyy.PhBusTypeRequest;
 import com.glxp.mipsdl.req.phxyy.PhOrderRequest;
 import com.glxp.mipsdl.req.phxyy.PhProductRequest;
 import com.glxp.mipsdl.req.phxyy.PhUnitRequest;
-import com.glxp.mipsdl.req.post.PostFileThrOrderRequest;
-import com.glxp.mipsdl.req.post.PostThrCorpRequest;
-import com.glxp.mipsdl.req.post.PostThrInvProductsRequest;
-import com.glxp.mipsdl.req.post.PostThrProductsRequest;
 import com.glxp.mipsdl.res.BaseResponse;
 import com.glxp.mipsdl.res.PageSimpleResponse;
 import com.glxp.mipsdl.res.udiwms.*;
 import com.glxp.mipsdl.service.auth.AuthWarehouseService;
 import com.glxp.mipsdl.service.order.OrderUploadLogService;
-import com.glxp.mipsdl.service.thrsys.ThrCorpService;
 import com.glxp.mipsdl.service.thrsys.ThrSystemDetailService;
+import com.glxp.mipsdl.thirddao.njxyy.ThrProductsMapper;
+import com.glxp.mipsdl.thirddao.njxyy.ThrSickerMapper;
 import com.glxp.mipsdl.util.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
@@ -60,6 +65,7 @@ import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -94,8 +100,6 @@ public class NjxyyClient extends CommonHttpClient {
     @Resource
     private ThirdSysConfig thirdSysConfig;
     @Resource
-    private ThrCorpService thrCorpService;
-    @Resource
     private IoOrderDetailBizDao orderDetailBizDao;
     @Resource
     private SubmitOrderUtil submitOrderUtil;
@@ -108,24 +112,147 @@ public class NjxyyClient extends CommonHttpClient {
     @Resource
     private ThrOrderUploadBustypesMapper thrOrderUploadBustypesMapper;
 
+    @Resource
+    ThrCorpMapper thrCorpMapper;
+    @Resource
+    ThrProductsMapper thrProductsMapper;
+    @Resource
+    ThrSickerMapper thrSickerMapper;
+
+
+    /**
+     * 获取产品信息---(A001产品信息查询)
+     *
+     * @param udiwmsProductRequest
+     * @return
+     */
     @Override
-    public BaseResponse getUnit(UdiwmsUnitRequest udiwmsUnitRequest) {
+    public BaseResponse getProducts(UdiwmsProductRequest udiwmsProductRequest) {
-        PhUnitRequest phUnitRequest = new PhUnitRequest();
+        IPage<ProductEntity> page = new Page<>(udiwmsProductRequest.getPage(), udiwmsProductRequest.getLimit());
-        BeanUtil.copyProperties(udiwmsUnitRequest, phUnitRequest);
+        IPage<ProductEntity> productEntityIPage = thrProductsMapper.selectPage(page, new QueryWrapper<ProductEntity>()
-        String response = httpClient.postJson(thrSystemDetailService.getUrl(Constants.URL_NAME_CORP_URL), phUnitRequest);
+                .lambda()
-        BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class);
+                .like(StringUtils.isNotBlank(udiwmsProductRequest.getCode()), ProductEntity::getCode, udiwmsProductRequest.getCode())
-        return baseResponse;
+                .like(StringUtils.isNotBlank(udiwmsProductRequest.getName()), ProductEntity::getName, udiwmsProductRequest.getName()));
+        PageSimpleResponse<ProductEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(productEntityIPage.getTotal());
+        pageSimpleResponse.setList(productEntityIPage.getRecords());
+        return ResultVOUtils.success(pageSimpleResponse);
     }
 
+    /**
+     * 获取患者信息--( A003病人信息视图)
+     *
+     * @param getSickRequest
+     * @return
+     */
+    public BaseResponse getSickInfo(GetSickRequest getSickRequest) {
+        IPage<SickerEntity> page = new Page<>(getSickRequest.getPage(), getSickRequest.getLimit());
+        IPage<SickerEntity> productEntityIPage = thrSickerMapper.selectPage(page, new QueryWrapper<SickerEntity>()
+                .lambda()
+                .like(StringUtils.isNotBlank(getSickRequest.getCode()), SickerEntity::getIdentityNo, getSickRequest.getCode())
+                .like(StringUtils.isNotBlank(getSickRequest.getName()), SickerEntity::getName, getSickRequest.getName()));
+
+        productEntityIPage.getRecords().forEach(sickerEntity -> {
+            BasicSkSickerResponse.builder()
+                    .sickerId(sickerEntity.getInpatientID())
+                    .code(sickerEntity.getCurno())
+                    .name(sickerEntity.getName())
+                    .adNum(sickerEntity.getInpatientID())
+                    .idNum(sickerEntity.getIdentityNo())
+                    .phone(sickerEntity.getCellPhoneNo())
+                    .gender(sickerEntity.getSex())
+                    .bornDate(sickerEntity.getBirthDate())
+                    .guardianName(sickerEntity.getOperName())
+                    .build();
+
+        });
+
+        PageSimpleResponse<SickerEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(productEntityIPage.getTotal());
+        pageSimpleResponse.setList(productEntityIPage.getRecords());
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+
+    /**
+     * 提交关联产品更新--（A004接收新增产品信息）
+     *
+     * @return
+     */
     @Override
-    public BaseResponse getProducts(UdiwmsProductRequest udiwmsProductRequest) {
+    public BaseResponse postRelProduct(PostRelProductRequest postThrInvProductsRequest) {
-        PhProductRequest phProductRequest = new PhProductRequest();
+        List<UdiRelevanceResponse> datas = postThrInvProductsRequest.getDatas();
-        BeanUtil.copyProperties(udiwmsProductRequest, phProductRequest);
+        BaseResponse baseResponse = null;
-        String response = httpClient.postJson(thrSystemDetailService.getUrl(Constants.URL_NAME_PI_QUERY_URL), phProductRequest);
+        if (CollUtil.isNotEmpty(datas)) {
+            for (UdiRelevanceResponse udiRelevanceResponse : datas) {
+                PostThrProductRequest postThrProductsRequest = new PostThrProductRequest();
+                BeanUtil.copyProperties(udiRelevanceResponse, postThrProductsRequest);
+                String response = httpClient.postJson(thrSystemDetailService.getUrl(Constants.URL_NAME_POST_THR_PRODUCTS_URL), postThrProductsRequest);
+                baseResponse = JSONObject.parseObject(response, BaseResponse.class);
+                log.error(baseResponse.getMessage());
+//                return baseResponse;
+            }
+        }
+        return ResultVOUtils.success(baseResponse);
+    }
+
+
+    /**
+     * B001 查询指定科室高值/普耗库存
+     *
+     * @param forInvProductsFilter
+     * @return
+     */
+    @Override
+    public BaseResponse queryUdiInvProductsFilter(ForInvProductsFilter forInvProductsFilter) {
+        //入参业务系统字段控制
+        FilterInvProductRequest filterInvProductRequest = new FilterInvProductRequest();
+        BeanUtils.copyProperties(forInvProductsFilter, filterInvProductRequest);
+        //调用业务系统http
+        String response = httpClient.postUDIWMSJson(thirdSysConfig.getPostInvProductsFilterUrl(), filterInvProductRequest);
+        //业务系统返回参数 字段控制
         BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class);
+        if (baseResponse.getCode() == 20000) {
+            PageSimpleResponse<InvProductResponse> pageSimpleResponse =
+                    JSONObject.parseObject(String.valueOf(baseResponse.getData()), PageSimpleResponse.class);
+            List<InvProductResponse> list = pageSimpleResponse.getList();
+            //处理list字段 进行实体转换 过滤掉不必要字段
+            String json = JSON.toJSONString(list);
+            List<ForInvProductsResponse> newList = JSON.parseArray(json, ForInvProductsResponse.class);
+
+            PageSimpleResponse<ForInvProductsResponse> newPageSimpleResponse = new PageSimpleResponse<>();
+            newPageSimpleResponse.setTotal(pageSimpleResponse.getTotal());
+            newPageSimpleResponse.setList(newList);
+            baseResponse.setData(newPageSimpleResponse);
+        } else {
+
+        }
         return baseResponse;
     }
 
+
+    /**
+     * 获取往来单位
+     *
+     * @param udiwmsUnitRequest
+     * @return
+     */
+    @Override
+    public BaseResponse getUnit(UdiwmsUnitRequest udiwmsUnitRequest) {
+        PhUnitRequest phUnitRequest = new PhUnitRequest();
+        BeanUtil.copyProperties(udiwmsUnitRequest, phUnitRequest);
+        IPage<ThrCorpEntity> page = new Page<>(udiwmsUnitRequest.getPage(), udiwmsUnitRequest.getLimit());
+        IPage<ThrCorpEntity> thrCorpEntityPage = thrCorpMapper.selectPage(page, new QueryWrapper<ThrCorpEntity>()
+                .lambda()
+                .like(StringUtils.isNotBlank(phUnitRequest.getUnitId()), ThrCorpEntity::getUnitId, phUnitRequest.getUnitId())
+                .like(StringUtils.isNotBlank(phUnitRequest.getName()), ThrCorpEntity::getName, phUnitRequest.getName()));
+        PageSimpleResponse<ThrCorpEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(thrCorpEntityPage.getTotal());
+        pageSimpleResponse.setList(thrCorpEntityPage.getRecords());
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+
     @Override
     public BaseResponse getOrderTypes(UdiwmsBusTypeRequest udiwmsBusTypeRequest) {
         PhBusTypeRequest phBusTypeRequest = new PhBusTypeRequest();
@@ -434,55 +561,29 @@ public class NjxyyClient extends CommonHttpClient {
         return baseResponse;
     }
 
-    @Override
-    public BaseResponse queryUdiInvProductsFilter(ForInvProductsFilter forInvProductsFilter) {
-        //入参业务系统字段控制
-        FilterInvProductRequest filterInvProductRequest = new FilterInvProductRequest();
-        BeanUtils.copyProperties(forInvProductsFilter,filterInvProductRequest);
-        //调用业务系统http
-        String response = httpClient.postUDIWMSJson(thirdSysConfig.getPostInvProductsFilterUrl(), filterInvProductRequest);
-        //业务系统返回参数 字段控制
-        BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class);
-        if (baseResponse.getCode() == 20000){
-            PageSimpleResponse<InvProductResponse> pageSimpleResponse =
-                    JSONObject.parseObject(String.valueOf(baseResponse.getData()), PageSimpleResponse.class);
-            List<InvProductResponse> list = pageSimpleResponse.getList();
-            //处理list字段 进行实体转换 过滤掉不必要字段
-            String json = JSON.toJSONString(list);
-            List<ForInvProductsResponse> newList = JSON.parseArray(json,ForInvProductsResponse.class);
-
-            PageSimpleResponse<ForInvProductsResponse> newPageSimpleResponse = new PageSimpleResponse<>();
-            newPageSimpleResponse.setTotal(pageSimpleResponse.getTotal());
-            newPageSimpleResponse.setList(newList);
-            baseResponse.setData(newPageSimpleResponse);
-        }else {
-
-        }
-        return baseResponse;
-    }
 
     @Override
     public BaseResponse queryUdiBasicProductsSearch(ForBasicProductsSearchFilter forBasicProductsSearchFilter) {
         //入参业务系统字段控制
         FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest();
-        BeanUtils.copyProperties(forBasicProductsSearchFilter,filterUdiRelRequest);
+        BeanUtils.copyProperties(forBasicProductsSearchFilter, filterUdiRelRequest);
         //调用业务系统http
         String response = httpClient.postUDIWMSJson(thirdSysConfig.getPostBasicProductsSearch(), filterUdiRelRequest);
         //业务系统返回参数 字段控制
         BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class);
-        if (baseResponse.getCode() == 20000){
+        if (baseResponse.getCode() == 20000) {
             PageSimpleResponse<UdiRelevanceResponse> pageSimpleResponse =
                     JSONObject.parseObject(String.valueOf(baseResponse.getData()), PageSimpleResponse.class);
             List<UdiRelevanceResponse> list = pageSimpleResponse.getList();
             //处理list字段 进行实体转换 过滤掉不必要字段
             String json = JSON.toJSONString(list);
-            List<ForBasicProductsSearchResponse> newList = JSON.parseArray(json,ForBasicProductsSearchResponse.class);
+            List<ForBasicProductsSearchResponse> newList = JSON.parseArray(json, ForBasicProductsSearchResponse.class);
 
             PageSimpleResponse<ForBasicProductsSearchResponse> newPageSimpleResponse = new PageSimpleResponse<>();
             newPageSimpleResponse.setTotal(pageSimpleResponse.getTotal());
             newPageSimpleResponse.setList(newList);
             baseResponse.setData(newPageSimpleResponse);
-        }else {
+        } else {
 
         }
         return baseResponse;
@@ -560,4 +661,5 @@ public class NjxyyClient extends CommonHttpClient {
         return baseResponse;
     }
 
+
 }

src/main/java/com/glxp/mipsdl/client/phxyy/PhxyyClient.java

@@ -9,7 +9,6 @@ import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.glxp.mipsdl.client.BaseHttpClient;
 import com.glxp.mipsdl.client.CommonHttpClient;
 import com.glxp.mipsdl.config.ThirdSysConfig;
 import com.glxp.mipsdl.constant.ConstantType;

src/main/java/com/glxp/mipsdl/client/ptxhyy/PtxhyyClient.java

@@ -3,18 +3,13 @@ package com.glxp.mipsdl.client.ptxhyy;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.exceptions.ExceptionUtil;
-import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONUtil;
-import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.alibaba.fastjson2.TypeReference;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.BeanUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.glxp.mipsdl.client.CommonHttpClient;
-import com.glxp.mipsdl.client.ctqyy.entity.InvProjectResultEntity;
 import com.glxp.mipsdl.client.ptxhyy.entity.HisProductEntity;
 import com.glxp.mipsdl.client.ptxhyy.entity.OrderUploadResponse;
 import com.glxp.mipsdl.client.ptxhyy.entity.ThrHslbEntity;
@@ -24,6 +19,7 @@ import com.glxp.mipsdl.constant.ConstantType;
 import com.glxp.mipsdl.constant.Constants;
 import com.glxp.mipsdl.dao.auth.AuthUserDao;
 import com.glxp.mipsdl.dao.auth.AuthWarehouseDao;
+import com.glxp.mipsdl.dao.auth.AuthWarehouseUserMapper;
 import com.glxp.mipsdl.dao.basic.*;
 import com.glxp.mipsdl.dao.inout.IoCodeDao;
 import com.glxp.mipsdl.dao.inout.IoOrderDao;
@@ -36,22 +32,16 @@ import com.glxp.mipsdl.dao.thrsys.ThrSystemBusApiDao;
 import com.glxp.mipsdl.entity.auth.AuthUserEntity;
 import com.glxp.mipsdl.entity.auth.AuthWarehouseEntity;
 import com.glxp.mipsdl.entity.auth.AuthWarehouseUser;
-import com.glxp.mipsdl.dao.auth.AuthWarehouseUserMapper;
 import com.glxp.mipsdl.entity.basic.BasicBussinessTypeEntity;
 import com.glxp.mipsdl.entity.basic.BasicCorpEntity;
-import com.glxp.mipsdl.entity.basic.BasicSkProjectDetailEntity;
 import com.glxp.mipsdl.entity.basic.BasicSkProjectEntity;
 import com.glxp.mipsdl.entity.inout.*;
-import com.glxp.mipsdl.entity.thrsys.ThrDeptEntity;
 import com.glxp.mipsdl.entity.thrsys.ThrInvWarehouseEntity;
-import com.glxp.mipsdl.entity.thrsys.ThrProductsEntity;
 import com.glxp.mipsdl.entity.thrsys.ThrSystemBusApiEntity;
 import com.glxp.mipsdl.http.HttpClient;
-import com.glxp.mipsdl.req.base.CompanyProductRelevanceRequest;
 import com.glxp.mipsdl.req.base.UdiwmsInvProductsRequest;
 import com.glxp.mipsdl.req.base.UdiwmsOrderDetailRequest;
 import com.glxp.mipsdl.req.base.UdiwmsOrderRequest;
-import com.glxp.mipsdl.req.ctqyy.CtqyyRequest;
 import com.glxp.mipsdl.req.ctqyy.DlThirdProjectRequest;
 import com.glxp.mipsdl.req.ptxhyy.PtxhyyInvRequest;
 import com.glxp.mipsdl.req.ptxhyy.PtxhyyOrderDetailRequest;
@@ -59,10 +49,7 @@ import com.glxp.mipsdl.req.ptxhyy.PtxhyyOrderRequest;
 import com.glxp.mipsdl.res.BaseResponse;
 import com.glxp.mipsdl.res.PageSimpleResponse;
 import com.glxp.mipsdl.res.ptxhyy.PtxhInvResponse;
-import com.glxp.mipsdl.res.udiwms.BasicSkProjectResponse;
-import com.glxp.mipsdl.res.udiwms.InvProductRequest;
 import com.glxp.mipsdl.res.udiwms.ThrInvResultResponse;
-import com.glxp.mipsdl.res.udiwms.UdiRlSupResponse;
 import com.glxp.mipsdl.service.auth.AuthWarehouseService;
 import com.glxp.mipsdl.service.order.OrderUploadLogService;
 import com.glxp.mipsdl.service.thrsys.ThrCorpService;
@@ -73,10 +60,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.io.IOException;
 import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 

src/main/java/com/glxp/mipsdl/client/pzh/PzhzdClient.java

@@ -1,7 +1,6 @@
 package com.glxp.mipsdl.client.pzh;
 
 import cn.hutool.core.util.StrUtil;
-import com.glxp.mipsdl.client.BaseHttpClient;
 import com.glxp.mipsdl.client.CommonHttpClient;
 import com.glxp.mipsdl.dao.pzhzd.YyUcloudV31SetDao;
 import com.glxp.mipsdl.entity.pzhzd.YyUcloudV31SetEntity;

src/main/java/com/glxp/mipsdl/client/yxzyy/YxzyyClient.java

@@ -4,8 +4,6 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.glxp.mipsdl.client.BaseHttpClient;
 import com.glxp.mipsdl.client.CommonHttpClient;
 import com.glxp.mipsdl.config.ThirdSysConfig;
 import com.glxp.mipsdl.constant.ConstantType;
@@ -23,7 +21,6 @@ import com.glxp.mipsdl.dao.thrsys.ThrProductsDao;
 import com.glxp.mipsdl.dao.thrsys.ThrSystemBusApiDao;
 import com.glxp.mipsdl.entity.auth.AuthWarehouseEntity;
 import com.glxp.mipsdl.entity.basic.BasicBussinessTypeEntity;
-import com.glxp.mipsdl.entity.basic.BasicCorpEntity;
 import com.glxp.mipsdl.entity.basic.BasicUdirelEntity;
 import com.glxp.mipsdl.entity.inout.IoCodeEntity;
 import com.glxp.mipsdl.entity.inout.IoOrderDetailBizEntity;

src/main/java/com/glxp/mipsdl/client/zaxyy/ZaxyyClient.java

@@ -11,7 +11,6 @@ import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.glxp.mipsdl.client.BaseHttpClient;
 import com.glxp.mipsdl.client.CommonHttpClient;
 import com.glxp.mipsdl.config.ThirdSysConfig;
 import com.glxp.mipsdl.constant.ConstantType;
@@ -31,19 +30,15 @@ import com.glxp.mipsdl.entity.auth.AuthWarehouseUser;
 import com.glxp.mipsdl.entity.basic.BasicBussinessTypeEntity;
 import com.glxp.mipsdl.entity.basic.BasicCorpEntity;
 import com.glxp.mipsdl.entity.inout.*;
-import com.glxp.mipsdl.entity.thrsys.ThrCorpEntity;
 import com.glxp.mipsdl.entity.thrsys.ThrInvWarehouseEntity;
 import com.glxp.mipsdl.entity.thrsys.ThrOrderUploadBustypesEntity;
 import com.glxp.mipsdl.entity.thrsys.ThrSystemBusApiEntity;
 import com.glxp.mipsdl.http.HttpClient;
 import com.glxp.mipsdl.req.base.*;
-import com.glxp.mipsdl.req.ctqyy.CtqPostRelProductRequest;
 import com.glxp.mipsdl.req.post.*;
 import com.glxp.mipsdl.req.zaxyy.ZaZyRequest;
 import com.glxp.mipsdl.req.zaxyy.ZaxzyyOrderRequest;
-import com.glxp.mipsdl.req.zzzyy.ZzzyyRequest;
 import com.glxp.mipsdl.res.BaseResponse;
-import com.glxp.mipsdl.res.udiwms.UdiRelevanceResponse;
 import com.glxp.mipsdl.res.udiwms.ZzzyyProductsResponse;
 import com.glxp.mipsdl.service.auth.AuthWarehouseService;
 import com.glxp.mipsdl.service.order.OrderUploadLogService;

src/main/java/com/glxp/mipsdl/client/zzzyy/ZzzyyClient.java

@@ -10,7 +10,6 @@ import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.glxp.mipsdl.client.BaseHttpClient;
 import com.glxp.mipsdl.client.CommonHttpClient;
 import com.glxp.mipsdl.config.ThirdSysConfig;
 import com.glxp.mipsdl.constant.ConstantType;
@@ -34,12 +33,10 @@ import com.glxp.mipsdl.entity.thrsys.ThrInvWarehouseEntity;
 import com.glxp.mipsdl.entity.thrsys.ThrSystemBusApiEntity;
 import com.glxp.mipsdl.http.HttpClient;
 import com.glxp.mipsdl.req.base.*;
-import com.glxp.mipsdl.req.ctqyy.CtqPostRelProductRequest;
 import com.glxp.mipsdl.req.post.*;
 import com.glxp.mipsdl.req.zaxyy.ZaxzyyOrderRequest;
 import com.glxp.mipsdl.req.zzzyy.ZzzyyRequest;
 import com.glxp.mipsdl.res.BaseResponse;
-import com.glxp.mipsdl.res.udiwms.UdiRelevanceResponse;
 import com.glxp.mipsdl.res.udiwms.ZzzyyProductsResponse;
 import com.glxp.mipsdl.service.auth.AuthWarehouseService;
 import com.glxp.mipsdl.service.thrsys.ThrCorpService;

src/main/java/com/glxp/mipsdl/config/HospConfig.java

@@ -3,7 +3,6 @@ package com.glxp.mipsdl.config;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.glxp.mipsdl.dao.auth.AuthLicenseDao;
 import com.glxp.mipsdl.dao.system.SysHospConfigDao;
 import com.glxp.mipsdl.entity.auth.AuthLicenseEntity;

src/main/java/com/glxp/mipsdl/config/MyBatisConfig.java

@@ -0,0 +1,27 @@
+package com.glxp.mipsdl.config;
+
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+
+@Configuration
+public class MyBatisConfig {
+    @Bean
+    public MybatisPlusInterceptor paginationInterceptor() {
+        MybatisPlusInterceptor mybatisPlusInterceptor = new MybatisPlusInterceptor();
+//这是分页拦截器
+        PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor();
+
+        paginationInnerInterceptor.setOverflow(false);
+        paginationInnerInterceptor.setMaxLimit(500L);
+        mybatisPlusInterceptor.addInnerInterceptor(paginationInnerInterceptor);
+//设置请求的页面大于最大页后操作，true调回到首页，false继续请求默认false
+// paginationInterceptor.setOverflow(false);//设置最大单页限制数量，默认500条，-1不受限制
+//paginationInterceptor.setLimit(500);
+//开启 count 的 join 优化,只针对部分 left join
+        return mybatisPlusInterceptor;
+    }
+}
+

src/main/java/com/glxp/mipsdl/config/ThirdSysConfig.java

@@ -1,7 +1,6 @@
 package com.glxp.mipsdl.config;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.glxp.mipsdl.constant.Constants;
 import com.glxp.mipsdl.dao.thrsys.ThrSystemDao;
 import com.glxp.mipsdl.entity.thrsys.ThrSystemEntity;

src/main/java/com/glxp/mipsdl/dao/auth/AuthLicenseDao.java

@@ -2,6 +2,8 @@ package com.glxp.mipsdl.dao.auth;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.mipsdl.entity.auth.AuthLicenseEntity;
+import org.apache.ibatis.annotations.Mapper;
 
+@Mapper
 public interface AuthLicenseDao extends BaseMapper<AuthLicenseEntity> {
-}
+}

src/main/java/com/glxp/mipsdl/dao/auth/AuthWarehouseDao.java

@@ -2,6 +2,8 @@ package com.glxp.mipsdl.dao.auth;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.mipsdl.entity.auth.AuthWarehouseEntity;
+import org.apache.ibatis.annotations.Mapper;
 
+@Mapper
 public interface AuthWarehouseDao extends BaseMapper<AuthWarehouseEntity> {
-}
+}

src/main/java/com/glxp/mipsdl/dao/auth/AuthWarehouseUserMapper.java

@@ -2,6 +2,8 @@ package com.glxp.mipsdl.dao.auth;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.mipsdl.entity.auth.AuthWarehouseUser;
+import org.apache.ibatis.annotations.Mapper;
 
+@Mapper
 public interface AuthWarehouseUserMapper extends BaseMapper<AuthWarehouseUser> {
 }

src/main/java/com/glxp/mipsdl/dao/basic/BasicBussinessTypeDao.java

@@ -2,8 +2,10 @@ package com.glxp.mipsdl.dao.basic;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.mipsdl.entity.basic.BasicBussinessTypeEntity;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+@Mapper
 public interface BasicBussinessTypeDao extends BaseMapper<BasicBussinessTypeEntity> {
 
     /**
@@ -14,4 +16,4 @@ public interface BasicBussinessTypeDao extends BaseMapper<BasicBussinessTypeEnti
      */
     BasicBussinessTypeEntity selectByAction(@Param("action") String action);
 
-}
+}

src/main/java/com/glxp/mipsdl/dao/basic/BasicCorpDao.java

@@ -2,8 +2,10 @@ package com.glxp.mipsdl.dao.basic;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.mipsdl.entity.basic.BasicCorpEntity;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+@Mapper
 public interface BasicCorpDao extends BaseMapper<BasicCorpEntity> {
 
     /**

src/main/java/com/glxp/mipsdl/dao/basic/BasicProductsDao.java

@@ -2,6 +2,8 @@ package com.glxp.mipsdl.dao.basic;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.mipsdl.entity.basic.BasicProductsEntity;
+import org.apache.ibatis.annotations.Mapper;
 
+@Mapper
 public interface BasicProductsDao extends BaseMapper<BasicProductsEntity> {
-}
+}

src/main/java/com/glxp/mipsdl/dao/basic/BasicUdirelDao.java

@@ -2,6 +2,8 @@ package com.glxp.mipsdl.dao.basic;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.mipsdl.entity.basic.BasicUdirelEntity;
+import org.apache.ibatis.annotations.Mapper;
 
+@Mapper
 public interface BasicUdirelDao extends BaseMapper<BasicUdirelEntity> {
-}
+}

src/main/java/com/glxp/mipsdl/dao/inout/IoCodeDao.java

@@ -2,6 +2,8 @@ package com.glxp.mipsdl.dao.inout;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.mipsdl.entity.inout.IoCodeEntity;
+import org.apache.ibatis.annotations.Mapper;
 
+@Mapper
 public interface IoCodeDao extends BaseMapper<IoCodeEntity> {
-}
+}

src/main/java/com/glxp/mipsdl/dao/inout/IoCodeTempDao.java

@@ -2,6 +2,8 @@ package com.glxp.mipsdl.dao.inout;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.mipsdl.entity.inout.IoCodeTempEntity;
+import org.apache.ibatis.annotations.Mapper;
 
+@Mapper
 public interface IoCodeTempDao extends BaseMapper<IoCodeTempEntity> {
-}
+}

src/main/java/com/glxp/mipsdl/dao/inout/IoOrderDao.java

@@ -2,6 +2,8 @@ package com.glxp.mipsdl.dao.inout;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.mipsdl.entity.inout.IoOrderEntity;
+import org.apache.ibatis.annotations.Mapper;
 
+@Mapper
 public interface IoOrderDao extends BaseMapper<IoOrderEntity> {
-}
+}

src/main/java/com/glxp/mipsdl/dao/inout/IoOrderDetailBizDao.java

@@ -2,6 +2,8 @@ package com.glxp.mipsdl.dao.inout;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.mipsdl.entity.inout.IoOrderDetailBizEntity;
+import org.apache.ibatis.annotations.Mapper;
 
+@Mapper
 public interface IoOrderDetailBizDao extends BaseMapper<IoOrderDetailBizEntity> {
-}
+}

src/main/java/com/glxp/mipsdl/dao/inout/IoOrderDetailCodeDao.java

@@ -2,6 +2,8 @@ package com.glxp.mipsdl.dao.inout;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.mipsdl.entity.inout.IoOrderDetailCodeEntity;
+import org.apache.ibatis.annotations.Mapper;
 
+@Mapper
 public interface IoOrderDetailCodeDao extends BaseMapper<IoOrderDetailCodeEntity> {
-}
+}

src/main/java/com/glxp/mipsdl/dao/inout/IoOrderDetailResultDao.java

@@ -2,6 +2,8 @@ package com.glxp.mipsdl.dao.inout;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.mipsdl.entity.inout.IoOrderDetailResultEntity;
+import org.apache.ibatis.annotations.Mapper;
 
+@Mapper
 public interface IoOrderDetailResultDao extends BaseMapper<IoOrderDetailResultEntity> {
-}
+}

src/main/java/com/glxp/mipsdl/dao/inout/IoOrderUploadLogDao.java

@@ -2,6 +2,8 @@ package com.glxp.mipsdl.dao.inout;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.mipsdl.entity.inout.IoOrderUploadLogEntity;
+import org.apache.ibatis.annotations.Mapper;
 
+@Mapper
 public interface IoOrderUploadLogDao extends BaseMapper<IoOrderUploadLogEntity> {
-}
+}

src/main/java/com/glxp/mipsdl/dao/pzhzd/YyUcloudV31SetDao.java

@@ -1,11 +1,13 @@
 package com.glxp.mipsdl.dao.pzhzd;
 
 import com.glxp.mipsdl.entity.pzhzd.YyUcloudV31SetEntity;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 /**
  * 片仔癀
  */
+@Mapper
 public interface YyUcloudV31SetDao {
 
     YyUcloudV31SetEntity findSetUp(@Param("url") String url);

src/main/java/com/glxp/mipsdl/dao/system/SysErpLogDao.java

@@ -2,6 +2,8 @@ package com.glxp.mipsdl.dao.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.mipsdl.entity.system.SysErpLogEntity;
+import org.apache.ibatis.annotations.Mapper;
 
+@Mapper
 public interface SysErpLogDao extends BaseMapper<SysErpLogEntity> {
-}
+}

src/main/java/com/glxp/mipsdl/dao/system/SysHospConfigDao.java

@@ -2,6 +2,8 @@ package com.glxp.mipsdl.dao.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.mipsdl.entity.system.SysHospConfigEntity;
+import org.apache.ibatis.annotations.Mapper;
 
+@Mapper
 public interface SysHospConfigDao extends BaseMapper<SysHospConfigEntity> {
-}
+}

src/main/java/com/glxp/mipsdl/dao/system/SysScheduledDao.java

@@ -2,6 +2,8 @@ package com.glxp.mipsdl.dao.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.mipsdl.entity.system.SysScheduledEntity;
+import org.apache.ibatis.annotations.Mapper;
 
+@Mapper
 public interface SysScheduledDao extends BaseMapper<SysScheduledEntity> {
-}
+}

src/main/java/com/glxp/mipsdl/dao/system/SysThirdSysApiDao.java

@@ -2,6 +2,8 @@ package com.glxp.mipsdl.dao.system;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.mipsdl.entity.system.SysThirdsysApiEntity;
+import org.apache.ibatis.annotations.Mapper;
 
+@Mapper
 public interface SysThirdSysApiDao extends BaseMapper<SysThirdsysApiEntity> {
-}
+}

src/main/java/com/glxp/mipsdl/dao/thrsys/ThrBustypeOriginDao.java

@@ -2,8 +2,10 @@ package com.glxp.mipsdl.dao.thrsys;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.mipsdl.entity.thrsys.ThrBustypeOriginEntity;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+@Mapper
 public interface ThrBustypeOriginDao extends BaseMapper<ThrBustypeOriginEntity> {
 
     /**
@@ -14,4 +16,4 @@ public interface ThrBustypeOriginDao extends BaseMapper<ThrBustypeOriginEntity>
      * @return
      */
     String findThirdActionByBillType(@Param("billType") String billType, @Param("hospCode") String hospCode);
-}
+}

src/main/java/com/glxp/mipsdl/dao/thrsys/ThrCorpDao.java

@@ -2,6 +2,8 @@ package com.glxp.mipsdl.dao.thrsys;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.mipsdl.entity.thrsys.ThrCorpEntity;
+import org.apache.ibatis.annotations.Mapper;
 
+@Mapper
 public interface ThrCorpDao extends BaseMapper<ThrCorpEntity> {
-}
+}

src/main/java/com/glxp/mipsdl/dao/thrsys/ThrDeptDao.java

@@ -2,6 +2,8 @@ package com.glxp.mipsdl.dao.thrsys;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.mipsdl.entity.thrsys.ThrDeptEntity;
+import org.apache.ibatis.annotations.Mapper;
 
+@Mapper
 public interface ThrDeptDao extends BaseMapper<ThrDeptEntity> {
-}
+}

src/main/java/com/glxp/mipsdl/dao/thrsys/ThrInvWarehouseDao.java

@@ -2,6 +2,8 @@ package com.glxp.mipsdl.dao.thrsys;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.mipsdl.entity.thrsys.ThrInvWarehouseEntity;
+import org.apache.ibatis.annotations.Mapper;
 
+@Mapper
 public interface ThrInvWarehouseDao extends BaseMapper<ThrInvWarehouseEntity> {
-}
+}

src/main/java/com/glxp/mipsdl/dao/thrsys/ThrProductsDao.java

@@ -2,6 +2,8 @@ package com.glxp.mipsdl.dao.thrsys;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.mipsdl.entity.thrsys.ThrProductsEntity;
+import org.apache.ibatis.annotations.Mapper;
 
+@Mapper
 public interface ThrProductsDao extends BaseMapper<ThrProductsEntity> {
-}
+}

src/main/java/com/glxp/mipsdl/dao/thrsys/ThrSystemBusApiDao.java

@@ -2,6 +2,8 @@ package com.glxp.mipsdl.dao.thrsys;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.mipsdl.entity.thrsys.ThrSystemBusApiEntity;
+import org.apache.ibatis.annotations.Mapper;
 
+@Mapper
 public interface ThrSystemBusApiDao extends BaseMapper<ThrSystemBusApiEntity> {
-}
+}

src/main/java/com/glxp/mipsdl/dao/thrsys/ThrSystemDao.java

@@ -2,6 +2,8 @@ package com.glxp.mipsdl.dao.thrsys;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.mipsdl.entity.thrsys.ThrSystemEntity;
+import org.apache.ibatis.annotations.Mapper;
 
+@Mapper
 public interface ThrSystemDao extends BaseMapper<ThrSystemEntity> {
-}
+}

src/main/java/com/glxp/mipsdl/dao/thrsys/ThrSystemDetailDao.java

@@ -2,8 +2,10 @@ package com.glxp.mipsdl.dao.thrsys;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.mipsdl.entity.thrsys.ThrSystemDetailEntity;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+@Mapper
 public interface ThrSystemDetailDao extends BaseMapper<ThrSystemDetailEntity> {
 
     /**
@@ -14,4 +16,4 @@ public interface ThrSystemDetailDao extends BaseMapper<ThrSystemDetailEntity> {
      * @return
      */
     ThrSystemDetailEntity selectByKey(@Param("key") String key, @Param("hospCode") String hospCode);
-}
+}

src/main/java/com/glxp/mipsdl/entity/njxyy/InvEntity.java

@@ -0,0 +1,27 @@
+package com.glxp.mipsdl.entity.njxyy;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data
+@TableName(value = "A002")
+public class InvEntity {
+    @TableField("DEPT_ID")
+    private String DEPT_ID;
+    @TableField("DEPT_CD")
+    private String DEPT_CD;
+    @TableField("DEPT_NAME")
+    private String DEPT_NAME;
+    @TableField("PY")
+    private String PY;
+    @TableField("WB")
+    private String WB;
+    @TableField("PARENT_DEPT_CD")
+    private String PARENT_DEPT_CD;
+    @TableField("DEPT_LEVEL")
+    private String DEPT_LEVEL;
+    @TableField("FDEPT_CD")
+    private String FDEPT_CD;
+
+}

src/main/java/com/glxp/mipsdl/entity/njxyy/ProductEntity.java

@@ -0,0 +1,75 @@
+package com.glxp.mipsdl.entity.njxyy;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@TableName(value = "A001")
+public class ProductEntity {
+
+    @TableField("lastUpdateTime")
+    private String lastUpdateTime;
+    @TableField("code")
+    private String code;
+    @TableField("name")
+    private String name;
+    @TableField("measname")
+    private String measname;
+    @TableField("standard")
+    private String standard;
+    @TableField("registerNo")
+    private String registerNo;
+    @TableField("manufactoryCode")
+    private String manufactoryCode;
+    @TableField("manufactory")
+    private String manufactory;
+    @TableField("supCode")
+    private String supCode;
+    @TableField("supName")
+    private String supName;
+    @TableField("cplb")
+    private String cplb;
+    @TableField("flbm")
+    private String flbm;
+    @TableField("qxlb")
+    private String qxlb;
+    @TableField("ybbm")
+    private String ybbm;
+    @TableField("sptm")
+    private String sptm;
+    @TableField("tyshxydm")
+    private String tyshxydm;
+    @TableField("ylqxzcrbarmc")
+    private String ylqxzcrbarmc;
+    @TableField("ylqxzcrbarywmc")
+    private String ylqxzcrbarywmc;
+    @TableField("cpms")
+    private String cpms;
+    @TableField("spmc")
+    private String spmc;
+    @TableField("qtbm")
+    private String qtbm;
+    @TableField("zczyxqz")
+    private String zczyxqz;
+    @TableField("price")
+    private BigDecimal price;
+    @TableField("deptCode")
+    private String deptCode;
+    @TableField("deptName")
+    private String deptName;
+    @TableField("remark")
+    private String remark;
+    @TableField("remark1")
+    private String remark1;
+    @TableField("remark2")
+    private String remark2;
+    @TableField("remark3")
+    private String remark3;
+    ;
+
+
+}

src/main/java/com/glxp/mipsdl/entity/njxyy/SickerEntity.java

@@ -0,0 +1,91 @@
+package com.glxp.mipsdl.entity.njxyy;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data
+@TableName("thr_sicker")
+public class SickerEntity {
+    @TableField("HOSPITAL_CD")
+    private String HOSPITAL_CD;
+    @TableField("Patientidp")
+    private String Patientidp;
+    /**
+     * 病人住院号
+     */
+    @TableField("InpatientID")
+    private String InpatientID;
+    @TableField("MZ_ZY")
+    private String MZ_ZY;
+    @TableField("Name")
+    private String Name;
+    @TableField("Sex")
+    private String Sex;
+    @TableField("Age")
+    private String Age;
+    @TableField("InpatientDeptID")
+    private String InpatientDeptID;
+    @TableField("InpatientDept")
+    private String InpatientDept;
+    @TableField("InpatientDate")
+    private String InpatientDate;
+    @TableField("Diagnosis")
+    private String Diagnosis;
+    @TableField("BirthDate")
+    private String BirthDate;
+    @TableField("Address")
+    private String Address;
+    @TableField("IDType")
+    private String IDType;
+    @TableField("IdentityNo")
+    private String IdentityNo;
+    @TableField("CellPhoneNo")
+    private String CellPhoneNo;
+    @TableField("OtherContent")
+    private String OtherContent;
+    @TableField("OtherPhone")
+    private String OtherPhone;
+    @TableField("OperID")
+    private String OperID;
+    @TableField("OperName")
+    private String OperName;
+    @TableField("OperDoctorID")
+    private String OperDoctorID;
+    @TableField("OperDoctor")
+    private String OperDoctor;
+    @TableField("OPERDOCTORDEPT")
+    private String OPERDOCTORDEPT;
+    @TableField("OPERNURSE")
+    private String OPERNURSE;
+    @TableField("OperAddress")
+    private String OperAddress;
+    @TableField("ApplyDept")
+    private String ApplyDept;
+    @TableField("ApplyDeptName")
+    private String ApplyDeptName;
+    @TableField("ApplyStaffID")
+    private String ApplyStaffID;
+    @TableField("OperDept")
+    private String OperDept;
+    @TableField("OperDeptName")
+    private String OperDeptName;
+    @TableField("OperStaffID")
+    private String OperStaffID;
+    @TableField("operDate")
+    private String operDate;
+    @TableField("YLZDM")
+    private String YLZDM;
+    @TableField("InpatientBmID")
+    private String InpatientBmID;
+    @TableField("InpatientBmName")
+    private String InpatientBmName;
+    @TableField("HealthCardNum")
+    private String HealthCardNum;
+    @TableField("REMARK")
+    private String REMARK;
+    @TableField("curno")
+    private String curno;
+
+
+}

src/main/java/com/glxp/mipsdl/req/njxyy/PostThrProductRequest.java

@@ -0,0 +1,37 @@
+package com.glxp.mipsdl.req.njxyy;
+
+import lombok.Data;
+
+@Data
+public class PostThrProductRequest {
+
+    private String code;
+    private String name;
+    /**
+     * DI
+     */
+    private String nameCode;
+    private String measname;
+    private String standard;
+    private String registerNo;
+    private String manufactory;
+    private String supName;
+    private String cplb;
+    private String flbm;
+    private String qxlb;
+    private String ybbm;
+    private String sptm;
+    private String tyshxydm;
+    private String ylqxzcrbarmc;
+    private String ylqxzcrbarywmc;
+    private String cpms;
+    private String spmc;
+    private String qtbm;
+    private String zczyxqz;
+    private String price;
+    private String remark;
+    private String remark1;
+    private String remark2;
+    private String remark3;
+
+}

src/main/java/com/glxp/mipsdl/res/udiwms/BasicSkSickerResponse.java

@@ -1,11 +1,20 @@
 package com.glxp.mipsdl.res.udiwms;
 
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.util.Date;
 
 @Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class BasicSkSickerResponse {
+
+    private String sickerId;
+
     /**
      * 患者编码
      */

src/main/java/com/glxp/mipsdl/service/system/SysParamConfigService.java

@@ -2,7 +2,6 @@ package com.glxp.mipsdl.service.system;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.glxp.mipsdl.util.IntUtil;
-import org.apache.logging.log4j.spi.Terminable;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.glxp.mipsdl.dao.system.SysParamConfigMapper;

src/main/java/com/glxp/mipsdl/service/thrsys/ThrProductService.java

@@ -3,7 +3,6 @@ package com.glxp.mipsdl.service.thrsys;
 import cn.hutool.core.util.ReflectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.glxp.mipsdl.config.ThirdSysConfig;
 import com.glxp.mipsdl.dao.basic.BasicUdirelDao;
 import com.glxp.mipsdl.dao.thrsys.ThrProductsDao;

src/main/java/com/glxp/mipsdl/service/thrsys/ThrSysBusTypeService.java

@@ -2,7 +2,6 @@ package com.glxp.mipsdl.service.thrsys;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.glxp.mipsdl.config.ThirdSysConfig;
 import com.glxp.mipsdl.dao.thrsys.ThrSystemBusApiDao;
 import com.glxp.mipsdl.entity.thrsys.ThrSystemBusApiEntity;

src/main/java/com/glxp/mipsdl/service/thrsys/ThrSystemDetailService.java

@@ -3,7 +3,6 @@ package com.glxp.mipsdl.service.thrsys;
 import com.glxp.mipsdl.config.ThirdSysConfig;
 import com.glxp.mipsdl.dao.thrsys.ThrSystemDetailDao;
 import com.glxp.mipsdl.entity.thrsys.ThrSystemDetailEntity;
-import com.glxp.mipsdl.util.DictUtl;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

src/main/java/com/glxp/mipsdl/thirddao/njxyy/ThrCorpMapper.java

@@ -0,0 +1,17 @@
+package com.glxp.mipsdl.thirddao.njxyy;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.mipsdl.entity.thrsys.ThrCorpEntity;
+import com.glxp.mipsdl.req.base.UdiwmsUnitRequest;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+@DS("njsql")
+public interface ThrCorpMapper extends BaseMapper<ThrCorpEntity> {
+
+    List<ThrCorpEntity> filterThrCorps(UdiwmsUnitRequest udiwmsUnitRequest);
+
+}

src/main/java/com/glxp/mipsdl/thirddao/njxyy/ThrInvWarehourseMapper.java

@@ -0,0 +1,11 @@
+package com.glxp.mipsdl.thirddao.njxyy;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.mipsdl.entity.thrsys.ThrInvWarehouseEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+@DS("njsql")
+public interface ThrInvWarehourseMapper extends BaseMapper<ThrInvWarehouseEntity> {
+}

src/main/java/com/glxp/mipsdl/thirddao/njxyy/ThrProductsMapper.java

@@ -0,0 +1,12 @@
+package com.glxp.mipsdl.thirddao.njxyy;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.mipsdl.entity.njxyy.ProductEntity;
+import com.glxp.mipsdl.entity.thrsys.ThrProductsEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+@DS("njsql")
+public interface ThrProductsMapper extends BaseMapper<ProductEntity> {
+}

src/main/java/com/glxp/mipsdl/thirddao/njxyy/ThrSickerMapper.java

@@ -0,0 +1,12 @@
+package com.glxp.mipsdl.thirddao.njxyy;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.mipsdl.entity.njxyy.SickerEntity;
+import com.glxp.mipsdl.entity.thrsys.ThrCorpEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+@DS("njsql")
+public interface ThrSickerMapper extends BaseMapper<SickerEntity> {
+}

src/main/resources/application-dev.yml

@@ -5,7 +5,7 @@ spring:
       strict: false
       datasource:
         master:
-          url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_ct?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+          url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_pt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
           username: root
           password: 123456
           driver-class-name: com.p6spy.engine.spy.P6SpyDriver
@@ -14,7 +14,17 @@ spring:
             maximum-pool-size: 60
             minimum-idle: 10
         njsql:
+          #          jdbc-url: jdbc:oracle:thin:@192.168.10.8:1521/njxyy
+          #          username: SD_UDIJK
+          #          password: SD_UDIJK
+          #          driver-class-name: oracle.jdbc.driver.OracleDrive
           url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_ct?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
           username: root
           password: 123456
           driver-class-name: com.p6spy.engine.spy.P6SpyDriver
+#        thirdSql:
+#          url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_pt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+#          username: root
+#          password: 123456
+#          driver-class-name: com.p6spy.engine.spy.P6SpyDriver
+

src/main/resources/application-pro.yml

@@ -14,12 +14,8 @@ spring:
             maximum-pool-size: 60
             minimum-idle: 10
         njsql:
-          url: jdbc:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+          jdbc-url: jdbc:oracle:thin:@192.168.10.8:1521/njxyy
-          username: root
+          username: SD_UDIJK
-          password: 123456
+          password: SD_UDIJK
-          driver-class-name: com.mysql.cj.jdbc.Driver
+          driver-class-name: oracle.jdbc.driver.OracleDrive
-          hikari:
-            connection-timeout: 60000
-            maximum-pool-size: 60
-            minimum-idle: 10
 UDIWMS_IP: http://127.0.0.1:9991

src/main/resources/application.yml

@@ -24,7 +24,7 @@ UDIWMS_IP: http://127.0.0.1:9991
 
 #mybatis-plus配置
 mybatis-plus:
-  mapper-locations: classpath:mybatis/mapper/*/*.xml
+  mapper-locations: classpath:mybatis/mapper/*/*/*.xml
   configuration:
     use-generated-keys: true
     use-column-label: true

src/main/resources/mybatis/mapper/basic/BasicProductsDao.xml

@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.glxp.mipsdl.dao.basic.BasicProductsDao">
-  <resultMap id="BaseResultMap" type="com.glxp.mipsdl.entity.basic.BasicProductsEntity">
-    <!--@mbg.generated-->
-    <!--@Table basic_products-->
-    <id column="id" jdbcType="INTEGER" property="id" />
-    <result column="uuid" jdbcType="VARCHAR" property="uuid" />
-    <result column="originUuid" jdbcType="VARCHAR" property="originUuid" />
-    <result column="nameCode" jdbcType="VARCHAR" property="nameCode" />
-    <result column="deviceRecordKey" jdbcType="VARCHAR" property="deviceRecordKey" />
-    <result column="packRatio" jdbcType="VARCHAR" property="packRatio" />
-    <result column="packUnit" jdbcType="VARCHAR" property="packUnit" />
-    <result column="packLevel" jdbcType="VARCHAR" property="packLevel" />
-    <result column="bhxjsl" jdbcType="INTEGER" property="bhxjsl" />
-    <result column="bhzxxsbzsl" jdbcType="INTEGER" property="bhzxxsbzsl" />
-    <result column="zxxsbzbhsydysl" jdbcType="INTEGER" property="zxxsbzbhsydysl" />
-    <result column="bhxjcpbm" jdbcType="VARCHAR" property="bhxjcpbm" />
-    <result column="bzcj" jdbcType="VARCHAR" property="bzcj" />
-    <result column="cpmctymc" jdbcType="VARCHAR" property="cpmctymc" />
-    <result column="cplb" jdbcType="VARCHAR" property="cplb" />
-    <result column="flbm" jdbcType="VARCHAR" property="flbm" />
-    <result column="ggxh" jdbcType="VARCHAR" property="ggxh" />
-    <result column="qxlb" jdbcType="VARCHAR" property="qxlb" />
-    <result column="tyshxydm" jdbcType="VARCHAR" property="tyshxydm" />
-    <result column="ylqxzcrbarmc" jdbcType="VARCHAR" property="ylqxzcrbarmc" />
-    <result column="zczbhhzbapzbh" jdbcType="VARCHAR" property="zczbhhzbapzbh" />
-    <result column="ylqxzcrbarywmc" jdbcType="VARCHAR" property="ylqxzcrbarywmc" />
-    <result column="sydycpbs" jdbcType="VARCHAR" property="sydycpbs" />
-    <result column="sjcpbm" jdbcType="VARCHAR" property="sjcpbm" />
-    <result column="versionNumber" jdbcType="INTEGER" property="versionNumber" />
-    <result column="diType" jdbcType="TINYINT" property="diType" />
-    <result column="ybbm" jdbcType="VARCHAR" property="ybbm" />
-    <result column="sptm" jdbcType="VARCHAR" property="sptm" />
-    <result column="manufactory" jdbcType="VARCHAR" property="manufactory" />
-    <result column="measname" jdbcType="VARCHAR" property="measname" />
-    <result column="productType" jdbcType="TINYINT" property="productType" />
-    <result column="scbssfbhph" jdbcType="VARCHAR" property="scbssfbhph" />
-    <result column="scbssfbhxlh" jdbcType="VARCHAR" property="scbssfbhxlh" />
-    <result column="scbssfbhscrq" jdbcType="VARCHAR" property="scbssfbhscrq" />
-    <result column="scbssfbhsxrq" jdbcType="VARCHAR" property="scbssfbhsxrq" />
-    <result column="cpms" jdbcType="LONGVARCHAR" property="cpms" />
-    <result column="allowNoBatch" jdbcType="TINYINT" property="allowNoBatch" />
-    <result column="allowNoExpire" jdbcType="TINYINT" property="allowNoExpire" />
-    <result column="allowNoProduct" jdbcType="TINYINT" property="allowNoProduct" />
-    <result column="spmc" jdbcType="VARCHAR" property="spmc" />
-    <result column="cplx" jdbcType="VARCHAR" property="cplx" />
-    <result column="hchzsb" jdbcType="VARCHAR" property="hchzsb" />
-    <result column="cpdls" jdbcType="VARCHAR" property="cpdls" />
-    <result column="price" jdbcType="DECIMAL" property="price" />
-    <result column="basicPrductRemak1" jdbcType="VARCHAR" property="basicPrductRemak1" />
-    <result column="basicPrductRemak2" jdbcType="VARCHAR" property="basicPrductRemak2" />
-    <result column="basicPrductRemak3" jdbcType="VARCHAR" property="basicPrductRemak3" />
-    <result column="basicPrductRemak4" jdbcType="VARCHAR" property="basicPrductRemak4" />
-    <result column="basicPrductRemak5" jdbcType="VARCHAR" property="basicPrductRemak5" />
-    <result column="basicPrductRemak6" jdbcType="VARCHAR" property="basicPrductRemak6" />
-    <result column="basicPrductRemak7" jdbcType="VARCHAR" property="basicPrductRemak7" />
-    <result column="basicPrductRemak8" jdbcType="VARCHAR" property="basicPrductRemak8" />
-    <result column="createTime" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="updateTime" jdbcType="VARCHAR" property="updateTime" />
-    <result column="createUser" jdbcType="VARCHAR" property="createUser" />
-    <result column="updateUser" jdbcType="VARCHAR" property="updateUser" />
-    <result column="remark" jdbcType="VARCHAR" property="remark" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    <!--@mbg.generated-->
-    id, uuid, originUuid, nameCode, deviceRecordKey, packRatio, packUnit, packLevel, 
-    bhxjsl, bhzxxsbzsl, zxxsbzbhsydysl, bhxjcpbm, bzcj, cpmctymc, cplb, flbm, ggxh, qxlb, 
-    tyshxydm, ylqxzcrbarmc, zczbhhzbapzbh, ylqxzcrbarywmc, sydycpbs, sjcpbm, versionNumber, 
-    diType, ybbm, sptm, manufactory, measname, productType, scbssfbhph, scbssfbhxlh, 
-    scbssfbhscrq, scbssfbhsxrq, cpms, allowNoBatch, allowNoExpire, allowNoProduct, spmc, 
-    cplx, hchzsb, cpdls, price, basicPrductRemak1, basicPrductRemak2, basicPrductRemak3, 
-    basicPrductRemak4, basicPrductRemak5, basicPrductRemak6, basicPrductRemak7, basicPrductRemak8, 
-    createTime, updateTime, `createUser`, updateUser, remark
-  </sql>
-</mapper>

src/main/resources/mybatis/mapper/master/auth/AuthLicenseDao.xml

@@ -17,4 +17,4 @@
     <!--@mbg.generated-->
     id, appid, `name`, apikey, secretkey, createDate, customerId, companyName
   </sql>
-</mapper>
+</mapper>

src/main/resources/mybatis/mapper/master/auth/AuthUserDao.xml

@@ -20,7 +20,7 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, userName, `passWord`, lastLoginIp, createTime, userFlag, lastModifyTime, comments, 
+    id, userName, `passWord`, lastLoginIp, createTime, userFlag, lastModifyTime, comments,
     employeeName, CustomerId, lastLoginTime, locDeptCode, locInvCode
   </sql>
-</mapper>
+</mapper>

src/main/resources/mybatis/mapper/master/auth/AuthWarehouseDao.xml

@@ -19,7 +19,7 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, code, `name`, parentId, remark, defaultInv, thirdId, thirdId1, thirdId2, thirdId3, 
+    id, code, `name`, parentId, remark, defaultInv, thirdId, thirdId1, thirdId2, thirdId3,
     thirdId4, parentCode
   </sql>
-</mapper>
+</mapper>

src/main/resources/mybatis/mapper/master/basic/BasicBussinessTypeDao.xml

@@ -127,4 +127,4 @@
         </where>
     </select>
 
-</mapper>
+</mapper>

src/main/resources/mybatis/mapper/master/basic/BasicProductsDao.xml

@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.glxp.mipsdl.dao.basic.BasicProductsDao">
+    <resultMap id="BaseResultMap" type="com.glxp.mipsdl.entity.basic.BasicProductsEntity">
+        <!--@mbg.generated-->
+        <!--@Table basic_products-->
+        <id column="id" jdbcType="INTEGER" property="id"/>
+        <result column="uuid" jdbcType="VARCHAR" property="uuid"/>
+        <result column="originUuid" jdbcType="VARCHAR" property="originUuid"/>
+        <result column="nameCode" jdbcType="VARCHAR" property="nameCode"/>
+        <result column="deviceRecordKey" jdbcType="VARCHAR" property="deviceRecordKey"/>
+        <result column="packRatio" jdbcType="VARCHAR" property="packRatio"/>
+        <result column="packUnit" jdbcType="VARCHAR" property="packUnit"/>
+        <result column="packLevel" jdbcType="VARCHAR" property="packLevel"/>
+        <result column="bhxjsl" jdbcType="INTEGER" property="bhxjsl"/>
+        <result column="bhzxxsbzsl" jdbcType="INTEGER" property="bhzxxsbzsl"/>
+        <result column="zxxsbzbhsydysl" jdbcType="INTEGER" property="zxxsbzbhsydysl"/>
+        <result column="bhxjcpbm" jdbcType="VARCHAR" property="bhxjcpbm"/>
+        <result column="bzcj" jdbcType="VARCHAR" property="bzcj"/>
+        <result column="cpmctymc" jdbcType="VARCHAR" property="cpmctymc"/>
+        <result column="cplb" jdbcType="VARCHAR" property="cplb"/>
+        <result column="flbm" jdbcType="VARCHAR" property="flbm"/>
+        <result column="ggxh" jdbcType="VARCHAR" property="ggxh"/>
+        <result column="qxlb" jdbcType="VARCHAR" property="qxlb"/>
+        <result column="tyshxydm" jdbcType="VARCHAR" property="tyshxydm"/>
+        <result column="ylqxzcrbarmc" jdbcType="VARCHAR" property="ylqxzcrbarmc"/>
+        <result column="zczbhhzbapzbh" jdbcType="VARCHAR" property="zczbhhzbapzbh"/>
+        <result column="ylqxzcrbarywmc" jdbcType="VARCHAR" property="ylqxzcrbarywmc"/>
+        <result column="sydycpbs" jdbcType="VARCHAR" property="sydycpbs"/>
+        <result column="sjcpbm" jdbcType="VARCHAR" property="sjcpbm"/>
+        <result column="versionNumber" jdbcType="INTEGER" property="versionNumber"/>
+        <result column="diType" jdbcType="TINYINT" property="diType"/>
+        <result column="ybbm" jdbcType="VARCHAR" property="ybbm"/>
+        <result column="sptm" jdbcType="VARCHAR" property="sptm"/>
+        <result column="manufactory" jdbcType="VARCHAR" property="manufactory"/>
+        <result column="measname" jdbcType="VARCHAR" property="measname"/>
+        <result column="productType" jdbcType="TINYINT" property="productType"/>
+        <result column="scbssfbhph" jdbcType="VARCHAR" property="scbssfbhph"/>
+        <result column="scbssfbhxlh" jdbcType="VARCHAR" property="scbssfbhxlh"/>
+        <result column="scbssfbhscrq" jdbcType="VARCHAR" property="scbssfbhscrq"/>
+        <result column="scbssfbhsxrq" jdbcType="VARCHAR" property="scbssfbhsxrq"/>
+        <result column="cpms" jdbcType="LONGVARCHAR" property="cpms"/>
+        <result column="allowNoBatch" jdbcType="TINYINT" property="allowNoBatch"/>
+        <result column="allowNoExpire" jdbcType="TINYINT" property="allowNoExpire"/>
+        <result column="allowNoProduct" jdbcType="TINYINT" property="allowNoProduct"/>
+        <result column="spmc" jdbcType="VARCHAR" property="spmc"/>
+        <result column="cplx" jdbcType="VARCHAR" property="cplx"/>
+        <result column="hchzsb" jdbcType="VARCHAR" property="hchzsb"/>
+        <result column="cpdls" jdbcType="VARCHAR" property="cpdls"/>
+        <result column="price" jdbcType="DECIMAL" property="price"/>
+        <result column="basicPrductRemak1" jdbcType="VARCHAR" property="basicPrductRemak1"/>
+        <result column="basicPrductRemak2" jdbcType="VARCHAR" property="basicPrductRemak2"/>
+        <result column="basicPrductRemak3" jdbcType="VARCHAR" property="basicPrductRemak3"/>
+        <result column="basicPrductRemak4" jdbcType="VARCHAR" property="basicPrductRemak4"/>
+        <result column="basicPrductRemak5" jdbcType="VARCHAR" property="basicPrductRemak5"/>
+        <result column="basicPrductRemak6" jdbcType="VARCHAR" property="basicPrductRemak6"/>
+        <result column="basicPrductRemak7" jdbcType="VARCHAR" property="basicPrductRemak7"/>
+        <result column="basicPrductRemak8" jdbcType="VARCHAR" property="basicPrductRemak8"/>
+        <result column="createTime" jdbcType="TIMESTAMP" property="createTime"/>
+        <result column="updateTime" jdbcType="VARCHAR" property="updateTime"/>
+        <result column="createUser" jdbcType="VARCHAR" property="createUser"/>
+        <result column="updateUser" jdbcType="VARCHAR" property="updateUser"/>
+        <result column="remark" jdbcType="VARCHAR" property="remark"/>
+    </resultMap>
+    <sql id="Base_Column_List">
+        <!--@mbg.generated-->
+        id, uuid, originUuid, nameCode, deviceRecordKey, packRatio, packUnit, packLevel,
+        bhxjsl, bhzxxsbzsl, zxxsbzbhsydysl, bhxjcpbm, bzcj, cpmctymc, cplb, flbm, ggxh, qxlb,
+        tyshxydm, ylqxzcrbarmc, zczbhhzbapzbh, ylqxzcrbarywmc, sydycpbs, sjcpbm, versionNumber,
+        diType, ybbm, sptm, manufactory, measname, productType, scbssfbhph, scbssfbhxlh,
+        scbssfbhscrq, scbssfbhsxrq, cpms, allowNoBatch, allowNoExpire, allowNoProduct, spmc,
+        cplx, hchzsb, cpdls, price, basicPrductRemak1, basicPrductRemak2, basicPrductRemak3,
+        basicPrductRemak4, basicPrductRemak5, basicPrductRemak6, basicPrductRemak7, basicPrductRemak8,
+        createTime, updateTime, `createUser`, updateUser, remark
+    </sql>
+</mapper>

src/main/resources/mybatis/mapper/master/inout/IoCodeDao.xml

@@ -28,8 +28,8 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, code, mainAction, `action`, orderId, corpOrderId, nameCode, batchNo, produceDate, 
+    id, code, mainAction, `action`, orderId, corpOrderId, nameCode, batchNo, produceDate,
-    expireDate, serialNo, packageLevel, supId, relId, `count`, reCount, deptCode, invCode, 
+    expireDate, serialNo, packageLevel, supId, relId, `count`, reCount, deptCode, invCode,
     warehouseCode, updateTime, createTime
   </sql>
-</mapper>
+</mapper>

src/main/resources/mybatis/mapper/master/inout/IoCodeTempDao.xml

@@ -28,8 +28,8 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, code, mainAction, `action`, orderId, corpOrderId, nameCode, batchNo, produceDate, 
+    id, code, mainAction, `action`, orderId, corpOrderId, nameCode, batchNo, produceDate,
-    expireDate, serialNo, packageLevel, supId, relId, `count`, reCount, deptCode, invCode, 
+    expireDate, serialNo, packageLevel, supId, relId, `count`, reCount, deptCode, invCode,
     warehouseCode, updateTime, createTime
   </sql>
-</mapper>
+</mapper>

src/main/resources/mybatis/mapper/master/inout/IoOrderDao.xml

@@ -40,10 +40,10 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, billNo, corpOrderId, mainAction, `action`, fromCorp, fromDeptCode, fromInvCode, 
+    id, billNo, corpOrderId, mainAction, `action`, fromCorp, fromDeptCode, fromInvCode,
-    fromType, `status`, dealStatus, `createUser`, createTime, updateUser, updateTime, 
+    fromType, `status`, dealStatus, `createUser`, createTime, updateUser, updateTime,
-    reviewUser, auditTime, customerId, deptCode, invCode, outChangeEnable, originUllageSupNo, 
+    reviewUser, auditTime, customerId, deptCode, invCode, outChangeEnable, originUllageSupNo,
-    ullageSupNo, supplementNo, thirdBillNo, replicateNo, preOutBillNo, preInBillNo, errMsg, 
+    ullageSupNo, supplementNo, thirdBillNo, replicateNo, preOutBillNo, preInBillNo, errMsg,
     printRemark, remark, orderType, entrustEnd
   </sql>
-</mapper>
+</mapper>

src/main/resources/mybatis/mapper/master/inout/IoOrderDetailBizDao.xml

@@ -36,9 +36,9 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, orderIdFk, bindRlFk, uuidFk, nameCode, batchNo, productDate, expireDate, coName, 
+    id, orderIdFk, bindRlFk, uuidFk, nameCode, batchNo, productDate, expireDate, coName,
-    certCode, ylqxzcrbarmc, manufacturer, measname, spec, price, secSalesListNo, firstSalesInvNo, 
+    certCode, ylqxzcrbarmc, manufacturer, measname, spec, price, secSalesListNo, firstSalesInvNo,
-    secSalesInvNo, invoiceDate, supId, bindSupStatus, `count`, reCount, remark, remark1, 
+    secSalesInvNo, invoiceDate, supId, bindSupStatus, `count`, reCount, remark, remark1,
     remark2, remark3, remark4, remark5
   </sql>
-</mapper>
+</mapper>

src/main/resources/mybatis/mapper/master/inout/IoOrderDetailCodeDao.xml

@@ -36,9 +36,9 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, orderIdFk, bindRlFk, uuidFk, nameCode, batchNo, productDate, expireDate, coName, 
+    id, orderIdFk, bindRlFk, uuidFk, nameCode, batchNo, productDate, expireDate, coName,
-    certCode, ylqxzcrbarmc, manufacturer, measname, spec, price, secSalesListNo, firstSalesInvNo, 
+    certCode, ylqxzcrbarmc, manufacturer, measname, spec, price, secSalesListNo, firstSalesInvNo,
-    secSalesInvNo, invoiceDate, supId, bindSupStatus, `count`, reCount, remark, remark1, 
+    secSalesInvNo, invoiceDate, supId, bindSupStatus, `count`, reCount, remark, remark1,
     remark2, remark3, remark4, remark5
   </sql>
-</mapper>
+</mapper>

src/main/resources/mybatis/mapper/master/inout/IoOrderDetailResultDao.xml

@@ -36,9 +36,9 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, orderIdFk, bindRlFk, uuidFk, nameCode, batchNo, productDate, expireDate, coName, 
+    id, orderIdFk, bindRlFk, uuidFk, nameCode, batchNo, productDate, expireDate, coName,
-    certCode, ylqxzcrbarmc, manufacturer, measname, spec, price, secSalesListNo, firstSalesInvNo, 
+    certCode, ylqxzcrbarmc, manufacturer, measname, spec, price, secSalesListNo, firstSalesInvNo,
-    secSalesInvNo, invoiceDate, supId, bindSupStatus, `count`, reCount, remark, remark1, 
+    secSalesInvNo, invoiceDate, supId, bindSupStatus, `count`, reCount, remark, remark1,
     remark2, remark3, remark4, remark5
   </sql>
-</mapper>
+</mapper>

src/main/resources/mybatis/mapper/master/inout/IoOrderUploadLogDao.xml

@@ -18,4 +18,4 @@
     <!--@mbg.generated-->
     id, billNo, billDate, billType, thrBillNo, submitTime, `status`, `result`, fromType
   </sql>
-</mapper>
+</mapper>

src/main/resources/mybatis/mapper/master/pzhzd/YyUcloudV31SetDao.xml

@@ -14,4 +14,4 @@
         </where>
             limit 1
     </select>
-</mapper>
+</mapper>

src/main/resources/mybatis/mapper/master/system/SysErpLogDao.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.mipsdl.dao.system.SysErpLogDao">
-</mapper>
+</mapper>

src/main/resources/mybatis/mapper/master/system/SysScheduledDao.xml

@@ -14,4 +14,4 @@
     <!--@mbg.generated-->
     id, cronName, cron, customerId, remark
   </sql>
-</mapper>
+</mapper>

src/main/resources/mybatis/mapper/master/system/SysThirdSysApiDao.xml

@@ -15,4 +15,4 @@
     <!--@mbg.generated-->
     id, `name`, apiUrl, guideUrl, remark, `type`
   </sql>
-</mapper>
+</mapper>

src/main/resources/mybatis/mapper/master/thrsys/ThrBustypeOriginDao.xml

@@ -44,4 +44,4 @@
             </if>
         </where>
     </select>
-</mapper>
+</mapper>

src/main/resources/mybatis/mapper/master/thrsys/ThrCorpDao.xml

@@ -21,7 +21,7 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, unitId, spell, addr, creditNo, contact, mobile, thirdSysFk, `name`, `createUser`, 
+    id, unitId, spell, addr, creditNo, contact, mobile, thirdSysFk, `name`, `createUser`,
     createTime, updateUser, updateTime, remark
   </sql>
-</mapper>
+</mapper>

src/main/resources/mybatis/mapper/master/thrsys/ThrDeptDao.xml

@@ -19,7 +19,7 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, pId, code, `name`, advanceType, isDefault, `status`, updateTime, remark, `level`, 
+    id, pId, code, `name`, advanceType, isDefault, `status`, updateTime, remark, `level`,
     pcode, thirdSysFk
   </sql>
-</mapper>
+</mapper>

src/main/resources/mybatis/mapper/master/thrsys/ThrInvWarehouseDao.xml

@@ -15,4 +15,4 @@
     <!--@mbg.generated-->
     id, code, `name`, parentId, remark, thirdSysFk
   </sql>
-</mapper>
+</mapper>

src/main/resources/mybatis/mapper/master/thrsys/ThrProductsDao.xml

@@ -39,9 +39,9 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, code, `name`, measname, spec, registerNo, manufactory, thirdSysFk, cplb, flbm, 
+    id, code, `name`, measname, spec, registerNo, manufactory, thirdSysFk, cplb, flbm,
-    qxlb, ybbm, sptm, tyshxydm, zczbhhzbapzbh, ylqxzcrbarmc, ylqxzcrbarywmc, cpms, updateTime, 
+    qxlb, ybbm, sptm, tyshxydm, zczbhhzbapzbh, ylqxzcrbarmc, ylqxzcrbarywmc, cpms, updateTime,
-    supName, model, `standard`, qtbm, zczyxqz, remark, remark1, remark2, remark3, price, 
+    supName, model, `standard`, qtbm, zczyxqz, remark, remark1, remark2, remark3, price,
     `createUser`, createTime, updateUser
   </sql>
-</mapper>
+</mapper>

src/main/resources/mybatis/mapper/master/thrsys/ThrSystemBusApiDao.xml

@@ -23,4 +23,4 @@
     id, code, `name`, thirdBuyCode, thirdSys, url, `type`, remark, filed,
     filed1, filed2, filed3, filed4
   </sql>
-</mapper>
+</mapper>

src/main/resources/mybatis/mapper/master/thrsys/ThrSystemDao.xml

@@ -16,8 +16,8 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, thirdId, thirdName, apikey, secretkey, mainSys, enabled, thridUrl, thirdSysUrl, 
+    id, thirdId, thirdName, apikey, secretkey, mainSys, enabled, thridUrl, thirdSysUrl,
     guideUrl, remark
   </sql>
 
-</mapper>
+</mapper>

src/main/resources/mybatis/mapper/master/thrsys/ThrSystemDetailDao.xml

@@ -25,4 +25,4 @@
         and thr_system_detail.`key` = #{key}
         and thr_system.enabled = 1
   </select>
-</mapper>
+</mapper>

src/main/resources/mybatis/mapper/other/njxyy/ThrCorpMapper.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.glxp.mipsdl.thirddao.njxyy.ThrCorpMapper">
+    <select id="filterThrCorps" parameterType="com.glxp.mipsdl.req.base.UdiwmsUnitRequest"
+            resultType="com.glxp.mipsdl.entity.thrsys.ThrCorpEntity">
+        SELECT *
+        FROM thr_corp
+        <where>
+            <if test="unitId != '' and unitId != null">
+                AND unitId like concat('%', #{unitId}, '%')
+            </if>
+            <if test="name != '' and name != null">
+                AND (name LIKE concat('%', #{name}, '%') or spell LIKE concat('%', #{name}, '%'))
+            </if>
+        </where>
+        ORDER BY updateTime DESC
+    </select>
+</mapper>

src/main/resources/mybatis/mapper/other/njxyy/ThrInvWarehourseMapper.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.glxp.mipsdl.thirddao.njxyy.ThrInvWarehourseMapper">
+</mapper>

src/main/resources/mybatis/mapper/other/njxyy/ThrProductsMapper.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.glxp.mipsdl.thirddao.njxyy.ThrProductsMapper">
+</mapper>