feat: 代码提交

# Conflicts:
#	src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java

pom.xml

@@ -24,6 +24,18 @@
 
     <dependencies>
 
+        <!--    二维码    -->
+        <dependency>
+            <groupId>com.google.zxing</groupId>
+            <artifactId>core</artifactId>
+            <version>3.5.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.zxing</groupId>
+            <artifactId>javase</artifactId>
+            <version>3.5.1</version>
+        </dependency>
+        <!--    二维码end    -->
         <!--Json 操作-->
         <dependency>
             <groupId>com.alibaba</groupId>

src/main/java/com/glxp/api/aspect/AuthorizeAspect.java

@@ -21,6 +21,7 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.lang.reflect.Method;
+import java.util.Enumeration;
 
 /**
  * 登录验证 AOP
@@ -51,7 +52,17 @@ public class AuthorizeAspect {
         }
         HttpServletRequest request = attributes.getRequest();
 
-        String id = request.getHeader("ADMIN_ID");
+        Enumeration<String> headerNames = request.getHeaderNames();
+        while (headerNames.hasMoreElements()) {
+            String name = headerNames.nextElement();
+
+            // 根据头部名称获取相应的值
+            String value = request.getHeader(name);
+            log.info("Header Name: " + name);
+            log.info("Header Value: " + value);
+        }
+
+        String id = request.getHeader("ADMINID");
         if (StrUtil.isBlank(id)) {
             String apiKey = request.getHeader("api_key");
             String secretKey = request.getHeader("secret_key");
@@ -70,7 +81,7 @@ public class AuthorizeAspect {
                 throw new JsonException(ResultEnum.LOGIN_VERIFY_FALL);
             }
 
-            String token = request.getHeader("ADMIN_TOKEN");
+            String token = request.getHeader("ADMINTOKEN");
             if (token == null) {
                 throw new JsonException(ResultEnum.LOGIN_VERIFY_FALL);
             }

src/main/java/com/glxp/api/aspect/LogAspect.java

@@ -81,7 +81,7 @@ public class LogAspect {
                 throw new JsonException(ResultEnum.NOT_NETWORK);
             }
             HttpServletRequest request = attributes.getRequest();
-            String id = request.getHeader("ADMIN_ID");
+            String id = request.getHeader("ADMINID");
             operLog.setOperName(id);
 
             if (e != null) {

src/main/java/com/glxp/api/common/enums/ResultEnum.java

@@ -9,7 +9,7 @@ import lombok.Getter;
 public enum ResultEnum {
 
     SUCCESS(20000, "success"),
-    NOT_NETWORK(1, "系统繁忙，请稍后再试。"),
+    NOT_NETWORK(500, "系统繁忙，请稍后再试。"),
     LOGIN_VERIFY_FALL(2, "登录失效"),
     PARAM_VERIFY_FALL(3, "参数验证错误"),
     AUTH_FAILED(4, "权限验证失败"),

src/main/java/com/glxp/api/common/util/ResultVOUtils.java

@@ -33,7 +33,7 @@ public class ResultVOUtils {
      * @param data 返回的data对象
      * @return {@link BaseResponse}
      */
