fix: 优化退货单再次分配

pom.xml

@@ -269,6 +269,10 @@
                     <groupId>com.lowagie</groupId>
                     <artifactId>itext</artifactId>
                 </exclusion>
+                <exclusion>
+                    <artifactId>olap4j</artifactId>
+                    <groupId>org.olap4j</groupId>
+                </exclusion>
             </exclusions>
 
         </dependency>

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

@@ -7,7 +7,6 @@ import com.glxp.api.dao.system.DbVersionDao;
 import com.glxp.api.entity.system.DbVersionEntity;
 import com.glxp.api.entity.system.SchemaData;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
 import org.springframework.core.annotation.Order;
@@ -27,16 +26,10 @@ public class HdSchemaExecutor implements ApplicationRunner {
     @Resource
     DbVersionDao hdCommonDao;
 
-    @Value("${initSql:true}")
-    private boolean initSql;
-
     private List<SchemaData> schema = new ArrayList<>();
 
     @Override
     public void run(ApplicationArguments args) throws Exception {
-        if (!initSql) {
-            return;
-        }
         //初始版本列表
         buildSchemas();
         //定义sql文件路径
@@ -49,7 +42,7 @@ public class HdSchemaExecutor implements ApplicationRunner {
         String sql = IoUtil.readUtf8(inputStream);
         try {
             //判断版本表是否存在
-            int count = hdCommonDao.selectTableExist("sys_db_version");
+            int count = hdCommonDao.selectTableExist("hd_version");
             if (count == 0) {
                 hdCommonDao.updateSql(sql);
             }
@@ -84,5 +77,7 @@ public class HdSchemaExecutor implements ApplicationRunner {
 //        schema.add(new SchemaData("v2.1", "schema_v2.1.sql"));
 //        schema.add(new SchemaData("v2.2", "schema_v2.2.sql"));
         schema.add(new SchemaData("v2.3", "schema_v2.3.sql"));
+//        schema.add(new SchemaData("v2.4", "schema_v2.4.sql"));
     }
+
 }

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

@@ -238,6 +238,9 @@ public class Constant {
 
     public static final String ORDER_STATUS_INCODE = "supInCode";
 
+
+    public static final String ORDER_STATUS_RETURN = "supReturned";
+
     /**前端页面查询相关单据类型标识*/
 
 

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/controller/auth/DeptController.java

@@ -11,6 +11,7 @@ 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.dto.DictDto;
 import com.glxp.api.entity.auth.AuthAdmin;
 import com.glxp.api.entity.auth.DeptEntity;
 import com.glxp.api.entity.auth.DeptUserEntity;
@@ -69,6 +70,18 @@ public class DeptController extends BaseController {
         return ResultVOUtils.success(invWarehouseEntities);
     }
 
+    @AuthRuleAnnotation("")
+    @GetMapping("spms/inv/warehouse/filterAllOptimize")
+    public BaseResponse filterAllInvWarehouseOptimize(FilterInvWarehouseRequest filterInvWarehouseRequest) {
+        filterInvWarehouseRequest.setPid(0);
+        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")
@@ -100,6 +113,29 @@ public class DeptController extends BaseController {
     }
 
 
+    @AuthRuleAnnotation("")
+    @GetMapping("spms/inv/warehouse/filterByUserOptimize")
+    public BaseResponse filterByUserOptimize(FilterInvWarehouseRequest filterInvWarehouseRequest) {
+
+        if (isHosUser()) {
+            AuthAdmin authAdmin = customerService.getUserBean();
+            filterInvWarehouseRequest.setUserId(authAdmin.getId());
+        } else {
+
+        }
+
+        filterInvWarehouseRequest.setPid(0);
+        filterInvWarehouseRequest.setStatus(1);
+
+        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/InvWarehouseController.java

@@ -12,6 +12,7 @@ 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.dto.DictDto;
 import com.glxp.api.entity.auth.*;
 import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
 import com.glxp.api.req.auth.*;
@@ -72,6 +73,23 @@ 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);
+    }
+
     /**
      * 获取部门底下仓库列表-关联用户
      *
@@ -141,6 +159,29 @@ public class InvWarehouseController extends BaseController {
         return ResultVOUtils.success(list);
     }
 
+    @AuthRuleAnnotation("")
+    @GetMapping("spms/inv/warehouse/findInvListByUserOptimize")
+    public BaseResponse findInvListByUserOptimize(FilterInvWarehouseRequest filterInvWarehouseRequest) {
+        Long userId = getUserId();
+        if (null == userId) {
+            return ResultVOUtils.error(ResultEnum.LOGIN_VERIFY_FALL);
+        }
+
+        if (isHosUser()) {
+            filterInvWarehouseRequest.setUserId(userId);
+        } else {
+            filterInvWarehouseRequest.setUserId(null);
+            filterInvWarehouseRequest.setSpUse(true);
+        }
+
+        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);
+    }
+
     /**
      * 获取往来仓库(除了自己)
      *

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

@@ -132,7 +132,7 @@ public class RegisterController {
             JSONObject json = new JSONObject();
             json.put("memPhone", checkCodeRequest.getPhoneNum());
             json.put("code", mobile_code);
-            json.put("createTime", System.currentTimeMillis());
+            json.put("createTime", System.currentTimeMillis() + "");
             //验证码存入redis中
             redisUtil.set(Constant.CAPTCHAS + checkCodeRequest.getPhoneNum(), json, 300L);
             return ResultVOUtils.success("发送成功" + "   " + mobile_code);

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

@@ -17,6 +17,7 @@ import com.glxp.api.constant.ConstantType;
 import com.glxp.api.constant.SocketMsgType;
 import com.glxp.api.controller.BaseController;
 import com.glxp.api.controller.sync.SpsSyncWebSocket;
+import com.glxp.api.dto.DictDto;
 import com.glxp.api.entity.auth.WarehouseBussinessTypeEntity;
 import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
 import com.glxp.api.entity.sync.SocketMsgEntity;
@@ -53,6 +54,7 @@ import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 单据类型接口
@@ -258,6 +260,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);
+
+    }
+
+
     @Resource
     IoOrderService orderService;
     @Resource

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

@@ -13,6 +13,7 @@ import com.glxp.api.constant.ConstantStatus;
 import com.glxp.api.constant.SocketMsgType;
 import com.glxp.api.controller.BaseController;
 import com.glxp.api.controller.sync.SpsSyncWebSocket;
+import com.glxp.api.dto.DictDto;
 import com.glxp.api.entity.basic.BasicCorpEntity;
 import com.glxp.api.entity.sync.SocketMsgEntity;
 import com.glxp.api.entity.system.SystemParamConfigEntity;
@@ -94,6 +95,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) {

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

@@ -193,8 +193,9 @@ public class UdiContrastController {
                     productInfoService.insertProductInfos(productInfoEntityList);
                     newUuid = productInfoEntityList.get(0).getUuid();
                 }
+            } else {
+                return ResultVOUtils.error(500, "实时获取国家库数据失败！");
             }
-
             udiInfoEntities = udiDlHttpClient.getUdiByUuid(newUuid);
             udiProductService.deleteByUuid(udiCombineRequest.getUuid());
             for (UdiProductEntity udiProductEntity : udiInfoEntities) {

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

@@ -16,6 +16,7 @@ import com.glxp.api.constant.SocketMsgType;
 import com.glxp.api.controller.BaseController;
 import com.glxp.api.controller.sync.SpsSyncWebSocket;
 import com.glxp.api.dao.basic.UdiRelevanceDao;
+import com.glxp.api.dto.DictDto;
 import com.glxp.api.entity.basic.*;
 import com.glxp.api.entity.sync.SocketMsgEntity;
 import com.glxp.api.entity.system.SystemParamConfigEntity;
@@ -35,6 +36,7 @@ import com.glxp.api.service.inv.InvProductService;
 import com.glxp.api.service.system.SystemParamConfigService;
 import com.glxp.api.service.thrsys.ThrDataService;
 import com.glxp.api.service.thrsys.ThrSystemService;
+import com.glxp.api.util.IntUtil;
 import com.glxp.api.util.udi.FilterUdiUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.validation.BindingResult;
@@ -226,6 +228,9 @@ public class UdiRelevanceController extends BaseController {
     @GetMapping("udiwms/udiinfo/local/filterByUuid")
     public BaseResponse filterLocalByUuid(FilterUdiRelRequest filterUdiRelRequest) {
 
+        if (filterUdiRelRequest.getId() == null) {
+            return ResultVOUtils.error(500, "产品ID主键不能为空！");
+        }
         if (filterUdiRelRequest.getId() == null) {
             return ResultVOUtils.error(500, "产品ID主键不能为空！");
         }
@@ -342,6 +347,7 @@ public class UdiRelevanceController extends BaseController {
         udiProductEntity.setAllowNoProduct(udiRelevanceSaveRequest.getAllowNoProduct());
         udiProductEntity.setAllowNoSerial(udiRelevanceSaveRequest.getAllowNoSerial());
         udiProductEntity.setZxxsbzbhsydysl(udiRelevanceEntity.getUseNum());
+        udiProductEntity.setGroupBuy(udiRelevanceSaveRequest.getGroupBuy());
         udiProductEntity.setBasicPrductRemak1(udiRelevanceSaveRequest.getBasicPrductRemak1());
         udiProductEntity.setBasicPrductRemak2(udiRelevanceSaveRequest.getBasicPrductRemak2());
         udiProductEntity.setBasicPrductRemak3(udiRelevanceSaveRequest.getBasicPrductRemak3());
@@ -519,6 +525,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("")
@@ -673,7 +710,7 @@ public class UdiRelevanceController extends BaseController {
 
     @AuthRuleAnnotation("")
     @PostMapping("/udi/udirel/updateById")
-    @Log(title = "单据管理", businessType = BusinessType.UPDATE)
+    @Log(title = "入院物资维护", businessType = BusinessType.UPDATE)
     public BaseResponse updateById(@RequestBody UdiProductEntity udiProductEntity, BindingResult bindingResult) {
 
         if (bindingResult.hasErrors()) {
@@ -682,7 +719,10 @@ public class UdiRelevanceController extends BaseController {
         boolean falg = udiProductService.updateUdiInfoById(udiProductEntity);
         UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity();
         udiRelevanceEntity.setId(udiProductEntity.getUid());
-        udiRelevanceEntity.setGroupBuy(udiProductEntity.isGroupBuy());
+        udiRelevanceEntity.setGroupBuy(IntUtil.value(udiProductEntity.getGroupBuy()));
+        udiRelevanceEntity.setPurType(udiProductEntity.getPurType());
+        udiRelevanceEntity.setAttributeType(udiProductEntity.getAttributeType());
+        udiRelevanceEntity.setUpdateTime(new Date());
         boolean b = udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
         if (udiProductEntity.getRelSupId() != null) {
             UdiRlSupEntity udiRlSupEntity = new UdiRlSupEntity();

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

@@ -244,6 +244,7 @@ public class UdiRlSupController extends BaseController {
         UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity();
         udiRelevanceEntity.setId(Long.parseLong(rlidStr));
         udiRelevanceEntity.setLockStatus(1);
+        udiRelevanceEntity.setGroupBuy(udiInfoExportRequest.getSupplementRequest().getGroupBuy());
         udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
         UdiProductEntity udiProductEntity = new UdiProductEntity();
         BeanUtil.copyProperties(udiInfoExportRequest.getSupplementRequest(), udiProductEntity);

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

@@ -3,11 +3,13 @@ package com.glxp.api.controller.basic;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
+import com.github.pagehelper.Page;
 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.constant.AsyncDiDlHelper;
+import com.glxp.api.dto.DictDto;
 import com.glxp.api.entity.basic.*;
 import com.glxp.api.req.basic.*;
 import com.glxp.api.res.PageSimpleResponse;
@@ -21,6 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 国家库产品信息相关接口
@@ -114,6 +117,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数据下载服务出错！");
+        }
+    }
+
     @AuthRuleAnnotation("")
     @GetMapping("udiwms/udiinfo/superSearch")
     public BaseResponse superSearch(FilterUdiInfoRequest filterUdiInfoRequest) {

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

@@ -714,11 +714,11 @@ public class IoCodeTempController extends BaseController {
                     return ResultVOUtils.error(500, "该产品不可配送，请联系院方！");
                 }
 
-                if (bussinessTypeEntity.getVailGroupBuy() == 1 && !udiRelevanceResponse.isGroupBuy()) {       //只采集集采产品
+                if (bussinessTypeEntity.getVailGroupBuy() == 1 && !IntUtil.value(udiRelevanceResponse.getGroupBuy())) {       //只采集集采产品
                     return ResultVOUtils.error(500, bussinessTypeEntity.getName() + "只允许录入集采产品！");
                 }
 
-                if (bussinessTypeEntity.getVailGroupBuy() == 2 && udiRelevanceResponse.isGroupBuy()) {        //只采集非集采产品
+                if (bussinessTypeEntity.getVailGroupBuy() == 2 && IntUtil.value(udiRelevanceResponse.getGroupBuy())) {        //只采集非集采产品
                     return ResultVOUtils.error(500, bussinessTypeEntity.getName() + "只允许录入非集采产品！");
                 }
 

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

@@ -295,6 +295,10 @@ public class IoOrderController extends BaseController {
         if (StringUtils.isNotBlank(addOrderRequest.getRemark())) {
             orderEntity.setRemark(addOrderRequest.getRemark());
         }
+        if (StringUtils.isNotBlank(addOrderRequest.getAction())) {
+            orderEntity.setAction(addOrderRequest.getAction());
+            orderService.update(orderEntity);
+        }
         BaseResponse tempResponse = checkSubmitEnable(orderEntity);
         if (tempResponse != null)
             return tempResponse;
@@ -688,6 +692,50 @@ public class IoOrderController extends BaseController {
         return ResultVOUtils.success();
     }
 
+
+    /**
+     * 1、根据 billNo 查找出当前退货单的io_order 、 io_order_detail_biz 、 io_order_detail_code 、 io_code
+     * 2、新增io_order 生产新的billNo
+     * 3、复制新的io_order_detail_biz 、 io_order_detail_code 绑定新billNo
+     * 4、复制io_code 到新billNo的io_code_temp
+     *
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udiwms/inout/order/copyOrder")
+    @Log(title = "单据管理", businessType = BusinessType.INSERT)
+    public BaseResponse copyOrder(@RequestBody IoOrderEntity ioOrderEntity) {
+        if ( null == ioOrderEntity || StrUtil.isEmpty(ioOrderEntity.getBillNo()) ) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
+        }
+
+        String oldBillNo = ioOrderEntity.getBillNo();
+        IoOrderEntity oldIoOrderEntity = orderService.findByBillNo(oldBillNo);
+        if (Objects.isNull(oldIoOrderEntity)){
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
+        }
+
+        //新单号
+        String newBillNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER, "yyyyMMdd"));
+        //当前操作人
+        AuthAdmin authAdmin = getUser();
+        //处理io_order
+        IoOrderEntity newIoOrderEntity = new IoOrderEntity();
+        orderService.copyOrder(authAdmin,newBillNo,newIoOrderEntity,oldIoOrderEntity);
+        orderService.insertOrder(newIoOrderEntity);
+        //处理io_order_detail_biz
+        boolean orderDetailBizFlag = orderDetailBizService.copyOrderDetailBiz(newBillNo, oldBillNo);
+        //处理io_order_detail_code
+        boolean orderDetailCodeFlag = orderDetailCodeService.copyOrderDetailCode(newBillNo, oldBillNo);
+        //处理io_code
+        boolean codeTempFlag = codeTempService.copyCodeTemp(newBillNo, oldBillNo);
+
+        if (orderDetailBizFlag && orderDetailCodeFlag && codeTempFlag){
+            return ResultVOUtils.success(newIoOrderEntity);
+        }
+
+        return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
+    }
+
     @Resource
     SpsSyncWebSocket webSocketServer;
     // --------------------------------------------------------UDI_MS平台--------------------------------------------------------------------------------------
@@ -707,6 +755,12 @@ public class IoOrderController extends BaseController {
     @Resource
     InvWarehouseService invWarehouseService;
 
+    /**
+     * 单据复制提交
+     *
+     * @param addOrderChangeRequest
+     * @return
+     */
     @AuthRuleAnnotation("")
     @PostMapping("/udiwms/stock/order/change")
     public BaseResponse stockOrderChange(@RequestBody AddOrderChangeRequest addOrderChangeRequest) {

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

@@ -437,7 +437,7 @@ public class SupCertController {
                     supData.put("status", obj.getStatus() == 0 ? "有效" : "失效");
                     supData.put("auditStatus", getAuditStatus(obj.getAuditStatus()));
                     supData.put("remark", obj.getRemark() == null ? ' ' : obj.getRemark());
-                    supData.put("filePath", filePath + "register/image2/" + url);
+                    supData.put("filePath", filePath + "register/file/image2/" + url);
                     list.add(supData);
                     i++;
                 }
@@ -553,7 +553,7 @@ public class SupCertController {
                     supData.put("status", obj.getStatus() == 0 ? "有效" : "失效");
                     supData.put("auditStatus", getAuditStatus(obj.getAuditStatus()));
                     supData.put("remark2", obj.getRemark() == null ? ' ' : obj.getRemark());
-                    supData.put("filePath", filePath + "register/image2/" + url);
+                    supData.put("filePath", filePath + "register/file/image2/" + url);
                     list.add(supData);
                     i++;
                 }
@@ -619,7 +619,7 @@ public class SupCertController {
                     supData.put("status", obj.getStatus() == 0 ? "有效" : "失效");
                     supData.put("auditStatus", getAuditStatus(obj.getAuditStatus()));
                     supData.put("remark2", obj.getRemark() == null ? ' ' : obj.getRemark());
-                    supData.put("filePath", filePath + "register/image2/" + url);
+                    supData.put("filePath", filePath + "register/file/image2/" + url);
                     list.add(supData);
                     i++;
                 }

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

@@ -144,15 +144,16 @@ public class SupProductController {
         int i = supProductService.findProduct(supProductEntity);
         System.out.println(i);
         if (i == 0) {
-        supProductEntity.setCreateTime(new Date());
-        supProductEntity.setUpdateTime(new Date());
-        supProductEntity.setId(IdUtil.getSnowflakeNextId());
-        boolean b = supProductService.insertRegistration(supProductEntity);
-        if (b) {
-            return ResultVOUtils.success("添加成功");
+            supProductEntity.setCreateTime(new Date());
+            supProductEntity.setUpdateTime(new Date());
+            supProductEntity.setId(IdUtil.getSnowflakeNextId());
+            boolean b = supProductService.insertRegistration(supProductEntity);
+            if (b) {
+                return ResultVOUtils.success("添加成功");
+            } else {
+                return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
+            }
         } else {
-            return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
-        }} else {
             return ResultVOUtils.error(ResultEnum.DATA_REPEAT);
         }
     }
@@ -176,6 +177,7 @@ public class SupProductController {
         supProductEntity.setProductType(udiRelevanceResponse.getQxlb());
         supProductEntity.setProductDirectoryCode(udiRelevanceResponse.getFlbm());
         supProductEntity.setRecordPeopleName(udiRelevanceResponse.getYlqxzcrbarmc());
+        supProductEntity.setManufactory(selectProductBindRequest.getCompanyName());
         supProductEntity.setSpecification(udiRelevanceResponse.getGgxh());
         supProductEntity.setCreateTime(new Date());
         supProductEntity.setUpdateTime(new Date());

src/main/java/com/glxp/api/controller/sup/CustomerController.java

@@ -8,6 +8,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.BusinessType;
+import com.glxp.api.dto.DictDto;
 import com.glxp.api.entity.auth.*;
 import com.glxp.api.entity.purchase.CustomerContactEntity;
 import com.glxp.api.entity.system.CompanyEntity;
@@ -31,6 +32,7 @@ import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @RestController
 @Slf4j
@@ -62,6 +64,23 @@ public class CustomerController {
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
+    @AuthRuleAnnotation("")
+    @GetMapping("/spms/customer/listOptimize")
+    public BaseResponse filterCustomersOptimize(CustomerInfoFilterRequest customerFilterRequest) {
+
+        List<CustomerInfoEntity> customerDetailEntities = customerInfoService.filterCustomerInfo(customerFilterRequest);
+        List<DictDto> reList = customerDetailEntities.stream().map(s-> {
+            DictDto dictDto = new DictDto(s.getCustomerId().toString(),s.getCompanyName());
+            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("salewarehouse/customer/list")
     public BaseResponse filterList(CustomerInfoFilterRequest customerFilterRequest) {
@@ -83,6 +102,7 @@ public class CustomerController {
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
+
     @AuthRuleAnnotation("")
     @GetMapping("salewarehouse/customer/detail")
     public BaseResponse customerDetail(CustomerInfoFilterRequest customerFilterRequest) {

src/main/java/com/glxp/api/controller/sync/SpsSyncBasicController.java

@@ -0,0 +1,68 @@
+package com.glxp.api.controller.sync;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+import com.glxp.api.annotation.AuthRuleAnnotation;
+import com.glxp.api.annotation.Log;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.constant.BusinessType;
+import com.glxp.api.dao.basic.BasicProductsDao;
+import com.glxp.api.dao.basic.CompanyProductRelevanceDao;
+import com.glxp.api.dao.basic.UdiRelevanceDao;
+import com.glxp.api.entity.basic.UdiRelevanceEntity;
+import com.glxp.api.req.sync.SpsSyncBasicRlRequest;
+import com.glxp.api.req.system.DeleteRequest;
+import io.swagger.annotations.Api;
+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.RestController;
+
+import javax.annotation.Resource;
+
+@RestController
+@Api(tags = "内网基础信息同步修改")
+@RequiredArgsConstructor
+@Slf4j
+public class SpsSyncBasicController {
+
+    private final UdiRelevanceDao udiRelevanceDao;
+    private final BasicProductsDao basicProductsDao;
+    private final CompanyProductRelevanceDao relevanceDao;
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/spssync/basic/udirl/update")
+    @Log(title = "内网同步修改基础数据", businessType = BusinessType.UPDATE)
+    public BaseResponse udiRlUpdate(@RequestBody UdiRelevanceEntity udiRelevanceEntity) {
+
+        if (udiRelevanceEntity.getId() == null) {
+            return ResultVOUtils.error(500, "缺少唯一标识");
+        }
+        int b = udiRelevanceDao.updateById(udiRelevanceEntity);
+        if (b > 0)
+            return ResultVOUtils.success("更新成功！");
+        else
+            return ResultVOUtils.error(500, "更新失败！");
+    }
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/spssync/basic/udirl/batchInsert")
+    @Log(title = "内网同步修改基础数据", businessType = BusinessType.UPDATE)
+    public BaseResponse udiRlUpdate(@RequestBody SpsSyncBasicRlRequest spsSyncBasicRlRequest) {
+
+        if (CollectionUtil.isNotEmpty(spsSyncBasicRlRequest.getUdiRelevanceEntities())) {
+            udiRelevanceDao.replaceBatchs(spsSyncBasicRlRequest.getUdiRelevanceEntities());
+        }
+        if (CollectionUtil.isNotEmpty(spsSyncBasicRlRequest.getBasicProductsEntities())) {
+            basicProductsDao.replaceBatchs(spsSyncBasicRlRequest.getBasicProductsEntities());
+        }
+        if (CollectionUtil.isNotEmpty(spsSyncBasicRlRequest.getCompanyProductRelevanceEntities())) {
+            relevanceDao.replaceBatchs(spsSyncBasicRlRequest.getCompanyProductRelevanceEntities());
+        }
+        return ResultVOUtils.success("同步成功！");
+    }
+
+
+}

src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java

@@ -1332,5 +1332,6 @@ public class SpsSyncDownloadController {
         }
     }
 
+
 }
 

src/main/java/com/glxp/api/controller/system/SysMenuHelpController.java

@@ -15,12 +15,10 @@ import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.service.auth.ISysMenuService;
 import com.glxp.api.service.system.SysMenuHelpService;
 import com.glxp.api.util.StringUtils;
+import org.apache.commons.collections.CollectionUtils;
 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 org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
@@ -121,6 +119,21 @@ public class SysMenuHelpController {
     }
 
 
+    /**
+     * 通过组件标识获取组件信息
+     * @param menuKeys
+     * @return
+     */
+    @AuthRuleAnnotation("system/param/help/selectAuthMenuByMenuKeys")
+    @PostMapping("/system/param/help/selectAuthMenuByMenuKeys")
+    public BaseResponse selectAuthMenuByMenuKeys(@RequestBody List<String> menuKeys) {
+        if(menuKeys.size()==0){
+            return ResultVOUtils.error(999,"参数错误");
+        }
+        List<SysMenuHelpEntity> list= sysMenuHelpService.selectAuthMenuByMenuKeys(menuKeys);
+        return  ResultVOUtils.success(list);
+    }
+
 }
 
 

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

@@ -0,0 +1,44 @@
+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.ThrProductTypeEntity;
+import com.glxp.api.req.thrsys.FilterThrProductTypeRequest;
+import com.glxp.api.res.PageSimpleResponse;
+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/ThrProductsAddDiController.java

@@ -224,6 +224,10 @@ public class ThrProductsAddDiController {
                     udiProductEntity.setBasicPrductRemak6(thrProductsAddDiResponse.getBasicPrductRemak6());
                     udiProductEntity.setBasicPrductRemak7(thrProductsAddDiResponse.getBasicPrductRemak7());
                     udiProductEntity.setBasicPrductRemak8(thrProductsAddDiResponse.getBasicPrductRemak8());
+                    udiProductEntity.setGroupBuy(thrProductsAddDiResponse.getGroupBuy());
+                    udiRelevanceEntity.setGroupBuy(thrProductsAddDiResponse.getGroupBuy());
+                    udiRelevanceEntity.setPurType(thrProductsAddDiResponse.getPurType());
+                    udiRelevanceEntity.setAttributeType(thrProductsAddDiResponse.getAttributeType());
                     udiProductEntity.setNameCode(null);
                     udiProductService.updateUdiInfoByUuid(udiProductEntity);
                     UdiRelevanceEntity udiRelevanceEntity1 = new UdiRelevanceEntity();

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/BasicBusTypePreDao.java

@@ -32,7 +32,8 @@ public interface BasicBusTypePreDao extends BaseMapperPlus<BasicBusTypePreDao, B
      * @param action
      * @return
      */
-    List<BasicBusTypePreEntity> findByAction(String action);
+    List<BasicBusTypePreEntity> findByAction(@Param("action") String action, @Param("originAction") String originAction);
+
 
     /**
      * 查询单据流转列表数据
@@ -44,4 +45,4 @@ public interface BasicBusTypePreDao extends BaseMapperPlus<BasicBusTypePreDao, B
 
     boolean insertOrUpdate(BasicBusTypePreEntity record);
 
-}
+}

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

@@ -6,6 +6,7 @@ import com.glxp.api.req.inout.FilterCodeRequest;
 import com.glxp.api.res.inout.IoCodeResponse;
 
 import java.util.List;
+import java.util.Map;
 
 public interface IoCodeDao extends BaseMapperPlus<IoCodeDao, IoCodeEntity, IoCodeEntity> {
 
@@ -24,4 +25,11 @@ public interface IoCodeDao extends BaseMapperPlus<IoCodeDao, IoCodeEntity, IoCod
      * @return
      */
     List<IoCodeResponse> filterList(FilterCodeRequest filterCodeRequest);
+
+    /**
+     * code分组sum实际库存数量
+     * @param codes
+     * @return
+     */
+    List<IoCodeResponse> findByCodeSumReCount(List<String> codes);
 }

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

@@ -30,4 +30,7 @@ public interface IoOrderDetailResultDao extends BaseMapperPlus<IoOrderDetailResu
     List<CptTraceOrderResponse> cptTrace(CptTraceRequest cptTraceRequest);
 
 
+    List<CptTraceOrderResponse> cptCodeTrace(CptTraceRequest cptTraceRequest);
+
+
 }

src/main/java/com/glxp/api/dao/system/SysMenuHelpMapper.java

@@ -12,5 +12,5 @@ public interface SysMenuHelpMapper  extends BaseMapper<SysMenuHelpEntity> {
 
     List<SysMenuHelpEntity> selectMenuHelpList(SysMenuHelpRequest sysMenuHelpRequest);
 
-
+    List<SysMenuHelpEntity> selectAuthMenuByMenuKeys(List<String> menuKeys);
 }

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

@@ -0,0 +1,15 @@
+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.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;
+}

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

@@ -0,0 +1,49 @@
+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")
+@Data
+public class SysCustomConfigEntity {
+
+
+    @TableId(value = "id", type = IdType.INPUT)
+    private Long id;
+
+    /**
+     * 业务标识
+     */
+    @TableField("businessType")
+    private String businessType;
+
+    /**
+     * 描述
+     */
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 类型 1列表 2表单
+     */
+    @TableField("type")
+    private String type;
+
+    /**
+     * 列表点击方法
+     */
+    @TableField("handleChangeFuc")
+    private String handleChangeFuc;
+
+}

src/main/java/com/glxp/api/entity/basic/BasicBusTypePreEntity.java

@@ -52,7 +52,7 @@ public class BasicBusTypePreEntity {
     private Integer changeType;
 
     /**
-     * 补单默认分库
+     * 补单默认部门
      */
     @TableField(value = "defaultDeptCode")
     private String defaultDeptCode;
@@ -123,24 +123,37 @@ public class BasicBusTypePreEntity {
     @TableField(value = "remark")
     private String remark;
 
-//   创建单模式：1：送货至入库单模式；2.向上级补单模式；3.预验收转入库单模式，4.寄售转入库单模式
-
+    /**
+     * 创建单模式：1：送货至入库单模式；2.向上级补单模式；3.预验收转入库单模式，4.寄售转入库单模式，5.退货向上级补单模式
+     */
     @TableField(value = "createType")
     private int createType;
 
-
     /**
      * 目标业务单
      */
     @TableField(value = "targetBusAction")
     private String targetBusAction;
+    /**
+     * 业务单据补单时间间隔
+     */
     @TableField(value = "busBeforeTime")
     private Integer busBeforeTime;
+    /**
+     * 生成扫码单据单据状态
+     */
     @TableField(value = "auditStatus")
     private Integer auditStatus;
+    /**
+     * 生成业务单据单据状态
+     */
     @TableField(value = "busAuditStatus")
     private Integer busAuditStatus;
-
+    /**
+     * 单据拆单模式：   0：无需拆单，1：入账库；2:预验收库；3:寄售仓库
+     */
+    @TableField(value = "splitOrder")
+    private Integer splitOrder;
     @TableField(exist = false)
     public static final String COL_ID = "id";
 

src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java

@@ -196,11 +196,10 @@ public class BasicBussinessTypeEntity {
     private boolean secCheckBalance;
 
     /**
-     * 允许科室多次使用出库
+     * 物资使用出库模式 0:正常，1：物资多次使用出库；2：科室集合使用出库
      */
     @TableField(value = "useDyCount")
-    private boolean useDyCount;
-
+    private int useDyCount;
     /**
      * 到期提示
      */

src/main/java/com/glxp/api/entity/basic/BasicCorpEntity.java

@@ -99,7 +99,7 @@ public class BasicCorpEntity {
     private String thirdName4;
 
     /**
-     * 往来单位类型：1.客户，2：供应商，3：内部科室,4.特殊单据
+     * 往来单位类型：1.客户，2：供应商，3：内部科室,4.特殊往来
      */
     @TableField(value = "corpType")
     private Integer corpType;

src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java

@@ -348,6 +348,9 @@ public class BasicProductsEntity {
     @TableField(value = "remark")
     private String remark;
 
+    @TableField(value = "cphhhbh")
+    private String cphhhbh;
+
     public static final String COL_ID = "id";
 
     public static final String COL_UUID = "uuid";

src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java

@@ -1,5 +1,6 @@
 package com.glxp.api.entity.basic;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 import java.util.Date;
@@ -95,8 +96,9 @@ public class UdiProductEntity {
 
     private Long relSupId;
 
-    private boolean groupBuy;
+    private Boolean groupBuy;
 
     private Long uid;
-
+    private Integer purType;
+    private Integer attributeType;
 }

src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java

@@ -96,6 +96,17 @@ public class UdiRelevanceEntity {
      */
     @TableField(value = "isAdavence")
     private Boolean isAdavence;
+    /**
+     * 采购类型  1:入账产品；2：预验收产品；3：寄售产品
+     */
+    @TableField(value = "purType")
+    private Integer purType;
+
+    /**
+     * 产品属性类型  0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费
+     */
+    @TableField(value = "attributeType")
+    private Integer attributeType;
 
     /**
      * 是否允许多次使用出库

src/main/java/com/glxp/api/entity/system/SysMenuHelpEntity.java

@@ -34,6 +34,12 @@ public class SysMenuHelpEntity {
     @TableField(value = "updateTime")
     private String updateTime;
 
+    @TableField(value = "helpType")
+    private Integer helpType;
+
+    @TableField(value = "urlPath")
+    private String urlPath;
+
     public static final String COL_ID = "id";
 
     public static final String COL_MENUKEY = "menuKey";
@@ -47,4 +53,8 @@ public class SysMenuHelpEntity {
     public static final String COL_REMARK = "remark";
 
     public static final String COL_UPDATETIME = "updateTime";
+
+    public static final String COL_HELPTYPE = "helpType";
+
+    public static final String COL_URLPATH = "urlPath";
 }

src/main/java/com/glxp/api/entity/thrsys/ThrProductTypeEntity.java

@@ -0,0 +1,56 @@
+package com.glxp.api.entity.thrsys;
+
+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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@ApiModel(value = "com-glxp-api-entity-thrsys-ThrProductType")
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "thr_product_type")
+public class ThrProductTypeEntity implements Serializable {
+    @TableId(value = "id", type = IdType.INPUT)
+    @ApiModelProperty(value = "")
+    private Integer id;
+
+    /**
+     * 类别编码
+     */
+    @TableField(value = "code")
+    @ApiModelProperty(value = "类别编码")
+    private String code;
+
+    /**
+     * 类别名称
+     */
+    @TableField(value = "`name`")
+    @ApiModelProperty(value = "类别名称")
+    private String name;
+
+    /**
+     * 第三系统标识
+     */
+    @TableField(value = "thirdSys")
+    @ApiModelProperty(value = "第三系统标识")
+    private String thirdSys;
+
+    /**
+     * 备注
+     */
+    @TableField(value = "remark")
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    private static final long serialVersionUID = 1L;
+}

src/main/java/com/glxp/api/entity/thrsys/ThrProductsAddDiEntity.java

@@ -282,6 +282,19 @@ public class ThrProductsAddDiEntity {
     @ApiModelProperty(value = "关联ID主键")
     private String relId;
 
+    @TableField(value = "groupBuy")
+    @ApiModelProperty(value = "集采")
+    private Boolean groupBuy;
+
+    @TableField(value = "purType")
+    @ApiModelProperty(value = "采购类型")
+    private Integer purType;
+
+    /**
+     * 产品属性类型  0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费
+     */
+    @TableField(value = "attributeType")
+    private Integer attributeType;
     /**
      * 1第三方2自增
      */

src/main/java/com/glxp/api/http/NmpaUdiClient.java

@@ -2,6 +2,7 @@ package com.glxp.api.http;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import com.glxp.api.constant.ConstantStatus;
 import com.glxp.api.entity.basic.ProductInfoEntity;
 import com.glxp.api.entity.basic.UdiProductEntity;
@@ -33,7 +34,8 @@ public class NmpaUdiClient {
         productInfoFilterRequest.setPage(1);
         productInfoFilterRequest.setLimit(100);
         productInfoFilterRequest.setUuid(uuid);
-
+        if (StrUtil.isEmpty(uuid))
+            return null;
         List<ProductInfoEntity> productInfoEntityList = productInfoService.findAll(productInfoFilterRequest);
         List<UdiProductEntity> udiInfoEntities = new ArrayList<>();
         String myUuid = UuidUtils.getUUId();

src/main/java/com/glxp/api/req/auth/FilterInvWarehouseRequest.java

@@ -14,6 +14,9 @@ public class FilterInvWarehouseRequest extends ListPageRequest {
     private String code;
     private String name;
     private String deptCode;
+    /**
+     * 1:入账库，2：预验收库，3：寄售库
+     */
     private Integer advanceType;
     private Boolean isDefault;
     private Date updateTime;

src/main/java/com/glxp/api/req/auth/SysCustomConfigDetailRequest.java

@@ -0,0 +1,12 @@
+package com.glxp.api.req.auth;
+
+
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+@Data
+public class SysCustomConfigDetailRequest extends ListPageRequest {
+    private String configId;
+    private String type;
+    private String isShow;
+}

src/main/java/com/glxp/api/req/auth/SysCustomConfigRequest.java

@@ -0,0 +1,13 @@
+package com.glxp.api.req.auth;
+
+
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+@Data
+public class SysCustomConfigRequest extends ListPageRequest {
+    private String businessType;
+
+    private String remark;
+    private String type;
+}

src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java

@@ -163,7 +163,7 @@ public class BussinessTypeSaveRequest {
     private Boolean secCheckBalance;
 
     /**
-     * 允许科室多次使用出库
+     * 物资使用出库模式 0:正常，1：物资多次使用出库；2：科室集合使用出库
      */
     private Boolean useDyCount;
 

src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java

@@ -1,5 +1,6 @@
 package com.glxp.api.req.basic;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.glxp.api.util.page.ListPageRequest;
 import lombok.Data;
 
@@ -24,6 +25,7 @@ public class CompanyProductRelevanceRequest extends ListPageRequest {
 
     private String thirdCode;
     private String thirdSys;
+    private String mainId;
 
     private String lastUpdateTime;
     private String zczbhhzbapzbh;
@@ -40,6 +42,8 @@ public class CompanyProductRelevanceRequest extends ListPageRequest {
     private Integer filterType;         //0:全部，1.对照完成，2.未对照DI，3.未对照产品编码，4.未对照其他产品编码
     private String customerId;
 
+    private String pinyinInitial;
+    private String code;
 
     private String auditStatus;
     private String companyName;
@@ -47,7 +51,28 @@ public class CompanyProductRelevanceRequest extends ListPageRequest {
     private Boolean isAdavence;
     private String unitFk;
 
+    /**
+     * 采购类型  1:入账产品；2：预验收产品；3：寄售产品
+     */
+    private Integer purType;
+    /**
+     * 产品属性类型  0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费
+     */
+    private Integer attributeType;
+
     private String corpId;
     private String billType;
+    private String manufactory;
+    private String flbm;
     private List<String> uuids;
+
+    private String basicPrductRemak1;
+    private String basicPrductRemak2;
+    private String basicPrductRemak3;
+    private String basicPrductRemak4;
+    private String basicPrductRemak5;
+    private String basicPrductRemak6;
+    private String basicPrductRemak7;
+    private String basicPrductRemak8;
+    private String category;
 }

src/main/java/com/glxp/api/req/basic/FilterUdiInfoRequest.java

@@ -45,6 +45,14 @@ public class FilterUdiInfoRequest extends ListPageRequest {
     private String udplatCode;
     private String mainId;
     private Boolean isAdavence;
+    /**
+     * 采购类型  1:入账产品；2：预验收产品；3：寄售产品
+     */
+    private Integer purType;
+    /**
+     * 产品属性类型  0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费
+     */
+    private Integer attributeType;
     private String corpId;
     private String billType;
 

src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java

@@ -46,6 +46,14 @@ public class FilterUdiRelRequest extends ListPageRequest {
     private String udplatCode;
     private String mainId;
     private Boolean isAdavence;
+    /**
+     * 采购类型  1:入账产品；2：预验收产品；3：寄售产品
+     */
+    private Integer purType;
+    /**
+     * 产品属性类型  0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费
+     */
+    private Integer attributeType;
     private String corpId;
     private String billType;
 

src/main/java/com/glxp/api/req/basic/SupplementRequest.java

@@ -5,7 +5,6 @@ import lombok.Data;
 //选入产品补充信息
 @Data
 public class SupplementRequest {
-
     //补充信息：
     private String basicPrductRemak1;
     private String basicPrductRemak2;
@@ -22,4 +21,10 @@ public class SupplementRequest {
     private String spmc;
     private String cpms;
     private String price;
+    private Boolean groupBuy;
+    private Integer purType;
+    /**
+     * 产品属性类型  0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费
+     */
+    private Integer attributeType;
 }

src/main/java/com/glxp/api/req/basic/UdiRelevanceRequest.java

@@ -31,6 +31,14 @@ public class UdiRelevanceRequest {
     private Integer lockStatus;
     private String udplatCode;
     private Boolean isAdavence;
+    /**
+     * 采购类型  1:入账产品；2：预验收产品；3：寄售产品
+     */
+    private Integer purType;
+    /**
+     * 产品属性类型  0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费
+     */
+    private Integer attributeType;
     private String supName;
     private String originUuid;
     private String price;

src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java

@@ -22,6 +22,14 @@ public class UdiRelevanceSaveRequest {
     private Boolean isLock;
     private Integer lockStatus;
     private Boolean isAdavence;
+    /**
+     * 采购类型  1:入账产品；2：预验收产品；3：寄售产品
+     */
+    private Integer purType;
+    /**
+     * 产品属性类型  0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费
+     */
+    private Integer attributeType;
     private Boolean useMuti;
     private Integer useNum;
     private String supName;

src/main/java/com/glxp/api/req/sync/SpsSyncBasicRlRequest.java

@@ -0,0 +1,16 @@
+package com.glxp.api.req.sync;
+
+import com.glxp.api.entity.basic.BasicProductsEntity;
+import com.glxp.api.entity.basic.CompanyProductRelevanceEntity;
+import com.glxp.api.entity.basic.UdiRelevanceEntity;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SpsSyncBasicRlRequest {
+
+    private List<UdiRelevanceEntity> udiRelevanceEntities;
+    private List<CompanyProductRelevanceEntity> companyProductRelevanceEntities;
+    private List<BasicProductsEntity> basicProductsEntities;
+}

src/main/java/com/glxp/api/req/system/SysMenuHelpRequest.java

@@ -29,6 +29,10 @@ public class SysMenuHelpRequest extends ListPageRequest {
 
     private String updateTime;
 
+    private String helpType;
+
+    private String urlPath;
+
     public static final String COL_ID = "id";
 
     public static final String COL_MENUKEY = "menuKey";
@@ -42,4 +46,8 @@ public class SysMenuHelpRequest extends ListPageRequest {
     public static final String COL_REMARK = "remark";
 
     public static final String COL_UPDATETIME = "updateTime";
+
+    public static final String COL_HELPTYPE = "helpType";
+
+    public static final String COL_URLPATH = "urlPath";
 }

src/main/java/com/glxp/api/req/thrsys/AddThrDiProductsRequest.java

@@ -49,6 +49,12 @@ public class AddThrDiProductsRequest {
     private String basicPrductRemak8;
 
     private String deviceRecordKey;
+    private Boolean groupBuy;
+    private Integer purType;
+    /**
+     * 产品属性类型  0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费
+     */
+    private Integer attributeType;
 
 
 }

src/main/java/com/glxp/api/req/thrsys/FilterThrProductTypeRequest.java

@@ -0,0 +1,26 @@
+package com.glxp.api.req.thrsys;
+
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+@Data
+public class FilterThrProductTypeRequest extends ListPageRequest {
+
+
+    /**
+     * 类别编码
+     */
+    private String code;
+
+    /**
+     * 类别名称
+     */
+    private String name;
+
+    /**
+     * 第三系统标识
+     */
+    private String thirdSys;
+
+    private String key;
+}

src/main/java/com/glxp/api/res/auth/SysCustomConfigFromDetailResponse.java

@@ -0,0 +1,12 @@
+package com.glxp.api.res.auth;
+
+import com.glxp.api.entity.auth.SysCustomConfigDetailEntity;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SysCustomConfigFromDetailResponse {
+    Integer number;
+    List<SysCustomConfigDetailEntity> list;
+}

src/main/java/com/glxp/api/res/auth/SysCustomConfigResponse.java

@@ -0,0 +1,18 @@
+package com.glxp.api.res.auth;
+
+import com.glxp.api.entity.auth.SysCustomConfigDetailEntity;
+import com.glxp.api.entity.auth.SysCustomConfigEntity;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SysCustomConfigResponse extends SysCustomConfigEntity{
+
+    List<SysCustomConfigDetailEntity> tableList;
+
+    List<SysCustomConfigDetailEntity> queryList;
+
+    List<SysCustomConfigFromDetailResponse> fromList;
+
+}

src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java

@@ -76,6 +76,9 @@ public class BasicBussinessTypeResponse {
 
     private int checkBalance;
     private boolean secCheckBalance;
+    /**
+     * 物资使用出库模式 0:正常，1：物资多次使用出库；2：科室集合使用出库
+     */
     private boolean useDyCount;
 
     private boolean expireTip;

src/main/java/com/glxp/api/res/basic/CompanyProductRelevanceResponse.java

@@ -58,7 +58,14 @@ public class CompanyProductRelevanceResponse {
     private String mainId;
     private String mainName;
     private Boolean isAdavence;
-
+    /**
+     * 采购类型  1:入账产品；2：预验收产品；3：寄售产品
+     */
+    private Integer purType;
+    /**
+     * 产品属性类型  0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费
+     */
+    private Integer attributeType;
     private String scbssfbhph;
     private String scbssfbhxlh;
     private String scbssfbhscrq;
@@ -83,4 +90,6 @@ public class CompanyProductRelevanceResponse {
     private String basicPrductRemak6;
     private String basicPrductRemak7;
     private String basicPrductRemak8;
+
+    private String cphhhbh;
 }

src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java

@@ -22,6 +22,14 @@ public class UdiRelevanceResponse {
     private Boolean isLock;
     private Integer lockStatus;
     private Boolean isAdavence;
+    /**
+     * 采购类型  1:入账产品；2：预验收产品；3：寄售产品
+     */
+    private Integer purType;
+    /**
+     * 产品属性类型  0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费
+     */
+    private Integer attributeType;
     private Boolean useMuti;
     private Integer useNum;
     private String supName;
@@ -104,7 +112,7 @@ public class UdiRelevanceResponse {
     //手持终端下载需要主键
     private Long relId;
     private boolean dispatch;           //是否可配送
-    private boolean groupBuy;           //是否集采产品
+    private Boolean groupBuy;           //是否集采产品
     private boolean needCert;           //是否需要资质材料
 
     private String classifyName;        //物资分类名称
@@ -119,7 +127,7 @@ public class UdiRelevanceResponse {
     private String syqsfxyjxmj;
     private String mjfs;
     private String categoryName;
-
+    private String cphhhbh;
 
     public int getBhzxxsbzsl() {
         if (bhzxxsbzsl == null || bhzxxsbzsl == 0) {

src/main/java/com/glxp/api/res/basic/UdiRlDlResponse.java

@@ -45,6 +45,7 @@ public class UdiRlDlResponse {
     private String sptm;
     private Integer productType;
     private String mainId;
+    private String cphhhbh;
 
     public Integer getProductType() {
         if (productType == null) return 0

src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java

@@ -59,7 +59,14 @@ public class UdiRlSupResponse {
     private String mainId;
     private String mainName;
     private Boolean isAdavence;
-
+    /**
+     * 采购类型  1:入账产品；2：预验收产品；3：寄售产品
+     */
+    private Integer purType;
+    /**
+     * 产品属性类型  0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费
+     */
+    private Integer attributeType;
     private String scbssfbhph;
     private String scbssfbhxlh;
     private String scbssfbhscrq;
@@ -94,6 +101,6 @@ public class UdiRlSupResponse {
     private String classifyName;
 
     private boolean groupBuy;           //是否集采产品
-
+    private String cphhhbh;
     private Long uid;
 }

src/main/java/com/glxp/api/res/inv/InnerOrderPrintResponse.java

@@ -23,6 +23,7 @@ public class InnerOrderPrintResponse {
     private String ylqxzcrbarmc;
     private String zczbhhzbapzbh;
     private String warehouseName;
+    private String manufactory;
     private String warehouseCode;
     private String spaceCode;
     private String spaceName;

src/main/java/com/glxp/api/res/thrsys/UdiInfoResponse.java

@@ -60,6 +60,14 @@ public class UdiInfoResponse {
     private Integer status;
     private String supId;
     private boolean isAdavence;
+    /**
+     * 采购类型  1:入账产品；2：预验收产品；3：寄售产品
+     */
+    private Integer purType;
+    /**
+     * 产品属性类型  0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费
+     */
+    private Integer attributeType;
     private boolean isDisable;
     private boolean useMuti;
 

src/main/java/com/glxp/api/service/CustomServiceImpl.java

@@ -6,7 +6,7 @@ import com.glxp.api.dao.BaseMapperPlus;
 
 import java.util.List;
 
-public class CustomServiceImpl<M extends BaseMapper<T>, T> extends ServiceImpl<BaseMapperPlus<M,T,T>, T>  implements CustomService<T>{
+public class CustomServiceImpl<M extends BaseMapperPlus<M,T,T>, T> extends ServiceImpl<M, T>  implements CustomService<T>{
     @Override
     public int insertIgnore(T entity) {
         return baseMapper.insertIgnore(entity);

src/main/java/com/glxp/api/service/auth/ISysCustomConfigDetailService.java

@@ -0,0 +1,23 @@
+package com.glxp.api.service.auth;
+
+import com.glxp.api.entity.auth.SysCustomConfigDetailEntity;
+import com.glxp.api.req.auth.SysCustomConfigDetailRequest;
+
+import java.util.List;
+
+public interface ISysCustomConfigDetailService {
+
+    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);
+
+}

src/main/java/com/glxp/api/service/auth/ISysCustomConfigService.java

@@ -0,0 +1,21 @@
+package com.glxp.api.service.auth;
+
+import com.glxp.api.entity.auth.SysCustomConfigEntity;
+import com.glxp.api.req.auth.SysCustomConfigRequest;
+
+import java.util.List;
+
+public interface ISysCustomConfigService {
+
+    List<SysCustomConfigEntity> filterSysCustomConfig(SysCustomConfigRequest request);
+
+
+    boolean insertSysCustomConfig(SysCustomConfigEntity entity);
+
+    boolean updateSysCustomConfig(SysCustomConfigEntity entity);
+
+    boolean deleteById(String id);
+
+    SysCustomConfigEntity selectById(Long id);
+
+}

src/main/java/com/glxp/api/service/auth/impl/SysCustomConfigDetailServiceImpl.java

@@ -0,0 +1,52 @@
+package com.glxp.api.service.auth.impl;
+
+import com.glxp.api.dao.auth.SysCustomConfigDetailDao;
+import com.glxp.api.entity.auth.SysCustomConfigDetailEntity;
+import com.glxp.api.req.auth.SysCustomConfigDetailRequest;
+import com.glxp.api.service.auth.ISysCustomConfigDetailService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class SysCustomConfigDetailServiceImpl implements ISysCustomConfigDetailService {
+
+
+    @Resource
+    private SysCustomConfigDetailDao sysCustomConfigDetailDao;
+
+
+    @Override
+    public List<SysCustomConfigDetailEntity> filterSysCustomConfigDetail(SysCustomConfigDetailRequest request) {
+        return sysCustomConfigDetailDao.filterSysCustomConfigDetail(request);
+    }
+
+    @Override
+    public boolean insertSysCustomConfigDetail(SysCustomConfigDetailEntity entity) {
+        return sysCustomConfigDetailDao.insertSysCustomConfigDetail(entity);
+    }
+
+    @Override
+    public boolean updateSysCustomConfigDetail(SysCustomConfigDetailEntity entity) {
+        return sysCustomConfigDetailDao.updateSysCustomConfigDetail(entity);
+    }
+
+
+    @Override
+    public boolean deleteById(String id) {
+        return sysCustomConfigDetailDao.deleteById(id);
+    }
+
+    @Override
+    public boolean deleteByConfigId(String id) {
+        return sysCustomConfigDetailDao.deleteByConfigId(id);
+    }
+
+    @Override
+    public SysCustomConfigDetailEntity selectById(Long id) {
+        return sysCustomConfigDetailDao.selectById(id);
+    }
+}

src/main/java/com/glxp/api/service/auth/impl/SysCustomConfigServiceImpl.java

@@ -0,0 +1,56 @@
+package com.glxp.api.service.auth.impl;
+
+import com.github.pagehelper.PageHelper;
+import com.glxp.api.dao.auth.SysCustomConfigDao;
+import com.glxp.api.entity.auth.SysCustomConfigEntity;
+import com.glxp.api.req.auth.SysCustomConfigRequest;
+import com.glxp.api.service.auth.ISysCustomConfigService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.Collections;
+import java.util.List;
+
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class SysCustomConfigServiceImpl implements ISysCustomConfigService {
+
+
+    @Resource
+    private SysCustomConfigDao sysCustomConfigDao;
+
+
+    @Override
+    public List<SysCustomConfigEntity> filterSysCustomConfig(SysCustomConfigRequest request) {
+        if (request == null) {
+            return Collections.emptyList();
+        }
+        if (request.getPage() != null) {
+            int offset = (request.getPage() - 1) * request.getLimit();
+            PageHelper.offsetPage(offset, request.getLimit());
+        }
+        return sysCustomConfigDao.filterSysCustomConfig(request);
+    }
+
+    @Override
+    public boolean insertSysCustomConfig(SysCustomConfigEntity entity) {
+        return sysCustomConfigDao.insertSysCustomConfig(entity);
+    }
+
+    @Override
+    public boolean updateSysCustomConfig(SysCustomConfigEntity entity) {
+        return sysCustomConfigDao.updateSysCustomConfig(entity);
+    }
+
+
+    @Override
+    public boolean deleteById(String id) {
+        return sysCustomConfigDao.deleteById(id);
+    }
+
+    @Override
+    public SysCustomConfigEntity selectById(Long id) {
+        return sysCustomConfigDao.selectById(id);
+    }
+}

src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java

@@ -20,6 +20,7 @@ public interface IBasicBusTypePreService extends IService<BasicBusTypePreEntity>
      * @return
      */
     List<BasicBusTypePreEntity> filterAll(FilterBusTypeChangeRequest busTypeChangeFilterRequest);
+
     /**
      * 根据ID删除补单单据类型
      *
@@ -62,6 +63,8 @@ public interface IBasicBusTypePreService extends IService<BasicBusTypePreEntity>
      */
     List<BasicBusTypePreEntity> findByAction(String action);
 
+    List<BasicBusTypePreEntity> findByOiginActions(String originAction);
+
     /**
      * 查询单据流转列表数据
      *

src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java

@@ -101,4 +101,7 @@ public interface UdiRelevanceService extends IService<UdiRelevanceEntity> {
      * @return
      */
     String getRelIdByUdiCode(String code);
+
+    Integer findPurType(Long relId);
+
 }

src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java

@@ -62,7 +62,12 @@ public class BasicBusTypePreServiceImpl extends ServiceImpl<BasicBusTypePreDao,
 
     @Override
     public List<BasicBusTypePreEntity> findByAction(String action) {
-        return basicBusTypePreDao.findByAction(action);
+        return basicBusTypePreDao.findByAction(action, null);
+    }
+
+    @Override
+    public List<BasicBusTypePreEntity> findByOiginActions(String originAction) {
+        return basicBusTypePreDao.findByAction(null, originAction);
     }
 
     @Override
@@ -83,14 +88,17 @@ public class BasicBusTypePreServiceImpl extends ServiceImpl<BasicBusTypePreDao,
 
     @Override
     public boolean verifyExists(BasicBusTypePreEntity basicBusTypePreEntity) {
+
+        // 校验是否有相同的单据类型流转配置
         QueryWrapper<BasicBusTypePreEntity> wrapper = new QueryWrapper<>();
         wrapper.eq("action", basicBusTypePreEntity.getAction())
                 .eq("originAction", basicBusTypePreEntity.getOriginAction())
-                .eq("invCode", basicBusTypePreEntity.getInvCode())
+                .eq(null != basicBusTypePreEntity.getInvCode(), "invCode", basicBusTypePreEntity.getInvCode())
                 .eq(null != basicBusTypePreEntity.getBeforeTime(), "beforeTime", basicBusTypePreEntity.getBeforeTime())
                 .eq(null != basicBusTypePreEntity.getDefaultInvCode(), "defaultInvCode", basicBusTypePreEntity.getDefaultInvCode())
-                .eq(null != basicBusTypePreEntity.getSupplementAll(), "supplementAll", basicBusTypePreEntity.getSupplementAll());
-
+                .eq(null != basicBusTypePreEntity.getSupplementAll(), "supplementAll", basicBusTypePreEntity.getSupplementAll())
+                .eq(null != basicBusTypePreEntity.getAuditStatus(), "auditStatus", basicBusTypePreEntity.getAuditStatus())
+                .eq(null != basicBusTypePreEntity.getBusAuditStatus(), "busAuditStatus", basicBusTypePreEntity.getBusAuditStatus());
         List<BasicBusTypePreEntity> list = basicBusTypePreDao.selectList(wrapper);
         if (CollUtil.isNotEmpty(list)) {
             if (null != basicBusTypePreEntity.getId()) {

src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java

@@ -257,7 +257,10 @@ public class BasicBussinessTypeServiceImpl extends ServiceImpl<BasicBussinessTyp
             case Constant.ORDER_ACTION_SUP_PREIN:
                 bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
                         .gt("spUse", 0).eq("enable", true).eq("corpType", ConstantStatus.CORP_TYPE_OUT).eq("actionType", 2));
-
+            case Constant.ORDER_STATUS_RETURN:
+                bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
+                        .gt("spUse", 0).eq("enable", true).eq("corpType", ConstantStatus.CORP_TYPE_OUT).eq("mainAction", ConstantType.TYPE_OUT));
+                break;
             default:
                 break;
         }

src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java

@@ -2,6 +2,7 @@ package com.glxp.api.service.basic.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.constant.ConstantStatus;
@@ -405,4 +406,11 @@ public class UdiRelevanceServiceImpl extends ServiceImpl<UdiRelevanceDao, UdiRel
         UdiEntity udi = FilterUdiUtils.getUdi(code);
         return udiRelevanceDao.selectRelIdByNameCode(udi.getUdi());
     }
+
+
+    @Override
+    public Integer findPurType(Long relId) {
+        UdiRelevanceEntity udiRelevanceEntity = udiRelevanceDao.selectOne(new QueryWrapper<UdiRelevanceEntity>().select("purType").eq("id", relId).last("limit 1"));
+        return IntUtil.value(udiRelevanceEntity.getPurType());
+    }
 }

src/main/java/com/glxp/api/service/inout/IoAddInoutService.java

@@ -154,6 +154,7 @@ public class IoAddInoutService {
             } else {
                 orderEntity.setStatus(ConstantStatus.ORDER_STATS_ERROR);
                 orderEntity.setUpdateTime(new Date());
+                orderEntity.setErrMsg(result);
                 orderService.update(orderEntity);
                 insertList.clear();
                 return;
@@ -682,7 +683,10 @@ public class IoAddInoutService {
         int count = 0;
         if (filterList != null) {
             for (IoCodeTempEntity temp : filterList) {
-                if (temp.getCode().equals(codeEntity.getCode())) {
+                if (temp.getCode().equals(codeEntity.getCode())
+                        && StrUtil.trimToEmpty(temp.getSerialNo()).equals(StrUtil.trimToEmpty(codeEntity.getSerialNo()))
+                        && StrUtil.trimToEmpty(temp.getInBatchNo()).equals(StrUtil.trimToEmpty(codeEntity.getInBatchNo()))
+                ) {
                     count = count + 1;
                 }
             }
@@ -693,7 +697,6 @@ public class IoAddInoutService {
             return null;
     }
 
-
     public String checkOriginCode(IoCodeTempEntity warehouseEntity) {
 
         UdiEntity udiEntity = FilterUdiUtils.getUdi(warehouseEntity.getCode());

src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java

@@ -18,6 +18,9 @@ import com.glxp.api.entity.inout.*;
 import com.glxp.api.entity.inv.InvInnerOrderPdfTempEntity;
 import com.glxp.api.entity.inv.InvPreinDetailEntity;
 import com.glxp.api.entity.system.SystemParamConfigEntity;
+import com.glxp.api.exception.JsonException;
+import com.glxp.api.exception.ServiceException;
+import com.glxp.api.res.inout.IoCodeResponse;
 import com.glxp.api.res.inout.IoOrderCheckResultResponse;
 import com.glxp.api.res.inout.IoOrderDetailBizResponse;
 import com.glxp.api.res.inout.IoOrderDetailCodeResponse;
@@ -156,65 +159,104 @@ public class IoCheckInoutService {
         orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_POST);
         orderService.update(orderEntity);
 
+        List<IoCodeTempEntity> codeTempEntities = codeTempService.findByOrderId(orderEntity.getBillNo());
+        //序列号唯一性校验
+        serialNoUniquenessVerification(codeTempEntities);
+
+
         BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction());
         if (!bussinessTypeEntity.isCheckEnable()) {
-            unCheckFirstFinish(orderEntity);
+            unCheckFirstFinish(orderEntity,codeTempEntities);
         } else {
             if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_UDIMS) {
                 if (bussinessTypeEntity.getCheckUdims() == 0) {
-                    unCheckFirstFinish(orderEntity);
+                    unCheckFirstFinish(orderEntity,codeTempEntities);
                     return;
                 }
             } else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_WEBNEW) {
                 if (bussinessTypeEntity.getCheckWebNew() == 0 || bussinessTypeEntity.getCheckWebNew() == 4) {
-                    unCheckFirstFinish(orderEntity);
+                    unCheckFirstFinish(orderEntity,codeTempEntities);
                     return;
                 }
             } else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_PDAED) {
                 if (bussinessTypeEntity.getCheckPdaEd() == 0) {
-                    unCheckFirstFinish(orderEntity);
+                    unCheckFirstFinish(orderEntity,codeTempEntities);
                     return;
                 }
             } else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_PDAUN) {
                 if (bussinessTypeEntity.getCheckPdaUn() == 0) {
-                    unCheckFirstFinish(orderEntity);
+                    unCheckFirstFinish(orderEntity,codeTempEntities);
                     return;
                 }
             } else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_PC) {
                 if (bussinessTypeEntity.getCheckPc() == 0) {
-                    unCheckFirstFinish(orderEntity);
+                    unCheckFirstFinish(orderEntity,codeTempEntities);
                     return;
                 }
             } else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_CHANGE) {
                 if (bussinessTypeEntity.getCheckChange() == 0) {
-                    unCheckFirstFinish(orderEntity);
+                    unCheckFirstFinish(orderEntity,codeTempEntities);
                     return;
                 }
             } else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_PEACE_CHANGE) {
                 if (bussinessTypeEntity.getCheckBalance() == 0) {
-                    unCheckFirstFinish(orderEntity);
+                    unCheckFirstFinish(orderEntity,codeTempEntities);
                     return;
                 }
             } else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_UDISP) {
                 if (bussinessTypeEntity.getCheckSp() == 0) {
-                    unCheckFirstFinish(orderEntity);
+                    unCheckFirstFinish(orderEntity,codeTempEntities);
                     return;
                 }
             } else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_COPY) {
                 if (bussinessTypeEntity.getCheckCopy() == 0) {
-                    unCheckFirstFinish(orderEntity);
+                    unCheckFirstFinish(orderEntity,codeTempEntities);
                     return;
                 }
             } else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_REVIEW) {
                 if (bussinessTypeEntity.getCheckReview() == 0) {
-                    unCheckFirstFinish(orderEntity);
+                    unCheckFirstFinish(orderEntity,codeTempEntities);
                     return;
                 }
             }
-            checkFirstFinish(orderEntity);
+            checkFirstFinish(orderEntity,codeTempEntities);
         }
     }
 
+    /**
+     * code列表中 有序列号的 进行唯一校验
+     * 1、查找出临时code中 有 序列号的 code集合
+     * 2、在正式code表里 对code分组sum库存 前提是 在待校验code集合中 校验出库存大于0抛出异常
+     */
+    private void serialNoUniquenessVerification(List<IoCodeTempEntity> codeTempEntities) {
+        if (CollUtil.isNotEmpty(codeTempEntities)){
+            List<String> codes = new ArrayList<>(codeTempEntities.size());
+            codeTempEntities.stream().forEach( x -> {
+                if (StrUtil.isNotBlank(x.getSerialNo())){
+                    codes.add(x.getCode());
+                }
+            });
+
+            if (CollUtil.isNotEmpty(codes)){
+                //正式code表里 对code分组sum实际库存数量
+                List<IoCodeResponse> codeSumReCountList = codeService.findByCodeSumReCount(codes);
+                if (codeSumReCountList.size() > 0 ){
+                    StringBuilder msg = new StringBuilder();
+                    codeSumReCountList.forEach( x -> {
+                        if (x.getReCount() > 0){
+                            msg.append(x.getCode()+",");
+                        }
+                    });
+                    if (StrUtil.isNotEmpty(msg)){
+                        msg.deleteCharAt(msg.length()-1);
+                        throw new JsonException(500,"产品UDI码：" + msg + "存库唯一性校验不通过！");
+                    }
+                }
+            }
+        }
+
+    }
+
     @Resource
     IoCodeLostService codeLostService;
 
@@ -334,7 +376,7 @@ public class IoCheckInoutService {
 
 
     //一次校验（无需校验）完成
-    public void unCheckFirstFinish(IoOrderEntity orderEntity) {
+    public void unCheckFirstFinish(IoOrderEntity orderEntity,List<IoCodeTempEntity> codeTempEntities) {
 
         List<IoOrderDetailCodeEntity> orderDetailCodeEntities = orderDetailCodeService.findByOrderId(orderEntity.getBillNo());
 
@@ -380,7 +422,6 @@ public class IoCheckInoutService {
 
 
         //临时表转正式表
-        List<IoCodeTempEntity> codeTempEntities = codeTempService.findByOrderId(orderEntity.getBillNo());
         for (IoCodeTempEntity codeTempEntity : codeTempEntities) {
             IoCodeEntity codeEnttity = new IoCodeEntity();
             BeanUtils.copyProperties(codeTempEntity, codeEnttity);
@@ -402,7 +443,7 @@ public class IoCheckInoutService {
 
 
     //一次校验完成
-    public void checkFirstFinish(IoOrderEntity orderEntity) {
+    public void checkFirstFinish(IoOrderEntity orderEntity,List<IoCodeTempEntity> codeTempEntities) {
         List<IoOrderDetailCodeEntity> orderDetailCodeEntities = orderDetailCodeService.findByOrderId(orderEntity.getBillNo());
         List<IoOrderDetailBizEntity> orderDetailBizEntities = orderDetailBizService.findByOrderId(orderEntity.getBillNo());
 
@@ -502,7 +543,6 @@ public class IoCheckInoutService {
 //            orderDetailCodeDao.updateBatchById(orderDetailCodeEntities);
 
             //临时表转正式表
-            List<IoCodeTempEntity> codeTempEntities = codeTempService.findByOrderId(orderEntity.getBillNo());
             for (IoCodeTempEntity codeTempEntity : codeTempEntities) {
                 IoCodeEntity codeEnttity = new IoCodeEntity();
                 BeanUtils.copyProperties(codeTempEntity, codeEnttity);

src/main/java/com/glxp/api/service/inout/IoCodeTempService.java

@@ -42,4 +42,12 @@ public interface IoCodeTempService {
     Boolean checkTempCode(IoCodeTempEntity ioCodeTempEntity);
 
     boolean isExit(String orderId);
+
+    /**
+     * 复制单据内容
+     * @param newBillNo
+     * @param oldBillNo
+     * @return
+     */
+    boolean copyCodeTemp(String newBillNo, String oldBillNo);
 }

src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java

@@ -55,4 +55,10 @@ public interface IoOrderDetailBizService {
 
     Boolean updateOrderDetailBiz(IoOrderDetailBizEntity ioOrderDetailBizEntity);
 
+    /**
+     * 复制单据内容
+     * @param newBillNo
+     * @param oldBillNo
+     */
+    boolean copyOrderDetailBiz(String newBillNo, String oldBillNo);
 }

src/main/java/com/glxp/api/service/inout/IoOrderDetailCodeService.java

@@ -56,4 +56,11 @@ public interface IoOrderDetailCodeService {
 
     Boolean updateOrderDetailBiz(IoOrderDetailCodeEntity orderDetailCodeEntity);
 
+    /**
+     * 复制单据内容
+     * @param newBillNo
+     * @param oldBillNo
+     * @return
+     */
+    boolean copyOrderDetailCode(String newBillNo, String oldBillNo);
 }

src/main/java/com/glxp/api/service/inout/IoOrderService.java

@@ -1,6 +1,7 @@
 package com.glxp.api.service.inout;
 
 import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.entity.auth.AuthAdmin;
 import com.glxp.api.entity.inout.IoOrderEntity;
 import com.glxp.api.req.inout.FilterOrderRequest;
 import com.glxp.api.req.inout.FilterUploadOrderRequest;
@@ -127,4 +128,14 @@ public interface IoOrderService {
 
     boolean isExitByAction(String action);
     List<IoOrderEntity> selectList(Long userId);
+
+    /**
+     * 复制单据内容
+     *
+     * @param authAdmin
+     * @param newBillNo
+     * @param newIoOrderEntity
+     * @param oldIoOrderEntity
+     */
+    boolean copyOrder(AuthAdmin authAdmin,String newBillNo, IoOrderEntity newIoOrderEntity, IoOrderEntity oldIoOrderEntity);
 }

src/main/java/com/glxp/api/service/inout/impl/IoCodeService.java

@@ -24,6 +24,7 @@ import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 @Service
 @Transactional(rollbackFor = Exception.class)
@@ -149,5 +150,12 @@ public class IoCodeService extends ServiceImpl<IoCodeDao, IoCodeEntity> {
         return ioCodeResponses;
     }
 
-
+    /**
+     * code分组sum实际库存数量
+     * @param codes
+     * @return
+     */
+    public List<IoCodeResponse> findByCodeSumReCount(List<String> codes) {
+        return ioCodeDao.findByCodeSumReCount(codes);
+    }
 }

src/main/java/com/glxp/api/service/inout/impl/IoCodeTempServiceImpl.java

@@ -1,20 +1,29 @@
 package com.glxp.api.service.inout.impl;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.IdUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageHelper;
+import com.glxp.api.dao.inout.IoCodeDao;
 import com.glxp.api.dao.inout.IoCodeTempDao;
+import com.glxp.api.entity.inout.IoCodeEntity;
 import com.glxp.api.entity.inout.IoCodeTempEntity;
+import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
 import com.glxp.api.req.inout.FilterCodeRequest;
 import com.glxp.api.res.inout.IoCodeTempResponse;
 import com.glxp.api.service.inout.IoCodeTempService;
 import com.glxp.api.util.BeanCopyUtils;
+import com.glxp.api.util.DateUtil;
 import com.glxp.api.util.page.PageQuery;
 import com.glxp.api.util.page.TableDataInfo;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 @Service
@@ -24,6 +33,9 @@ public class IoCodeTempServiceImpl implements IoCodeTempService {
     @Resource
     IoCodeTempDao ioCodeTempDao;
 
+    @Resource
+    IoCodeDao ioCodeDao;
+
     @Override
     public IoCodeTempEntity selectById(Integer id) {
         return ioCodeTempDao.selectById(id);
@@ -108,4 +120,28 @@ public class IoCodeTempServiceImpl implements IoCodeTempService {
         return ioCodeTempDao.exists(new QueryWrapper<IoCodeTempEntity>().eq("orderId", orderId));
     }
 
+    @Override
+    public boolean copyCodeTemp(String newBillNo, String oldBillNo) {
+        //获取旧列表数据
+        FilterCodeRequest filterCodeRequest = new FilterCodeRequest();
+        filterCodeRequest.setOrderId(oldBillNo);
+        List<IoCodeEntity> oldIoCodeEntityList = ioCodeDao.filterCodeList(filterCodeRequest);
+        if (CollUtil.isNotEmpty(oldIoCodeEntityList)){
+            List<IoCodeTempEntity> newIoCodeTempEntityList = new ArrayList<>(oldIoCodeEntityList.size());
+            //遍历修改新单号为新订单号
+            oldIoCodeEntityList.forEach( x -> {
+                IoCodeTempEntity ioCodeTempEntity = new IoCodeTempEntity();
+                BeanUtils.copyProperties(x,ioCodeTempEntity);
+                ioCodeTempEntity.setOrderId(newBillNo);
+                ioCodeTempEntity.setId(null);
+                ioCodeTempEntity.setUpdateTime(new Date());
+                ioCodeTempEntity.setCreateTime(new Date());
+                newIoCodeTempEntityList.add(ioCodeTempEntity);
+            });
+            //批量插入
+            return ioCodeTempDao.insertBatch(newIoCodeTempEntityList);
+        }
+        return true;
+    }
+
 }

src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java

@@ -25,7 +25,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 
 @Service
@@ -212,4 +214,21 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
         return ioOrderDetailBizDao.updateById(ioOrderDetailBizEntity) > 0;
     }
 
+    @Override
+    public boolean copyOrderDetailBiz(String newBillNo, String oldBillNo) {
+        //获取旧列表数据
+        List<IoOrderDetailBizEntity> oldOrderDetailBiz = findByOrderIdAndNameCode(oldBillNo, false);
+        if (CollUtil.isNotEmpty(oldOrderDetailBiz)){
+            List<IoOrderDetailBizEntity> newOrderDetailBiz = new ArrayList<>(oldOrderDetailBiz.size());
+            //遍历修改新单号为新订单号
+            oldOrderDetailBiz.forEach( x -> {
+                x.setOrderIdFk(newBillNo);
+                x.setId(IdUtil.getSnowflakeNextId());
+                newOrderDetailBiz.add(x);
+            });
+            return ioOrderDetailBizDao.insertBatch(newOrderDetailBiz);
+        }
+        return true;
+    }
+
 }

src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java

@@ -22,6 +22,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 
 @Service
@@ -138,4 +139,23 @@ public class IoOrderDetailCodeServiceImpl implements IoOrderDetailCodeService {
         return ioOrderDetailCodeDao.updateById(orderDetailCodeEntity) > 0;
     }
 
+    @Override
+    public boolean copyOrderDetailCode(String newBillNo, String oldBillNo) {
+        //获取旧列表数据
+        List<IoOrderDetailCodeEntity> oldOrderDetailCode = findByOrderId(oldBillNo);
+        if (CollUtil.isNotEmpty(oldOrderDetailCode)){
+            List<IoOrderDetailCodeEntity> newOrderDetailCode = new ArrayList<>(oldOrderDetailCode.size());
+            //遍历修改新单号为新订单号
+            oldOrderDetailCode.forEach( x -> {
+                x.setOrderIdFk(newBillNo);
+                x.setId(IdUtil.getSnowflakeNextId());
+                x.setUpdateTime(new Date());
+                newOrderDetailCode.add(x);
+            });
+            //批量插入
+            return ioOrderDetailCodeDao.insertIgnoreBatchs(newOrderDetailCode);
+        }
+        return true;
+    }
+
 }

src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java

@@ -76,7 +76,10 @@ public class IoOrderDetailResultServiceImpl implements IoOrderDetailResultServic
 
     @Override
     public List<CptTraceOrderResponse> cptTrace(CptTraceRequest cptTraceRequest) {
-        return orderDetailResultDao.cptTrace(cptTraceRequest);
+        if (StrUtil.isNotEmpty(cptTraceRequest.getSerialNo())) {
+            return orderDetailResultDao.cptCodeTrace(cptTraceRequest);
+        } else
+            return orderDetailResultDao.cptTrace(cptTraceRequest);
     }
 
 }

src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java

@@ -22,6 +22,7 @@ import com.glxp.api.dao.basic.BasicCorpDao;
 import com.glxp.api.dao.inout.IoOrderDao;
 import com.glxp.api.dao.thrsys.ThrSystemBusApiDao;
 import com.glxp.api.dao.thrsys.ThrSystemDao;
+import com.glxp.api.entity.auth.AuthAdmin;
 import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
 import com.glxp.api.entity.basic.BasicCorpEntity;
 import com.glxp.api.entity.inout.*;
@@ -42,7 +43,9 @@ import com.glxp.api.service.inv.*;
 import com.glxp.api.service.inv.impl.InvProductDetailService;
 import com.glxp.api.service.system.SyncUploadDataBustypeService;
 import com.glxp.api.util.DateUtil;
+import com.glxp.api.util.GennerOrderUtils;
 import com.glxp.api.util.IntUtil;
+import com.glxp.api.util.OrderNoTypeBean;
 import com.glxp.api.util.udi.UdiCalCountUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.exception.ExceptionUtils;
@@ -691,6 +694,11 @@ public class IoOrderServiceImpl implements IoOrderService {
             case Constant.ORDER_STATUS_UN_ALLOCATE:
                 filterOrderRequest.setStatuses(Arrays.asList(ConstantStatus.ORDER_STATUS_ALLOCATE));
                 filterOrderRequest.setDealStatuses(Arrays.asList(2));
+
+            case Constant.ORDER_STATUS_RETURN:
+                filterOrderRequest.setStatuses(Arrays.asList(10, 7));
+                filterOrderRequest.setDealStatuses(Arrays.asList(3, 4));
+                break;
             default:
                 break;
         }
@@ -882,6 +890,26 @@ public class IoOrderServiceImpl implements IoOrderService {
         return ioOrderEntities;
     }
 
+    @Override
+    public boolean copyOrder(AuthAdmin authAdmin,String newBillNo, IoOrderEntity newIoOrderEntity, IoOrderEntity oldIoOrderEntity) {
+        newIoOrderEntity.setBillNo(newBillNo);
+        newIoOrderEntity.setMainAction(ConstantType.TYPE_OUT);
+        newIoOrderEntity.setFromCorp(oldIoOrderEntity.getFromCorp());
+        newIoOrderEntity.setInvCode(oldIoOrderEntity.getInvCode());
+        newIoOrderEntity.setDeptCode(oldIoOrderEntity.getDeptCode());
+        newIoOrderEntity.setReplicateNo(oldIoOrderEntity.getReplicateNo());
+        newIoOrderEntity.setFromType(ConstantStatus.FROM_WEBNEW);//网页新增
+        newIoOrderEntity.setStatus(ConstantStatus.ORDER_STATUS_TEMP_SAVE);//草稿
+        newIoOrderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_DRAFT);//草稿
+        newIoOrderEntity.setCorpOrderId(oldIoOrderEntity.getCorpOrderId());//单据号
+        newIoOrderEntity.setCreateUser(authAdmin.getId() + "");
+        newIoOrderEntity.setCreateTime(new Date());
+        newIoOrderEntity.setUpdateUser(authAdmin.getId() + "");
+        newIoOrderEntity.setUpdateTime(new Date());
+        newIoOrderEntity.setOrderType(ConstantStatus.ORDER_TYPE_NORMAL);//正常单据处理
+        return false;
+    }
+
     /**
      * 查询此单据关联的所有单据
      *

src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java

@@ -147,10 +147,12 @@ public class SupProductServiceImpl extends ServiceImpl<SupProductDao, SupProduct
     public boolean insertRegistration(SupProductEntity companyEntity) {
         return supProductDao.insert(companyEntity) > 0 ? true : false;
     }
+
     @Override
     public int findProduct(SupProductEntity supProductEntity) {
         return supProductDao.findProduct(supProductEntity);
     }
+
     @Override
     public boolean deleteById(String id) {
         return supProductDao.deleteById(id);

src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java

@@ -295,7 +295,7 @@ public class SpsSyncDownloadService {
             }
             exportStatus = BasicExportStatusEntity.builder()
                     .id(CustomUtil.getId())
-                    .status(syncTime == null ? BasicExportStatusEnum.WAIT_TRIGGERED.getCode() : BasicExportStatusEnum.WAIT_BUILT.getCode())
+                    .status(BasicExportStatusEnum.WAIT_BUILT.getCode())
                     .idDatas(exportEnum.getKey())
                     .type(exportEnum.getRemark())
                     .scheduleType(0)
@@ -303,9 +303,9 @@ public class SpsSyncDownloadService {
                     .startTime(now)
                     .build();
             basicExportService.save(exportStatus);
-            if (syncTime != null) {
-                createFileMethod.apply(applicationContext.getBean(this.getClass()));
-            }
+//            if (syncTime != null) {
+            createFileMethod.apply(applicationContext.getBean(this.getClass()));
+//            }
         } else if (exportStatus.getStatus().equals(BasicExportStatusEnum.WAIT_BUILT.getCode())) {//文件待生成
             createFileMethod.apply(applicationContext.getBean(this.getClass()));
         }

src/main/java/com/glxp/api/service/sync/impl/BasicExportTimeServiceImpl.java

@@ -18,14 +18,12 @@ import java.util.List;
 @Transactional(rollbackFor = Exception.class)
 public class BasicExportTimeServiceImpl extends CustomServiceImpl<BasicExportTimeDao, BasicExportStatusTimeEntity> implements BasicExportTimeService {
 
-    @Resource
-    BasicExportTimeDao basicExportTimeDao;
 
     @Override
     public BasicExportStatusTimeEntity findByType(String type) {
         BasicExportTimeRequest basicExportTimeRequest = new BasicExportTimeRequest();
         basicExportTimeRequest.setKey(type);
-        List<BasicExportStatusTimeEntity> basicExportStatusTimeEntities = basicExportTimeDao.filterExportStatus(basicExportTimeRequest);
+        List<BasicExportStatusTimeEntity> basicExportStatusTimeEntities = super.baseMapper.filterExportStatus(basicExportTimeRequest);
         if (CollUtil.isNotEmpty(basicExportStatusTimeEntities)) {
             return basicExportStatusTimeEntities.get(0);
         }
@@ -41,23 +39,23 @@ public class BasicExportTimeServiceImpl extends CustomServiceImpl<BasicExportTim
         if (basicExportStatusRequest == null) {
             return Collections.emptyList();
         }
-        return basicExportTimeDao.filterExportStatus(basicExportStatusRequest);
+        return super.baseMapper.filterExportStatus(basicExportStatusRequest);
     }
 
     @Override
     public boolean insertExportStatus(BasicExportStatusTimeEntity basicExportStatusTimeEntity) {
-        return basicExportTimeDao.insertExportStatus(basicExportStatusTimeEntity);
+        return super.baseMapper.insertExportStatus(basicExportStatusTimeEntity);
 
     }
 
     @Override
     public boolean deleteById(String id) {
-        return basicExportTimeDao.deleteById(id);
+        return super.baseMapper.deleteById(id);
     }
 
     @Override
     public boolean updateExportStatus(BasicExportStatusTimeEntity basicExportStatusTimeEntity) {
-        return basicExportTimeDao.updateExportStatus(basicExportStatusTimeEntity);
+        return super.baseMapper.updateExportStatus(basicExportStatusTimeEntity);
 
     }
 }

src/main/java/com/glxp/api/service/system/SysMenuHelpService.java

@@ -17,8 +17,5 @@ public interface SysMenuHelpService {
 
     boolean deleteMenuHelp(String  id);
 
-
-
-
-
+    List<SysMenuHelpEntity> selectAuthMenuByMenuKeys(List<String> menuKeys);
 }

src/main/java/com/glxp/api/service/system/impl/SysMenuHelpServiceImpl.java

@@ -3,6 +3,7 @@ package com.glxp.api.service.system.impl;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.dao.monitor.SysOperLogMapper;
 import com.glxp.api.req.system.SysMenuHelpRequest;
+import com.glxp.api.util.DateUtil;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.glxp.api.dao.system.SysMenuHelpMapper;
@@ -11,6 +12,8 @@ import com.glxp.api.service.system.SysMenuHelpService;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import javax.xml.crypto.Data;
+import java.util.Date;
 import java.util.List;
 
 @Service
@@ -43,4 +46,9 @@ public class SysMenuHelpServiceImpl implements SysMenuHelpService {
     public boolean deleteMenuHelp(String id) {
         return sysMenuHelpMapper.deleteById(id)>0;
     }
+
+    @Override
+    public List<SysMenuHelpEntity> selectAuthMenuByMenuKeys(List<String> menuKeys) {
+        return sysMenuHelpMapper.selectAuthMenuByMenuKeys(menuKeys);
+    }
 }

src/main/java/com/glxp/api/service/thrsys/ThrProductTypeService.java

@@ -0,0 +1,30 @@
+package com.glxp.api.service.thrsys;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
+import com.glxp.api.dao.thrsys.ThrProductTypeMapper;
+import com.glxp.api.entity.thrsys.ThrProductTypeEntity;
+import com.glxp.api.req.thrsys.FilterThrProductTypeRequest;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Collections;
+import java.util.List;
+
+@Service
+public class ThrProductTypeService extends ServiceImpl<ThrProductTypeMapper, ThrProductTypeEntity> {
+    @Resource
+    ThrProductTypeMapper thrProductTypeMapper;
+
+    public List<ThrProductTypeEntity> getProductTypes(FilterThrProductTypeRequest filterThrProductTypeRequest) {
+        if (filterThrProductTypeRequest == null) {
+            return Collections.emptyList();
+        }
+        if (filterThrProductTypeRequest.getPage() != null) {
+            int offset = (filterThrProductTypeRequest.getPage() - 1) * filterThrProductTypeRequest.getLimit();
+            PageHelper.offsetPage(offset, filterThrProductTypeRequest.getLimit());
+        }
+        List<ThrProductTypeEntity> data = thrProductTypeMapper.getProductTypes(filterThrProductTypeRequest);
+        return data;
+    }
+}

src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiService.java

@@ -122,7 +122,7 @@ public class ThrProductsAddDiService extends ServiceImpl<ThrProductsAddDiDao, Th
             thrProductsAddDiEntity.setYlqxzcrbarmc(productInfoEntity.getYlqxzcrbarmc());
             thrProductsAddDiEntity.setDeviceRecordKey(productInfoEntity.getDeviceRecordKey());
             thrProductsAddDiEntity.setZczbhhzbapzbh(productInfoEntity.getZczbhhzbapzbh());
-
+            thrProductsAddDiEntity.setGroupBuy(thrDiProductsRequest.getGroupBuy());
             //设置编辑区参数
             thrProductsAddDiEntity.setSptm(thrDiProductsRequest.getSptm());
             thrProductsAddDiEntity.setYbbm(thrDiProductsRequest.getYbbm());
@@ -131,10 +131,11 @@ public class ThrProductsAddDiService extends ServiceImpl<ThrProductsAddDiDao, Th
             thrProductsAddDiEntity.setSpmc(thrDiProductsRequest.getSpmc());
             thrProductsAddDiEntity.setCpms(thrDiProductsRequest.getCpms());
             thrProductsAddDiEntity.setPrice(thrDiProductsRequest.getPrice());
-
+            thrProductsAddDiEntity.setPurType(thrDiProductsRequest.getPurType());
+            thrProductsAddDiEntity.setAttributeType(thrDiProductsRequest.getAttributeType());
             thrProductsAddDiEntity.setCreateTime(date);
             thrProductsAddDiEntity.setUpdateTime(new Date());
-            thrProductsAddDiEntity.setStatus(1); //未审核
+            thrProductsAddDiEntity.setStatus(1); //..
             thrProductsAddDiEntity.setSelectThridSysStr(JSONUtil.toJsonStr(thrDiProductsRequest.getSelectThirdSys()));
             list.add(thrProductsAddDiEntity);
         }
@@ -157,6 +158,9 @@ public class ThrProductsAddDiService extends ServiceImpl<ThrProductsAddDiDao, Th
             udiInfoResponse.setMeasname(thrProductsAddDiEntity.getMeasname());
             udiInfoResponse.setManufactory(thrProductsAddDiEntity.getManufactory());
             udiInfoResponse.setPrice(thrProductsAddDiEntity.getPrice());
+            udiInfoResponse.setPurType(thrProductsAddDiEntity.getPurType());
+            udiInfoResponse.setAttributeType(thrProductsAddDiEntity.getAttributeType());
+
             udiInfoResponse.setBasicPrductRemak1(thrProductsAddDiEntity.getBasicPrductRemak1());
             udiInfoResponse.setBasicPrductRemak2(thrProductsAddDiEntity.getBasicPrductRemak2());
             udiInfoResponse.setBasicPrductRemak3(thrProductsAddDiEntity.getBasicPrductRemak3());

src/main/java/com/glxp/api/upload/uploadController.java

@@ -1,10 +1,13 @@
 package com.glxp.api.upload;
 
+import cn.hutool.core.exceptions.ExceptionUtil;
 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.util.MinioUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -21,6 +24,7 @@ import java.util.UUID;
 /**
  * 上传文件控制器
  */
+@Slf4j
 @RestController
 public class uploadController {
 
@@ -41,7 +45,8 @@ public class uploadController {
      */
 
     @PostMapping("/udiwms/upload/pdf/template/jasper")
-    public BaseResponse uploadPDFTemplate(@RequestParam("file") MultipartFile file) throws UnsupportedEncodingException {
+    public BaseResponse uploadPDFTemplate(@RequestParam("file") MultipartFile file) {
+        log.error("上传jasper文件了");
         if (file.isEmpty()) {
             return ResultVOUtils.error(ResultEnum.DATA_ERROR, "上传文件不能为空");
         }
@@ -60,6 +65,8 @@ public class uploadController {
             file1.mkdirs();// 创建多层目录
         }
         file1 = new File(savePath + "/" + newName);
+
+        log.error("创建文件了");
         try {
             file.transferTo(file1);
             Map<String, String> rMap = new HashMap<>();
@@ -68,6 +75,7 @@ public class uploadController {
             return ResultVOUtils.success(rMap);
         } catch (IOException e) {
             e.printStackTrace();
+            log.error("异常" + ExceptionUtils.getStackTrace(e));
         }
         return ResultVOUtils.error(ResultEnum.DATA_ERROR, "上传失败");
     }

src/main/java/com/glxp/api/util/JasperUtils.java

@@ -2,12 +2,14 @@ package com.glxp.api.util;
 
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
+import lombok.extern.slf4j.Slf4j;
 import net.sf.jasperreports.engine.*;
 import net.sf.jasperreports.engine.export.ooxml.JRDocxExporter;
 import net.sf.jasperreports.engine.query.JsonQueryExecuterFactory;
 import net.sf.jasperreports.engine.util.JRLoader;
 import net.sf.jasperreports.export.SimpleExporterInput;
 import net.sf.jasperreports.export.SimpleOutputStreamExporterOutput;
+import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
@@ -28,6 +30,7 @@ import java.util.Map;
  * @date 2021-11-10 22:23
  */
 @Component
+@Slf4j
 public class JasperUtils {
     private static Logger logger = LoggerFactory.getLogger(JasperUtils.class);
 
@@ -102,7 +105,7 @@ public class JasperUtils {
                 os.close();
             }
         } catch (Exception e) {
-
+            log.error(ExceptionUtils.getStackTrace(e));
             e.printStackTrace();
 
         }

src/main/java/com/glxp/api/util/SupplementVailUtil.java

@@ -78,6 +78,18 @@ public class SupplementVailUtil {
                 }
             }
 
+            basicProductSetEntity = basicProductSetEntityMap.get("groupBuy");
+            if (isMustFill(type, basicProductSetEntity)) {
+                if (supplementRequest.getGroupBuy() == null) {
+                    return "请选择是否集采";
+                }
+            }
+            basicProductSetEntity = basicProductSetEntityMap.get("purType");
+            if (isMustFill(type, basicProductSetEntity)) {
+                if (StrUtil.isEmptyIfStr(supplementRequest.getPurType())) {
+                    return "采购类型不能为空";
+                }
+            }
 
             basicProductSetEntity = basicProductSetEntityMap.get("basicPrductRemak1");
             if (isMustFill(type, basicProductSetEntity)) {
@@ -131,6 +143,15 @@ public class SupplementVailUtil {
                     if (!systemParamConfigEntity.getParamValue().equals("0")) {
                         return systemParamConfigEntity.getParamValue() + "不能为空";
                     }
+                } else {
+                    if (supplementRequest.getBasicPrductRemak6().equals("1")) {
+                        if (StrUtil.isEmpty(supplementRequest.getBasicPrductRemak8())) {
+                            SystemParamConfigEntity temp = systemParamConfigEntityMap.get("basicPrductRemak8");
+                            if (!temp.getParamValue().equals("0")) {
+                                return temp.getParamValue() + "不能为空";
+                            }
+                        }
+                    }
                 }
             }
             basicProductSetEntity = basicProductSetEntityMap.get("basicPrductRemak7");