-    public static BaseResponse success(String msg,Object data) {
+    public static BaseResponse success(String msg, Object data) {
         BaseResponse<Object> baseResponse = new BaseResponse<>();
         baseResponse.setCode(ResultEnum.SUCCESS.getCode());
         baseResponse.setMessage(msg);
@@ -122,6 +122,16 @@ public class ResultVOUtils {
         return error(resultEnum.getCode(), message);
     }
 
+    /**
+     * 错误时返回
+     *
+     * @param message 错误的信息
+     * @return {@link BaseResponse}
+     */
+    public static BaseResponse error(String message) {
+        return error(ResultEnum.NOT_NETWORK.getCode(), message);
+    }
+
     /**
      * 根据PageHelper分页对象，直接返回分页结果
      *

src/main/java/com/glxp/api/config/TaskPoolConfig.java

@@ -2,6 +2,7 @@ package com.glxp.api.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 
@@ -15,6 +16,7 @@ import java.util.concurrent.ThreadPoolExecutor;
 public class TaskPoolConfig {
 
     @Bean(name = "taskExecutor")
+    @Primary
     public ThreadPoolTaskExecutor taskExecutor() {
         // 获取当前主机的cpu核心数
         int threadCount = Runtime.getRuntime().availableProcessors();

src/main/java/com/glxp/api/config/WebMvcConfig.java

@@ -19,6 +19,8 @@ public class WebMvcConfig implements WebMvcConfigurer {
                 //设置允许的方法
                 .allowedMethods("*")
                 //跨域允许时间
-                .maxAge(3600);
+                .maxAge(3600)
+
+        ;
     }
 }

src/main/java/com/glxp/api/constant/Constant.java

@@ -4,8 +4,8 @@ public class Constant {
 
     public static String SYSTEM_CUSTOMER_ID = "110";
 
-    public static final String INV_PRE_IN_CODE = "1000001";//默认预验收仓库号
-    public static final String INV_PRE_CODE = "1000002";//默认寄售仓库号
+//    public static final String INV_PRE_IN_CODE = "1000001";//默认预验收仓库号
+//    public static final String INV_PRE_CODE = "1000002";//默认寄售仓库号
 
 
     public static String MUTI = "MUTI";
@@ -78,11 +78,17 @@ public class Constant {
      */
     public static final String INV_PLACE_ORDER = "PO";
 
+    /**
+     * 三方出入库单据前缀
+     */
+    public static final String TRIPARTITE_INV_ORDER = "SFIO";
+
 
     public static final String dlThrProducts = "THR_DOWNLOAD_PRODUCTS";
     public static final String dlThrInvProducts = "THR_DOWNLOAD_INV_PRODUCTS";
     public static final String dlThrOrders = "THR_DOWNLOAD_ORDERS";
     public static final String dlThrCorps = "THR_DOWNLOAD_CORPS";
+    public static final String dlThrManus = "THR_DOWNLOAD_MANUS";
     public static final String SPS_SYNC_DOWNLOAD_INFO = "SPS_SYNC_DOWNLOAD_INFO";
 
 
@@ -298,4 +304,9 @@ public class Constant {
 
     //密码复杂度校验
     public static final String passwordReg = "^(?![a-zA-Z]+$)(?![A-Z0-9]+$)(?![A-Z\\W_.*%@!]+$)(?![a-z0-9]+$)(?![a-z\\W_.;*%@!]+$)(?![0-9\\W_.;*%@!]+$)[a-zA-Z0-9\\W_.;*%@!]{8,20}$";
+
+    /**
+     * 第三方单据上传结束标识
+     */
+    public static final String THIRD_ORDER_SUBMIT = "thirdOrderSubmit";
 }

src/main/java/com/glxp/api/constant/ConstantStatus.java

@@ -327,5 +327,7 @@ public class ConstantStatus {
     public static final int SPACE_OUT_SET = 1;       //按指定货位出库
     public static final int SPACE_OUT_CODE = 2;     //按条码默认货位出库
 
-
+    //三方出入库单据
+    public static final int SFIO_DRAFT = 0;     //草稿
+    public static final int SFIO_CFMD = 1;       //已确认
 }

src/main/java/com/glxp/api/constant/ConstantType.java

@@ -3,6 +3,6 @@ package com.glxp.api.constant;
 public interface ConstantType {
 
     String TYPE_STOCK_CHECK = "StockCheck"; //盘点
-    String TYPE_PUT = "WareHouseIn";             //出库
-    String TYPE_OUT = "WareHouseOut";             //入库
+    String TYPE_PUT = "WareHouseIn";             //入库
+    String TYPE_OUT = "WareHouseOut";             //出库
 }

src/main/java/com/glxp/api/constant/ThirdSysConstant.java

@@ -45,5 +45,15 @@ public interface ThirdSysConstant {
      */
     String PI_SUBMIT_URL = "productSubmitUrl";
 
+    /**
+     * 患者信息下载
+     */
+    String SICKER_QUERY_URL = "sickerQueryUrl";
+
+    /**
+     * 出入库明细下载
+     */
+    String INV_ORDER_QUERY_URL = "invOrderUrl";
+
 
 }

src/main/java/com/glxp/api/controller/TestController.java

@@ -4,22 +4,27 @@ import cn.hutool.core.util.StrUtil;
 import com.glxp.api.annotation.RepeatSubmit;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.constant.Constant;
+import com.glxp.api.entity.thrsys.ThrSystemDetailEntity;
 import com.glxp.api.req.sync.BasicExportStatusRequest;
+import com.glxp.api.service.thrsys.ThrInvOrderService;
 import com.glxp.api.task.TestStatOrderService;
 import com.glxp.api.util.MsDateUtil;
+import com.glxp.api.util.RedisUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.text.ParseException;
-import java.util.Date;
 
 @Slf4j
 @RestController
 public class TestController {
     @Resource
     TestStatOrderService statOrderService;
+    @Resource
+    ThrInvOrderService thrInvOrderService;
 
 
     @GetMapping("/test/stat/order")
@@ -52,4 +57,28 @@ public class TestController {
     public BaseResponse testRepeat(String message) {
         return ResultVOUtils.success("hello");
     }
+
+    @Resource
+    public RedisUtil redisUtil;
+
+    @GetMapping("/test/redis")
+    public BaseResponse testRedis(String message) {
+
+
+        Boolean b = redisUtil.getBool(Constant.THIRD_ORDER_SUBMIT);
+        redisUtil.set(Constant.THIRD_ORDER_SUBMIT, true, 1 * 60);
+
+        return ResultVOUtils.success("hello");
+    }
+
+    @GetMapping("/test/downloadInvOrder")
+    public BaseResponse downloadInvOrder() {
+        ThrSystemDetailEntity thrSystemDetailEntity = new ThrSystemDetailEntity();
+        thrSystemDetailEntity.setThirdSysFk("thirdId");
+        thrInvOrderService.downloadInvOrder(thrSystemDetailEntity);
+
+        return ResultVOUtils.success("");
+    }
+
+
 }

src/main/java/com/glxp/api/controller/auth/DeptController.java

@@ -8,6 +8,7 @@ import com.glxp.api.annotation.AuthRuleAnnotation;
 import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.dto.DictDto;
 import com.glxp.api.entity.auth.AuthAdmin;
 import com.glxp.api.entity.auth.DeptEntity;
 import com.glxp.api.entity.auth.DeptUserEntity;
@@ -31,6 +32,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.util.*;
+import java.util.stream.Collectors;
 
 @RestController
 public class DeptController {
@@ -67,6 +69,19 @@ public class DeptController {
         return ResultVOUtils.success(invWarehouseEntities);
     }
 
+    @AuthRuleAnnotation("")
+    @GetMapping("spms/inv/warehouse/filterAllOptimize")
+    public BaseResponse filterAllInvWarehouseOptimize(FilterInvWarehouseRequest filterInvWarehouseRequest) {
+        filterInvWarehouseRequest.setPid(0L);
+        filterInvWarehouseRequest.setStatus(1);
+        List<DeptEntity> invWarehouseEntities = deptService.filterInvWarehouse(filterInvWarehouseRequest);
+        List<DictDto> reList = invWarehouseEntities.stream().map(s-> {
+            DictDto dictDto = new DictDto(s.getCode(),s.getName());
+            return dictDto;
+        }).collect(Collectors.toList());
+        return ResultVOUtils.success(reList);
+    }
+
 
     @AuthRuleAnnotation("")
     @GetMapping("spms/inv/warehouse/filterNext")
@@ -91,6 +106,21 @@ public class DeptController {
     }
 
 
+    @AuthRuleAnnotation("")
+    @GetMapping("spms/inv/warehouse/filterByUserOptimize")
+    public BaseResponse filterByUserOptimize(FilterInvWarehouseRequest filterInvWarehouseRequest) {
+        AuthAdmin authAdmin = customerService.getUserBean();
+        filterInvWarehouseRequest.setPid(0L);
+        filterInvWarehouseRequest.setStatus(1);
+        filterInvWarehouseRequest.setUserId(authAdmin.getId());
+        List<DeptEntity> mInvWarehouseEntities = deptService.filterAllByUser(filterInvWarehouseRequest);
+        List<DictDto> reList = mInvWarehouseEntities.stream().map(s-> {
+            DictDto dictDto = new DictDto(s.getCode(),s.getName());
+            return dictDto;
+        }).collect(Collectors.toList());
+        return ResultVOUtils.success(reList);
+    }
+
     @AuthRuleAnnotation("")
     @GetMapping("spms/inv/warehouse/filterAllLocInv")
     public BaseResponse filterAllLocInv(FilterInvWarehouseRequest filterInvWarehouseRequest) {

src/main/java/com/glxp/api/controller/auth/InvSpaceController.java

@@ -6,6 +6,7 @@ import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.ConstantStatus;
+import com.glxp.api.dto.DictDto;
 import com.glxp.api.entity.auth.InvSpace;
 import com.glxp.api.entity.auth.InvWarehouseEntity;
 import com.glxp.api.req.auth.FilterInvSpaceRequest;
@@ -23,6 +24,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 货位字典接口
@@ -56,6 +58,31 @@ public class InvSpaceController {
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
+    @GetMapping("/spms/inv/space/filterOptimize")
+    public BaseResponse filterListOptimize(FilterInvSpaceRequest filterInvSpaceRequest) {
+        if (StrUtil.isNotEmpty(filterInvSpaceRequest.getFilterType())) {
+            if (filterInvSpaceRequest.getFilterType().equals("preIn")) {
+                InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByOne(ConstantStatus.ACTION_TYPE_PREIN);
+                filterInvSpaceRequest.setInvWarehouseCode(invWarehouseEntity.getCode());
+            } else if (filterInvSpaceRequest.getFilterType().equals("pre")) {
+                InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByOne(ConstantStatus.ACTION_TYPE_ADVANCE);
+                filterInvSpaceRequest.setInvWarehouseCode(invWarehouseEntity.getCode());
+            }
+        }
+
+        List<InvSpaceResponse> list = invSpaceService.filterList(filterInvSpaceRequest);
+        List<DictDto> reList = list.stream().map(s-> {
+            DictDto dictDto = new DictDto(s.getCode(),s.getName());
+            return dictDto;
+        }).collect(Collectors.toList());
+
+        PageInfo<DictDto> pageInfo = new PageInfo<>(reList);
+        PageSimpleResponse<DictDto> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setList(reList);
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
     /**
      * 添加货位
      *

src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java

@@ -1,5 +1,6 @@
 package com.glxp.api.controller.auth;
 
+import com.glxp.api.dto.DictDto;
 import org.springframework.beans.BeanUtils;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.IdUtil;
@@ -72,6 +73,24 @@ public class InvWarehouseController extends BaseController {
         return ResultVOUtils.success(responses);
     }
 
+    /**
+     * 获取仓库列表
+     *
+     * @param filterInvSubWarehouseRequest
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @GetMapping("spms/sub/inv/warehouse/filterOptimize")
+    public BaseResponse filterOptimize(FilterInvSubWarehouseRequest filterInvSubWarehouseRequest) {
+        List<InvSubWarehouseResponse> responses = invWarehouseService.filterInvSubWarehouseResponse(filterInvSubWarehouseRequest);
+        List<DictDto> reList = responses.stream().map(s-> {
+            DictDto dictDto = new DictDto(s.getCode(),s.getName());
+            return dictDto;
+        }).collect(Collectors.toList());
+        return ResultVOUtils.success(reList);
+    }
+
+
 
     /**
      * 获取部门底下仓库列表-关联用户
@@ -105,6 +124,24 @@ public class InvWarehouseController extends BaseController {
         return ResultVOUtils.success(invSubWarehouseEntities);
     }
 
+    /**
+     * 获取用户所有关联仓库
+     *
+     * @param filterInvWarehouseRequest
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @GetMapping("spms/inv/warehouse/findByUserOptimize")
+    public BaseResponse findByUserOptimize(FilterInvWarehouseRequest filterInvWarehouseRequest) {
+        filterInvWarehouseRequest.setUserId(getUserId());
+        List<InvWarehouseEntity> invSubWarehouseEntities = invWarehouseService.filterGroupInvSub(filterInvWarehouseRequest);
+        List<DictDto> reList = invSubWarehouseEntities.stream().map(s-> {
+            DictDto dictDto = new DictDto(s.getCode(),s.getName());
+            return dictDto;
+        }).collect(Collectors.toList());
+        return ResultVOUtils.success(reList);
+    }
+
 
     /**
      * 获取供应商可使用单据类型
@@ -119,6 +156,17 @@ public class InvWarehouseController extends BaseController {
         return ResultVOUtils.success(invSubWarehouseEntities);
     }
 
+    @AuthRuleAnnotation("")
+    @GetMapping("spms/inv/warehouse/filterGroupBySpuseOptimize")
+    public BaseResponse filterGroupBySpuseOptimize(FilterInvWarehouseRequest filterInvWarehouseRequest) {
+        List<InvWarehouseEntity> invSubWarehouseEntities = invWarehouseService.filterGroupBySpuse(filterInvWarehouseRequest);
+        List<DictDto> reList = invSubWarehouseEntities.stream().map(s-> {
+            DictDto dictDto = new DictDto(s.getCode(),s.getName());
+            return dictDto;
+        }).collect(Collectors.toList());
+        return ResultVOUtils.success(reList);
+    }
+
     /**
      * 前端页面查询参数拉取用户关联所有仓库接口，只返回编码，父ID和名称
      *
@@ -136,6 +184,60 @@ public class InvWarehouseController extends BaseController {
     }
 
 
+    /**
+     * 前端页面查询参数拉取用户关联所有仓库接口，只返回编码，父ID和名称
+     *
+     * @return
+     */
+    @GetMapping("spms/inv/warehouse/findInvListByUserOptimize")
+    public BaseResponse findInvListByUserOptimize(FilterInvWarehouseRequest filterInvWarehouseRequest) {
+        Long userId = getUserId();
+        if (null == userId) {
+            return ResultVOUtils.error(ResultEnum.LOGIN_VERIFY_FALL);
+        }
+        filterInvWarehouseRequest.setUserId(userId);
+        List<InvWarehouseEntity> list = invWarehouseService.findInvListByUser(filterInvWarehouseRequest);
+        List<DictDto> reList = list.stream().map(s-> {
+            DictDto dictDto = new DictDto(s.getCode(),s.getName());
+            return dictDto;
+        }).collect(Collectors.toList());
+        return ResultVOUtils.success(reList);
+    }
+
+    /**
+     * 前端查询自己关联仓库包含预验收，寄售库
+     *
+     * @return
+     */
+    @GetMapping("spms/inv/warehouse/findAllInvByUserOptimize")
+    public BaseResponse findAllInvByUserOptimize(FilterInvWarehouseRequest filterInvWarehouseRequest) {
+        Long userId = getUserId();
+        List<InvWarehouseEntity> list = new ArrayList<>();
+        if (null == userId) {
+            return ResultVOUtils.error(ResultEnum.LOGIN_VERIFY_FALL);
+        }
+        if (filterInvWarehouseRequest.getAdvanceType() == 2 || filterInvWarehouseRequest.getAdvanceType() == 3) {
+            FilterInvSubWarehouseRequest filterInvSubWarehouseRequest = new FilterInvSubWarehouseRequest();
+            BeanUtils.copyProperties(filterInvWarehouseRequest, filterInvSubWarehouseRequest);
+            list = invWarehouseService.filterInvSubWarehouse(filterInvSubWarehouseRequest);
+        } else {
+            FilterInvSubWarehouseRequest filterInvSubWarehouseRequest = new FilterInvSubWarehouseRequest();
+            filterInvSubWarehouseRequest.setFilterAdvanceType(1);
+            List<InvWarehouseEntity> preInList = invWarehouseService.filterInvSubWarehouse(filterInvSubWarehouseRequest);
+            filterInvWarehouseRequest.setUserId(userId);
+            List<InvWarehouseEntity> myList = invWarehouseService.findInvListByUser(filterInvWarehouseRequest);
+            list = myList.stream().filter(invWarehouseEntity ->
+                    preInList.stream().anyMatch(preIn -> !preIn.getCode().equals(invWarehouseEntity.getCode()))
+            ).collect(Collectors.toList());
+            list.addAll(preInList);
+        }
+        List<DictDto> reList = list.stream().map(s-> {
+            DictDto dictDto = new DictDto(s.getCode(),s.getName());
+            return dictDto;
+        }).collect(Collectors.toList());
+        return ResultVOUtils.success(reList);
+    }
+
     /**
      * 前端查询自己关联仓库包含预验收，寄售库
      *
@@ -162,7 +264,7 @@ public class InvWarehouseController extends BaseController {
                     preInList.stream().anyMatch(preIn -> !preIn.getCode().equals(invWarehouseEntity.getCode()))
             ).collect(Collectors.toList());
             resultList.addAll(preInList);
-            return ResultVOUtils.success(list);
+            return ResultVOUtils.success(resultList);
         }
         return ResultVOUtils.success(list);
     }
@@ -197,6 +299,36 @@ public class InvWarehouseController extends BaseController {
         return ResultVOUtils.success(results.stream().distinct().collect(Collectors.toList()));
     }
 
+    @AuthRuleAnnotation("")
+    @GetMapping("spms/inv/warehouse/findByFromOptimize")
+    public BaseResponse findByFromOptimize(FilterInvWarehouseRequest filterInvWarehouseRequest) {
+        if (StrUtil.isEmpty(filterInvWarehouseRequest.getLocInvCode())) {
+            return ResultVOUtils.error(500, "当前仓库不能为空！");
+        }
+        FilterInvSubWarehouseRequest filterInvSubWarehouseRequest = new FilterInvSubWarehouseRequest();
+        BeanUtils.copyProperties(filterInvWarehouseRequest, filterInvSubWarehouseRequest);
+        if (filterInvWarehouseRequest.getType() == null) {
+            filterInvSubWarehouseRequest.setAdvanceType(1);
+        }
+        List<InvWarehouseEntity> invWarehouseEntities = invWarehouseService.filterInvSubWarehouse(filterInvSubWarehouseRequest);
+
+        List<InvWarehouseEntity> results = new ArrayList<>();
+        if (CollUtil.isNotEmpty(invWarehouseEntities)) {
+            invWarehouseEntities.forEach(invWarehouseEntity -> {
+                if (!invWarehouseEntity.getCode().equals(filterInvWarehouseRequest.getLocInvCode())) {
+                    results.add(invWarehouseEntity);
+                }
+            });
+        }
+        List<InvWarehouseEntity> list = results.stream().distinct().collect(Collectors.toList());
+
+        List<DictDto> reList = list.stream().map(s-> {
+            DictDto dictDto = new DictDto(s.getCode(),s.getName());
+            return dictDto;
+        }).collect(Collectors.toList());
+        return ResultVOUtils.success(reList);
+    }
+
     /**
      * 获取上级仓库
      *

src/main/java/com/glxp/api/controller/auth/LoginController.java

@@ -287,7 +287,7 @@ public class LoginController extends BaseController {
     @AuthRuleAnnotation("")
     @GetMapping("/admin/auth/login/getInv")
     public BaseResponse getInv(HttpServletRequest request) {
-        String adminId = request.getHeader("ADMIN_ID");
+        String adminId = request.getHeader("ADMINID");
         Long id = Long.valueOf(adminId);
         AuthAdmin authAdmin = authAdminService.findById(id);
         LoginUserInfoResponse loginUserInfoResponse = new LoginUserInfoResponse();
@@ -309,7 +309,7 @@ public class LoginController extends BaseController {
     @AuthRuleAnnotation("")
     @GetMapping("/getInfo")
     public BaseResponse getUserInfo(HttpServletRequest request) {
-        String adminId = request.getHeader("ADMIN_ID");
+        String adminId = request.getHeader("ADMINID");
         Long id = Long.valueOf(adminId);
         AuthAdmin authAdmin = authAdminService.findById(id);
         LoginUserInfoResponse loginUserInfoResponse = new LoginUserInfoResponse();

src/main/java/com/glxp/api/controller/auth/SysCustomConfigController.java

@@ -0,0 +1,224 @@
+package com.glxp.api.controller.auth;
+
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.beust.jcommander.internal.Lists;
+import com.beust.jcommander.internal.Maps;
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.annotation.AuthRuleAnnotation;
+import com.glxp.api.annotation.Log;
+import com.glxp.api.common.enums.ResultEnum;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.constant.BusinessType;
+import com.glxp.api.controller.BaseController;
+import com.glxp.api.entity.auth.SysCustomConfigDetailEntity;
+import com.glxp.api.entity.auth.SysCustomConfigEntity;
+import com.glxp.api.req.auth.SysCustomConfigDetailRequest;
+import com.glxp.api.req.auth.SysCustomConfigRequest;
+import com.glxp.api.req.system.DeleteRequest;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.res.auth.SysCustomConfigFromDetailResponse;
+import com.glxp.api.res.auth.SysCustomConfigResponse;
+import com.glxp.api.service.auth.ISysCustomConfigDetailService;
+import com.glxp.api.service.auth.ISysCustomConfigService;
+import com.glxp.api.util.StringUtils;
+import lombok.RequiredArgsConstructor;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 用户信息
+ *
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/custom/config")
+@Transactional(rollbackFor = Exception.class)
+public class SysCustomConfigController extends BaseController {
+
+    private final ISysCustomConfigService sysCustomConfigService;
+
+    private final ISysCustomConfigDetailService sysCustomConfigDetailService;
+
+    @GetMapping("/list")
+    public BaseResponse list(SysCustomConfigRequest request, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<SysCustomConfigEntity> list = sysCustomConfigService.filterSysCustomConfig(request);
+        PageInfo<SysCustomConfigEntity> authAdminPageInfo = new PageInfo<>(list);
+        PageSimpleResponse<SysCustomConfigEntity> authAdminPageSimpleResponse = new PageSimpleResponse<>();
+        authAdminPageSimpleResponse.setTotal(authAdminPageInfo.getTotal());
+        authAdminPageSimpleResponse.setList(list);
+
+        return ResultVOUtils.success(authAdminPageSimpleResponse);
+    }
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/save")
+    @Log(title = "界面配置管理", businessType = BusinessType.INSERT)
+    public BaseResponse save(@RequestBody SysCustomConfigEntity entity,
+                             BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+
+        boolean b = sysCustomConfigService.insertSysCustomConfig(entity);
+        if (!b) {
+            return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
+        }
+        return ResultVOUtils.success("添加成功！");
+    }
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/edit")
+    @Log(title = "界面配置管理", businessType = BusinessType.UPDATE)
+    public BaseResponse edit(@RequestBody @Valid SysCustomConfigEntity entity,
+                             BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        if (entity.getId() == null) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
+        }
+        SysCustomConfigEntity originEntity = sysCustomConfigService.selectById(entity.getId());
+        if (originEntity == null) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
+        }
+        boolean b = sysCustomConfigService.updateSysCustomConfig(entity);
+        if (!b) {
+            return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
+        }
+
+        return ResultVOUtils.success("修改成功！");
+
+
+    }
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/delete")
+    @Log(title = "界面配置管理", businessType = BusinessType.DELETE)
+    public BaseResponse delete(@RequestBody DeleteRequest deleteRequest) {
+
+        if (StringUtils.isEmpty(deleteRequest.getId())) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
+        }
+        boolean b = sysCustomConfigService.deleteById(deleteRequest.getId());
+        sysCustomConfigDetailService.deleteByConfigId(deleteRequest.getId());
+        if (!b) {
+            return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
+        }
+        return ResultVOUtils.success();
+    }
+
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/getConfigs")
+    @Log(title = "界面配置管理")
+    public BaseResponse getConfigs(@RequestBody SysCustomConfigRequest request,BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<SysCustomConfigEntity> list = sysCustomConfigService.filterSysCustomConfig(request);
+        if (CollectionUtil.isEmpty(list)) {
+            return ResultVOUtils.error(ResultEnum.DATA_NOT);
+        }
+        SysCustomConfigEntity sysCustomConfigEntity = list.get(0);
+        SysCustomConfigDetailRequest detailRequest = new SysCustomConfigDetailRequest();
+        detailRequest.setConfigId(sysCustomConfigEntity.getId().toString());
+        detailRequest.setIsShow("1");
+//        detailRequest.setType(request.getType());
+        List<SysCustomConfigDetailEntity> detailList = sysCustomConfigDetailService.filterSysCustomConfigDetail(detailRequest);
+        Map<String,List<SysCustomConfigDetailEntity>> map = detailList.stream().collect(
+                Collectors.groupingBy(SysCustomConfigDetailEntity::getType));
+        List<SysCustomConfigDetailEntity> tableList = map.get("1") == null? Lists.newArrayList():map.get("1");
+        List<SysCustomConfigDetailEntity> queryList = map.get("2") == null? Lists.newArrayList():map.get("2");
+        List<SysCustomConfigDetailEntity> fromList = map.get("3") == null? Lists.newArrayList():map.get("3");
+
+        List<SysCustomConfigDetailEntity> fromSortList = fromList.stream().sorted(Comparator.comparing(SysCustomConfigDetailEntity::getLineNumber)).collect(Collectors.toList());
+
+        Map<Integer,List<SysCustomConfigDetailEntity>> fromMap = fromSortList.stream().collect(
+                Collectors.groupingBy(SysCustomConfigDetailEntity::getLineNumber,LinkedHashMap::new,Collectors.toList()));
+        List<SysCustomConfigFromDetailResponse> fromDetailList = Lists.newArrayList();
+        for (Map.Entry<Integer, List<SysCustomConfigDetailEntity>> entry : fromMap.entrySet()) {
+            SysCustomConfigFromDetailResponse sysCustomConfigFromDetailResponse = new SysCustomConfigFromDetailResponse();
+            sysCustomConfigFromDetailResponse.setNumber(entry.getKey());
+            List<SysCustomConfigDetailEntity> entities = entry.getValue();
+            entities.stream().forEach(s->{
+                if(StringUtils.isNotEmpty(s.getCheckRules())){
+                    String replacedJsonString = s.getCheckRules().replaceAll("(\\w+)(\\s*:\\s*)", "\"$1\"$2");
+                    JSONArray object = JSONArray.parseArray(replacedJsonString);
+                    s.setCheckRulesObj(object);
+                }
+                if(StringUtils.isNotEmpty(s.getLableRule())){
+                    JSONObject objectLaber = JSONObject.parseObject(s.getLableRule());
+                    List<Map> mapList = Lists.newArrayList();
+                    Iterator<String> it = objectLaber.keySet().iterator();
+                    String inputType = s.getInputType();
+                    while(it.hasNext()) {
+                        Map<String,Object> mapTemp = Maps.newHashMap();
+                        String key = (String) it.next();
+                        String value = objectLaber.getString(key);
+                        mapTemp.put("label", value);
+                        if("number".equals(inputType)){
+                            mapTemp.put("value", Integer.parseInt(key));
+                        }else{
+                            mapTemp.put("value", key);
+                        }
+                        mapList.add(mapTemp);
+                    }
+                    s.setLableRuleObj(mapList);
+                }
+            });
+            sysCustomConfigFromDetailResponse.setList(entities);
+            fromDetailList.add(sysCustomConfigFromDetailResponse);
+        }
+
+        tableList.stream().forEach(s->{
+            if(StringUtils.isNotEmpty(s.getLableRule())) {
+                JSONObject objectLaber = JSONObject.parseObject(s.getLableRule());
+                s.setLableRuleObj(objectLaber);
+            }
+            if(StringUtils.isNotEmpty(s.getButtonRule())){
+                JSONArray objectButton = JSONArray.parseArray(s.getButtonRule());
+                s.setButtonRulObj(objectButton);
+            }
+        });
+        queryList.stream().forEach(s->{
+            if(StringUtils.isNotEmpty(s.getLableRule())){
+                JSONObject objectLaber = JSONObject.parseObject(s.getLableRule());
+                List<Map> mapList = Lists.newArrayList();
+                Iterator<String> it = objectLaber.keySet().iterator();
+                while(it.hasNext()) {
+                    Map<String,String> mapTemp = Maps.newHashMap();
+                    String key = (String) it.next();
+                    String value = objectLaber.getString(key);
+                    mapTemp.put("label", value);
+                    mapTemp.put("value", key);
+                    mapList.add(mapTemp);
+                }
+                s.setLableRuleObj(mapList);
+            }
+        });
+        SysCustomConfigResponse sysCustomConfigResponse = new SysCustomConfigResponse();
+        BeanUtil.copyProperties(sysCustomConfigEntity, sysCustomConfigResponse);
+        sysCustomConfigResponse.setTableList(tableList);
+        sysCustomConfigResponse.setQueryList(queryList);
+        sysCustomConfigResponse.setFromList(fromDetailList);
+        return ResultVOUtils.success(sysCustomConfigResponse);
+    }
+}

src/main/java/com/glxp/api/controller/auth/SysCustomConfigDetailController.java

@@ -0,0 +1,114 @@
+package com.glxp.api.controller.auth;
+
+
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.annotation.AuthRuleAnnotation;
+import com.glxp.api.annotation.Log;
+import com.glxp.api.common.enums.ResultEnum;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.constant.BusinessType;
+import com.glxp.api.controller.BaseController;
+import com.glxp.api.entity.auth.SysCustomConfigDetailEntity;
+import com.glxp.api.req.auth.SysCustomConfigDetailRequest;
+import com.glxp.api.req.system.DeleteRequest;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.service.auth.ISysCustomConfigDetailService;
+import com.glxp.api.util.StringUtils;
+import lombok.RequiredArgsConstructor;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * 用户信息
+ *
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/custom/configDetail")
+@Transactional(rollbackFor = Exception.class)
+public class SysCustomConfigDetailController extends BaseController {
+
+    private final ISysCustomConfigDetailService sysCustomConfigDetailService;
+
+
+    @GetMapping("/list")
+    public BaseResponse list(SysCustomConfigDetailRequest request, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<SysCustomConfigDetailEntity> list = sysCustomConfigDetailService.filterSysCustomConfigDetail(request);
+        PageInfo<SysCustomConfigDetailEntity> authAdminPageInfo = new PageInfo<>(list);
+        PageSimpleResponse<SysCustomConfigDetailEntity> authAdminPageSimpleResponse = new PageSimpleResponse<>();
+        authAdminPageSimpleResponse.setTotal(authAdminPageInfo.getTotal());
+        authAdminPageSimpleResponse.setList(list);
+
+        return ResultVOUtils.success(authAdminPageSimpleResponse);
+    }
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/save")
+    @Log(title = "界面配置管理", businessType = BusinessType.INSERT)
+    public BaseResponse save(@RequestBody SysCustomConfigDetailEntity entity,
+                             BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+
+        boolean b = sysCustomConfigDetailService.insertSysCustomConfigDetail(entity);
+        if (!b) {
+            return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
+        }
+        return ResultVOUtils.success("添加成功！");
+    }
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/edit")
+    @Log(title = "界面配置管理", businessType = BusinessType.UPDATE)
+    public BaseResponse edit(@RequestBody @Valid SysCustomConfigDetailEntity entity,
+                             BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        if (entity.getId() == null) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
+        }
+        SysCustomConfigDetailEntity originEntity = sysCustomConfigDetailService.selectById(entity.getId());
+        if (originEntity == null) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
+        }
+        boolean b = sysCustomConfigDetailService.updateSysCustomConfigDetail(entity);
+        if (!b) {
+            return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
+        }
+
+        return ResultVOUtils.success("修改成功！");
+
+
+    }
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/delete")
+    @Log(title = "界面配置管理", businessType = BusinessType.DELETE)
+    public BaseResponse delete(@RequestBody DeleteRequest deleteRequest) {
+
+        if (StringUtils.isEmpty(deleteRequest.getId())) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
+        }
+        boolean b = sysCustomConfigDetailService.deleteById(deleteRequest.getId());
+
+        if (!b) {
+            return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
+        }
+        return ResultVOUtils.success();
+    }
+
+}

src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java

@@ -2,6 +2,8 @@ package com.glxp.api.controller.basic;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.glxp.api.constant.Constant;
+import com.glxp.api.entity.auth.InvWarehouseEntity;
+import com.glxp.api.dto.DictDto;
 import com.glxp.api.service.auth.InvWarehouseService;
 import org.springframework.beans.BeanUtils;
 import cn.hutool.core.collection.CollUtil;
@@ -51,6 +53,7 @@ import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 单据类型接口
@@ -203,9 +206,11 @@ public class BasicBussinessTypeController extends BaseController {
         List<BasicBussinessTypeResponse> bussinessTypeResponses = new ArrayList<>();
         if (detailType.equals("norDetail")) {
         } else if (detailType.equals("preDetail")) {
-            bussinessTypeRequest.setCode(Constant.INV_PRE_CODE);
+            InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByPreInv();
+            bussinessTypeRequest.setCode(invWarehouseEntity.getCode());
         } else if (detailType.equals("preInDetail")) {
-            bussinessTypeRequest.setCode(Constant.INV_PRE_IN_CODE);
+            InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByPreInInv();
+            bussinessTypeRequest.setCode(invWarehouseEntity.getCode());
         }
         bussinessTypeResponses = basicBussinessTypeService.filterJoinByInv(bussinessTypeRequest);
         PageInfo<BasicBussinessTypeResponse> pageInfo;
@@ -216,6 +221,42 @@ public class BasicBussinessTypeController extends BaseController {
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
+    /**
+     * 获取出入库明细单据类型
+     *
+     * @param bussinessTypeRequest
+     * @param bindingResult
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @GetMapping("/udiwms/orderDetail/busTypesOptimize")
+    public BaseResponse orderDetailBusTypesOptimize(FilterBussinessTypeRequest bussinessTypeRequest,
+                                            BindingResult bindingResult) {
+
+        String detailType = bussinessTypeRequest.getDetailType();
+        List<BasicBussinessTypeResponse> bussinessTypeResponses = new ArrayList<>();
+        if (detailType.equals("norDetail")) {
+        } else if (detailType.equals("preDetail")) {
+            InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByPreInv();
+            bussinessTypeRequest.setCode(invWarehouseEntity.getCode());
+        } else if (detailType.equals("preInDetail")) {
+            InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByPreInInv();
+            bussinessTypeRequest.setCode(invWarehouseEntity.getCode());
+        }
+        bussinessTypeResponses = basicBussinessTypeService.filterJoinByInv(bussinessTypeRequest);
+        List<DictDto> reList = bussinessTypeResponses.stream().map(s-> {
+            DictDto dictDto = new DictDto(s.getAction(),s.getName());
+            return dictDto;
+        }).collect(Collectors.toList());
+
+        PageInfo<DictDto> pageInfo;
+        pageInfo = new PageInfo<>(reList);
+        PageSimpleResponse<DictDto> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(reList);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
     @AuthRuleAnnotation("")
     @GetMapping("/udiwms/localBusType/filterJoinByUser")
     public BaseResponse filterJoinByUser(FilterBussinessTypeRequest bussinessTypeFilterRequest,
@@ -271,6 +312,58 @@ public class BasicBussinessTypeController extends BaseController {
     }
 
 
+    @AuthRuleAnnotation("")
+    @GetMapping("/udiwms/localBusType/filterJoinByUserOptimize")
+    public BaseResponse filterJoinByUserOptimize(FilterBussinessTypeRequest bussinessTypeFilterRequest,
+                                         BindingResult bindingResult) {
+        List<DictDto> reList  = new ArrayList<>();
+        if (StrUtil.isNotEmpty(bussinessTypeFilterRequest.getVueType())) {
+            List<BasicBussinessTypeEntity> result = new ArrayList<>();
+            List<BasicBussinessTypeEntity> bussinessTypeEntities = basicBussinessTypeService.findByVueType(bussinessTypeFilterRequest.getVueType());
+            if (StrUtil.isNotEmpty(bussinessTypeFilterRequest.getInvCode()) || StrUtil.isNotEmpty(bussinessTypeFilterRequest.getCode())) {
+                //过滤是否是当前仓库底下单据类型
+                FilterBussinessTypeRequest tempRequest = new FilterBussinessTypeRequest();
+                tempRequest.setCode(bussinessTypeFilterRequest.getCode());
+                tempRequest.setInvCode(bussinessTypeFilterRequest.getInvCode());
+                tempRequest.setMainAction(bussinessTypeFilterRequest.getMainAction());
+                List<BasicBussinessTypeResponse> bussinessTypeResponses = basicBussinessTypeService.filterJoinByInv(tempRequest);
+                if (CollUtil.isNotEmpty(bussinessTypeResponses)) {
+                    for (BasicBussinessTypeResponse bussinessTypExportResponse : bussinessTypeResponses) {
+                        for (BasicBussinessTypeEntity basicBussinessTypeEntity : bussinessTypeEntities) {
+                            if (bussinessTypExportResponse.getAction().equals(basicBussinessTypeEntity.getAction())) {
+                                result.add(basicBussinessTypeEntity);
+                            }
+                        }
+                    }
+
+                }
+            } else {
+                result.addAll(bussinessTypeEntities);
+            }
+
+            reList = result.stream().map(s-> {
+                DictDto dictDto = new DictDto(s.getAction(),s.getName());
+                return dictDto;
+            }).collect(Collectors.toList());
+        } else {
+
+            List<BasicBussinessTypeResponse> bussinessTypeEntities;
+            //判断是否是医院用户
+            bussinessTypeFilterRequest.setUserId(getUserId());
+            bussinessTypeEntities = basicBussinessTypeService.filterJoinByUser(
+                    bussinessTypeFilterRequest);
+
+            reList = bussinessTypeEntities.stream().map(s-> {
+                DictDto dictDto = new DictDto(s.getAction(),s.getName());
+                return dictDto;
+            }).collect(Collectors.toList());
+
+        }
+        return ResultVOUtils.success(reList);
+
+    }
+
+
     /**
      * 删除单据类型
      *

src/main/java/com/glxp/api/controller/basic/BasicCorpController.java

@@ -1,5 +1,6 @@
 package com.glxp.api.controller.basic;
 
+import com.glxp.api.dto.DictDto;
 import org.springframework.beans.BeanUtils;
 import cn.hutool.core.util.IdUtil;
 import com.github.pagehelper.PageInfo;
@@ -89,6 +90,28 @@ public class BasicCorpController extends BaseController {
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
+    @GetMapping("/udiwms/basic/unit/maintain/filterOptimize")
+    public BaseResponse filterBasicUnitMaintainOptimize(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest,
+                                                BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BasicCorpEntity> basicUnitMaintainEntities;
+        basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest);
+        PageInfo<BasicCorpEntity> pageInfo = new PageInfo<>(basicUnitMaintainEntities);
+        PageSimpleResponse<DictDto> pageSimpleResponse = new PageSimpleResponse<>();
+        List<DictDto> reList = basicUnitMaintainEntities.stream().map(s-> {
+            DictDto dictDto = new DictDto(s.getErpId(),s.getName());
+            return dictDto;
+        }).collect(Collectors.toList());
+
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(reList);
+
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
     @GetMapping("/udiwms/basic/unit/maintain/filter2")
     public BaseResponse filterBasicUnitMaintain2(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest,
                                                  BindingResult bindingResult) {
@@ -547,6 +570,18 @@ public class BasicCorpController extends BaseController {
         return ResultVOUtils.success(getCorpList);
     }
 
+    @AuthRuleAnnotation("")
+    @PostMapping("/udiwms/basic/unit/maintain/selectCorpListOptimize")
+    public BaseResponse selectCorpListOptimize(@RequestBody BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest) {
+
+        List<BasicCorpEntity> getCorpList = basicUnitMaintainService.selectCorpList(basicUnitMaintainFilterRequest);
+        List<DictDto> reList = getCorpList.stream().map(s-> {
+            DictDto dictDto = new DictDto(s.getErpId(),s.getName());
+            return dictDto;
+        }).collect(Collectors.toList());
+        return ResultVOUtils.success(reList);
+    }
+
     @AuthRuleAnnotation("")
     @GetMapping("/udiwms/basic/unit/maintain/getCorpLists")
     public BaseResponse getCorpLists() {

src/main/java/com/glxp/api/controller/basic/BasicDestinyRelController.java

@@ -207,7 +207,7 @@ public class BasicDestinyRelController {
             throw new JsonException(ResultEnum.NOT_NETWORK);
         }
         HttpServletRequest request = attributes.getRequest();
-        String userId = request.getHeader("ADMIN_ID");
+        String userId = request.getHeader("ADMINID");
         AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId));
         return authAdmin.getCustomerId() + "";
     }

src/main/java/com/glxp/api/controller/basic/BasicManufacturerController.java

@@ -1,13 +1,316 @@
 package com.glxp.api.controller.basic;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.IdUtil;
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.annotation.AuthRuleAnnotation;
+import com.glxp.api.common.enums.ResultEnum;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.constant.ConstantStatus;
+import com.glxp.api.constant.SyncDelType;
 import com.glxp.api.controller.BaseController;
+import com.glxp.api.entity.basic.BasicCorpEntity;
+import com.glxp.api.entity.basic.BasicManufacturerEntity;
+import com.glxp.api.entity.thrsys.ThrSystemDetailEntity;
+import com.glxp.api.entity.thrsys.ThrSystemEntity;
+import com.glxp.api.req.basic.BasicDataRequest;
+import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest;
+import com.glxp.api.req.basic.CombineSingleUnitRequest;
+import com.glxp.api.req.basic.CombineUnitRequest;
+import com.glxp.api.req.system.DeleteRequest;
+import com.glxp.api.req.thrsys.FilterBasicThirdSysRequest;
+import com.glxp.api.req.thrsys.ThrUnitMaintainFilterRequest;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.res.basic.BasicErpUnitsResponse;
+import com.glxp.api.res.basic.BasicProductThirdSysResponse;
+import com.glxp.api.service.basic.BasicManufacturerService;
+import com.glxp.api.service.thrsys.ThrSystemDetailService;
+import com.glxp.api.service.thrsys.ThrSystemService;
+import com.glxp.api.util.CustomUtil;
 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.Date;
+import java.util.List;
+
 /**
  * 生产企业字典
  */
 @Slf4j
 @RestController
 public class BasicManufacturerController extends BaseController {
+
+
+    @Resource
+    BasicManufacturerService manufacturerService;
+
+
+    @GetMapping("/udiwms/basic/manu/maintain/filter")
+    public BaseResponse filterBasicUnitMaintain(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest,
+                                                BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BasicManufacturerEntity> basicUnitMaintainEntities;
+        basicUnitMaintainEntities = manufacturerService.filterList(basicUnitMaintainFilterRequest);
+        PageInfo<BasicManufacturerEntity> pageInfo = new PageInfo<>(basicUnitMaintainEntities);
+        PageSimpleResponse<BasicManufacturerEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(basicUnitMaintainEntities);
+
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/udiwms/basic/manu/maintain/save")
+    public BaseResponse save(@RequestBody @Valid BasicManufacturerEntity basicUnitMaintainSaveRequest,
+                             BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+
+        boolean result = manufacturerService.verifyExists(basicUnitMaintainSaveRequest);
+        if (result) {
+            return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "重复添加");
+        }
+
+        BasicManufacturerEntity basicUnitMaintainEntity = new BasicManufacturerEntity();
+        BeanUtils.copyProperties(basicUnitMaintainSaveRequest, basicUnitMaintainEntity);
+        basicUnitMaintainEntity.setErpId(CustomUtil.getId());
+        basicUnitMaintainEntity.setUpdateTime(new Date());
+        basicUnitMaintainEntity.setId(IdUtil.getSnowflakeNextId());
+        boolean b = manufacturerService.save(basicUnitMaintainEntity);
+        if (!b) {
+            return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
+        }
+
+        return ResultVOUtils.success();
+    }
+
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/udiwms/basic/manu/maintain/update")
+    public BaseResponse update(@RequestBody @Valid BasicManufacturerEntity basicUnitMaintainSaveRequest, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+
+        boolean result = manufacturerService.verifyExists(basicUnitMaintainSaveRequest);
+        if (result) {
+            return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "重复添加");
+        }
+
+        basicUnitMaintainSaveRequest.setOutType(ConstantStatus.CORP_SICK_CUS);
+        basicUnitMaintainSaveRequest.setUpdateTime(new Date());
+        manufacturerService.updateById(basicUnitMaintainSaveRequest);
+        return ResultVOUtils.success("修改成功");
+    }
+
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/udiwms/basic/manu/maintain/delete")
+    public BaseResponse deleteBasicUnitMaintain(@RequestBody DeleteRequest deleteRequest) {
+
+        String id = deleteRequest.getId();
+        manufacturerService.removeById(id);
+//        //调用同步删除的方法
+//        BasicDataRequest basicDataRequest = new BasicDataRequest();
+//        basicDataRequest.setDeleteRequest(deleteRequest);
+//        basicDataRequest.setKey(SyncDelType.BASIC_CORP_MAINTAIN);
+//        Long userId = getUserId();
+//        spGetHttpClient.deleteBasicData(basicDataRequest, userId + "");
+        return ResultVOUtils.success("删除成功");
+    }
+
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/udiwms/basic/manu/maintain/combine")
+    public BaseResponse combine(@RequestBody CombineUnitRequest combineRequest, BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BasicErpUnitsResponse> erpUnitsResponses = combineRequest.getCustmandocResponses();
+        if (erpUnitsResponses != null && erpUnitsResponses.size() > 0) {
+            for (BasicErpUnitsResponse erpUnitsResponse : erpUnitsResponses) {
+                BasicManufacturerEntity basicUnitMaintainEntity = new BasicManufacturerEntity();
+                if (combineRequest.getThirdSys() != null) {
+                    if ("thirdId".equals(combineRequest.getThirdSys())) {
+                        basicUnitMaintainEntity.setThirdId(erpUnitsResponse.getUnitId());
+                        basicUnitMaintainEntity.setThirdName(erpUnitsResponse.getName());
+                    } else if ("thirdId1".equals(combineRequest.getThirdSys())) {
+                        basicUnitMaintainEntity.setThirdId1(erpUnitsResponse.getUnitId());
+                        basicUnitMaintainEntity.setThirdName1(erpUnitsResponse.getName());
+                    } else if ("thirdId2".equals(combineRequest.getThirdSys())) {
+                        basicUnitMaintainEntity.setThirdId2(erpUnitsResponse.getUnitId());
+                        basicUnitMaintainEntity.setThirdName2(erpUnitsResponse.getName());
+                    } else if ("thirdId3".equals(combineRequest.getThirdSys())) {
+                        basicUnitMaintainEntity.setThirdId3(erpUnitsResponse.getUnitId());
+                        basicUnitMaintainEntity.setThirdName3(erpUnitsResponse.getName());
+                    } else if ("thirdId4".equals(combineRequest.getThirdSys())) {
+                        basicUnitMaintainEntity.setThirdId4(erpUnitsResponse.getUnitId());
+                        basicUnitMaintainEntity.setThirdName4(erpUnitsResponse.getName());
+                    }
+                }
+                basicUnitMaintainEntity.setErpId(CustomUtil.getId());
+                basicUnitMaintainEntity.setName(erpUnitsResponse.getName());
+                basicUnitMaintainEntity.setSpell(erpUnitsResponse.getSpell());
+                basicUnitMaintainEntity.setAddr(erpUnitsResponse.getAddr());
+                basicUnitMaintainEntity.setCreditNo(erpUnitsResponse.getCreditNo());
+                basicUnitMaintainEntity.setContact(erpUnitsResponse.getContact());
+                basicUnitMaintainEntity.setMobile(erpUnitsResponse.getMobile());
+                basicUnitMaintainEntity.setCorpType(ConstantStatus.CORP_SP);
+                basicUnitMaintainEntity.setUpdateTime(new Date());
+                basicUnitMaintainEntity.setId(IdUtil.getSnowflakeNextId());
+                manufacturerService.save(basicUnitMaintainEntity);
+            }
+        }
+        return ResultVOUtils.success("选入成功");
+    }
+
+    @Resource
+    ThrSystemDetailService thrSystemDetailService;
+
+    @AuthRuleAnnotation("")
+    @GetMapping("/udiwms/basic/manu/maintain/combineAll")
+    public BaseResponse combineAll(ThrUnitMaintainFilterRequest unitMaintainFilterRequest, BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        ThrSystemDetailEntity basicThirdSysDetailEntity = thrSystemDetailService.selectByKey("manuUrl", unitMaintainFilterRequest.getThirdSys());
+        if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null)
+            return ResultVOUtils.error(500, "往来单位接口地址未定义");
+        if (basicThirdSysDetailEntity.getEnabled()) {
+            manufacturerService.selectAllUnit(basicThirdSysDetailEntity, unitMaintainFilterRequest);
+        } else {
+            return ResultVOUtils.error(500, "第三方系统往来单位接口服务未启用");
+        }
+
+        return ResultVOUtils.success("后台正在添加，请稍后刷新查看！");
+    }
+
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/udiwms/basic/manu/maintain/combineSingle")
+    public BaseResponse combineSingle(@RequestBody CombineSingleUnitRequest combineRequest, BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        BasicErpUnitsResponse basicErpUnitsResponse = combineRequest.getBasicErpUnitsResponse();
+        BasicManufacturerEntity basicCorpEntity = new BasicManufacturerEntity();
+        basicCorpEntity.setId(Long.parseLong(combineRequest.getKey()));
+        if (combineRequest.getThirdSys() != null) {
+            if ("thirdId".equals(combineRequest.getThirdSys())) {
+                basicCorpEntity.setThirdId(basicErpUnitsResponse.getId());
+                basicCorpEntity.setThirdName(basicErpUnitsResponse.getName());
+            } else if ("thirdId1".equals(combineRequest.getThirdSys())) {
+                basicCorpEntity.setThirdId1(basicErpUnitsResponse.getId());
+                basicCorpEntity.setThirdName1(basicErpUnitsResponse.getName());
+            } else if ("thirdId2".equals(combineRequest.getThirdSys())) {
+                basicCorpEntity.setThirdId2(basicErpUnitsResponse.getId());
+                basicCorpEntity.setThirdName2(basicErpUnitsResponse.getName());
+            } else if ("thirdId3".equals(combineRequest.getThirdSys())) {
+                basicCorpEntity.setThirdId3(basicErpUnitsResponse.getId());
+                basicCorpEntity.setThirdName3(basicErpUnitsResponse.getName());
+            } else if ("thirdId4".equals(combineRequest.getThirdSys())) {
+                basicCorpEntity.setThirdId4(basicErpUnitsResponse.getId());
+                basicCorpEntity.setThirdName4(basicErpUnitsResponse.getName());
+            }
+        }
+
+        manufacturerService.updateById(basicCorpEntity);
+        return ResultVOUtils.success("关联成功");
+    }
+
+    @Resource
+    private ThrSystemService thrSystemService;
+
+    //获取产品信息详情（多平台）
+    @AuthRuleAnnotation("")
+    @GetMapping("/udiwms/manutMaintain/thirdSys/detail")
+    public BaseResponse getThirdSysDetail(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest,
+                                          BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        BasicManufacturerEntity basicUnitMaintainEntity = manufacturerService.getById(basicUnitMaintainFilterRequest.getId() + "");
+
+        FilterBasicThirdSysRequest filterBasicThirdSysRequest = new FilterBasicThirdSysRequest();
+        filterBasicThirdSysRequest.setEnabled(true);
+        List<ThrSystemEntity> basicThirdSysEntities = thrSystemService.filterBasicThiSys(filterBasicThirdSysRequest);
+        List<BasicProductThirdSysResponse> basicProductThirdSysResponses = new ArrayList<>();
+
+        for (ThrSystemEntity basicThirdSysEntity : basicThirdSysEntities) {
+            if (basicThirdSysEntity.getThirdId().equals("thirdId")) {
+                BasicProductThirdSysResponse basicProductThirdSysResponse = new BasicProductThirdSysResponse();
+                basicProductThirdSysResponse.setSysId(basicThirdSysEntity.getThirdId());
+                basicProductThirdSysResponse.setSysName(basicThirdSysEntity.getThirdName());
+                if (basicUnitMaintainEntity != null) {
+                    basicProductThirdSysResponse.setThirdId(basicUnitMaintainEntity.getThirdId());
+                    basicProductThirdSysResponse.setThirdName(basicUnitMaintainEntity.getThirdName());
+                }
+
+                basicProductThirdSysResponses.add(basicProductThirdSysResponse);
+            } else if (basicThirdSysEntity.getThirdId().equals("thirdId1")) {
+                BasicProductThirdSysResponse basicProductThirdSysResponse = new BasicProductThirdSysResponse();
+                basicProductThirdSysResponse.setSysId(basicThirdSysEntity.getThirdId());
+                basicProductThirdSysResponse.setSysName(basicThirdSysEntity.getThirdName());
+                if (basicUnitMaintainEntity != null) {
+                    basicProductThirdSysResponse.setThirdId(basicUnitMaintainEntity.getThirdId1());
+                    basicProductThirdSysResponse.setThirdName(basicUnitMaintainEntity.getThirdName1());
+                }
+                basicProductThirdSysResponses.add(basicProductThirdSysResponse);
+            } else if (basicThirdSysEntity.getThirdId().equals("thirdId2")) {
+                BasicProductThirdSysResponse basicProductThirdSysResponse = new BasicProductThirdSysResponse();
+                basicProductThirdSysResponse.setSysId(basicThirdSysEntity.getThirdId());
+                basicProductThirdSysResponse.setSysName(basicThirdSysEntity.getThirdName());
+                if (basicUnitMaintainEntity != null) {
+                    basicProductThirdSysResponse.setThirdId(basicUnitMaintainEntity.getThirdId2());
+                    basicProductThirdSysResponse.setThirdName(basicUnitMaintainEntity.getThirdName2());
+                }
+                basicProductThirdSysResponses.add(basicProductThirdSysResponse);
+            } else if (basicThirdSysEntity.getThirdId().equals("thirdId3")) {
+                BasicProductThirdSysResponse basicProductThirdSysResponse = new BasicProductThirdSysResponse();
+                basicProductThirdSysResponse.setSysId(basicThirdSysEntity.getThirdId());
+                basicProductThirdSysResponse.setSysName(basicThirdSysEntity.getThirdName());
+                if (basicUnitMaintainEntity != null) {
+                    basicProductThirdSysResponse.setThirdId(basicUnitMaintainEntity.getThirdId3());
+                    basicProductThirdSysResponse.setThirdName(basicUnitMaintainEntity.getThirdName3());
+                }
+                basicProductThirdSysResponses.add(basicProductThirdSysResponse);
+            } else if (basicThirdSysEntity.getThirdId().equals("thirdId4")) {
+                BasicProductThirdSysResponse basicProductThirdSysResponse = new BasicProductThirdSysResponse();
+                basicProductThirdSysResponse.setSysId(basicThirdSysEntity.getThirdId());
+                basicProductThirdSysResponse.setSysName(basicThirdSysEntity.getThirdName());
+                if (basicUnitMaintainEntity != null) {
+                    basicProductThirdSysResponse.setThirdId(basicUnitMaintainEntity.getThirdId4());
+                    basicProductThirdSysResponse.setThirdName(basicUnitMaintainEntity.getThirdName4());
+                }
+                basicProductThirdSysResponses.add(basicProductThirdSysResponse);
+            }
+        }
+        PageInfo<BasicProductThirdSysResponse> pageInfo;
+        pageInfo = new PageInfo<>(basicProductThirdSysResponses);
+        PageSimpleResponse<BasicProductThirdSysResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(basicProductThirdSysResponses);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+
 }

src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java

@@ -132,6 +132,7 @@ public class BasicOrderPrintController {
                     bizData.put("remark1", sysPdfTemplateRelevanceCodeEntity.getRemark1() == null ? ' ' : sysPdfTemplateRelevanceCodeEntity.getRemark1());
                     bizData.put("remark2", sysPdfTemplateRelevanceCodeEntity.getRemark2() == null ? ' ' : sysPdfTemplateRelevanceCodeEntity.getRemark2());
                     bizData.put("productName", udiProductEntity.getCpms() == null ? ' ' : udiProductEntity.getCpms());
+                    bizData.put("ybbm", udiProductEntity.getYbbm() == null ? ' ' : udiProductEntity.getYbbm());
                     bizData.put("spmc", obj.getCoName() == null ? ' ' : obj.getCoName());
                     bizData.put("spec", obj.getSpec() == null ? ' ' : obj.getSpec());
                     bizData.put("count", obj.getCount());
@@ -202,6 +203,7 @@ public class BasicOrderPrintController {
                     bizData.put("remark2", sysPdfTemplateRelevanceCodeEntity.getRemark2() == null ? ' ' : sysPdfTemplateRelevanceCodeEntity.getRemark2());
                     if (udiProductEntity != null) {
                         bizData.put("productName", udiProductEntity.getCpms() == null ? ' ' : udiProductEntity.getCpms());
+                        bizData.put("ybbm", udiProductEntity.getYbbm() == null ? ' ' : udiProductEntity.getYbbm());
                         bizData.put("ylqxzcrbarmc", udiProductEntity.getYlqxzcrbarmc() == null ? ' ' : udiProductEntity.getYlqxzcrbarmc());
                     }
                     bizData.put("spmc", ioOrderDetailBizEntity.getCoName() == null ? ' ' : ioOrderDetailBizEntity.getCoName());

src/main/java/com/glxp/api/controller/basic/BasicSickPrescribeDiController.java

@@ -0,0 +1,114 @@
+package com.glxp.api.controller.basic;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.entity.basic.BasicSkPrescribeDiEntity;
+import com.glxp.api.entity.basic.BasicSkSickerEntity;
+import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
+import com.glxp.api.entity.inout.IoOrderEntity;
+import com.glxp.api.req.basic.BasicSkPrescribeDiRequest;
+import com.glxp.api.req.basic.GetSickPrescribeRequest;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.res.basic.BasicSkPrescribeDiResponse;
+import com.glxp.api.service.BasicSkPrescribeDiService;
+import com.glxp.api.service.basic.BasicSkPrescribeService;
+import com.glxp.api.service.basic.BasicSkSickerService;
+import com.glxp.api.service.inout.IoAddInoutService;
+import com.glxp.api.service.inout.IoCheckInoutService;
+import com.glxp.api.service.inout.IoOrderDetailCodeService;
+import com.glxp.api.service.inout.IoOrderService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@RestController
+public class BasicSickPrescribeDiController {
+
+    @Resource
+    BasicSkPrescribeDiService basicSkPrescribeDiService;
+    @Resource
+    BasicSkPrescribeService basicSkPrescribeService;
+    @Resource
+    BasicSkSickerService basicSkSickerService;
+    @Resource
+    IoAddInoutService addInoutService;
+    @Resource
+    IoCheckInoutService checkInoutService;
+
+
+    /**
+     * 获取处方使用耗材详情
+     *
+     * @return
+     */
+    @GetMapping("/udiwms/basic/sk/prescribe/di/filter")
+    public BaseResponse filterSicker(BasicSkPrescribeDiRequest basicSkPrescribeDiRequest) {
+        List<BasicSkPrescribeDiResponse> basicSkPrescribeResponses = basicSkPrescribeDiService.filterList(basicSkPrescribeDiRequest);
+        PageInfo<BasicSkPrescribeDiResponse> pageInfo = new PageInfo<>(basicSkPrescribeResponses);
+        PageSimpleResponse<BasicSkPrescribeDiResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(basicSkPrescribeResponses);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+
+    /**
+     * 获取处方校验详情
+     *
+     * @return
+     */
+    @GetMapping("/udiwms/basic/sk/prescribe/check")
+    public BaseResponse checkPrescribe(BasicSkPrescribeDiRequest basicSkPrescribeDiRequest) {
+        List<BasicSkPrescribeDiResponse> basicSkPrescribeDiEntities;
+        if (StrUtil.isEmpty(basicSkPrescribeDiRequest.getAdNum()))
+            return ResultVOUtils.error(500, "病人住院信息");
+        if (StrUtil.isEmpty(basicSkPrescribeDiRequest.getBillNo())) {
+            basicSkPrescribeDiEntities = basicSkPrescribeDiService.findBySkAdNum(basicSkPrescribeDiRequest.getAdNum());
+            return ResultVOUtils.success(basicSkPrescribeDiEntities);
+        }
+        List<IoOrderDetailCodeEntity> orderDetailCodeEntities = orderDetailCodeService.findByOrderId(basicSkPrescribeDiRequest.getBillNo());
+        IoOrderEntity orderEntity = orderService.findByBillNo(basicSkPrescribeDiRequest.getBillNo());
+        basicSkPrescribeDiEntities = checkInoutService.checkPrescirbe(orderDetailCodeEntities, orderEntity);
+        return ResultVOUtils.success(basicSkPrescribeDiEntities);
+    }
+
+    @Resource
+    IoOrderDetailCodeService orderDetailCodeService;
+
+    @Resource
+    IoOrderService orderService;
+
+
+    /**
+     * 下载并返回处方信息
+     */
+    @GetMapping("/udiwms/basic/sk/prescribe/di/dlOrFilter")
+    public BaseResponse filterOrDlSickDi(BasicSkPrescribeDiRequest basicSkPrescribeDiRequest) {
+        if (StrUtil.isEmpty(basicSkPrescribeDiRequest.getAdNum()))
+            return ResultVOUtils.error(500, "病人住院信息");
+
+        List<BasicSkPrescribeDiResponse> basicSkPrescribeResponses = basicSkPrescribeDiService.filterList(basicSkPrescribeDiRequest);
+        if (CollUtil.isEmpty(basicSkPrescribeResponses)) {
+            BasicSkSickerEntity basicSkSickerEntity = basicSkSickerService.findByAdNum(basicSkPrescribeDiRequest.getAdNum());
+            GetSickPrescribeRequest getSickPrescribeRequest = new GetSickPrescribeRequest();
+            getSickPrescribeRequest.setSickCode(basicSkSickerEntity.getCode());
+            getSickPrescribeRequest.setAdNum(basicSkSickerEntity.getAdNum());
+            basicSkPrescribeService.downloadSickerPrescribe(getSickPrescribeRequest);
+            basicSkPrescribeResponses = basicSkPrescribeDiService.filterList(basicSkPrescribeDiRequest);
+        }
+
+
+        PageInfo<BasicSkPrescribeDiResponse> pageInfo = new PageInfo<>(basicSkPrescribeResponses);
+        PageSimpleResponse<BasicSkPrescribeDiResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(basicSkPrescribeResponses);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+
+}

src/main/java/com/glxp/api/controller/basic/BasicSickerController.java

@@ -1,5 +1,7 @@
 package com.glxp.api.controller.basic;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.thread.ThreadUtil;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.annotation.CusRedissonAnnotation;
@@ -8,12 +10,15 @@ import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.RedissonCacheKey;
 import com.glxp.api.controller.BaseController;
+import com.glxp.api.entity.basic.BasicSkSickerEntity;
+import com.glxp.api.http.ErpBasicClient;
 import com.glxp.api.req.basic.BasicSkSickerRequest;
 import com.glxp.api.req.basic.GetSickRequest;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.basic.BasicSkSickerResponse;
 import com.glxp.api.service.basic.BasicSkSickerService;
 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;
@@ -21,6 +26,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 
 @Slf4j
@@ -29,7 +35,8 @@ public class BasicSickerController extends BaseController {
 
     @Resource
     BasicSkSickerService basicSkSickerService;
-
+    @Resource
+    ErpBasicClient erpBasicClient;
 
     @GetMapping("/udiwms/basic/sk/sicker/filter")
     public BaseResponse filterSicker(BasicSkSickerRequest basicSkSickerRequest) {
@@ -41,6 +48,57 @@ public class BasicSickerController extends BaseController {
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
+
+    @GetMapping("/udiwms/basic/sk/sicker/filter/noPage")
+    public BaseResponse filterSickerNoPage(BasicSkSickerRequest basicSkSickerRequest) {
+        List<BasicSkSickerResponse> basicSkSickerResponses = basicSkSickerService.filterNoList(basicSkSickerRequest);
+        PageSimpleResponse<BasicSkSickerResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setList(basicSkSickerResponses);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+    /**
+     * 远程查询并下载患者信息
+     *
+     * @return
+     */
+    @GetMapping("/udiwms/basic/sk/sicker/filter/remote")
+    public BaseResponse filterSickerRemote(BasicSkSickerRequest basicSkSickerRequest) {
+        List<BasicSkSickerResponse> basicSkSickerResponses = basicSkSickerService.filterNoList(basicSkSickerRequest);
+        if (CollUtil.isEmpty(basicSkSickerResponses)) {
+            GetSickRequest getSickRequest = new GetSickRequest();
+            BeanUtils.copyProperties(basicSkSickerRequest, getSickRequest);
+            BaseResponse<PageSimpleResponse<BasicSkSickerResponse>> baseResponse = erpBasicClient.getSicker(getSickRequest);
+            if (CollUtil.isNotEmpty(baseResponse.getData().getList())) {
+                List<BasicSkSickerResponse> list = baseResponse.getData().getList();
+//                List<BasicSkSickerEntity> basicSkSickerEntities = new ArrayList<>();
+//                list.forEach(item -> {
+//                    BasicSkSickerEntity basicSkSickerEntity = new BasicSkSickerEntity();
+//                    BeanUtil.copyProperties(item, basicSkSickerEntity);
+//                    basicSkSickerEntities.add(basicSkSickerEntity);
+//                });
+                basicSkSickerService.replaceBatchs(list);
+            }
+            return baseResponse;
+        } else {
+            PageSimpleResponse<BasicSkSickerResponse> pageSimpleResponse = new PageSimpleResponse<>();
+            pageSimpleResponse.setList(basicSkSickerResponses);
+            return ResultVOUtils.success(pageSimpleResponse);
+        }
+    }
+
+
+    /**
+     * 在线实时获取患者信息
+     *
+     * @return
+     */
+    @GetMapping("/udiwms/basic/sk/sicker/filter/onLine")
+    public BaseResponse filterSickerOnLine(GetSickRequest getSickRequest) {
+        return erpBasicClient.getSicker(getSickRequest);
+    }
+
+
     @CusRedissonAnnotation(cacheName = RedissonCacheKey.DL_SICKER, key = {"#getSickRequest.thirdSys"}, waitTime = 3, timeOutMsg = "后台正在下载，请勿重复提交")
     @PostMapping("/udiwms/basic/sk/sicker/download")
     public BaseResponse sickerDl(@RequestBody GetSickRequest getSickRequest, BindingResult bindingResult) {
@@ -48,9 +106,13 @@ public class BasicSickerController extends BaseController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
-        ThreadUtil.execAsync(() -> {
-            basicSkSickerService.downloadSicker(getSickRequest);
-        });
+        if (CollUtil.isNotEmpty(getSickRequest.getSelectSickers())) {
+            basicSkSickerService.replaceBatchs(getSickRequest.getSelectSickers());
+        } else {
+            ThreadUtil.execAsync(() -> {
+                basicSkSickerService.downloadSicker(getSickRequest, 1);
+            });
+        }
         return ResultVOUtils.success("后台已开始下载，请稍后刷新查看！");
     }
 

src/main/java/com/glxp/api/controller/basic/UdiContrastController.java

@@ -1,5 +1,6 @@
 package com.glxp.api.controller.basic;
 
+import com.glxp.api.req.basic.AddProductRequest;
 import com.glxp.api.service.inout.IoOrderDetailCodeService;
 import com.glxp.api.util.IntUtil;
 import org.springframework.beans.BeanUtils;
@@ -40,6 +41,7 @@ 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.Date;
 import java.util.List;
@@ -305,6 +307,15 @@ public class UdiContrastController {
     }
 
 
+    //耗材字段维护-新增产品
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/udirel/addProduct")
+    public BaseResponse addProduct(@RequestBody @Valid AddProductRequest addProductRequest) {
+        udiProductService.addProduct(addProductRequest);
+        return ResultVOUtils.success();
+
+    }
+
     public void updateDi(UdiRelevanceEntity udiRelevanceEntity, String key) {
         List<UdiProductEntity> udiInfoEntities = udiDlHttpClient.getOrUpdateByUuid(key);
         List<UdiProductEntity> originProductEntities = udiProductService.findByUuids(udiRelevanceEntity.getUuid());

src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java

@@ -2,6 +2,7 @@ package com.glxp.api.controller.basic;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.glxp.api.dao.basic.UdiRelevanceDao;
+import com.glxp.api.dto.DictDto;
 import com.glxp.api.service.inout.impl.IoCodeService;
 import com.glxp.api.service.inv.impl.InvProductService;
 import org.springframework.beans.BeanUtils;
@@ -48,6 +49,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @RestController
 public class UdiRelevanceController extends BaseController {
@@ -535,6 +537,37 @@ public class UdiRelevanceController extends BaseController {
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
+    //获取产品信息详情（多平台）
+    @AuthRuleAnnotation("")
+    @GetMapping("/udiwms/udirel/thirdSys/filterOptimize")
+    public BaseResponse getThirdSysfilterOptimize(FilterUdiRelRequest filterUdiRelRequest,
+                                          BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        FilterBasicThirdSysRequest filterBasicThirdSysRequest = new FilterBasicThirdSysRequest();
+        filterBasicThirdSysRequest.setEnabled(true);
+        List<ThrSystemEntity> basicThirdSysEntities = thrSystemService.filterBasicThiSys(filterBasicThirdSysRequest);
+        List<DictDto> filterSysEntityList = new ArrayList<DictDto>();
+
+        filterSysEntityList.add(new DictDto(0, "全部"));
+        filterSysEntityList.add(new DictDto(1, "对照完成"));
+        filterSysEntityList.add(new DictDto(2, "未对照DI"));
+        if (basicThirdSysEntities != null && basicThirdSysEntities.size() > 0) {
+            for (int i = 0; i < basicThirdSysEntities.size(); i++) {
+                filterSysEntityList.add(new DictDto(i + 3, "未对照" + basicThirdSysEntities.get(i).getThirdName()));
+            }
+        }
+        filterSysEntityList.add(new DictDto(10, "最新同步"));
+        PageInfo<DictDto> pageInfo;
+        pageInfo = new PageInfo<>(filterSysEntityList);
+        PageSimpleResponse<DictDto> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(filterSysEntityList);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
 
     //获取对照过滤列表
     @AuthRuleAnnotation("")
@@ -730,6 +763,26 @@ public class UdiRelevanceController extends BaseController {
         return ResultVOUtils.success(ggxhList);
     }
 
+    /**
+     * 查询产品规格型号列表
+     *
+     * @param relId
+     * @return
+     */
+    @GetMapping("/udiwms/udiinfo/getGgxhListOptimize")
+    public BaseResponse getGgxhListOptimize(String relId) {
+        if (StrUtil.isBlank(relId)) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
+        }
+        List<String> ggxhList = udiProductService.getGgxhList(relId);
+        List<DictDto> reList = ggxhList.stream().map(s-> {
+            DictDto dictDto = new DictDto(s,s);
+            return dictDto;
+        }).collect(Collectors.toList());
+        return ResultVOUtils.success(reList);
+    }
+
+
     //国家库uuid获取产品
     @PostMapping("/udi/udirel/selectOriginuuid")
     @Log(title = "单据管理", businessType = BusinessType.INSERT)

src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java

@@ -380,7 +380,7 @@ public class UdiRlSupController extends BaseController {
             throw new JsonException(ResultEnum.NOT_NETWORK);
         }
         HttpServletRequest request = attributes.getRequest();
-        String userId = request.getHeader("ADMIN_ID");
+        String userId = request.getHeader("ADMINID");
         AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId));
         return authAdmin.getCustomerId() + "";
     }

src/main/java/com/glxp/api/controller/basic/UdiSyncController.java

@@ -1,5 +1,7 @@
 package com.glxp.api.controller.basic;
 
+import com.github.pagehelper.Page;
+import com.glxp.api.dto.DictDto;
 import org.springframework.beans.BeanUtils;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
@@ -33,6 +35,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 /**
  * 国家库产品信息相关接口
@@ -128,6 +131,27 @@ public class UdiSyncController {
         }
     }
 
+    //获取同步库医疗器械注册人信息
+    @AuthRuleAnnotation("")
+    @GetMapping("udiwms/udiinfo/filterCompanyOptimize")
+    public BaseResponse filterCompanyOptimize(UdiCompanyRequest udiCompanyRequest) {
+
+        try {
+            BaseResponse<Page<UdiCompanyEntity>> udiDlDeviceResponse = syncUdiService.filterCompany(udiCompanyRequest);
+            List<DictDto> reList = udiDlDeviceResponse.getData().getResult().stream().map(s-> {
+                DictDto dictDto = new DictDto(s.getYlqxzcrbarmc(),s.getYlqxzcrbarmc());
+                return dictDto;
+            }).collect(Collectors.toList());
+            PageSimpleResponse<DictDto> pageSimpleResponse = new PageSimpleResponse<>();
+            pageSimpleResponse.setTotal(udiDlDeviceResponse.getData().getTotal());
+            pageSimpleResponse.setList(reList);
+            return ResultVOUtils.success(pageSimpleResponse);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResultVOUtils.error(500, "连接UDI数据下载服务出错！");
+        }
+    }
+
     @Resource
     SpGetHttpClient spGetHttpClient;
 

src/main/java/com/glxp/api/controller/dev/DeviceChangeOrderController.java

@@ -0,0 +1,161 @@
+package com.glxp.api.controller.dev;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.annotation.AuthRuleAnnotation;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.controller.BaseController;
+import com.glxp.api.entity.auth.AuthAdmin;
+import com.glxp.api.entity.dev.DeviceChangeOrderItemEntity;
+import com.glxp.api.req.dev.DeviceChangeOrderDetailQuery;
+import com.glxp.api.req.dev.DeviceChangeOrderParam;
+import com.glxp.api.req.dev.DeviceChangeOrderQuery;
+import com.glxp.api.req.system.DeleteRequest;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.service.dev.DeviceChangeOrderService;
+import com.glxp.api.vo.dev.DeviceChangeOrderVo;
+import io.swagger.annotations.Api;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+@RestController
+@Slf4j
+@RequestMapping
+@RequiredArgsConstructor
+@Api("变更单相关")
+public class DeviceChangeOrderController extends BaseController {
+
+    private final DeviceChangeOrderService deviceChangeOrderService;
+
+    /**
+     * 变更单列表
+     *
+     * @param query
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/changeOrder/page")
+    public BaseResponse page(@RequestBody DeviceChangeOrderQuery query) {
+        AuthAdmin user = super.getUser();
+        PageHelper.startPage(query.getPage(), query.getLimit());
+        List<DeviceChangeOrderVo> list = deviceChangeOrderService.listByVo(query, user);
+        PageInfo pageInfo = new PageInfo<>(list);
+        PageSimpleResponse simpleResponse = new PageSimpleResponse();
+        simpleResponse.setTotal(pageInfo.getTotal());
+        simpleResponse.setList(BeanUtil.copyToList(pageInfo.getList(), DeviceChangeOrderVo.class));
+        return ResultVOUtils.success(simpleResponse);
+    }
+
+    /**
+     * 草稿保存变更单
+     *
+     * @param param
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/changeOrder/draft/save")
+    public BaseResponse draftSave(@RequestBody @Valid DeviceChangeOrderParam param) {
+        AuthAdmin user = super.getUser();
+        deviceChangeOrderService.saveDraftOrder(user, param);
+        return ResultVOUtils.successMsg("添加成功");
+    }
+
+
+    /**
+     * 保存变更单
+     *
+     * @param param
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/changeOrder/save")
+    public BaseResponse save(@RequestBody @Valid DeviceChangeOrderParam param) {
+        AuthAdmin user = super.getUser();
+        deviceChangeOrderService.saveOrder(user, param);
+        return ResultVOUtils.successMsg("添加成功");
+    }
+
+    /**
+     * 删除变更单
+     *
+     * @param deleteRequest
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/changeOrder/del")
+    public BaseResponse delOrder(@RequestBody DeleteRequest deleteRequest) {
+        deviceChangeOrderService.delOrder(deleteRequest);
+        return ResultVOUtils.successMsg("删除成功！");
+    }
+
+
+    /**
+     * 接收设备
+     *
+     * @param orderId 变更单id
+     * @param remark  备注
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @GetMapping("/udi/device/changeOrder/confirm/{orderId}")
+    public BaseResponse confirm(@PathVariable Long orderId, String remark) {
+        AuthAdmin user = super.getUser();
+        deviceChangeOrderService.confirm(orderId, remark, user, false);
+        return ResultVOUtils.successMsg("确认成功");
+    }
+
+    /**
+     * 拒收设备
+     *
+     * @param orderId 变更单id
+     * @param remark  备注
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @GetMapping("/udi/device/changeOrder/reject/{orderId}")
+    public BaseResponse reject(@PathVariable Long orderId, String remark) {
+        AuthAdmin user = super.getUser();
+        deviceChangeOrderService.confirm(orderId, remark, user, true);
+        return ResultVOUtils.successMsg("确认成功");
+    }
+
+    /**
+     * 变更单详情
+     *
+     * @param query
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/changeOrder/detailByUser")
+    public BaseResponse detailByUser(@RequestBody @Valid DeviceChangeOrderDetailQuery query) {
+        AuthAdmin user = super.getUser();
+        List<DeviceChangeOrderItemEntity> list = deviceChangeOrderService.detailByUser(user, query);
+        PageInfo pageInfo = new PageInfo<>(list);
+        PageSimpleResponse simpleResponse = new PageSimpleResponse();
+        simpleResponse.setTotal(pageInfo.getTotal());
+        simpleResponse.setList(list);
+        return ResultVOUtils.success(simpleResponse);
+    }
+
+    /**
+     * 取消变更单
+     *
+     * @param orderId 变更单id
+     * @param remark  备注
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @GetMapping("/udi/device/changeOrder/cancel/{orderId}")
+    public BaseResponse cancel(@PathVariable Long orderId, String remark) {
+        AuthAdmin user = super.getUser();
+        deviceChangeOrderService.cancel(user, orderId, remark);
+        return ResultVOUtils.successMsg("取消成功");
+    }
+
+}

src/main/java/com/glxp/api/controller/dev/DeviceCheckController.java

@@ -0,0 +1,94 @@
+package com.glxp.api.controller.dev;
+
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.annotation.AuthRuleAnnotation;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.controller.BaseController;
+import com.glxp.api.entity.auth.AuthAdmin;
+import com.glxp.api.entity.dev.DeviceCheckEntity;
+import com.glxp.api.req.dev.DeviceCheckQuery;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.service.dev.DeviceCheckItemDictService;
+import com.glxp.api.service.dev.DeviceCheckService;
+import com.glxp.api.vo.dev.DeviceCheckPrintVo;
+import com.glxp.api.vo.dev.DeviceCheckVo;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequiredArgsConstructor
+@Slf4j
+@RequestMapping
+public class DeviceCheckController extends BaseController {
+
+    private final DeviceCheckService deviceCheckService;
+
+    /**
+     * 巡检任务单列表
+     *
+     * @param query
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/check/page")
+    public BaseResponse page(@RequestBody DeviceCheckQuery query) {
+        List<DeviceCheckVo> list = deviceCheckService.pageList(query);
+        PageInfo pageInfo = new PageInfo<>(list);
+        PageSimpleResponse page = new PageSimpleResponse();
+        page.setTotal(pageInfo.getTotal());
+        page.setList(pageInfo.getList());
+        return ResultVOUtils.success(page);
+    }
+
+    /**
+     * 本部门巡检任务单列表
+     *
+     * @param query
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/check/pageByDept")
+    public BaseResponse pageByDept(@RequestBody DeviceCheckQuery query) {
+        AuthAdmin user = super.getUser();
+        query.setChargeDeptCode(user.getLocDeptCode());
+        List<DeviceCheckVo> list = deviceCheckService.pageList(query);
+        PageInfo pageInfo = new PageInfo<>(list);
+        PageSimpleResponse page = new PageSimpleResponse();
+        page.setTotal(pageInfo.getTotal());
+        page.setList(pageInfo.getList());
+        return ResultVOUtils.success(page);
+    }
+
+    /**
+     * 根据计划id生成巡检任务单
+     *
+     * @param planId 计划id
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @GetMapping("/udi/device/check/gen/{planId}")
+    public BaseResponse genDeviceCheck(@PathVariable Long planId) {
+        AuthAdmin user = super.getUser();
+        deviceCheckService.genByPlanId(planId, false, user);
+        return ResultVOUtils.successMsg("操作成功");
+    }
+
+    @AuthRuleAnnotation("")
+    @GetMapping("/udi/device/check/info/print/{taskId}")
+    public BaseResponse checkInfoPrint(@PathVariable Long taskId) {
+        DeviceCheckPrintVo vo = deviceCheckService.checkInfoPrint(taskId, null);
+        return ResultVOUtils.success(vo);
+    }
+
+    @AuthRuleAnnotation("")
+    @GetMapping("/udi/device/check/info/print/{taskId}/{deviceCode}")
+    public BaseResponse checkInfoPrint(@PathVariable Long taskId, @PathVariable String deviceCode) {
+        DeviceCheckPrintVo vo = deviceCheckService.checkInfoPrint(taskId, deviceCode);
+        return ResultVOUtils.success(vo);
+    }
+
+}

src/main/java/com/glxp/api/controller/dev/DeviceCheckDetailController.java

@@ -0,0 +1,61 @@
+package com.glxp.api.controller.dev;
+
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.annotation.AuthRuleAnnotation;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.controller.BaseController;
+import com.glxp.api.entity.auth.AuthAdmin;
+import com.glxp.api.entity.dev.DeviceCheckDetailEntity;
+import com.glxp.api.req.dev.DeviceCheckDetailQuery;
+import com.glxp.api.req.dev.DeviceCheckDetailRepairParam;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.service.dev.DeviceCheckDetailService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+@RestController
+@RequiredArgsConstructor
+@Slf4j
+@RequestMapping
+public class DeviceCheckDetailController extends BaseController {
+
+    private final DeviceCheckDetailService deviceCheckDetailService;
+
+    /**
+     * 巡检任务单明细列表
+     *
+     * @param query
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/check/detail/page")
+    public BaseResponse page(@RequestBody @Valid DeviceCheckDetailQuery query) {
+        List<DeviceCheckDetailEntity> list = deviceCheckDetailService.pageList(query);
+        PageInfo pageInfo = new PageInfo<>(list);
+        PageSimpleResponse page = new PageSimpleResponse();
+        page.setTotal(pageInfo.getTotal());
+        page.setList(pageInfo.getList());
+        return ResultVOUtils.success(page);
+    }
+
+    /**
+     * 巡检任务单明细--创建维修单
+     *
+     * @param param
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/check/detail/repair")
+    public BaseResponse repair(@RequestBody @Valid DeviceCheckDetailRepairParam param) {
+        AuthAdmin user = super.getUser();
+        deviceCheckDetailService.repair(param, user);
+        return ResultVOUtils.successMsg("创建成功");
+    }
+
+
+}

src/main/java/com/glxp/api/controller/dev/DeviceCheckDetailItemController.java

@@ -0,0 +1,67 @@
+package com.glxp.api.controller.dev;
+
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.annotation.AuthRuleAnnotation;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.controller.BaseController;
+import com.glxp.api.entity.auth.AuthAdmin;
+import com.glxp.api.entity.dev.DeviceCheckDetailItemEntity;
+import com.glxp.api.req.dev.DeviceCheckDetailItemFinishParam;
+import com.glxp.api.req.dev.DeviceCheckDetailItemQuery;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.service.dev.DeviceCheckDetailItemService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * 设备巡检单明细
+ */
+@RestController
+@RequiredArgsConstructor
+@Slf4j
+@RequestMapping
+public class DeviceCheckDetailItemController extends BaseController {
+
+    private final DeviceCheckDetailItemService deviceCheckDetailItemService;
+
+    /**
+     * 巡检任务单明细项目列表
+     *
+     * @param query
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/check/detail/item/page")
+    public BaseResponse page(@RequestBody @Valid DeviceCheckDetailItemQuery query) {
+        List<DeviceCheckDetailItemEntity> list = deviceCheckDetailItemService.pageList(query);
+        PageInfo pageInfo = new PageInfo<>(list);
+        PageSimpleResponse page = new PageSimpleResponse();
+        page.setTotal(pageInfo.getTotal());
+        page.setList(pageInfo.getList());
+        return ResultVOUtils.success(page);
+    }
+
+    /**
+     * 完成巡检任务单明细项目
+     *
+     * @param param
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/check/detail/item/finish")
+    public BaseResponse page(@RequestBody @Valid DeviceCheckDetailItemFinishParam param) {
+        AuthAdmin user = super.getUser();
+        deviceCheckDetailItemService.finish(param, user);
+        return ResultVOUtils.successMsg("操作成功");
+    }
+
+
+}

src/main/java/com/glxp/api/controller/dev/DeviceCheckItemDictController.java

@@ -0,0 +1,98 @@
+package com.glxp.api.controller.dev;
+
+import cn.hutool.core.util.RandomUtil;
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.annotation.AuthRuleAnnotation;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.controller.BaseController;
+import com.glxp.api.entity.dev.DeviceCheckItemDictEntity;
+import com.glxp.api.req.dev.DeviceCheckItemDictParam;
+import com.glxp.api.req.dev.DeviceCheckItemDictQuery;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.service.dev.DeviceCheckItemDictService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+@Slf4j
+@RequestMapping
+@RestController
+@RequiredArgsConstructor
+public class DeviceCheckItemDictController extends BaseController {
+
+    private final DeviceCheckItemDictService deviceCheckItemDictService;
+
+
+    /**
+     * 生成一个项目编码
+     *
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @GetMapping("/udi/device/checkItemDict/code/gen")
+    public BaseResponse genItemCode() {
+        String code = "";
+        DeviceCheckItemDictEntity info = null;
+        do {
+            code = "XJ" + RandomUtil.randomNumbers(10);
+            info = deviceCheckItemDictService.getById(code);
+        } while (info != null);
+        return ResultVOUtils.success(code);
+    }
+
+    /**
+     * 设备巡检项目字典分页查询
+     *
+     * @param query
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/checkItemDict/page")
+    public BaseResponse page(@RequestBody DeviceCheckItemDictQuery query) {
+        List<DeviceCheckItemDictEntity> list = deviceCheckItemDictService.pageList(query);
+        PageInfo pageInfo = new PageInfo<>(list);
+        PageSimpleResponse page = new PageSimpleResponse();
+        page.setTotal(pageInfo.getTotal());
+        page.setList(pageInfo.getList());
+        return ResultVOUtils.success(page);
+    }
+
+    /**
+     * 添加巡检项目字典
+     *
+     * @param param
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/checkItemDict/save")
+    public BaseResponse save(@RequestBody @Valid DeviceCheckItemDictParam param) {
+        DeviceCheckItemDictEntity entity = param.getEntity(super.getUser());
+        int i = deviceCheckItemDictService.insertIgnore(entity);
+        if (i == 0) {
+            return ResultVOUtils.error("项目编码已存在");
+        }
+        return ResultVOUtils.successMsg("添加成功");
+    }
+
+    /**
+     * 删除巡检项目字典
+     *
+     * @param itemCode 项目编码
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @DeleteMapping("/udi/device/checkItemDict/del/{itemCode}")
+    public BaseResponse del(@PathVariable String itemCode) {
+
+        boolean b = deviceCheckItemDictService.removeById(itemCode);
+        if (!b) {
+            return ResultVOUtils.error("删除失败，请稍后再试");
+        }
+        return ResultVOUtils.successMsg("删除成功");
+    }
+
+}

src/main/java/com/glxp/api/controller/dev/DeviceInfoController.java

@@ -0,0 +1,378 @@
+package com.glxp.api.controller.dev;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.RandomUtil;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.annotation.AuthRuleAnnotation;
+import com.glxp.api.common.enums.ResultEnum;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.controller.BaseController;
+import com.glxp.api.entity.auth.AuthAdmin;
+import com.glxp.api.entity.dev.DeviceChangeLogEntity;
+import com.glxp.api.entity.dev.DeviceInfoEntity;
+import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity;
+import com.glxp.api.entity.system.SystemPDFTemplateEntity;
+import com.glxp.api.exception.JsonException;
+import com.glxp.api.req.dev.DeviceInfoDetailQuery;
+import com.glxp.api.req.dev.DeviceInfoQuery;
+import com.glxp.api.req.dev.FilterDeptDeviceRequest;
+import com.glxp.api.req.dev.FilterDeviceReceiveOrderRequest;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.res.dev.DeptDeviceDetailResponse;
+import com.glxp.api.service.dev.DeviceChangeLogService;
+import com.glxp.api.service.dev.DeviceInfoService;
+import com.glxp.api.service.system.SystemPDFModuleService;
+import com.glxp.api.service.system.SystemPDFTemplateService;
+import com.glxp.api.util.JasperUtils;
+import com.glxp.api.vo.dev.DeviceChangeLogVo;
+import com.glxp.api.vo.dev.DeviceInfoVo;
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.EncodeHintType;
+import com.google.zxing.WriterException;
+import com.google.zxing.common.BitMatrix;
+import com.google.zxing.qrcode.QRCodeWriter;
+import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.imageio.ImageIO;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.awt.*;
+import java.awt.font.LineMetrics;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.List;
+
+
+@RestController
+@RequestMapping
+@RequiredArgsConstructor
+@Slf4j
+public class DeviceInfoController extends BaseController {
+
+    private final DeviceInfoService deviceInfoService;
+    private final DeviceChangeLogService deviceChangeLogService;
+
+
+    @Value("${file_path}")
+    private String filePath;
+
+    /**
+     * 生成一个设备号
+     *
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @GetMapping("/udi/device/code/gen")
+    public BaseResponse genDeviceCode() {
+        String deviceCode = "";
+        DeviceInfoEntity deviceInfo = null;
+        do {
+            deviceCode = "S" + RandomUtil.randomNumbers(10);
+            deviceInfo = deviceInfoService.getById(deviceCode);
+        } while (deviceInfo != null);
+        return ResultVOUtils.success(deviceCode);
+    }
+
+    /**
+     * 本科室设备
+     *
+     * @param query
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/info/page")
+    public BaseResponse page(@RequestBody DeviceInfoQuery query) {
+        AuthAdmin user = super.getUser();
+        List<DeviceInfoVo> list = deviceInfoService.pageVo(query, user.getLocDeptCode());
+        PageInfo pageInfo = new PageInfo<>(list);
+        PageSimpleResponse page = new PageSimpleResponse();
+        page.setTotal(pageInfo.getTotal());
+        page.setList(pageInfo.getList());
+        return ResultVOUtils.success(page);
+    }
+
+
+    /**
+     * 所有科室设备
+     *
+     * @param query
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/info/all/page")
+    public BaseResponse allPage(@RequestBody DeviceInfoQuery query) {
+        AuthAdmin user = super.getUser();
+        List<DeviceInfoVo> list = deviceInfoService.allPageVo(query);
+        PageInfo pageInfo = new PageInfo<>(list);
+        PageSimpleResponse page = new PageSimpleResponse();
+        page.setTotal(pageInfo.getTotal());
+        page.setList(pageInfo.getList());
+        return ResultVOUtils.success(page);
+    }
+
+
+    /**
+     * 查看当前用户所在科室设备详情
+     *
+     * @param query
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/info/detailByUser/page")
+    public BaseResponse detailByUser(@RequestBody @Valid DeviceInfoDetailQuery query) {
+        AuthAdmin user = super.getUser();
+        query.setDeptCode(user.getLocDeptCode());
+        List<DeviceInfoVo> list = deviceInfoService.detail(query);
+        PageInfo pageInfo = new PageInfo<>(list);
+        PageSimpleResponse page = new PageSimpleResponse();
+        page.setTotal(pageInfo.getTotal());
+        page.setList(pageInfo.getList());
+        return ResultVOUtils.success(page);
+    }
+
+    /**
+     * 查看所有科室设备--设备码级别
+     *
+     * @param query
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/detailInfo/page")
+    public BaseResponse detailInfoPage(@RequestBody DeviceInfoDetailQuery query) {
+        AuthAdmin user = super.getUser();
+        query.setDeptCode(user.getLocDeptCode());
+        List<DeviceInfoVo> list = deviceInfoService.detail(query);
+        PageInfo pageInfo = new PageInfo<>(list);
+        PageSimpleResponse page = new PageSimpleResponse();
+        page.setTotal(pageInfo.getTotal());
+        page.setList(pageInfo.getList());
+        return ResultVOUtils.success(page);
+    }
+
+
+    /**
+     * 设备详情
+     *
+     * @param query
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/info/detail/page")
+    public BaseResponse detail(@RequestBody @Valid DeviceInfoDetailQuery query) {
+//        AuthAdmin user = super.getUser();
+        List<DeviceInfoVo> list = deviceInfoService.detail(query);
+        PageInfo pageInfo = new PageInfo<>(list);
+        PageSimpleResponse page = new PageSimpleResponse();
+        page.setTotal(pageInfo.getTotal());
+        page.setList(pageInfo.getList());
+        return ResultVOUtils.success(page);
+    }
+
+    /**
+     * 获取设备变更日志
+     *
+     * @param deviceCode 设备编码
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @GetMapping("/udi/device/log/{deviceCode}")
+    public BaseResponse deviceLogs(@PathVariable String deviceCode) {
+        List<DeviceChangeLogEntity> logList = deviceChangeLogService.list(Wrappers.lambdaQuery(DeviceChangeLogEntity.class)
+                .eq(DeviceChangeLogEntity::getDeviceCode, deviceCode)
+                .orderByDesc(DeviceChangeLogEntity::getCreateTime)
+        );
+        return ResultVOUtils.success(BeanUtil.copyToList(logList, DeviceChangeLogVo.class));
+    }
+
+    /**
+     * 生成设备二维码
+     *
+     * @param deviceCode
+     * @throws WriterException
+     */
+    @GetMapping("/udi/device/genQR/{deviceCode}")
+    public BaseResponse genQRImage(@PathVariable String deviceCode) throws WriterException {
+        DeviceInfoEntity deviceInfo = deviceInfoService.getById(deviceCode);
+        if (deviceInfo == null) {
+            throw new JsonException("未找到该设备，无法生成");
+        }
+        String text = deviceInfo.getDeviceCode();
+        // 二维码大小
+        int width = 500, height = 500;
+        Map<EncodeHintType, Object> hints = new HashMap<>();
+        //内容编码格式
+        hints.put(EncodeHintType.CHARACTER_SET, "UTF-8");
+        // 指定纠错等级
+        hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.H);
+        //设置二维码边的空度，非负数
+        hints.put(EncodeHintType.MARGIN, 1);
+
+        // 生成二维码图片
+        QRCodeWriter writer = new QRCodeWriter();
+        BitMatrix bm = writer.encode(text, BarcodeFormat.QR_CODE, width, height, hints);
+
+        int margin = 10;
+        int tempM = margin * 2;
+        int[] rec = bm.getEnclosingRectangle();   //获取二维码图案的属性
+        int resWidth = rec[2] + tempM;
+        int resHeight = rec[3] + tempM;
+        BitMatrix resMatrix = new BitMatrix(resWidth, resHeight); // 按照自定义边框生成新的BitMatrix
+        resMatrix.clear();
+        for (int i = margin; i < resWidth - margin; i++) {   //循环，将二维码图案绘制到新的bitMatrix中
+            for (int j = margin; j < resHeight - margin; j++) {
+                if (bm.get(i - margin + rec[0], j - margin + rec[1])) {
+                    resMatrix.set(i, j);
+                }
+            }
+        }
+        bm = resMatrix;
+
+        int w = bm.getWidth();
+        int h = bm.getHeight();
+        BufferedImage qrcodeBuffImg = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
+
+        // 开始利用二维码数据创建Bitmap图片
+        for (int x = 0; x < w; x++) {
+            for (int y = 0; y < h; y++) {
+                qrcodeBuffImg.setRGB(x, y, bm.get(x, y) ? 0xFF000000 : 0xFFFFFFFF);
+            }
+        }
+        // 新的图片，二维码下面加上文字
+        String desc = String.format("设备编码：%s", deviceCode);
+        String desc1 = String.format("设备名称：%s", deviceInfo.getProductName());
+        String desc2 = String.format("设备规格：%s", deviceInfo.getGgxh());
+        String[] descArr = {desc, desc1, desc2};
+        // 字体、字型、字号
+        Font font = new Font("宋体", Font.BOLD, 26);
+        int textHeight = font.getSize();
+        int textMargin = 10;
+        BufferedImage outImage = new BufferedImage(qrcodeBuffImg.getWidth(), qrcodeBuffImg.getHeight() + textHeight + (textMargin * 2), BufferedImage.TYPE_4BYTE_ABGR);
+        Graphics2D outg = outImage.createGraphics();
+        outg.setFont(font);
+        FontMetrics fontMetrics = outg.getFontMetrics();
+        int lineCount = 1;
+        int lineWidth = outImage.getWidth() - textMargin * 2;
+        int hasWidth = lineWidth;
+        HashMap<Integer, Integer> hashMap = new HashMap<>();
+        for (String item : descArr) {
+            for (String s : item.split("")) {
+                int strWidth = fontMetrics.stringWidth(s);
+                hasWidth -= strWidth;
+                if (hasWidth <= 0) {
+                    hasWidth = lineWidth;
+                    lineCount += 1;
+                    hasWidth -= strWidth;
+                }
+                Integer i = hashMap.putIfAbsent(lineCount, 1);
+                if (i != null) {
+                    hashMap.put(lineCount, i + 1);
+                }
+            }
+            hasWidth = lineWidth;
+            lineCount += 1;
+        }
+        lineCount -= 1;
+        desc = desc.concat(desc1).concat(desc2);
+        outImage = new BufferedImage(qrcodeBuffImg.getWidth(), qrcodeBuffImg.getHeight() + lineCount * textHeight + (textMargin * (lineCount + 1)), BufferedImage.TYPE_4BYTE_ABGR);
+        outg = outImage.createGraphics();
+        outg.setFont(font);
+        for (int x = 0; x < outImage.getWidth(); x++) {
+            for (int y = 0; y < outImage.getHeight(); y++) {
+                outImage.setRGB(x, y, 0xFFFFFFFF);
+            }
+        }
+        // 画二维码到新的面板
+        outg.drawImage(qrcodeBuffImg, 0, 0, qrcodeBuffImg.getWidth(), qrcodeBuffImg.getHeight(), null);
+        outg.setColor(Color.BLACK);
+        outg.setBackground(Color.WHITE);
+        int startIndex = 0;
+        for (int i = 0; i < lineCount; i++) {
+            Integer length = hashMap.get(i + 1);
+            String line = desc.substring(startIndex, startIndex + length);
+            if (length != null) {
+                startIndex += length.intValue();
+            }
+//            outg.drawString(line, (outImage.getWidth() - fontMetrics.stringWidth(line) - textMargin) / 2, qrcodeBuffImg.getHeight() + textMargin + (i * textHeight) + (i + 2) * textMargin);
+            outg.drawString(line, textMargin, qrcodeBuffImg.getHeight() + textMargin + (i * textHeight) + (i + 2) * textMargin);
+        }
+        outg.dispose();
+        try {
+            ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+            ImageIO.write(outImage, "png", byteArrayOutputStream);
+            byte[] imageBytes = byteArrayOutputStream.toByteArray();
+
+            // 使用Base64编码器将字节数组编码为Base64字符串
+            String base64String = Base64.getEncoder().encodeToString(imageBytes);
+            return ResultVOUtils.success("data:image/png;base64," + base64String);
+        } catch (IOException e) {
+            log.error("e");
+            throw new JsonException("系统异常");
+        }
+    }
+
+    @Resource
+    private SystemPDFModuleService systemPDFModuleService;
+    @Resource
+    private SystemPDFTemplateService systemPDFTemplateService;
+
+    /**
+     * 设备标签打印
+     *
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udiwms/inv/deptDev/label/print")
+    public BaseResponse printLabel(@RequestBody DeviceInfoDetailQuery query, HttpServletRequest request, HttpServletResponse response) throws Exception {
+
+        List<DeviceInfoVo> list = deviceInfoService.detail(query);
+        if (CollUtil.isEmpty(list)) {
+            throw new JsonException("未找到该设备，无法生成");
+        }
+        DeviceInfoVo obj = list.get(0);
+        SysPdfTemplateRelevanceLabelEntity sysPdfTemplateRelevanceLabelEntity = systemPDFModuleService.selectByLabelId(query.getLabelId() + "");
+        if (null == sysPdfTemplateRelevanceLabelEntity) {
+            return ResultVOUtils.error(ResultEnum.DATA_NOT, "所属模块错误");
+        }
+
+        SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(String.valueOf(sysPdfTemplateRelevanceLabelEntity.getTemplateId()));
+        if (null == systemPDFTemplateEntity) {
+            return ResultVOUtils.error(ResultEnum.DATA_NOT, "模板错误");
+        }
+
+        //打印单号标签
+        Map<String, Object> data = new HashMap<>(1);
+        Map<String, Object> supData = new HashMap<>();
+        supData.put("deviceCode", obj.getDeviceCode() == null ? ' ' : obj.getDeviceCode());
+        supData.put("deptName", obj.getDeptName() == null ? ' ' : obj.getDeptName());
+        supData.put("productName", obj.getProductName() == null ? ' ' : obj.getProductName());
+        supData.put("ggxh", obj.getGgxh() == null ? ' ' : obj.getGgxh());
+        supData.put("productionDate", obj.getProductionDate() == null ? ' ' : obj.getProductionDate());
+        supData.put("expireDate", obj.getExpireDate() == null ? ' ' : obj.getExpireDate());
+        supData.put("batchNo", obj.getBatchNo() == null ? ' ' : obj.getBatchNo());
+        supData.put("serialNo", obj.getSerialNo() == null ? ' ' : obj.getSerialNo());
+        supData.put("manufactory", obj.getManufactory() == null ? ' ' : obj.getManufactory());
+        supData.put("measname", obj.getMeasname() == null ? ' ' : obj.getMeasname());
+        supData.put("zczbhhzbapzbh", obj.getZczbhhzbapzbh() == null ? ' ' : obj.getZczbhhzbapzbh());
+        supData.put("supName", obj.getSupName() == null ? ' ' : obj.getSupName());
+        data.put("data", supData);
+        String param = JSON.toJSONString(data);
+        log.error(param);
+        JasperUtils.jasperReport(request, response, param, filePath + "pdf/template/" + systemPDFTemplateEntity.getPath(), "pdf");
+
+        return ResultVOUtils.error(ResultEnum.DATA_NOT, "模板错误");
+    }
+}

src/main/java/com/glxp/api/controller/dev/DevicePlanController.java

@@ -0,0 +1,103 @@
+package com.glxp.api.controller.dev;
+
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.annotation.AuthRuleAnnotation;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.controller.BaseController;
+import com.glxp.api.entity.auth.AuthAdmin;
+import com.glxp.api.entity.dev.DevicePlanEntity;
+import com.glxp.api.req.dev.DevicePlanParam;
+import com.glxp.api.req.dev.DevicePlanQuery;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.service.auth.DeptService;
+import com.glxp.api.service.dev.DevicePlanService;
+import com.glxp.api.vo.dev.DevicePlanVo;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+@RestController
+@RequestMapping
+@RequiredArgsConstructor
+@Slf4j
+public class DevicePlanController extends BaseController {
+
+    private final DevicePlanService devicePlanService;
+    private final DeptService deptService;
+
+
+    /**
+     * 设备巡检计划分页
+     *
+     * @param query
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/plan/page")
+    public BaseResponse page(@RequestBody @Valid DevicePlanQuery query) {
+        List<DevicePlanVo> list = devicePlanService.pageList(query);
+        PageInfo pageInfo = new PageInfo<>(list);
+        PageSimpleResponse page = new PageSimpleResponse();
+        page.setTotal(pageInfo.getTotal());
+        page.setList(pageInfo.getList());
+        return ResultVOUtils.success(page);
+    }
+
+
+    /**
+     * 设备巡检计划保存
+     *
+     * @param param 参数
+     * @return 计划id
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/plan/save")
+    public BaseResponse save(@RequestBody @Valid DevicePlanParam param) {
+        AuthAdmin user = super.getUser();
+        param.valid(deptService);
+        DevicePlanEntity entity = param.getEntity(user);
+        if (param.getPlanId() == null) {
+            devicePlanService.save(entity);
+        } else {
+            devicePlanService.updateById(entity);
+        }
+        return ResultVOUtils.success("保存成功", entity.getPlanId());
+    }
+
+
+    /**
+     * 设备巡检计划详情
+     *
+     * @param planId 计划id
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @GetMapping("/udi/device/plan/info/{planId}")
+    public BaseResponse info(@PathVariable Long planId) {
+        DevicePlanEntity entity = devicePlanService.getById(planId);
+        if (entity == null) {
+            return ResultVOUtils.error("计划不存在");
+        }
+        return ResultVOUtils.success(entity);
+    }
+
+
+    /**
+     * 设备巡检计划删除
+     *
+     * @param planId 计划id
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @DeleteMapping("/udi/device/plan/del/{planId}")
+    public BaseResponse del(@PathVariable Long planId) {
+        devicePlanService.deletePlan(planId);
+        return ResultVOUtils.successMsg("删除成功");
+    }
+
+
+}

src/main/java/com/glxp/api/controller/dev/DevicePlanDetailController.java

@@ -0,0 +1,115 @@
+package com.glxp.api.controller.dev;
+
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.annotation.AuthRuleAnnotation;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.controller.BaseController;
+import com.glxp.api.entity.dev.DevicePlanDetailEntity;
+import com.glxp.api.req.dev.DevicePlanDetailGroupQuery;
+import com.glxp.api.req.dev.DevicePlanDetailParam;
+import com.glxp.api.req.dev.DevicePlanDetailQuery;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.service.dev.DeviceInfoService;
+import com.glxp.api.service.dev.DevicePlanDetailService;
+import com.glxp.api.service.dev.DevicePlanService;
+import com.glxp.api.vo.dev.DevicePlanDetailVo;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+@RestController
+@RequestMapping
+@RequiredArgsConstructor
+@Slf4j
+public class DevicePlanDetailController extends BaseController {
+
+    private final DeviceInfoService deviceInfoService;
+    private final DevicePlanService devicePlanService;
+    private final DevicePlanDetailService devicePlanDetailService;
+
+
+    /**
+     * 设备巡检计划分页
+     *
+     * @param query
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/plan/detailGroup/page")
+    public BaseResponse pageGroup(@RequestBody @Valid DevicePlanDetailGroupQuery query) {
+        List<DevicePlanDetailVo> list = devicePlanDetailService.pageGroupVo(query);
+        PageInfo pageInfo = new PageInfo<>(list);
+        PageSimpleResponse page = new PageSimpleResponse();
+        page.setTotal(pageInfo.getTotal());
+        page.setList(pageInfo.getList());
+        return ResultVOUtils.success(page);
+    }
+
+
+    /**
+     * 设备巡检计划明细分页
+     *
+     * @param query
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/plan/detail/page")
+    public BaseResponse pageGroup(@RequestBody @Valid DevicePlanDetailQuery query) {
+        List<DevicePlanDetailVo> list = devicePlanDetailService.pageVo(query);
+        PageInfo pageInfo = new PageInfo<>(list);
+        PageSimpleResponse page = new PageSimpleResponse();
+        page.setTotal(pageInfo.getTotal());
+        page.setList(pageInfo.getList());
+        return ResultVOUtils.success(page);
+    }
+
+
+    /**
+     * 设备巡检计划明细新增
+     *
+     * @param param 参数
+     * @return 计划id
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/plan/detail/add")
+    public BaseResponse add(@RequestBody @Valid DevicePlanDetailParam param) {
+        param.valid(devicePlanService);
+        List<DevicePlanDetailEntity> list = param.getEntity(deviceInfoService);
+        devicePlanDetailService.replaceBatch(list);
+        return ResultVOUtils.successMsg("添加成功");
+    }
+
+
+    /**
+     * 设备巡检计划明细删除
+     *
+     * @param planId    计划id
+     * @param productId 产品id
+     */
+    @AuthRuleAnnotation("")
+    @DeleteMapping("/udi/device/plan/detail/delByProductId/{planId}/{productId}")
+    public BaseResponse delByProductId(@PathVariable Long planId, @PathVariable Long productId) {
+        devicePlanDetailService.delByProductId(planId, productId);
+        return ResultVOUtils.successMsg("删除成功");
+    }
+
+
+    /**
+     * 设备巡检计划明细删除
+     *
+     * @param planId    计划id
+     * @param deviceCode 设备编码
+     */
+    @AuthRuleAnnotation("")
+    @DeleteMapping("/udi/device/plan/detail/delByDeviceCode/{planId}/{deviceCode}")
+    public BaseResponse delByDeviceCode(@PathVariable Long planId, @PathVariable String deviceCode) {
+        devicePlanDetailService.delByDeviceCode(planId, deviceCode);
+        return ResultVOUtils.successMsg("删除成功");
+    }
+
+
+}

src/main/java/com/glxp/api/controller/dev/DevicePlanDetailItemController.java

@@ -0,0 +1,111 @@
+package com.glxp.api.controller.dev;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.annotation.AuthRuleAnnotation;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.controller.BaseController;
+import com.glxp.api.entity.dev.DevicePlanDetailItemEntity;
+import com.glxp.api.req.dev.DevicePlanDetailItemParam;
+import com.glxp.api.req.dev.DevicePlanDetailItemQuery;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.service.dev.DeviceCheckItemDictService;
+import com.glxp.api.service.dev.DevicePlanDetailItemService;
+import com.glxp.api.service.dev.DevicePlanDetailService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+@RestController
+@RequestMapping
+@RequiredArgsConstructor
+@Slf4j
+public class DevicePlanDetailItemController extends BaseController {
+
+    private final DevicePlanDetailService devicePlanDetailService;
+    private final DevicePlanDetailItemService devicePlanDetailItemService;
+    private final DeviceCheckItemDictService deviceCheckItemDictService;
+
+
+    /**
+     * 设备巡检计划明细项目分页
+     *
+     * @param query
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/plan/detail/item/page")
+    public BaseResponse page(@RequestBody @Valid DevicePlanDetailItemQuery query) {
+        List<DevicePlanDetailItemEntity> list = devicePlanDetailItemService.pageList(query);
+        PageInfo pageInfo = new PageInfo<>(list);
+        PageSimpleResponse page = new PageSimpleResponse();
+        page.setTotal(pageInfo.getTotal());
+        page.setList(pageInfo.getList());
+        return ResultVOUtils.success(page);
+    }
+
+
+    /**
+     * 设备巡检计划明细项目新增
+     *
+     * @param param 参数
+     * @return 计划id
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/plan/detail/item/add")
+    public BaseResponse add(@RequestBody @Valid DevicePlanDetailItemParam param) {
+        param.valid(devicePlanDetailService);
+        List<DevicePlanDetailItemEntity> entityList = param.getEntity(deviceCheckItemDictService);
+        if (StrUtil.isBlank(param.getDeviceCode())) {
+            devicePlanDetailItemService.replaceBatch(entityList);
+        } else {
+            devicePlanDetailItemService.insertIgnoreBatch(entityList);
+        }
+        return ResultVOUtils.successMsg("添加成功");
+    }
+
+
+    /**
+     * 设备巡检计划明细项目删除
+     *
+     * @param planId    计划id
+     * @param productId 产品id
+     * @param itemCode  项目编码
+     */
+    @AuthRuleAnnotation("")
+    @DeleteMapping("/udi/device/plan/detail/item/delByProduct/{planId}/{productId}/{itemCode}")
+    public BaseResponse delByProduct(@PathVariable Long planId, @PathVariable Long productId, @PathVariable String itemCode) {
+        devicePlanDetailItemService.remove(Wrappers.lambdaQuery(DevicePlanDetailItemEntity.class)
+                .eq(DevicePlanDetailItemEntity::getPlanId, planId)
+                .eq(DevicePlanDetailItemEntity::getProductId, productId)
+                .eq(DevicePlanDetailItemEntity::getItemCode, itemCode)
+        );
+        return ResultVOUtils.successMsg("删除成功");
+    }
+
+
+    /**
+     * 设备巡检计划明细项目删除
+     *
+     * @param planId     计划id
+     * @param deviceCode 设备编码
+     * @param itemCode   项目编码
+     */
+    @AuthRuleAnnotation("")
+    @DeleteMapping("/udi/device/plan/detail/item/delByDevice/{planId}/{deviceCode}/{itemCode}")
+    public BaseResponse delByDevice(@PathVariable Long planId, @PathVariable String deviceCode, @PathVariable String itemCode) {
+        devicePlanDetailItemService.remove(Wrappers.lambdaQuery(DevicePlanDetailItemEntity.class)
+                .eq(DevicePlanDetailItemEntity::getPlanId, planId)
+                .eq(DevicePlanDetailItemEntity::getDeviceCode, deviceCode)
+                .eq(DevicePlanDetailItemEntity::getItemCode, itemCode)
+        );
+        return ResultVOUtils.successMsg("删除成功");
+    }
+
+
+}

src/main/java/com/glxp/api/controller/dev/DeviceRepairApplyController.java

@@ -0,0 +1,110 @@
+package com.glxp.api.controller.dev;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.annotation.AuthRuleAnnotation;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.controller.BaseController;
+import com.glxp.api.entity.auth.AuthAdmin;
+import com.glxp.api.entity.dev.DeviceRepairApplyEntity;
+import com.glxp.api.enums.dev.DeviceRepairApplyStatusEnum;
+import com.glxp.api.req.dev.DeviceRepairApplyAddParam;
+import com.glxp.api.req.dev.DeviceRepairApplyConfirmParam;
+import com.glxp.api.req.dev.DeviceRepairApplyHallQuery;
+import com.glxp.api.req.dev.DeviceRepairApplyQuery;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.service.dev.DeviceRepairApplyService;
+import com.glxp.api.vo.dev.DeviceRepairApplyVo;
+import groovy.util.logging.Slf4j;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+@Slf4j
+@RestController
+@RequestMapping
+@RequiredArgsConstructor
+public class DeviceRepairApplyController extends BaseController {
+
+    private final DeviceRepairApplyService deviceRepairApplyService;
+
+    /**
+     * 本部门的报修单
+     *
+     * @param query
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/repair/apply/page")
+    public BaseResponse page(@RequestBody DeviceRepairApplyQuery query) {
+        AuthAdmin user = super.getUser();
+        query.setApplyDeptCode(user.getLocDeptCode());
+        List<DeviceRepairApplyEntity> list = deviceRepairApplyService.pageList(query);
+        PageInfo pageInfo = new PageInfo<>(list);
+        PageSimpleResponse page = new PageSimpleResponse();
+        page.setTotal(pageInfo.getTotal());
+        page.setList(BeanUtil.copyToList(pageInfo.getList(), DeviceRepairApplyVo.class));
+        return ResultVOUtils.success(page);
+    }
+
+    /**
+     * 报修单大厅
+     *
+     * @param query
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/repair/apply/hall/page")
+    public BaseResponse adminPage(@RequestBody DeviceRepairApplyHallQuery query) {
+        DeviceRepairApplyQuery applyQuery = new DeviceRepairApplyQuery();
+        applyQuery.setStatus(DeviceRepairApplyStatusEnum.WAIT_PROCESS);
+        applyQuery.setApplyId(query.getApplyId());
+        applyQuery.setApplyDeptCode(query.getApplyDeptCode());
+        List<DeviceRepairApplyEntity> list = deviceRepairApplyService.pageList(applyQuery);
+        PageInfo pageInfo = new PageInfo<>(list);
+        PageSimpleResponse page = new PageSimpleResponse();
+        page.setTotal(pageInfo.getTotal());
+        page.setList(BeanUtil.copyToList(pageInfo.getList(), DeviceRepairApplyVo.class));
+        return ResultVOUtils.success(page);
+    }
+
+    /**
+     * 我受理的报修单
+     *
+     * @param query
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/repair/apply/confirmByUser/page")
+    public BaseResponse confirmByUserPage(@RequestBody DeviceRepairApplyQuery query) {
+        AuthAdmin user = super.getUser();
+        query.setConfirmUserId(user.getId());
+        List<DeviceRepairApplyEntity> list = deviceRepairApplyService.pageList(query);
+        PageInfo pageInfo = new PageInfo<>(list);
+        PageSimpleResponse page = new PageSimpleResponse();
+        page.setTotal(pageInfo.getTotal());
+        page.setList(BeanUtil.copyToList(pageInfo.getList(), DeviceRepairApplyVo.class));
+        return ResultVOUtils.success(page);
+    }
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/repair/apply/add")
+    public BaseResponse addDeviceRepairApply(@RequestBody @Valid DeviceRepairApplyAddParam param) {
+        AuthAdmin user = super.getUser();
+        deviceRepairApplyService.addDeviceRepairApply(param, user);
+        return ResultVOUtils.successMsg("创建成功");
+    }
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/repair/apply/confirm")
+    public BaseResponse confirmDeviceRepairApply(@RequestBody @Valid DeviceRepairApplyConfirmParam param) {
+        AuthAdmin user = super.getUser();
+        deviceRepairApplyService.confirmDeviceRepairApply(param, user);
+        return ResultVOUtils.successMsg("操作成功");
+    }
+
+
+}

src/main/java/com/glxp/api/controller/dev/DeviceRepairApplyDetailController.java

@@ -0,0 +1,70 @@
+package com.glxp.api.controller.dev;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.annotation.AuthRuleAnnotation;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.controller.BaseController;
+import com.glxp.api.entity.auth.AuthAdmin;
+import com.glxp.api.entity.dev.DeviceRepairApplyDetailEntity;
+import com.glxp.api.entity.dev.DeviceRepairApplyEntity;
+import com.glxp.api.req.dev.*;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.service.dev.DeviceRepairApplyDetailService;
+import com.glxp.api.service.dev.DeviceRepairApplyService;
+import com.glxp.api.vo.dev.DeviceRepairApplyDetailVo;
+import com.glxp.api.vo.dev.DeviceRepairApplyVo;
+import groovy.util.logging.Slf4j;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+@Slf4j
+@RestController
+@RequestMapping
+@RequiredArgsConstructor
+public class DeviceRepairApplyDetailController extends BaseController {
+
+    private final DeviceRepairApplyDetailService deviceRepairApplyDetailService;
+
+    /**
+     * 本部门的报修单
+     *
+     * @param query
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/repair/apply/detail/page")
+    public BaseResponse page(@RequestBody @Valid DeviceRepairApplyDetailQuery query) {
+
+        List<DeviceRepairApplyDetailEntity> list = deviceRepairApplyDetailService.pageList(query);
+        PageInfo pageInfo = new PageInfo<>(list);
+        PageSimpleResponse page = new PageSimpleResponse();
+        page.setTotal(pageInfo.getTotal());
+        page.setList(BeanUtil.copyToList(pageInfo.getList(), DeviceRepairApplyDetailVo.class));
+        return ResultVOUtils.success(page);
+    }
+
+
+    /**
+     * 诊断设备
+     *
+     * @param param
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/repair/apply/detail/diagnosis")
+    public BaseResponse diagnosis(@RequestBody @Valid DeviceRepairApplyDetailDiagnosisParam param) {
+        AuthAdmin user = super.getUser();
+        deviceRepairApplyDetailService.diagnosis(param, user);
+        return ResultVOUtils.successMsg("操作成功");
+    }
+
+
+}

src/main/java/com/glxp/api/controller/dev/DeviceRepairController.java

@@ -0,0 +1,81 @@
+package com.glxp.api.controller.dev;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.annotation.AuthRuleAnnotation;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.controller.BaseController;
+import com.glxp.api.entity.auth.AuthAdmin;
+import com.glxp.api.entity.dev.DeviceRepairApplyEntity;
+import com.glxp.api.entity.dev.DeviceRepairEntity;
+import com.glxp.api.enums.dev.DeviceRepairApplyStatusEnum;
+import com.glxp.api.req.dev.*;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.service.dev.DeviceRepairApplyService;
+import com.glxp.api.service.dev.DeviceRepairService;
+import com.glxp.api.vo.dev.DeviceRepairApplyVo;
+import groovy.util.logging.Slf4j;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+@Slf4j
+@RestController
+@RequestMapping
+@RequiredArgsConstructor
+public class DeviceRepairController extends BaseController {
+
+    private final DeviceRepairService deviceRepairService;
+
+    /**
+     * 我的维修单
+     *
+     * @param query
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/repair/byUser/page")
+    public BaseResponse pageByUser(@RequestBody DeviceRepairQuery query) {
+        AuthAdmin user = super.getUser();
+        query.setCreateUserId(user.getId());
+        List<DeviceRepairEntity> list = deviceRepairService.pageList(query);
+        PageInfo pageInfo = new PageInfo<>(list);
+        PageSimpleResponse page = new PageSimpleResponse();
+        page.setTotal(pageInfo.getTotal());
+        page.setList(pageInfo.getList());
+        return ResultVOUtils.success(page);
+    }
+
+    /**
+     * 完成我的维修单
+     *
+     * @param repairId 维修单id
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @GetMapping("/udi/device/repair/finishByUser/{repairId}")
+    public BaseResponse finishByUser(@PathVariable Long repairId) {
+        AuthAdmin user = super.getUser();
+        deviceRepairService.finishByUser(repairId, user);
+        return ResultVOUtils.successMsg("操作成功");
+    }
+
+
+    /**
+     * 维修单信息
+     *
+     * @param repairId 维修单号
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @GetMapping("/udi/device/repair/info/{repairId}")
+    public BaseResponse repairInfo(@PathVariable Long repairId) {
+        DeviceRepairEntity entity = deviceRepairService.getById(repairId);
+        return ResultVOUtils.success(entity);
+    }
+
+
+}

src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java

@@ -519,19 +519,9 @@ public class IoCodeTempController extends BaseController {
             }
         }
 
-        if (addOrderRequest.getFromCorp() == null) {
-            BasicCorpEntity basicCorpEntity = basicUnitMaintainService.selectByName(addOrderRequest.getFromCorp());
-            if (basicCorpEntity == null && bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_INPUT && bussinessTypeEntity.isGenUnit()) {
-                basicCorpEntity = new BasicCorpEntity();
-                basicCorpEntity.setErpId(CustomUtil.getUnitId());
-                addOrderRequest.setFromCorp((basicCorpEntity.getErpId()));
-                basicCorpEntity.setCorpType(ConstantStatus.CORP_SICK);
-                basicCorpEntity.setOutType(ConstantStatus.CORP_SICK_SICK);
-                basicCorpEntity.setName(addOrderRequest.getFromCorp());
-                addOrderRequest.setFromCorp(basicCorpEntity.getName());
-                basicCorpEntity.setId(IdUtil.getSnowflakeNextId());
-                basicUnitMaintainService.insert(basicCorpEntity);
-            }
+        if (addOrderRequest.getFromCorp() != null || StrUtil.isNotEmpty(addOrderRequest.getSickerAdNum())) {
+            String fromCorp = ioAddInoutService.updateCorp(bussinessTypeEntity, addOrderRequest.getFromCorp(), addOrderRequest.getSickerAdNum());
+            addOrderRequest.setFromCorp(fromCorp);
         }
 
         //先生成扫码单据
@@ -711,6 +701,7 @@ public class IoCodeTempController extends BaseController {
                 orderEntity.setInvCode(addOrderRequest.getInvCode());
                 orderEntity.setOrderType(addOrderRequest.getOrderType());
                 orderEntity.setBusType(bussinessTypeEntity.getBusType());
+                orderEntity.setSickerAdNum(addOrderRequest.getSickerAdNum());
                 orderService.insertOrder(orderEntity);
             }
 
@@ -803,9 +794,14 @@ public class IoCodeTempController extends BaseController {
 
     public BaseResponse checkInv(BasicBussinessTypeEntity bussinessTypeEntity, IoCodeTempEntity codeTempEntity, boolean isEdit) {
         if (bussinessTypeEntity.isVailInv() && bussinessTypeEntity.getMainAction().equals(ConstantType.TYPE_OUT)) {
+            String outInvCode = codeTempEntity.getInvCode();
+            InvWarehouseEntity invWarehouseEntity = invWarehouseService.findNoInvTypeInv(bussinessTypeEntity.getDeptNoInvType(), outInvCode);
+            if (invWarehouseEntity != null) {
+                outInvCode = invWarehouseEntity.getCode();
+            }
             int count = 0;
             if (bussinessTypeEntity.getSpaceOut() == ConstantStatus.SPACE_OUT_NULL) {
-                count = invProductDetailService.vailStockCount(codeTempEntity.getRelId(), codeTempEntity.getBatchNo(), codeTempEntity.getSupId(), codeTempEntity.getDeptCode(), codeTempEntity.getInvCode(), null);
+                count = invProductDetailService.vailStockCount(codeTempEntity.getRelId(), codeTempEntity.getBatchNo(), codeTempEntity.getSupId(), null, outInvCode, null);
             } else if (bussinessTypeEntity.getSpaceOut() == ConstantStatus.SPACE_OUT_SET) {
                 count = invProductDetailService.vailStockCount(codeTempEntity.getRelId(), codeTempEntity.getBatchNo(), codeTempEntity.getSupId(), codeTempEntity.getDeptCode(), codeTempEntity.getInvCode(), codeTempEntity.getWarehouseCode());
             } else if (bussinessTypeEntity.getSpaceOut() == ConstantStatus.SPACE_OUT_CODE) {
@@ -955,17 +951,17 @@ public class IoCodeTempController extends BaseController {
             }
         }
 
-        InvPreInProductDetailEntity invPreinDetailEntity = invPreinProductDetailService.findUseOneByCode(codeTempEntity.getCode());
+//        InvPreInProductDetailEntity invPreinDetailEntity = invPreinProductDetailService.findUseOneByCode(codeTempEntity.getCode());
         if (count <= 0) {
             if (count == -1) {
                 return ResultVOUtils.error(500, "该产品未入库");
             } else
                 return ResultVOUtils.error(500, "预验收库存数量不足！");
         } else {
-            if (StrUtil.isNotEmpty(invPreinDetailEntity.getBatchNo()) && StrUtil.isNotEmpty(codeTempEntity.getBatchNo())
-                    && !invPreinDetailEntity.getBatchNo().equals(codeTempEntity.getBatchNo())) {
-                return ResultVOUtils.error(500, "当前批次号与预验收录入批次号不匹配！");
-            }
+//            if (StrUtil.isNotEmpty(invPreinDetailEntity.getBatchNo()) && StrUtil.isNotEmpty(codeTempEntity.getBatchNo())
+//                    && !invPreinDetailEntity.getBatchNo().equals(codeTempEntity.getBatchNo())) {
+//                return ResultVOUtils.error(500, "当前批次号与预验收录入批次号不匹配！");
+//            }
             if (StrUtil.isNotEmpty(codeTempEntity.getOrderId())) {//非首次添加
                 if (StrUtil.isEmpty(codeTempEntity.getSerialNo())) {//该单据已有该产品
                     //无序列号，则可能存在多个预验收入库单
@@ -1074,7 +1070,7 @@ public class IoCodeTempController extends BaseController {
             BeanUtils.copyProperties(codeEnttity, ioCodeEntity);
             String supId = transInoutService.checkInvExitSup(ioCodeEntity);
             if (supId == null) {
-                supId = transInoutService.checkExitSup(codeEnttity.getRelId());
+                supId = transInoutService.checkExitSup(codeEnttity);
             }
             if (supId == null) {
                 codeEnttity.setSupId(null);
@@ -1183,7 +1179,6 @@ public class IoCodeTempController extends BaseController {
     @AuthRuleAnnotation("")
     @PostMapping("/udiwms/addCode/updateBindSup")
     @Log(title = "单据管理", businessType = BusinessType.UPDATE)
-
     public BaseResponse updateBindSup(@RequestBody IoCodeTempEntity codeSaveRequest, BindingResult bindingResult) {
 
         if (bindingResult.hasErrors()) {

src/main/java/com/glxp/api/controller/inout/IoOrderController.java

@@ -318,7 +318,7 @@ public class IoOrderController extends BaseController {
 
         BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(addOrderRequest.getAction());
         //要是特殊往来信息没有就创建
-        orderEntity.setFromCorp(ioAddInoutService.updateCorp(bussinessTypeEntity, addOrderRequest.getFromCorp()));
+        orderEntity.setFromCorp(ioAddInoutService.updateCorp(bussinessTypeEntity, addOrderRequest.getFromCorp(), addOrderRequest.getSickerAdNum()));
         orderEntity.setAction(addOrderRequest.getAction());
         orderEntity.setMainAction(bussinessTypeEntity.getMainAction());
         orderEntity.setRemark(addOrderRequest.getRemark());
@@ -1269,9 +1269,14 @@ public class IoOrderController extends BaseController {
 
 
     public BaseResponse checkInv(IoOrderDetailBizEntity bizEntity, IoOrderEntity orderEntity) {
-
+        BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction());
+        String outInvCode = orderEntity.getInvCode();
+        InvWarehouseEntity invWarehouseEntity = invWarehouseService.findNoInvTypeInv(bussinessTypeEntity.getDeptNoInvType(), outInvCode);
+        if (invWarehouseEntity != null) {
+            outInvCode = invWarehouseEntity.getCode();
+        }
         int count = 0;
-        count = invProductDetailService.vailStockCount(bizEntity.getBindRlFk(), bizEntity.getBatchNo(), bizEntity.getSupId(), orderEntity.getDeptCode(), orderEntity.getInvCode(), null);
+        count = invProductDetailService.vailStockCount(bizEntity.getBindRlFk(), bizEntity.getBatchNo(), bizEntity.getSupId(), null, outInvCode, null);
         if (count <= 0) {
             if (count == -1) {
                 return ResultVOUtils.error(500, "该产品未入库");

src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java

@@ -241,11 +241,17 @@ public class IoOrderDetailBizController extends BaseController {
         IoOrderEntity orderEntity = orderService.findByBillNo(orderDetailBizEntity.getOrderIdFk());
         BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction());
         if (bussinessTypeEntity.getCheckWebNew() == 4 && bussinessTypeEntity.getMainAction().equals(ConstantType.TYPE_OUT)) {
-            Integer count = invProductDetailService.vailStockCount(orderDetailBizEntity.getBindRlFk(), orderDetailBizEntity.getBatchNo(), orderDetailBizEntity.getSupId(), orderEntity.getDeptCode(), orderEntity.getInvCode(), null);
 
+            String outInvCode = orderEntity.getInvCode();
+            InvWarehouseEntity invWarehouseEntity = invWarehouseService.findNoInvTypeInv(bussinessTypeEntity.getDeptNoInvType(), outInvCode);
+            if (invWarehouseEntity != null) {
+                outInvCode = invWarehouseEntity.getCode();
+            }
+
+            Integer count = invProductDetailService.vailStockCount(orderDetailBizEntity.getBindRlFk(), orderDetailBizEntity.getBatchNo(), orderDetailBizEntity.getSupId(), null, outInvCode, null);
             count = IntUtil.value(count) - orderDetailBizEntity.getCount();
 
-            if (count <= 0) {
+            if (count < 0) {
                 if (count == -1) {
                     return ResultVOUtils.error(500, "该产品未入库");
                 } else

src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java

@@ -11,9 +11,11 @@ import com.glxp.api.annotation.AuthRuleAnnotation;
 import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.constant.Constant;
 import com.glxp.api.constant.ConstantType;
 import com.glxp.api.controller.BaseController;
 import com.glxp.api.entity.auth.AuthAdmin;
+import com.glxp.api.entity.auth.InvWarehouseEntity;
 import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
 import com.glxp.api.entity.inout.*;
 import com.glxp.api.entity.system.CompanyEntity;
@@ -21,11 +23,9 @@ import com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity;
 import com.glxp.api.entity.system.SystemPDFTemplateEntity;
 import com.glxp.api.entity.thrsys.ThrProductsEntity;
 import com.glxp.api.req.inout.*;
-import com.glxp.api.res.inout.CptTraceOrderResponse;
-import com.glxp.api.res.inout.CptTraceResultResponse;
-import com.glxp.api.res.inout.IoOrderDetailResultResponse;
-import com.glxp.api.res.inout.IoOrderDetailVo;
+import com.glxp.api.res.inout.*;
 import com.glxp.api.service.auth.CustomerService;
+import com.glxp.api.service.auth.InvWarehouseService;
 import com.glxp.api.service.basic.IBasicBussinessTypeService;
 import com.glxp.api.service.inout.*;
 import com.glxp.api.service.inout.impl.IoCodeService;
@@ -95,6 +95,9 @@ public class IoOrderDetailResultController extends BaseController {
         return ResultVOUtils.page(pageInfo);
     }
 
+    @Resource
+    InvWarehouseService invWarehouseService;
+
     /**
      * 查询单据扫码明细列表
      *
@@ -121,7 +124,14 @@ public class IoOrderDetailResultController extends BaseController {
         }
         orderDetailResultRequest.setActions(actions);
         AuthAdmin authAdmin = customerService.getUserBean();
-        if (StrUtil.isBlank(orderDetailResultRequest.getInvCode())) {
+
+        if (orderDetailResultRequest.getActionType().equals(Constant.ORDER_ACTION_PRE_DETAIL)) {
+            InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByPreInv();
+            orderDetailResultRequest.setInvCode(invWarehouseEntity.getCode());
+        } else if (orderDetailResultRequest.getActionType().equals(Constant.ORDER_ACTION_PREIN_DETAIL)) {
+            InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByPreInInv();
+            orderDetailResultRequest.setInvCode(invWarehouseEntity.getCode());
+        } else if (StrUtil.isBlank(orderDetailResultRequest.getInvCode())) {
             orderDetailResultRequest.setInvCode(authAdmin.getLocInvCode());
         }
         List<IoOrderDetailResultResponse> list = orderDetailResultService.filterOrderList(orderDetailResultRequest);
@@ -372,14 +382,14 @@ public class IoOrderDetailResultController extends BaseController {
                     cptTraceResultResponse.setInOutType(2);
                     cptTraceResultResponse.setFromCorp(authCompany.getName());
                     cptTraceResultResponse.setFromCorpCreditNum(authCompany.getCreditCode());
-
-                    //往来单位为病人
-                    if (cptTraceOrderResponse.getCorpType() == 1 && cptTraceOrderResponse.getOutType() == 1) {
-                        cptTraceResultResponse.setToUserInfo(cptTraceOrderResponse.getFromCorpName());
-                    } else {
-                        cptTraceResultResponse.setToCorp(cptTraceOrderResponse.getFromCorpName());
-                        cptTraceResultResponse.setToCorpCreditNum(cptTraceOrderResponse.getCreditNo());
-                    }
+                    cptTraceResultResponse.setToCorp(cptTraceOrderResponse.getFromCorpName());
+                    cptTraceResultResponse.setToCorpCreditNum(cptTraceOrderResponse.getCreditNo());
+//                    //往来单位为病人
+//                    if (cptTraceOrderResponse.getCorpType() == 1 && cptTraceOrderResponse.getOutType() == 1) {
+//                        cptTraceResultResponse.setToUserInfo(cptTraceOrderResponse.getFromCorpName());
+//                    } else {
+//
+//                    }
                 } else {
                     cptTraceResultResponse.setInOutType(1);
                     cptTraceResultResponse.setFromCorp(cptTraceOrderResponse.getFromCorpName());
@@ -395,4 +405,18 @@ public class IoOrderDetailResultController extends BaseController {
         return ResultVOUtils.success(cptTraceResultResponses);
 
     }
+
+
+    /**
+     * 查询出入库单明细
+     */
+
+    @GetMapping("/udiwms/inout/external/orderDetail/filter")
+    public BaseResponse externalOrderFilter(FilterOrderDetailResultRequest orderDetailResultRequest) {
+        List<IoExOrderDetailResultResponse> list = orderDetailResultService.exFilterOrderDetail(orderDetailResultRequest);
+        PageInfo<IoExOrderDetailResultResponse> pageInfo = new PageInfo<>(list);
+        return ResultVOUtils.page(pageInfo);
+    }
+
+
 }

src/main/java/com/glxp/api/controller/inout/IoStatDataController.java

@@ -6,9 +6,13 @@ import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.entity.inout.*;
 import com.glxp.api.req.inout.FilterStatDataDetailRequest;
 import com.glxp.api.req.inout.FilterStatDataRequest;
+import com.glxp.api.res.inout.IoStatOrderResponse;
 import com.glxp.api.service.inout.*;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.regexp.RE;
 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;
@@ -31,6 +35,8 @@ public class IoStatDataController {
     private IoStatQuarterService statQuarterService;
     @Resource
     private IoStatYearService statYearService;
+    @Resource
+    IoStatDetailService statDetailService;
 
     /**
      * 查询汇总记录列表
@@ -40,8 +46,8 @@ public class IoStatDataController {
      */
     @GetMapping("/udiwms/inout/stat/filter")
     public BaseResponse filterList(FilterStatDataRequest statDataRequest) {
-        List<IoStatOrderEntity> list = statOrderService.filterList(statDataRequest);
-        PageInfo<IoStatOrderEntity> pageInfo = new PageInfo<>(list);
+        List<IoStatOrderResponse> list = statOrderService.filterList(statDataRequest);
+        PageInfo<IoStatOrderResponse> pageInfo = new PageInfo<>(list);
         return ResultVOUtils.page(pageInfo);
     }
 
@@ -97,4 +103,30 @@ public class IoStatDataController {
         return ResultVOUtils.page(pageInfo);
     }
 
+
+    /**
+     * 查询月汇总数据列表
+     *
+     * @param statDataDetailRequest
+     * @return
+     */
+    @GetMapping("/udiwms/inout/detail/custom/filter")
+    public BaseResponse filterCustonmerList(FilterStatDataDetailRequest statDataDetailRequest) {
+        List<IoStatDetailEntity> list = statDetailService.filterList(statDataDetailRequest);
+        PageInfo<IoStatDetailEntity> pageInfo = new PageInfo<>(list);
+        return ResultVOUtils.page(pageInfo);
+    }
+
+
+    /**
+     * 查询月汇总数据列表
+     *
+     * @param statDataDetailRequest
+     * @return
+     */
+    @PostMapping("/udiwms/inout/detail/custom/create")
+    public BaseResponse crateCustomStat(@RequestBody FilterStatDataDetailRequest statDataDetailRequest) {
+        return statDetailService.createCustomStat(statDataDetailRequest);
+    }
+
 }

src/main/java/com/glxp/api/controller/inv/InvPreinOrderController.java

@@ -15,6 +15,7 @@ import com.glxp.api.entity.inout.IoCodeTempEntity;
 import com.glxp.api.entity.inv.InvPreInProductDetailEntity;
 import com.glxp.api.entity.inv.InvPreinDetailEntity;
 import com.glxp.api.entity.inv.InvProductDetailEntity;
+import com.glxp.api.req.inout.CheckPreInInvRequest;
 import com.glxp.api.req.inv.FilterInvPreinDetailRequest;
 import com.glxp.api.req.inv.FilterInvPreinRequest;
 import com.glxp.api.req.inv.FilterInvProductDetailRequest;
@@ -24,6 +25,8 @@ import com.glxp.api.res.inv.InvPreinDetailResponse;
 import com.glxp.api.res.inv.InvPreinOrderResponse;
 import com.glxp.api.service.auth.InvWarehouseService;
 import com.glxp.api.service.basic.IBasicBussinessTypeService;
+import com.glxp.api.service.inout.IoCodeTempService;
+import com.glxp.api.service.inout.impl.IoCodeService;
 import com.glxp.api.service.inv.InvPreProductDetailService;
 import com.glxp.api.service.inv.InvPreinDetailService;
 import com.glxp.api.service.inv.InvPreinOrderService;
@@ -84,27 +87,46 @@ public class InvPreinOrderController extends BaseController {
 
     }
 
+    @Resource
+    IoCodeTempService codeTempService;
+    @Resource
+    IoCodeService codeService;
 
     @AuthRuleAnnotation("")
     @PostMapping("spms/prein/inv/products/getDetaiByCode")
-    public BaseResponse getDetaiByCode(@RequestBody IoCodeTempEntity codeTempEntity) {
+    public BaseResponse getDetaiByCode(@RequestBody CheckPreInInvRequest checkPreInInvRequest) {
         InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByOne(ConstantStatus.ACTION_TYPE_PREIN);
-        BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(codeTempEntity.getAction());
+        BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(checkPreInInvRequest.getAction());
+
+        if (bussinessTypeEntity.getBackPreinType() == 1 && bussinessTypeEntity.isPreInBack()) {//按单出库&& bussinessTypeEntity.isPreInBack()
+            String orderIds = checkPreInInvRequest.getCheckPreInOrders();
+            if (StrUtil.isNotEmpty(orderIds)) {
+                String[] orderIdArray = orderIds.split(",");
+                List<String> orderList = CollUtil.toList(orderIdArray);
+                int count = codeService.findByOrderIdsCount(orderList, checkPreInInvRequest.getCode());
+                if (count <= 0) {
+                    return ResultVOUtils.error(500, "非预验收单产品或预验收库存数量不足！");
+                }
+            } else {
+                return ResultVOUtils.error(500, "未选择预验收入库单，请先选择预验收入库单！");
+            }
+        }
+
         int count = 0;
         if (bussinessTypeEntity.getSpaceOut() == ConstantStatus.SPACE_OUT_NULL) {
-            if (StrUtil.isNotEmpty(codeTempEntity.getSerialNo())) {
-                count = invPreinProductDetailService.vailStockCountByCode(null, invWarehouseEntity.getCode(), null, codeTempEntity.getCode());
+            if (StrUtil.isNotEmpty(checkPreInInvRequest.getSerialNo())) {
+                count = invPreinProductDetailService.vailStockCountByCode(null, invWarehouseEntity.getCode(), null, checkPreInInvRequest.getCode());
             } else
-                count = invPreinProductDetailService.vailStockCount(codeTempEntity.getRelId(), codeTempEntity.getBatchNo(), codeTempEntity.getSupId(), null, invWarehouseEntity.getCode(), null);
+                count = invPreinProductDetailService.vailStockCount(checkPreInInvRequest.getRelId(), checkPreInInvRequest.getBatchNo(), checkPreInInvRequest.getSupId(), null, invWarehouseEntity.getCode(), null);
         } else if (bussinessTypeEntity.getSpaceOut() == ConstantStatus.SPACE_OUT_SET) {
-            if (StrUtil.isNotEmpty(codeTempEntity.getSerialNo())) {
-                count = invPreinProductDetailService.vailStockCountByCode(null, invWarehouseEntity.getCode(), codeTempEntity.getPreInSpaceCode(), codeTempEntity.getCode());
+            if (StrUtil.isNotEmpty(checkPreInInvRequest.getSerialNo())) {
+                count = invPreinProductDetailService.vailStockCountByCode(null, invWarehouseEntity.getCode(), checkPreInInvRequest.getPreInSpaceCode(), checkPreInInvRequest.getCode());
             } else
-                count = invPreinProductDetailService.vailStockCount(codeTempEntity.getRelId(), codeTempEntity.getBatchNo(), codeTempEntity.getSupId(), null, invWarehouseEntity.getCode(), codeTempEntity.getPreInSpaceCode());
+                count = invPreinProductDetailService.vailStockCount(checkPreInInvRequest.getRelId(), checkPreInInvRequest.getBatchNo(), checkPreInInvRequest.getSupId(), null, invWarehouseEntity.getCode(), checkPreInInvRequest.getPreInSpaceCode());
         } else if (bussinessTypeEntity.getSpaceOut() == ConstantStatus.SPACE_OUT_CODE) {
             //按指定货位出库
-            if (StrUtil.isEmpty(codeTempEntity.getPreSpaceCode())) {
-                List<InvPlaceDetailResponse> invProductDetailEntities = invPreinProductDetailService.findByGroupCode(invWarehouseEntity.getCode(), codeTempEntity.getCode());
+            if (StrUtil.isEmpty(checkPreInInvRequest.getPreSpaceCode())) {
+                List<InvPlaceDetailResponse> invProductDetailEntities = invPreinProductDetailService.findByGroupCode(invWarehouseEntity.getCode(), checkPreInInvRequest.getCode());
                 if (CollUtil.isNotEmpty(invProductDetailEntities) && invProductDetailEntities.size() > 1) {
                     BaseResponse baseResponse = ResultVOUtils.error(511, "存在多个货位，请指定当前货位！");
                     baseResponse.setData(invProductDetailEntities);
@@ -112,26 +134,26 @@ public class InvPreinOrderController extends BaseController {
                 } else if (invProductDetailEntities.size() == 1) {
                     InvPlaceDetailResponse invPlaceDetailResponse = invProductDetailEntities.get(0);
                     count = invPlaceDetailResponse.getReCount();
-                    codeTempEntity.setPreSpaceCode(invPlaceDetailResponse.getInvSpaceCode());
+                    checkPreInInvRequest.setPreSpaceCode(invPlaceDetailResponse.getInvSpaceCode());
                 } else {
                     return ResultVOUtils.error(500, "添加失败，该产品未上架货位!");
                 }
             } else {
-                if (StrUtil.isNotEmpty(codeTempEntity.getSerialNo())) {
-                    count = invPreinProductDetailService.vailStockCountByCode(null, codeTempEntity.getInvCode(), codeTempEntity.getPreInSpaceCode(), codeTempEntity.getCode());
+                if (StrUtil.isNotEmpty(checkPreInInvRequest.getSerialNo())) {
+                    count = invPreinProductDetailService.vailStockCountByCode(null, checkPreInInvRequest.getInvCode(), checkPreInInvRequest.getPreInSpaceCode(), checkPreInInvRequest.getCode());
                 } else
-                    count = invPreinProductDetailService.vailStockCount(codeTempEntity.getRelId(), codeTempEntity.getBatchNo(), codeTempEntity.getSupId(), null, codeTempEntity.getInvCode(), codeTempEntity.getPreInSpaceCode());
+                    count = invPreinProductDetailService.vailStockCount(checkPreInInvRequest.getRelId(), checkPreInInvRequest.getBatchNo(), checkPreInInvRequest.getSupId(), null, checkPreInInvRequest.getInvCode(), checkPreInInvRequest.getPreInSpaceCode());
             }
         }
 
-        InvPreInProductDetailEntity invPreinDetailEntity = invPreinProductDetailService.findUseOneByCode(codeTempEntity.getCode());
+//        InvPreInProductDetailEntity invPreinDetailEntity = invPreinProductDetailService.findUseOneByCode(checkPreInInvRequest.getCode());
         if (count <= 0) {
             return ResultVOUtils.error(500, "预验收库存数量不足！");
         } else {
-            if (invPreinDetailEntity != null && StrUtil.isNotEmpty(invPreinDetailEntity.getBatchNo()) && StrUtil.isNotEmpty(codeTempEntity.getBatchNo())
-                    && !invPreinDetailEntity.getBatchNo().equals(codeTempEntity.getBatchNo())) {
-                return ResultVOUtils.error(500, "当前批次号与预验收录入批次号不匹配！");
-            }
+//            if (invPreinDetailEntity != null && StrUtil.isNotEmpty(invPreinDetailEntity.getBatchNo()) && StrUtil.isNotEmpty(checkPreInInvRequest.getBatchNo())
+//                    && !invPreinDetailEntity.getBatchNo().equals(checkPreInInvRequest.getBatchNo())) {
+//                return ResultVOUtils.error(500, "当前批次号与预验收录入批次号不匹配！");
+//            }
         }
         return ResultVOUtils.success(count);
     }

src/main/java/com/glxp/api/controller/inv/InvProductController.java

@@ -1,5 +1,6 @@
 package com.glxp.api.controller.inv;
 
+import com.glxp.api.entity.auth.InvWarehouseEntity;
 import com.glxp.api.service.inv.impl.InvProductDetailService;
 import com.glxp.api.service.inv.impl.InvProductService;
 import org.springframework.beans.BeanUtils;
@@ -309,7 +310,14 @@ public class InvProductController extends BaseController {
         BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(codeTempEntity.getAction());
         int count = 0;
         if (bussinessTypeEntity.getSpaceOut() == ConstantStatus.SPACE_OUT_NULL) {
-            count = invProductDetailService.vailStockCount(codeTempEntity.getRelId(), codeTempEntity.getBatchNo(), codeTempEntity.getSupId(), codeTempEntity.getDeptCode(), codeTempEntity.getInvCode(), null);
+
+
+            String outInvCode = codeTempEntity.getInvCode();
+            InvWarehouseEntity invWarehouseEntity = invWarehouseService.findNoInvTypeInv(bussinessTypeEntity.getDeptNoInvType(), outInvCode);
+            if (invWarehouseEntity != null) {
+                outInvCode = invWarehouseEntity.getCode();
+            }
+            count = invProductDetailService.vailStockCount(codeTempEntity.getRelId(), codeTempEntity.getBatchNo(), codeTempEntity.getSupId(), null, outInvCode, null);
         } else if (bussinessTypeEntity.getSpaceOut() == ConstantStatus.SPACE_OUT_SET) {
             count = invProductDetailService.vailStockCount(codeTempEntity.getRelId(), codeTempEntity.getBatchNo(), codeTempEntity.getSupId(), codeTempEntity.getDeptCode(), codeTempEntity.getInvCode(), codeTempEntity.getWarehouseCode());
         } else if (bussinessTypeEntity.getSpaceOut() == ConstantStatus.SPACE_OUT_CODE) {

src/main/java/com/glxp/api/controller/inv/StockCompareController.java

@@ -1,5 +1,9 @@
 package com.glxp.api.controller.inv;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
+import com.alibaba.excel.EasyExcel;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageHelper;
@@ -7,22 +11,38 @@ import com.github.pagehelper.PageInfo;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.controller.BaseController;
+import com.glxp.api.entity.inv.InvCpLocalProductEntity;
+import com.glxp.api.entity.inv.InvCpThrProuductEntity;
 import com.glxp.api.entity.inv.StockCompareDetailEntity;
 import com.glxp.api.entity.inv.StockCompareEntity;
 import com.glxp.api.entity.thrsys.ThrSystemEntity;
 import com.glxp.api.enums.StockCompareStatusEnum;
 import com.glxp.api.exception.JsonException;
+import com.glxp.api.req.inout.FilterOrderDetailResultRequest;
 import com.glxp.api.req.inv.*;
 import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.res.inout.IoOrderDetailResultResponse;
+import com.glxp.api.res.inout.IoOrderDetailVo;
+import com.glxp.api.res.inv.StockCompareDetailVo;
+import com.glxp.api.service.inv.InvCpLocalProductService;
+import com.glxp.api.service.inv.InvCpThrProuductService;
 import com.glxp.api.service.inv.StockCompareDetailService;
 import com.glxp.api.service.inv.StockCompareService;
+import com.glxp.api.util.IntUtil;
 import com.glxp.api.vo.inv.InvProductDetailSelectVo;
 import com.glxp.api.vo.inv.StockCompareVo;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @RestController
 @RequestMapping
@@ -51,7 +71,7 @@ public class StockCompareController extends BaseController {
     public BaseResponse selectInvProductDetail(@RequestBody @Valid InvProductDetailSelectRequest param) {
         StockCompareEntity stockCompare = stockCompareService.getById(param.getCompareId());
         if (stockCompare == null) {
-            return ResultVOUtils.error(500, "对比纪录不存在");
+            return ResultVOUtils.error(500, "对比记录不存在");
         }
 
         InvProductDetailSelectQuery invProductDetailSelectQuery = new InvProductDetailSelectQuery(stockCompare.getInvCode(), stockCompare.getMainAction()
@@ -83,6 +103,17 @@ public class StockCompareController extends BaseController {
         return ResultVOUtils.successMsg("添加成功");
     }
 
+
+    /**
+     * 添加第三方库存产品明细
+     */
+    @PostMapping("/udiwms/stockCompare/addThrProduct")
+    public BaseResponse addThrProduct(@RequestBody FilterInvProductRequest invProductRequest) {
+        stockCompareService.dlThrProduct(invProductRequest);
+        return ResultVOUtils.successMsg("添加成功");
+    }
+
+
     /**
      * 立即对比
      *
@@ -95,6 +126,11 @@ public class StockCompareController extends BaseController {
         if (stockCompare == null) {
             return ResultVOUtils.error(500, "对比记录不存在");
         }
+        stockCompare.setStatus(StockCompareStatusEnum.FINISHED);
+        stockCompareService.updateById(stockCompare);
+        List<StockCompareDetailEntity> stockCompareDetailEntities = stockCompareService.getCompareResult(compareId);
+        stockCompareDetailService.remove(new QueryWrapper<StockCompareDetailEntity>().eq("compareId", compareId));
+        stockCompareDetailService.saveBatch(stockCompareDetailEntities);
         return ResultVOUtils.successMsg("对比成功");
     }
 
@@ -124,6 +160,20 @@ public class StockCompareController extends BaseController {
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
+    @Resource
+    InvCpLocalProductService localProductService;
+    @Resource
+    InvCpThrProuductService thrProuductService;
+
+    @PostMapping("/udiwms/stockCompare/detail/result")
+    public BaseResponse realDeatilPage(@RequestBody @Valid InvProductDetailSelectRequest param) {
+        StockCompareEntity stockCompare = stockCompareService.getById(param.getCompareId());
+        if (stockCompare == null) {
+            return ResultVOUtils.error(500, "对比记录不存在");
+        }
+        return ResultVOUtils.success(stockCompareService.getCompareResult(param.getCompareId()));
+    }
+
 
     @DeleteMapping("/udiwms/stockCompare/detail/del")
     public BaseResponse stockCompareDetailPage(@RequestBody @Valid StockCompareDetailDelParam param) {
@@ -134,12 +184,35 @@ public class StockCompareController extends BaseController {
         if (stockCompare.getStatus() != StockCompareStatusEnum.DRAFT) {
             throw new JsonException(500, String.format("非%s状态无法移除", StockCompareStatusEnum.DRAFT.getDesc()));
         }
-        stockCompareDetailService.remove(Wrappers.lambdaQuery(StockCompareDetailEntity.class)
-                .eq(StockCompareDetailEntity::getCompareId, param.getCompareId())
-                .eq(StockCompareDetailEntity::getProductId, param.getProductId())
-                .eq(StockCompareDetailEntity::getMainAction, param.getMainAction())
-        );
+
+        localProductService.remove(Wrappers.lambdaQuery(InvCpLocalProductEntity.class)
+                .eq(InvCpLocalProductEntity::getCompareId, param.getCompareId())
+                .eq(InvCpLocalProductEntity::getProductId, param.getProductId())
+                .eq(InvCpLocalProductEntity::getBatchNo, param.getBatchNo()));
+
+//        stockCompareDetailService.remove(Wrappers.lambdaQuery(StockCompareDetailEntity.class)
+//                .eq(StockCompareDetailEntity::getCompareId, param.getCompareId())
+//                .eq(StockCompareDetailEntity::getProductId, param.getProductId())
+//                .eq(StockCompareDetailEntity::getMainAction, param.getMainAction())
+//        );
         return ResultVOUtils.successMsg("移除成功");
     }
 
+
+    @PostMapping("/udiwms/stockCompare/compare/exportExcel")
+    public void selectExportExcel(@RequestBody InvProductDetailSelectRequest invProductDetailSelectRequest, HttpServletResponse response) throws IOException {
+        // 模拟数据库获取数据
+
+        List<StockCompareDetailEntity> stockCompareDetailEntities = stockCompareDetailService.list(new QueryWrapper<StockCompareDetailEntity>().eq("compareId", invProductDetailSelectRequest.getCompareId()));
+
+        List<StockCompareDetailVo> stockCompareDetailVos =
+                BeanUtil.copyToList(stockCompareDetailEntities, StockCompareDetailVo.class);
+        response.setCharacterEncoding(StandardCharsets.UTF_8.name());
+        response.setHeader("content-Type", "application/vnd.ms-excel");
+        response.setHeader("Content-Disposition",
+                "attachment;filename=" + URLEncoder.encode("库存对比明细" + DateUtil.format(new Date(), "yyyy-MM-dd") + ".xlsx", StandardCharsets.UTF_8.name()));
+
+        EasyExcel.write(response.getOutputStream(), StockCompareDetailVo.class).sheet().doWrite(stockCompareDetailVos);
+    }
+
 }

src/main/java/com/glxp/api/controller/purchase/PurApplyController.java

@@ -107,6 +107,13 @@ public class PurApplyController {
         } else {
             purApplyService.update(purApplyEntity);
         }
+        if (CollUtil.isNotEmpty(postPurApplyRequest.getSubErpOrders())) {
+            for (PurApplyDetailEntity purApplyDetailEntity : postPurApplyRequest.getSubErpOrders()) {
+                purApplyDetailEntity.setId(null);
+                purApplyDetailService.insert(purApplyDetailEntity);
+            }
+        }
+
 
         return ResultVOUtils.success("提交成功！");
     }

src/main/java/com/glxp/api/controller/purchase/PurOrderPrintController.java

@@ -178,7 +178,7 @@ public class PurOrderPrintController {
         Map<String, Object> data = new HashMap<>(1);
         List<Object> list = new ArrayList<>();
         PurApplyDetailRequest purApplyDetailRequest = new PurApplyDetailRequest();
-        purApplyDetailRequest.setOrderIdFk(purOrderPrintRequest.getBillNo());
+        purApplyDetailRequest.setOrderIdFk(purApplyResponse.getId() + "");
         List<PurOrderDetailResponse> responseList = purApplyDetailService.joinQueryList(purApplyDetailRequest);
         int i = 1;
         if (CollUtil.isNotEmpty(responseList)) {
@@ -208,6 +208,10 @@ public class PurOrderPrintController {
                 supData.put("supName", obj.getSupName());
                 supData.put("ylqxzcrbarmc", obj.getYlqxzcrbarmc());
                 supData.put("zczbhhzbapzbh", obj.getZczbhhzbapzbh());
+                supData.put("arrivalTime", MsDateUtil.formatDate(purApplyResponse.getArrivalTime(), "yyyy-MM-dd"));
+                supData.put("remark1", sysPdfTemplateRelevanceBizEntity.getRemark1() == null ? ' ' : sysPdfTemplateRelevanceBizEntity.getRemark1());
+                supData.put("remark2", sysPdfTemplateRelevanceBizEntity.getRemark2() == null ? ' ' : sysPdfTemplateRelevanceBizEntity.getRemark2());
+                supData.put("remark3", sysPdfTemplateRelevanceBizEntity.getRemark3() == null ? ' ' : sysPdfTemplateRelevanceBizEntity.getRemark3());
                 list.add(supData);
                 i++;
             }

src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java

@@ -2,6 +2,7 @@ package com.glxp.api.controller.purchase;
 //领用单
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.annotation.AuthRuleAnnotation;
@@ -57,10 +58,7 @@ import com.glxp.api.service.purchase.impl.PurApplyDetailService;
 import com.glxp.api.service.purchase.impl.PurApplyService;
 import com.glxp.api.service.purchase.impl.PurOrderDetailService;
 import com.glxp.api.service.purchase.impl.PurPlanDetailService;
-import com.glxp.api.util.CustomUtil;
-import com.glxp.api.util.GennerOrderUtils;
-import com.glxp.api.util.IntUtil;
-import com.glxp.api.util.OrderNoTypeBean;
+import com.glxp.api.util.*;
 import com.glxp.api.util.udi.FilterUdiUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -137,6 +135,7 @@ public class PurOrderReceiveController extends BaseController {
         return ResultVOUtils.success("成功");
     }
 
+
     @AuthRuleAnnotation("")
     @PostMapping("/udiwms/receive/order/update")
     public BaseResponse updateReceive(@RequestBody PurReceiveEntity purReceiveEntity, BindingResult bindingResult) {
@@ -237,6 +236,43 @@ public class PurOrderReceiveController extends BaseController {
         return ResultVOUtils.success(orderNo);
     }
 
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/udiwms/thrsys/order/repeatAdd")
+    public BaseResponse repeatAddReceive(@RequestBody AddReceiveDetailRequest addReceiveDetailRequest, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        AuthAdmin authAdmin = getUser();
+        PurReceiveEntity purReceiveEntity = addReceiveDetailRequest.getPurReceiveEntity();
+        String orderNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.LIN_YONG, "yyyyMMdd"));
+        purReceiveEntity.setBillNo(orderNo);
+        purReceiveEntity.setCreateUser(authAdmin.getId() + "");
+        purReceiveEntity.setCreateTime(new Date());
+        purReceiveEntity.setStatus(1);
+        purReceiveEntity.setId(IdUtil.getSnowflakeNextId());
+        receiveService.insertOrder(purReceiveEntity);
+        for (AddReceiveDetailRequest.DetaiData detaiData : addReceiveDetailRequest.getDatas()) {
+            PurReceiveDetailEntity purReceiveDetailEntity = new PurReceiveDetailEntity();
+            purReceiveDetailEntity.setOrderIdFk(purReceiveEntity.getBillNo());
+            purReceiveDetailEntity.setId(null);
+            purReceiveDetailEntity.setNameCode(detaiData.getNameCode());
+            purReceiveDetailEntity.setExpireDate(detaiData.getExpireDate());
+            purReceiveDetailEntity.setProductDate(detaiData.getProductDate());
+            purReceiveDetailEntity.setRelIdFk(detaiData.getRelIdFk());
+            purReceiveDetailEntity.setBatchNo(detaiData.getBatchNo());
+            purReceiveDetailEntity.setPrice(detaiData.getPrice());
+            purReceiveDetailEntity.setSupId(detaiData.getSupId());
+            purReceiveDetailEntity.setCount(detaiData.getCount());
+            receivedetailService.insert(purReceiveDetailEntity);
+        }
+        purReceiveEntity.setUpdateTime(new Date());
+        receiveService.updateOrder(purReceiveEntity);
+        addReceiveDetailRequest.setPurReceiveEntity(purReceiveEntity);
+        return ResultVOUtils.success(purReceiveEntity);
+    }
+
+
     @Resource
     WarehouseUserService warehouseUserService;
     @Resource

src/main/java/com/glxp/api/controller/purchase/SupCertController.java

@@ -321,7 +321,7 @@ public class SupCertController {
             throw new JsonException(ResultEnum.NOT_NETWORK);
         }
         HttpServletRequest request = attributes.getRequest();
-        String userId = request.getHeader("ADMIN_ID");
+        String userId = request.getHeader("ADMINID");
         AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId));
         return authAdmin.getCustomerId() + "";
     }

src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java

@@ -335,7 +335,7 @@ public class SupCompanyController {
             throw new JsonException(ResultEnum.NOT_NETWORK);
         }
         HttpServletRequest request = attributes.getRequest();
-        String userId = request.getHeader("ADMIN_ID");
+        String userId = request.getHeader("ADMINID");
         AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId));
         return authAdmin.getCustomerId() + "";
     }
@@ -346,7 +346,7 @@ public class SupCompanyController {
             throw new JsonException(ResultEnum.NOT_NETWORK);
         }
         HttpServletRequest request = attributes.getRequest();
-        String userId = request.getHeader("ADMIN_ID");
+        String userId = request.getHeader("ADMINID");
         AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId));
         return authAdmin;
     }

src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java

@@ -404,7 +404,7 @@ public class SupManufacturerController {
             throw new JsonException(ResultEnum.NOT_NETWORK);
         }
         HttpServletRequest request = attributes.getRequest();
-        String userId = request.getHeader("ADMIN_ID");
+        String userId = request.getHeader("ADMINID");
         AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId));
         return authAdmin.getCustomerId() + "";
     }

src/main/java/com/glxp/api/controller/purchase/SupProductController.java

@@ -454,7 +454,7 @@ public class SupProductController {
             throw new JsonException(ResultEnum.NOT_NETWORK);
         }
         HttpServletRequest request = attributes.getRequest();
-        String userId = request.getHeader("ADMIN_ID");
+        String userId = request.getHeader("ADMINID");
         AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId));
         return authAdmin.getCustomerId() + "";
     }

src/main/java/com/glxp/api/controller/thrsys/ThrInvOrderController.java

@@ -0,0 +1,111 @@
+package com.glxp.api.controller.thrsys;
+
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.annotation.AuthRuleAnnotation;
+import com.glxp.api.common.enums.ResultEnum;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.entity.thrsys.ThrInvOrder;
+import com.glxp.api.entity.thrsys.ThrInvOrderDetail;
+import com.glxp.api.entity.thrsys.ThrOrderDetailEntity;
+import com.glxp.api.entity.thrsys.ThrOrderEntity;
+import com.glxp.api.req.system.DeleteRequest;
+import com.glxp.api.req.thrsys.*;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.service.thrsys.ThrInvOrderDetailService;
+import com.glxp.api.service.thrsys.ThrInvOrderService;
+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.List;
+
+@RestController
+public class ThrInvOrderController {
+
+    @Resource
+    ThrInvOrderService thrInvOrderService;
+
+    @Resource
+    ThrInvOrderDetailService thrInvOrderDetailService;
+
+    @AuthRuleAnnotation("")
+    @GetMapping("/udiwms/thrsys/getThrInvOrders")
+    public BaseResponse getOrders(FilterThrInvOrderRequest filterThrInvOrderRequest,
+                                  BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<ThrInvOrder> thrInvOrders
+                = thrInvOrderService.filterThrInvOrder(filterThrInvOrderRequest);
+        PageInfo<ThrInvOrder> pageInfo;
+        pageInfo = new PageInfo<>(thrInvOrders);
+        PageSimpleResponse<ThrInvOrder> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(thrInvOrders);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+    @AuthRuleAnnotation("")
+    @GetMapping("/udiwms/thrsys/getThrInvOrderDetails")
+    public BaseResponse getThrInvOrderDetails(FilterThrInvOrderDetailRequest filterThrInvOrderDetailRequest,
+                                              BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<ThrInvOrderDetail> thrInvOrderDetails
+                = thrInvOrderDetailService.filterThrInvOrderDetails(filterThrInvOrderDetailRequest);
+        PageInfo<ThrInvOrderDetail> pageInfo;
+        pageInfo = new PageInfo<>(thrInvOrderDetails);
+        PageSimpleResponse<ThrInvOrderDetail> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(thrInvOrderDetails);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/udiwms/thrsys/delThrInvOrderDetail")
+    public BaseResponse delThrInvOrderDetail(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        String id = deleteRequest.getId();
+        int b = thrInvOrderDetailService.delThrInvOrderDetail(Integer.parseInt(id));
+        if (b > 0) return ResultVOUtils.success("删除成功");
+        else return ResultVOUtils.error(500, "无法删除！");
+    }
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/udiwms/thrsys/delThrInvOrder")
+    public BaseResponse delThrInvOrder(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        String billNo = deleteRequest.getBillNo();
+        int b = thrInvOrderService.delThrInvOrderByBillNo(billNo);
+        if (b > 0) {
+            thrInvOrderDetailService.delThrInvOrderDetailByBillNo(billNo);
+            return ResultVOUtils.success("删除成功");
+        }
+        else return ResultVOUtils.error(500, "无法删除！");
+    }
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/udiwms/thrsys/generateOrder")
+    public BaseResponse generateOrder(@RequestBody @Valid GenerateOrderRequest generateOrderRequest, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        if (thrInvOrderService.generateOrder(generateOrderRequest)){
+            return ResultVOUtils.success("生成成功");
+        }
+        return ResultVOUtils.error(500, "生成失败！");
+    }
+
+}

src/main/java/com/glxp/api/controller/thrsys/ThrManusController.java

@@ -0,0 +1,132 @@
+package com.glxp.api.controller.thrsys;
+
+import cn.hutool.core.thread.ThreadUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.annotation.AuthRuleAnnotation;
+import com.glxp.api.common.enums.ResultEnum;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.entity.thrsys.ThrManufacturerEntity;
+import com.glxp.api.entity.thrsys.ThrSystemDetailEntity;
+import com.glxp.api.http.ErpBasicClient;
+import com.glxp.api.req.system.DeleteRequest;
+import com.glxp.api.req.thrsys.FilterThrCorpRequest;
+import com.glxp.api.req.thrsys.ThrManuFilterRequest;
+import com.glxp.api.req.thrsys.ThrUnitMaintainFilterRequest;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.res.thrsys.ThrCorpsResponse;
+import com.glxp.api.res.thrsys.ThrUnitMaintainResponse;
+import com.glxp.api.service.thrsys.ThrManufacturerService;
+import com.glxp.api.service.thrsys.ThrSystemDetailService;
+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 java.util.List;
+import java.util.stream.Collectors;
+
+@Slf4j
+@RestController
+public class ThrManusController {
+
+
+    @Resource
+    ThrManufacturerService thrManufacturerService;
+    @Resource
+    private ThrSystemDetailService thrSystemDetailService;
+    @Resource
+    private ErpBasicClient erpBasicClient;
+
+
+    @GetMapping("/udiwms/thrsys/getManus")
+    public BaseResponse getManus(FilterThrCorpRequest filterThrCorpRequest,
+                                 BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<ThrManufacturerEntity> thrManufacturerEntities
+                = thrManufacturerService.filterThrManu(filterThrCorpRequest);
+        PageInfo<ThrManufacturerEntity> pageInfo;
+        pageInfo = new PageInfo<>(thrManufacturerEntities);
+        PageSimpleResponse<ThrManufacturerEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(thrManufacturerEntities);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/udiwms/thrsys/delManus")
+    public BaseResponse delCorps(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        String id = deleteRequest.getId();
+        thrManufacturerService.removeById(id);
+        return ResultVOUtils.success("删除成功");
+    }
+
+
+    //选中或者下载全部
+    @AuthRuleAnnotation("")
+    @PostMapping("/udiwms/thrsys/manu/corpsDlAll")
+    public BaseResponse corpsDlAll(@RequestBody ThrManuFilterRequest thrManuFilterRequest) {
+        if (null == thrManuFilterRequest) {
+            return ResultVOUtils.error(500, "参数不能为空");
+        }
+        ThreadUtil.execAsync(() -> {
+            try {
+                thrManufacturerService.downloadByRequest(thrManuFilterRequest);
+            } catch (Exception e) {
+                log.error("下载异常", e);
+                e.printStackTrace();
+            }
+
+        });
+        return ResultVOUtils.success("后台正在下载，请稍后刷新查看！");
+    }
+
+
+    //查询ERP往来单位
+    @AuthRuleAnnotation("")
+    @GetMapping("/udiwms/manu/filterErp")
+    public BaseResponse filterErp(ThrManuFilterRequest thrManuFilterRequest,
+                                  BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        ThrSystemDetailEntity thrSystemDetailEntity = thrSystemDetailService.selectByKey("manuUrl", thrManuFilterRequest.getThirdSys());
+        if (thrSystemDetailEntity == null || thrSystemDetailEntity.getValue() == null)
+            return ResultVOUtils.error(500, "生产企业接口地址未定义");
+        if (thrSystemDetailEntity.getEnabled()) {
+            BaseResponse<PageSimpleResponse<ThrManufacturerEntity>> udiDlDeviceResponse = erpBasicClient.getThrManu(thrManuFilterRequest);
+            if (udiDlDeviceResponse.getCode() == 20000) {
+                for (ThrManufacturerEntity item : udiDlDeviceResponse.getData().getList()) {
+                    ThrManufacturerEntity thrManufacturerEntity = thrManufacturerService.getOne(new QueryWrapper<ThrManufacturerEntity>().eq("unitId", item.getUnitId()).eq("thirdSysFk", thrManuFilterRequest.getThirdSys()).last("limit 1"));
+                    if (thrManufacturerEntity != null) {
+                        item.setChecked(true);
+                    } else {
+                        item.setChecked(false);
+                    }
+                }
+                return udiDlDeviceResponse;
+            } else {
+                return udiDlDeviceResponse;
+            }
+
+        } else {
+            return ResultVOUtils.error(500, "第三方系统往来单位服务接口未启用");
+        }
+    }
+
+
+}

src/main/java/com/glxp/api/controller/thrsys/ThrProductTypeCotroller.java

@@ -0,0 +1,47 @@
+package com.glxp.api.controller.thrsys;
+
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.annotation.AuthRuleAnnotation;
+import com.glxp.api.common.enums.ResultEnum;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.entity.thrsys.ThrHslbEntity;
+import com.glxp.api.entity.thrsys.ThrProductTypeEntity;
+import com.glxp.api.req.thrsys.FilterThrHslbRequest;
+import com.glxp.api.req.thrsys.FilterThrProductTypeRequest;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.service.thrsys.ThrHslbService;
+import com.glxp.api.service.thrsys.ThrProductTypeService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Slf4j
+@RestController
+public class ThrProductTypeCotroller {
+
+    @Resource
+    ThrProductTypeService thrProductTypeService;
+
+    @AuthRuleAnnotation("")
+    @GetMapping("/udiwms/thrsys/getThrProductType")
+    public BaseResponse getProductTypes(FilterThrProductTypeRequest filterThrProductTypeRequest,
+                                        BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<ThrProductTypeEntity> thrProductTypeEntityList
+                = thrProductTypeService.getProductTypes(filterThrProductTypeRequest);
+        PageInfo<ThrProductTypeEntity> pageInfo;
+        pageInfo = new PageInfo<ThrProductTypeEntity>(thrProductTypeEntityList);
+        PageSimpleResponse<ThrProductTypeEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(thrProductTypeEntityList);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+}

src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java

@@ -1,6 +1,7 @@
 package com.glxp.api.controller.thrsys;
 
 
+import com.glxp.api.res.basic.UdiRelevanceResponse;
 import org.springframework.beans.BeanUtils;
 import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.collection.CollUtil;
@@ -296,8 +297,6 @@ public class ThrProductsController {
         if (null == filterThrProductsRequest) {
             return ResultVOUtils.error(500, "参数不能为空");
         }
-
-
         ThreadUtil.execAsync(() -> {
             try {
                 thrProductsService.downloadByRequest(filterThrProductsRequest);
@@ -310,4 +309,24 @@ public class ThrProductsController {
         return ResultVOUtils.success("后台正在下载，请稍后刷新查看！");
     }
 
+
+    /**
+     * 上传第三方产品信息
+     *
+     * @param udiRelevanceResponse
+     * @return
+     */
+    @PostMapping("/udiwms/thrsys/products/post")
+    public BaseResponse postThirdData(@RequestBody UdiRelevanceResponse udiRelevanceResponse) {
+        if (null == udiRelevanceResponse) {
+            return ResultVOUtils.error(500, "参数不能为空");
+        }
+        if (StrUtil.isEmpty(udiRelevanceResponse.getOriginUuid())) {
+            return ResultVOUtils.error(500, "产品未关联DI");
+        }
+
+        return thrProductsService.postThrProduct(udiRelevanceResponse, "thirdId");
+    }
+
+
 }

src/main/java/com/glxp/api/dao/BaseMapperPlus.java

@@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.core.toolkit.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
 import com.glxp.api.util.BeanCopyUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.apache.ibatis.binding.MapperMethod;
 import org.apache.ibatis.logging.Log;
 import org.apache.ibatis.logging.LogFactory;
@@ -314,7 +315,8 @@ public interface BaseMapperPlus<M, T, V> extends BaseMapper<T> {
                 }
             }
         } catch (Exception e) {
-            log.error("replaceBatch fail", e);
+            e.printStackTrace();
+            log.error("replaceBatch fail" + ExceptionUtils.getStackTrace(e));
             return false;
         }
         return true;

src/main/java/com/glxp/api/dao/auth/InvWarehouseDao.java

@@ -25,8 +25,6 @@ public interface InvWarehouseDao extends BaseMapperPlus<InvWarehouseDao, InvWare
 
     boolean insertInvSubWarehouse(InvWarehouseEntity invWarehouseEntity);
 
-    boolean updateInvSubWarehouse(InvWarehouseEntity invWarehouseEntity);
-
     void importInvSubWarehouse(@Param("invWarehouseEntities") List<InvWarehouseEntity> invSubWarehouseEntities);
 
     boolean deleteByParentCode(@Param("code") String code);

src/main/java/com/glxp/api/dao/auth/SysCustomConfigDao.java

@@ -0,0 +1,26 @@
+package com.glxp.api.dao.auth;
+
+
+import com.glxp.api.entity.auth.SysCustomConfigEntity;
+import com.glxp.api.req.auth.SysCustomConfigRequest;
+import com.glxp.api.req.system.DeleteRequest;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface SysCustomConfigDao {
+
+    List<SysCustomConfigEntity> filterSysCustomConfig(SysCustomConfigRequest request);
+
+    boolean insertSysCustomConfig(SysCustomConfigEntity entity);
+
+    boolean updateSysCustomConfig(SysCustomConfigEntity entity);
+
+    boolean deleteById(String id);
+
+    SysCustomConfigEntity selectById(Long id);
+
+    boolean deleteContact(DeleteRequest request);
+
+}

src/main/java/com/glxp/api/dao/auth/SysCustomConfigDetailDao.java

@@ -0,0 +1,28 @@
+package com.glxp.api.dao.auth;
+
+
+import com.glxp.api.entity.auth.SysCustomConfigDetailEntity;
+import com.glxp.api.req.auth.SysCustomConfigDetailRequest;
+import com.glxp.api.req.system.DeleteRequest;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface SysCustomConfigDetailDao {
+
+    List<SysCustomConfigDetailEntity> filterSysCustomConfigDetail(SysCustomConfigDetailRequest request);
+
+    boolean insertSysCustomConfigDetail(SysCustomConfigDetailEntity entity);
+
+    boolean updateSysCustomConfigDetail(SysCustomConfigDetailEntity entity);
+
+    boolean deleteById(String id);
+
+    boolean deleteByConfigId(String id);
+
+    SysCustomConfigDetailEntity selectById(Long id);
+
+    boolean deleteContact(DeleteRequest request);
+
+}

src/main/java/com/glxp/api/dao/basic/BasicDestinyRelMapper.java

@@ -5,6 +5,7 @@ import com.glxp.api.entity.basic.BasicSkProjectDetailEntity;
 import com.glxp.api.req.basic.FilterUdiRelRequest;
 import com.glxp.api.res.basic.UdiRelevanceResponse;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -16,4 +17,5 @@ public interface BasicDestinyRelMapper extends BaseMapperPlus<BasicDestinyRelMap
     List<UdiRelevanceResponse> filterDestinyProducts(FilterUdiRelRequest filterUdiRelRequest);
 
 
+    List<BasicSkProjectDetailEntity> filterDestinyRelListByPId(@Param("thrCode") String thrCode);
 }

src/main/java/com/glxp/api/dao/basic/BasicManufacturerMapper.java

@@ -1,9 +1,30 @@
 package com.glxp.api.dao.basic;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.dao.BaseMapperPlus;
+import com.glxp.api.entity.basic.BasicCorpEntity;
 import com.glxp.api.entity.basic.BasicManufacturerEntity;
+import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 @Mapper
-public interface BasicManufacturerMapper extends BaseMapper<BasicManufacturerEntity> {
+public interface BasicManufacturerMapper extends BaseMapperPlus<BasicManufacturerMapper, BasicManufacturerEntity, BasicManufacturerEntity> {
+
+    List<BasicManufacturerEntity> filterList(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest);
+
+
+    List<BasicManufacturerEntity> batchSelectByErpIdsAndName(@Param("erpIds") List<String> erpIds, @Param("name") String name);
+
+    /**
+     * 根据往来单位名称和社会信用号查询列表
+     *
+     * @param name
+     * @param creditNo
+     * @return
+     */
+    List<BasicManufacturerEntity> selectByNameAndCreditNo(@Param("name") String name, @Param("creditNo") String creditNo);
+
 }

src/main/java/com/glxp/api/dao/basic/BasicSkPrescribeDiMapper.java

@@ -0,0 +1,20 @@
+package com.glxp.api.dao.basic;
+
+import com.glxp.api.entity.basic.BasicSkPrescribeDiEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.req.basic.BasicSkPrescribeDiRequest;
+import com.glxp.api.res.basic.BasicSkPrescribeDiResponse;
+
+import java.util.List;
+
+/**
+ * 针对表【basic_sk_prescribe_item_detail(处方关联的耗材信息表)】的数据库操作Mapper
+ */
+public interface BasicSkPrescribeDiMapper extends BaseMapper<BasicSkPrescribeDiEntity> {
+
+    List<BasicSkPrescribeDiResponse> filterList(BasicSkPrescribeDiRequest basicSkPrescribeDiRequest);
+}
+
+
+
+

src/main/java/com/glxp/api/dao/basic/BasicSkPrescribeItemDetailMapper.java

@@ -1,18 +0,0 @@
-package com.glxp.api.dao.basic;
-
-import com.glxp.api.entity.basic.BasicSkPrescribeItemDetailEntity;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
-* @author Administrator
-* @description 针对表【basic_sk_prescribe_item_detail(处方用药信息表)】的数据库操作Mapper
-* @createDate 2023-11-07 10:13:54
-* @Entity com.glxp.api.entity.basic.BasicSkPrescribeItemDetailEntity
-*/
-public interface BasicSkPrescribeItemDetailMapper extends BaseMapper<BasicSkPrescribeItemDetailEntity> {
-
-}
-
-
-
-

src/main/java/com/glxp/api/dao/basic/BasicSkPrescribeItemMapper.java

@@ -4,10 +4,7 @@ import com.glxp.api.entity.basic.BasicSkPrescribeItemEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
-* @author Administrator
-* @description 针对表【basic_sk_prescribe_item(处方用药信息表)】的数据库操作Mapper
-* @createDate 2023-11-07 10:13:54
-* @Entity com.glxp.api.entity.basic.BasicSkPrescribeItemEntity
+*  针对表【basic_sk_prescribe_item(处方用药信息表)】的数据库操作Mapper
 */
 public interface BasicSkPrescribeItemMapper extends BaseMapper<BasicSkPrescribeItemEntity> {
 

src/main/java/com/glxp/api/dao/basic/BasicSkSickerMapper.java

@@ -14,6 +14,8 @@ public interface BasicSkSickerMapper extends BaseMapperPlus<BasicSkSickerMapper,
 
     List<BasicSkSickerResponse> filterList(BasicSkSickerRequest basicSkSickerRequest);
 
+    List<BasicSkSickerResponse> filterNoList(BasicSkSickerRequest basicSkSickerRequest);
+
 }
 
 

src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java

@@ -1,6 +1,7 @@
 package com.glxp.api.dao.basic;
 
 import com.glxp.api.dao.BaseMapperPlus;
+import com.glxp.api.entity.basic.BasicProductsEntity;
 import com.glxp.api.entity.basic.UdiRelevanceEntity;
 import com.glxp.api.req.basic.FilterUdiRelRequest;
 import com.glxp.api.res.basic.UdiRelevanceResponse;
@@ -134,4 +135,5 @@ public interface UdiRelevanceDao extends BaseMapperPlus<UdiRelevanceDao, UdiRele
 
     UdiRelevanceResponse selectOneUdi(FilterUdiRelRequest filterUdiRelRequest);
 
+    List<BasicProductsEntity> selectProductByRelIds(@Param("relIds")List<Long> relIds);
 }

src/main/java/com/glxp/api/dao/dev/DeviceChangeLogMapper.java

@@ -0,0 +1,15 @@
+package com.glxp.api.dao.dev;
+
+import com.glxp.api.entity.dev.DeviceChangeLogEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+*  针对表【device_change_log(设备变更日志表)】的数据库操作Mapper
+*/
+public interface DeviceChangeLogMapper extends BaseMapper<DeviceChangeLogEntity> {
+
+}
+
+
+
+

src/main/java/com/glxp/api/dao/dev/DeviceChangeOrderItemMapper.java

@@ -0,0 +1,15 @@
+package com.glxp.api.dao.dev;
+
+import com.glxp.api.entity.dev.DeviceChangeOrderItemEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+*  针对表【device_change_order_item(设备变更单明细)】的数据库操作Mapper
+*/
+public interface DeviceChangeOrderItemMapper extends BaseMapper<DeviceChangeOrderItemEntity> {
+
+}
+
+
+
+

src/main/java/com/glxp/api/dao/dev/DeviceChangeOrderMapper.java

@@ -0,0 +1,28 @@
+package com.glxp.api.dao.dev;
+
+import com.glxp.api.entity.auth.AuthAdmin;
+import com.glxp.api.entity.dev.DeviceChangeOrderEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.entity.dev.DeviceChangeOrderItemEntity;
+import com.glxp.api.req.dev.DeviceChangeOrderDetailQuery;
+import com.glxp.api.req.dev.DeviceChangeOrderQuery;
+import com.glxp.api.vo.dev.DeviceChangeOrderVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 针对表【device_change_order(设备变更单)】的数据库操作Mapper
+ */
+public interface DeviceChangeOrderMapper extends BaseMapper<DeviceChangeOrderEntity> {
+
+    List<DeviceChangeOrderVo> listByVo(@Param("param") DeviceChangeOrderQuery query, @Param("user") AuthAdmin user);
+
+    DeviceChangeOrderVo getVoById(Long orderId);
+
+    List<DeviceChangeOrderItemEntity> detailByUser(@Param("param")DeviceChangeOrderDetailQuery query, @Param("user") AuthAdmin user);
+}
+
+
+
+

src/main/java/com/glxp/api/dao/dev/DeviceCheckDetailItemMapper.java

@@ -0,0 +1,15 @@
+package com.glxp.api.dao.dev;
+
+import com.glxp.api.entity.dev.DeviceCheckDetailItemEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+*  针对表【device_check_detail_item(设备巡检项目)】的数据库操作Mapper
+*/
+public interface DeviceCheckDetailItemMapper extends BaseMapper<DeviceCheckDetailItemEntity> {
+
+}
+
+
+
+

src/main/java/com/glxp/api/dao/dev/DeviceCheckDetailMapper.java

@@ -0,0 +1,14 @@
+package com.glxp.api.dao.dev;
+
+import com.glxp.api.entity.dev.DeviceCheckDetailEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+*  针对表【device_check_detail(巡检任务明细)】的数据库操作Mapper
+*/
+public interface DeviceCheckDetailMapper extends BaseMapper<DeviceCheckDetailEntity> {
+}
+
+
+
+

src/main/java/com/glxp/api/dao/dev/DeviceCheckItemDictMapper.java

@@ -0,0 +1,19 @@
+package com.glxp.api.dao.dev;
+
+import com.glxp.api.dao.BaseMapperPlus;
+import com.glxp.api.entity.dev.DeviceCheckItemDictEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.vo.dev.DeviceCheckItemDictVo;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 针对表【device_check_item_dict(巡检项目字典)】的数据库操作Mapper
+ */
+@Mapper
+public interface DeviceCheckItemDictMapper extends BaseMapperPlus<DeviceCheckItemDictMapper, DeviceCheckItemDictEntity, DeviceCheckItemDictEntity> {
+
+}
+
+
+
+

src/main/java/com/glxp/api/dao/dev/DeviceCheckMapper.java

@@ -0,0 +1,24 @@
+package com.glxp.api.dao.dev;
+
+import com.glxp.api.entity.dev.DeviceCheckEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.req.dev.DeviceCheckQuery;
+import com.glxp.api.vo.dev.DeviceCheckPrintVo;
+import com.glxp.api.vo.dev.DeviceCheckVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+*  针对表【device_check(巡检任务表)】的数据库操作Mapper
+*/
+public interface DeviceCheckMapper extends BaseMapper<DeviceCheckEntity> {
+
+    List<DeviceCheckVo> pageVo(DeviceCheckQuery query);
+
+    DeviceCheckVo getVoById(@Param("taskId") Long taskId);
+}
+
+
+
+

src/main/java/com/glxp/api/dao/dev/DeviceInfoMapper.java

@@ -0,0 +1,32 @@
+package com.glxp.api.dao.dev;
+
+import com.glxp.api.entity.dev.DeviceInfoEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.enums.dev.DeviceStatusEnum;
+import com.glxp.api.req.dev.DeviceInfoDetailQuery;
+import com.glxp.api.req.dev.DeviceInfoQuery;
+import com.glxp.api.vo.dev.DeviceInfoVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * 针对表【device_info(设备表)】的数据库操作Mapper
+ */
+public interface DeviceInfoMapper extends BaseMapper<DeviceInfoEntity> {
+
+    List<DeviceInfoVo> pageVo(@Param("param") DeviceInfoQuery query, @Param("deptCode") String locDeptCode);
+
+    List<DeviceInfoVo> allPageVo(@Param("param") DeviceInfoQuery query);
+
+    List<DeviceInfoVo> detail(@Param("param") DeviceInfoDetailQuery query);
+
+    List<DeviceInfoVo> listVoByProductIdAndStatus(@Param("productId")Long productId, @Param("status")DeviceStatusEnum status);
+
+    List<DeviceInfoVo> listVoByCodes(@Param("list") List<String> deviceCodes,@Param("deptCode") String deptCode,@Param("status") DeviceStatusEnum status);
+}
+
+
+
+

src/main/java/com/glxp/api/dao/dev/DevicePlanDetailItemMapper.java

@@ -0,0 +1,16 @@
+package com.glxp.api.dao.dev;
+
+import com.glxp.api.dao.BaseMapperPlus;
+import com.glxp.api.entity.dev.DevicePlanDetailItemEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 针对表【device_plan_detail_item(巡检设备的项目)】的数据库操作Mapper
+ */
+public interface DevicePlanDetailItemMapper extends BaseMapperPlus<DevicePlanDetailItemMapper, DevicePlanDetailItemEntity, DevicePlanDetailItemEntity> {
+
+}
+
+
+
+

src/main/java/com/glxp/api/dao/dev/DevicePlanDetailMapper.java

@@ -0,0 +1,25 @@
+package com.glxp.api.dao.dev;
+
+import com.glxp.api.dao.BaseMapperPlus;
+import com.glxp.api.entity.dev.DevicePlanDetailEntity;
+import com.glxp.api.req.dev.DevicePlanDetailGroupQuery;
+import com.glxp.api.req.dev.DevicePlanDetailQuery;
+import com.glxp.api.vo.dev.DevicePlanDetailVo;
+
+import java.util.List;
+
+/**
+ * 针对表【device_plan_detail(巡检计划明细)】的数据库操作Mapper
+ */
+public interface DevicePlanDetailMapper extends BaseMapperPlus<DevicePlanDetailMapper, DevicePlanDetailEntity, DevicePlanDetailEntity> {
+
+    List<DevicePlanDetailVo> pageGroupVo(DevicePlanDetailGroupQuery query);
+
+    List<DevicePlanDetailVo> pageVo(DevicePlanDetailQuery query);
+
+    List<DevicePlanDetailVo> listByPlanId(Long planId);
+}
+
+
+
+

src/main/java/com/glxp/api/dao/dev/DevicePlanMapper.java

@@ -0,0 +1,20 @@
+package com.glxp.api.dao.dev;
+
+import com.glxp.api.entity.dev.DevicePlanEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.req.dev.DevicePlanQuery;
+import com.glxp.api.vo.dev.DevicePlanVo;
+
+import java.util.List;
+
+/**
+*  针对表【device_plan(设备巡检计划)】的数据库操作Mapper
+*/
+public interface DevicePlanMapper extends BaseMapper<DevicePlanEntity> {
+
+    List<DevicePlanVo> pageVo(DevicePlanQuery query);
+}
+
+
+
+

src/main/java/com/glxp/api/dao/dev/DeviceRepairApplyDetailMapper.java

@@ -0,0 +1,18 @@
+package com.glxp.api.dao.dev;
+
+import com.glxp.api.entity.dev.DeviceRepairApplyDetailEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author Administrator
+* @description 针对表【device_repair_apply_detail(设备报修单明细)】的数据库操作Mapper
+* @createDate 2023-12-07 17:15:49
+* @Entity com.glxp.api.entity.dev.DeviceRepairApplyDetailEntity
+*/
+public interface DeviceRepairApplyDetailMapper extends BaseMapper<DeviceRepairApplyDetailEntity> {
+
+}
+
+
+
+

src/main/java/com/glxp/api/dao/dev/DeviceRepairApplyMapper.java

@@ -0,0 +1,18 @@
+package com.glxp.api.dao.dev;
+
+import com.glxp.api.entity.dev.DeviceRepairApplyEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author Administrator
+* @description 针对表【device_repair_apply(设备报修单)】的数据库操作Mapper
+* @createDate 2023-12-07 17:15:49
+* @Entity com.glxp.api.entity.dev.DeviceRepairApplyEntity
+*/
+public interface DeviceRepairApplyMapper extends BaseMapper<DeviceRepairApplyEntity> {
+
+}
+
+
+
+

src/main/java/com/glxp/api/dao/dev/DeviceRepairMapper.java

@@ -0,0 +1,18 @@
+package com.glxp.api.dao.dev;
+
+import com.glxp.api.entity.dev.DeviceRepairEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author Administrator
+* @description 针对表【device_repair(设备维修单)】的数据库操作Mapper
+* @createDate 2023-12-07 17:15:49
+* @Entity com.glxp.api.entity.dev.DeviceRepairEntity
+*/
+public interface DeviceRepairMapper extends BaseMapper<DeviceRepairEntity> {
+
+}
+
+
+
+

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

@@ -5,6 +5,7 @@ import com.glxp.api.entity.inout.IoOrderDetailResultEntity;
 import com.glxp.api.req.inout.CptTraceRequest;
 import com.glxp.api.req.inout.FilterOrderDetailResultRequest;
 import com.glxp.api.res.inout.CptTraceOrderResponse;
+import com.glxp.api.res.inout.IoExOrderDetailResultResponse;
 import com.glxp.api.res.inout.IoOrderDetailResultResponse;
 import com.glxp.api.res.inv.IoOrderDetailStatRsponse;
 import io.lettuce.core.dynamic.annotation.Param;
@@ -37,4 +38,10 @@ public interface IoOrderDetailResultDao extends BaseMapperPlus<IoOrderDetailBizD
     List<IoOrderDetailStatRsponse> selectStatDataByTime(@Param("list") List<String> orderIdFk);
 
     List<CptTraceOrderResponse> cptTrace(CptTraceRequest cptTraceRequest);
+
+
+    List<CptTraceOrderResponse> cptCodeTrace(CptTraceRequest cptTraceRequest);
+
+
+    List<IoExOrderDetailResultResponse> exFilterOrderDetail(FilterOrderDetailResultRequest orderDetailResultRequest);
 }

src/main/java/com/glxp/api/dao/inout/IoOrderSkPrescribeMapper.java

@@ -0,0 +1,16 @@
+package com.glxp.api.dao.inout;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.entity.inout.IoOrderSkPrescribeEntity;
+import com.glxp.api.req.inout.FilterOrderDetailBizRequest;
+import com.glxp.api.res.inout.IoOrderDetailBizResponse;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface IoOrderSkPrescribeMapper extends BaseMapper<IoOrderSkPrescribeEntity> {
+
+    List<IoOrderDetailBizResponse> filterList(FilterOrderDetailBizRequest orderDetailBizRequest);
+
+}

src/main/java/com/glxp/api/dao/inout/IoStatDetailMapper.java

@@ -0,0 +1,24 @@
+package com.glxp.api.dao.inout;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.entity.inout.IoStatDayEntity;
+import com.glxp.api.entity.inout.IoStatDetailEntity;
+import com.glxp.api.req.inout.FilterStatDataDetailRequest;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface IoStatDetailMapper extends BaseMapper<IoStatDetailEntity> {
+
+    /**
+     * 查询日汇总数据列表
+     *
+     * @param statDataDetailRequest
+     * @return
+     */
+    List<IoStatDetailEntity> filterList(FilterStatDataDetailRequest statDataDetailRequest);
+
+    List<IoStatDetailEntity> filterListByRecordKey(String recordKey);
+
+}

src/main/java/com/glxp/api/dao/inout/IoStatOrderDao.java

@@ -3,6 +3,7 @@ package com.glxp.api.dao.inout;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.api.entity.inout.IoStatOrderEntity;
 import com.glxp.api.req.inout.FilterStatDataRequest;
+import com.glxp.api.res.inout.IoStatOrderResponse;
 
 import java.util.List;
 
@@ -14,6 +15,6 @@ public interface IoStatOrderDao extends BaseMapper<IoStatOrderEntity> {
      * @param statDataRequest
      * @return
      */
-    List<IoStatOrderEntity> filterList(FilterStatDataRequest statDataRequest);
+    List<IoStatOrderResponse> filterList(FilterStatDataRequest statDataRequest);
 
-}
+}

src/main/java/com/glxp/api/dao/inv/InvCpLocalProductMapper.java

@@ -0,0 +1,9 @@
+package com.glxp.api.dao.inv;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.entity.inv.InvCpLocalProductEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface InvCpLocalProductMapper extends BaseMapper<InvCpLocalProductEntity> {
+}

src/main/java/com/glxp/api/dao/inv/InvCpThrProuductMapper.java

@@ -0,0 +1,9 @@
+package com.glxp.api.dao.inv;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.entity.inv.InvCpThrProuductEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface InvCpThrProuductMapper extends BaseMapper<InvCpThrProuductEntity> {
+}

src/main/java/com/glxp/api/dao/inv/InvProductDao.java

@@ -92,4 +92,12 @@ public interface InvProductDao extends BaseMapperPlus<InvProductDao, InvProductE
 
     Integer selectExitCount(@Param("invCode") String invCode, @Param("supId") Long supId, @Param("relIdFk") Long relIdFk);
 
+    /**
+     * 过滤掉实际库存为0的供应商
+     * @param relId 产品号
+     * @param batchNo 批次号
+     * @param unitFks 供应商列表
+     * @return
+     */
+    List<String> filterReCount(Long relId, String batchNo, List<String> unitFks);
 }

src/main/java/com/glxp/api/dao/inv/StockCompareDetailMapper.java

@@ -5,9 +5,13 @@ import com.glxp.api.dao.BaseMapperPlus;
 import com.glxp.api.entity.inv.StockCompareDetailEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.api.req.inv.InvProductDetailSelectQuery;
+import com.glxp.api.req.inv.InvProductDetailSelectRequest;
+import com.glxp.api.res.inv.StockCompareDetailResponse;
 import com.glxp.api.vo.inv.InvProductDetailSelectVo;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * @author Administrator
  * @description 针对表【inv_stock_compare_detail(库存对比明细)】的数据库操作Mapper
@@ -17,6 +21,10 @@ import org.apache.ibatis.annotations.Param;
 public interface StockCompareDetailMapper extends BaseMapperPlus<StockCompareDetailMapper, StockCompareDetailEntity, StockCompareDetailEntity> {
 
     Page<InvProductDetailSelectVo> invProductDetailSelectPage(Page pageObj, @Param("param") InvProductDetailSelectQuery query);
+
+
+    List<StockCompareDetailResponse> filterCompareDetail(InvProductDetailSelectRequest invProductDetailSelectRequest);
+
 }
 
 

src/main/java/com/glxp/api/dao/inv/StockCompareMapper.java

@@ -9,10 +9,7 @@ import com.glxp.api.vo.inv.StockCompareVo;
 import org.apache.ibatis.annotations.Param;
 
 /**
-* @author Administrator
-* @description 针对表【inv_stock_compare】的数据库操作Mapper
-* @createDate 2023-10-23 11:40:33
-* @Entity com.glxp.api.entity.inv.StockCompareEntity
+*  针对表【inv_stock_compare】的数据库操作Mapper
 */
 public interface StockCompareMapper extends BaseMapperPlus<StockCompareMapper,StockCompareEntity,StockCompareEntity> {
 

src/main/java/com/glxp/api/dao/thrsys/ThrInvOrderDetailMapper.java

@@ -0,0 +1,27 @@
+package com.glxp.api.dao.thrsys;
+
+import com.glxp.api.dao.BaseMapperPlus;
+import com.glxp.api.dao.inout.IoOrderDetailBizDao;
+import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
+import com.glxp.api.entity.thrsys.ThrInvOrderDetail;
+import com.glxp.api.req.thrsys.FilterThrInvOrderDetailRequest;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface ThrInvOrderDetailMapper extends BaseMapperPlus<ThrInvOrderDetailMapper, ThrInvOrderDetail, ThrInvOrderDetail> {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(ThrInvOrderDetail record);
+
+    int insertSelective(ThrInvOrderDetail record);
+
+    ThrInvOrderDetail selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(ThrInvOrderDetail record);
+
+    int updateByPrimaryKey(ThrInvOrderDetail record);
+
+    List<ThrInvOrderDetail> filterThrOrderDetailDetail(FilterThrInvOrderDetailRequest filterThrInvOrderDetailRequest);
+}

src/main/java/com/glxp/api/dao/thrsys/ThrInvOrderMapper.java

@@ -0,0 +1,26 @@
+package com.glxp.api.dao.thrsys;
+
+import com.glxp.api.dao.BaseMapperPlus;
+import com.glxp.api.entity.thrsys.ThrInvOrder;
+import com.glxp.api.entity.thrsys.ThrInvOrderDetail;
+import com.glxp.api.req.thrsys.FilterThrInvOrderRequest;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface ThrInvOrderMapper extends BaseMapperPlus<ThrInvOrderMapper, ThrInvOrder, ThrInvOrder> {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(ThrInvOrder record);
+
+    int insertSelective(ThrInvOrder record);
+
+    ThrInvOrder selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(ThrInvOrder record);
+
+    int updateByPrimaryKey(ThrInvOrder record);
+
+    List<ThrInvOrder> filterThrInvOrder(FilterThrInvOrderRequest filterThrInvOrderRequest);
+}

src/main/java/com/glxp/api/dao/thrsys/ThrManufacturerMapper.java

@@ -0,0 +1,21 @@
+package com.glxp.api.dao.thrsys;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.dao.BaseMapperPlus;
+import com.glxp.api.entity.thrsys.ThrCorpEntity;
+import com.glxp.api.entity.thrsys.ThrManufacturerEntity;
+import com.glxp.api.req.thrsys.FilterThrCorpRequest;
+import com.glxp.api.res.thrsys.ThrCorpsResponse;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface ThrManufacturerMapper extends BaseMapperPlus<ThrManufacturerMapper, ThrManufacturerEntity, ThrManufacturerEntity> {
+
+    List<ThrManufacturerEntity> filterThrManu(FilterThrCorpRequest filterThrCorpRequest);
+
+    ThrManufacturerEntity selectByUnitIdAndThirdId(@Param("unitId") String unitId, @Param("thirdId") String thirdId);
+
+}

src/main/java/com/glxp/api/dao/thrsys/ThrProductTypeMapper.java

@@ -0,0 +1,16 @@
+package com.glxp.api.dao.thrsys;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.entity.thrsys.ThrProductTypeEntity;
+import com.glxp.api.req.thrsys.FilterThrHslbRequest;
+import com.glxp.api.req.thrsys.FilterThrProductTypeRequest;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface ThrProductTypeMapper extends BaseMapper<ThrProductTypeEntity> {
+
+    List<ThrProductTypeEntity> getProductTypes(FilterThrProductTypeRequest filterThrProductTypeRequest);
+
+}

src/main/java/com/glxp/api/dto/DictDto.java

@@ -0,0 +1,20 @@
+package com.glxp.api.dto;
+
+import lombok.Data;
+
+@Data
+public class DictDto {
+
+    private String code;
+    private String label;
+
+    public DictDto(String code, String label) {
+        this.code = code;
+        this.label = label;
+    }
+
+    public DictDto(Integer code, String label) {
+        this.code = code.toString();
+        this.label = label;
+    }
+}

src/main/java/com/glxp/api/entity/auth/SysCustomConfigDetailEntity.java

@@ -0,0 +1,188 @@
+package com.glxp.api.entity.auth;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author 作者
+ * @since 2023-02-07
+ */
+@TableName("sys_custom_config_detail")
+@Data
+public class SysCustomConfigDetailEntity {
+
+
+    @TableId(value = "id", type = IdType.INPUT)
+    private Long id;
+
+    /**
+     * 配置id
+     */
+    @TableField("configId")
+    private Long configId;
+    /**
+     * 类型 1列表 2表单 3查询框
+     */
+    @TableField("type")
+    private String type;
+
+    /**
+     * 是否显示 1显示 2隐藏
+     */
+    @TableField("isShow")
+    private String isShow;
+
+    /**
+     * 列名
+     */
+    @TableField("columnName")
+    private String columnName;
+
+    /**
+     * 列描述
+     */
+    @TableField("columnDesc")
+    private String columnDesc;
+    /**
+     * 列类型
+     */
+    @TableField("columnType")
+    private String columnType;
+
+    /**
+     * 颜色规则
+     */
+    @TableField("colorRule")
+    private String colorRule;
+
+    /**
+     * 字段替换规则
+     */
+    @TableField("lableRule")
+    private String lableRule;
+
+    /**
+     * 字段替换规则
+     */
+    @TableField(exist = false)
+    private Object lableRuleObj;
+
+    /**
+     * 按钮规则
+     */
+    @TableField("buttonRule")
+    private String buttonRule;
+
+    /**
+     * 按钮规则
+     */
+    @TableField(exist = false)
+    private Object buttonRulObj;
+
+
+    /**
+     * 宽度
+     */
+    @TableField("width")
+    private Integer width;
+
+    /**
+     * 是否排序
+     */
+    @TableField("sort")
+    private Boolean sort;
+
+
+    /**
+     * 是否缩略
+     */
+    @TableField("tooltip")
+    private Boolean tooltip;
+
+
+    /**
+     * 排序
+     */
+    @TableField("number")
+    private Integer number;
+
+
+    /**
+     * 行号
+     */
+    @TableField("lineNumber")
+    private Integer lineNumber;
+
+    /**
+     * 点击事件
+     */
+    @TableField("clickFuc")
+    private String clickFuc;
+
+    /**
+     * 禁用方法
+     */
+    @TableField("禁用方法")
+    private String disabledFuc;
+
+
+    /**
+     * eval表达式
+     */
+    @TableField("eval表达式")
+    private String expression;
+
+    /**
+     * 大小
+     */
+    @TableField("size")
+    private String size;
+
+    /**
+     * 样式
+     */
+    @TableField("style")
+    private String style;
+
+    /**
+     * 是否禁用
+     */
+    @TableField("disabled")
+    private Boolean disabled;
+
+    /**
+     * 验证规则
+     */
+    @TableField("checkRules")
+    private String checkRules;
+    /**
+     * 验证规则
+     */
+    @TableField(exist = false)
+    private Object checkRulesObj;
+
+    /**
+     * input类型
+     */
+    @TableField("inputType")
+    private String inputType;
+
+    /**
+     * 获取数据方法
+     */
+    @TableField("dataFuc")
+    private String dataFuc;
+
+    /**
+     * 是否展示详细 1是 2否
+     */
+    @TableField("isShowXx")
+    private String isShowXx;
+}