Merge branch 'udims_mango' of https://gitee.com/anthonywj/udims-java into udims_mango

 Conflicts:

	api-common/target/classes/com/glxp/udi/common/constant/CacheConstant.class

	api-common/target/classes/com/glxp/udi/common/converter/LongList2StringConverter.class

	api-common/target/classes/com/glxp/udi/common/converter/String2LongListConverter.class

	api-common/target/classes/com/glxp/udi/common/converter/String2StringListConverter.class

	api-common/target/classes/com/glxp/udi/common/enums/ResultEnum.class

	api-common/target/classes/com/glxp/udi/common/req/BaseLimitRequest.class

	api-common/target/classes/com/glxp/udi/common/req/BaseRequest.class

	api-common/target/classes/com/glxp/udi/common/res/BaseResponse.class

	api-common/target/classes/com/glxp/udi/common/util/ResultVOUtils.class

	api-common/target/test-classes/com/glxp/udi/common/util/ResultVOUtilsTest.class

	api-udims/src/main/resources/application-pro.properties

api-common/target/maven-archiver/pom.properties

@@ -1,4 +0,0 @@
-#Created by Apache Maven 3.5.4
-groupId=com.glxp
-artifactId=api-common
-version=0.0.1

api-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,9 +0,0 @@
-D:\ylswork\SaleWarehouse\api-common\src\main\java\com\glxp\sale\common\req\BaseLimitRequest.java
-D:\ylswork\SaleWarehouse\api-common\src\main\java\com\glxp\sale\common\converter\LongList2StringConverter.java
-D:\ylswork\SaleWarehouse\api-common\src\main\java\com\glxp\sale\common\constant\CacheConstant.java
-D:\ylswork\SaleWarehouse\api-common\src\main\java\com\glxp\sale\common\res\BaseResponse.java
-D:\ylswork\SaleWarehouse\api-common\src\main\java\com\glxp\sale\common\converter\String2LongListConverter.java
-D:\ylswork\SaleWarehouse\api-common\src\main\java\com\glxp\sale\common\converter\String2StringListConverter.java
-D:\ylswork\SaleWarehouse\api-common\src\main\java\com\glxp\sale\common\util\ResultVOUtils.java
-D:\ylswork\SaleWarehouse\api-common\src\main\java\com\glxp\sale\common\req\BaseRequest.java
-D:\ylswork\SaleWarehouse\api-common\src\main\java\com\glxp\sale\common\enums\ResultEnum.java

api-common/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst

@@ -1 +0,0 @@
-D:\ylswork\SaleWarehouse\api-common\src\test\java\com\glxp\sale\common\util\ResultVOUtilsTest.java

api-common/target/surefire-reports/TEST-com.glxp.sale.common.util.ResultVOUtilsTest.xml

@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<testsuite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report.xsd" name="com.glxp.sale.common.util.ResultVOUtilsTest" time="0.007" tests="0" errors="0" skipped="0" failures="0">
-  <properties>
-    <property name="java.specification.version" value="14"/>
-    <property name="sun.cpu.isalist" value="amd64"/>
-    <property name="sun.jnu.encoding" value="GBK"/>
-    <property name="java.class.path" value="D:\ylswork\SaleWarehouse\api-common\target\test-classes;D:\ylswork\SaleWarehouse\api-common\target\classes;D:\Program Files\maven\maven-repository\org\projectlombok\lombok\1.18.6\lombok-1.18.6.jar;D:\Program Files\maven\maven-repository\org\apache\commons\commons-lang3\3.9\commons-lang3-3.9.jar;"/>
-    <property name="java.vm.vendor" value="Oracle Corporation"/>
-    <property name="sun.arch.data.model" value="64"/>
-    <property name="user.variant" value=""/>
-    <property name="java.vendor.url" value="https://java.oracle.com/"/>
-    <property name="user.timezone" value="GMT+08:00"/>
-    <property name="os.name" value="Windows 10"/>
-    <property name="java.vm.specification.version" value="14"/>
-    <property name="sun.java.launcher" value="SUN_STANDARD"/>
-    <property name="user.country" value="CN"/>
-    <property name="sun.boot.library.path" value="C:\Program Files\Java\jdk-14.0.2\bin"/>
-    <property name="sun.java.command" value="C:\Users\yewen\AppData\Local\Temp\surefire11294539595372133777\surefirebooter11627009231378106841.jar C:\Users\yewen\AppData\Local\Temp\surefire11294539595372133777 2020-11-11T22-12-52_072-jvmRun1 surefire5241565499038608356tmp surefire_0398784169093598879tmp"/>
-    <property name="jdk.debug" value="release"/>
-    <property name="surefire.test.class.path" value="D:\ylswork\SaleWarehouse\api-common\target\test-classes;D:\ylswork\SaleWarehouse\api-common\target\classes;D:\Program Files\maven\maven-repository\org\projectlombok\lombok\1.18.6\lombok-1.18.6.jar;D:\Program Files\maven\maven-repository\org\apache\commons\commons-lang3\3.9\commons-lang3-3.9.jar;"/>
-    <property name="sun.cpu.endian" value="little"/>
-    <property name="user.home" value="C:\Users\yewen"/>
-    <property name="user.language" value="zh"/>
-    <property name="java.specification.vendor" value="Oracle Corporation"/>
-    <property name="java.version.date" value="2020-07-14"/>
-    <property name="java.home" value="C:\Program Files\Java\jdk-14.0.2"/>
-    <property name="file.separator" value="\"/>
-    <property name="basedir" value="D:\ylswork\SaleWarehouse\api-common"/>
-    <property name="java.vm.compressedOopsMode" value="32-bit"/>
-    <property name="line.separator" value="&#10;"/>
-    <property name="java.vm.specification.vendor" value="Oracle Corporation"/>
-    <property name="java.specification.name" value="Java Platform API Specification"/>
-    <property name="surefire.real.class.path" value="C:\Users\yewen\AppData\Local\Temp\surefire11294539595372133777\surefirebooter11627009231378106841.jar"/>
-    <property name="user.script" value=""/>
-    <property name="sun.management.compiler" value="HotSpot 64-Bit Tiered Compilers"/>
-    <property name="java.runtime.version" value="14.0.2+12-46"/>
-    <property name="user.name" value="yewen"/>
-    <property name="path.separator" value=";"/>
-    <property name="os.version" value="10.0"/>
-    <property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/>
-    <property name="file.encoding" value="GBK"/>
-    <property name="java.vm.name" value="Java HotSpot(TM) 64-Bit Server VM"/>
-    <property name="localRepository" value="D:\Program Files\maven\maven-repository"/>
-    <property name="java.vendor.url.bug" value="https://bugreport.java.com/bugreport/"/>
-    <property name="java.io.tmpdir" value="C:\Users\yewen\AppData\Local\Temp\"/>
-    <property name="java.version" value="14.0.2"/>
-    <property name="user.dir" value="D:\ylswork\SaleWarehouse\api-common"/>
-    <property name="os.arch" value="amd64"/>
-    <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
-    <property name="sun.os.patch.level" value=""/>
-    <property name="java.library.path" value="C:\Program Files\Java\jdk-14.0.2\bin;C:\WINDOWS\Sun\Java\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\Program Files\Java\jdk-14.0.2\bin\;C:\Python38\Scripts\;C:\Python38\;C:\Program Files (x86)\Intel\iCLS Client\;C:\Program Files\Intel\iCLS Client\;C:\windows\system32;C:\windows;C:\windows\System32\Wbem;C:\windows\System32\WindowsPowerShell\v1.0\;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\IPT;C:\Program Files\Intel\Intel(R) Management Engine Components\IPT;C:\Program Files (x86)\NVIDIA Corporation\PhysX\Common;C:\Program Files\Git\cmd;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\WINDOWS\System32\OpenSSH\;C:\Program Files\Intel\WiFi\bin\;C:\Program Files\Common Files\Intel\WirelessCommon\;C:\Program Files\TortoiseSVN\bin;C:\Program Files\TortoiseGit\bin;C:\Program Files (x86)\Microsoft SQL Server\100\Tools\Binn\;C:\Program Files\Microsoft SQL Server\100\Tools\Binn\;C:\Program Files\Microsoft SQL Server\100\DTS\Binn\;C:\Program Files\nodejs\;C:\ProgramData\chocolatey\bin;D:\Program Files\maven\apache-maven-3.5.4\bin\;C:\Program Files\MySQL\MySQL Shell 8.0\bin\;C:\Users\yewen\AppData\Local\Microsoft\WindowsApps;;D:\Program Files (x86)\Egret\Egret Wing 3\bin;d:\Users\yewen\AppData\Local\Programs\Microsoft VS Code\bin;C:\Users\yewen\AppData\Roaming\npm;D:\Program Files\JetBrains\IntelliJ IDEA 2018.3.2\bin;;."/>
-    <property name="java.vm.info" value="mixed mode, sharing"/>
-    <property name="java.vendor" value="Oracle Corporation"/>
-    <property name="java.vm.version" value="14.0.2+12-46"/>
-    <property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
-    <property name="java.class.version" value="58.0"/>
-  </properties>
-</testsuite>

api-common/target/surefire-reports/com.glxp.sale.common.util.ResultVOUtilsTest.txt

@@ -1,4 +0,0 @@
--------------------------------------------------------------------------------
-Test set: com.glxp.sale.common.util.ResultVOUtilsTest
--------------------------------------------------------------------------------
-Tests run: 0, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.007 s - in com.glxp.sale.common.util.ResultVOUtilsTest

api-udims/pom.xml

@@ -150,6 +150,15 @@
             <artifactId>gson</artifactId>
             <version>2.8.5</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-mongodb</artifactId>
+        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>com.github.Ryan-Miao</groupId>-->
+            <!--<artifactId>mongo-page-helper</artifactId>-->
+            <!--<version>1.0</version>-->
+        <!--</dependency>-->
 
     </dependencies>
 

api-udims/src/main/java/com/glxp/udi/admin/config/MongoConfiguration.java

@@ -0,0 +1,18 @@
+package com.glxp.udi.admin.config;
+
+import com.glxp.udi.admin.mongo.utils.MongoPageHelper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.mongodb.core.MongoTemplate;
+
+@Configuration
+public class MongoConfiguration {
+    @Autowired
+    private MongoTemplate mongoTemplate;
+
+    @Bean
+    public MongoPageHelper mongoPageHelper() {
+        return new MongoPageHelper(mongoTemplate);
+    }
+}

api-udims/src/main/java/com/glxp/udi/admin/constant/Constant.java

@@ -0,0 +1,21 @@
+package com.glxp.udi.admin.constant;
+
+public class Constant {
+
+    public static final Integer DITYPE_DI = 1;      //主标识
+    public static final Integer DITYPE_SYDY = 2;     //使用单元标识
+    public static final Integer DITYPE_PK = 4;       //包装标识
+    public static final Integer DITYPE_SELF = 3;    //本体标识
+
+
+    public static final int USEDY_TRUE = 1;     //使用单元入库
+    public static final int USEDY_FALSE = 0;    //不使用单元入库
+
+
+    public static final String ORDER_STATUS_SUCCESS = "success";
+    public static final String ORDER_STATUS_ERROR = "error";
+    public static final String ORDER_STATUS_NEW = "new";
+    public static final String ORDER_STATUS_PROCESS = "process";
+
+
+}

api-udims/src/main/java/com/glxp/udi/admin/constant/CookieConstant.java

@@ -6,6 +6,24 @@ package com.glxp.udi.admin.constant;
 public interface CookieConstant {
 
     String TOKEN = "token";
+    String test = "0106922943800643102024112111021722110221101002" +
+            "0126922943800647102024112111021722110221101" +
+            "0126922943800647102024112111021722110221101" +
+            "010697121760652811200226172302271020022632100001" +
+            "010697121760652811200226172302271020022632100003" +
+            "" +
+            "010692294380065010PCH000111210112172301112100001" +
+            "0106922943800650172301111121011210PCH00012100003" +
+            "01069229438006501723011110PCH00012100004" +
+            "010692294380065010PCH00012100007" +
+            "01069012345678921055511111111175555552195656" +
+            "010692294380065010PCH000111210112172301112100001" +
+            "010692294380065010PCH00011121011217230111" +
+            "01069229438006501723011110PCH00012100004" +
+            "010692294380065010PCH000111210112172301112100001" +
+            "010692294380065010PCH000111210112172301112100001" +
+            "0126922943800647102024\u001D112111021722110221101"+
+            "01269229438006541121012117230121102021011604\u001D2100001";
 
     Integer EXPIRE = 7200;
 }

api-udims/src/main/java/com/glxp/udi/admin/controller/TestController.java

@@ -0,0 +1,72 @@
+package com.glxp.udi.admin.controller;
+
+import com.glxp.udi.admin.entity.info.CompanyEntity;
+import com.glxp.udi.admin.req.info.CompanyRequest;
+import com.glxp.udi.common.res.BaseResponse;
+import com.glxp.udi.common.util.ResultVOUtils;
+import org.apache.ibatis.annotations.Param;
+import org.apache.tomcat.util.codec.binary.Base64;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.crypto.Cipher;
+import java.security.KeyFactory;
+import java.security.PrivateKey;
+import java.security.spec.PKCS8EncodedKeySpec;
+
+@RestController
+public class TestController {
+    String privateKey =
+            "MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC1ocuIO2xyfDJ5" +
+                    "7iUb2MLwZQRlgi4GjPj1bcZLLYsQ5WkpHKJA0KNGbJu9BLmop2xvelXvbQdAme/+" +
+                    "dAueyD+9ZsVz0vT18R4l0NnFA5/wPsId5WAt3z5+H8Z7NAJUuKMaVsBU5Fc6sWjk" +
+                    "xx3I52wsl7LXHgfEhHXdrv0kcHux297XgDZpLptDs09a7yEz0ukl3WHKWxeB0GlH" +
+                    "6JfcM8V56nxLHyM+dZ9R8YXakM0TeHW7P1HKUYFhTPi0M/PPQhc7u9mTJQVd6yXM" +
+                    "oUMVyaGFufW2htf5qXhe99GmOgKNJPaZF+oK3ho24EMzUsczPIwFUml+6L3WKQsY" +
+                    "yA/gZ1+zAgMBAAECggEBAIf3iol9En3Rg2fLYnQqHCQhOt1SSmoU9fmkJ6D3gvcv" +
+                    "BT4FdWDXzqJVg3BILUOXsZDyH4qQL7GoiwQMkvZWKYD7gixma4IA8fSVF7BoOj56" +
+                    "fI4su4cba4i2+LoaAPSzE0YQUwI5vSLu0/sPI7jVpSDsnrByhpYSIrnE2TOCENbe" +
+                    "4Dx+5iBw+dYxvIGohgRp4r19d4glYsquJ6Akt5+7LnvFPMqGXhswlMnjhA6wv558" +
+                    "bMV2q8CUQN3x6XipGs+Nx7n3JwHuFFtMWYbk6xti+31ASkhNKXMYkxE5qBLGiGJ7" +
+                    "qX472TQhH5U4G34dJZhix18KsI46Fp2h9jQyU9c6NWECgYEA8hXcxXrNqPXQOxGu" +
+                    "t06oaAZ2+rxcn9Focfv0L/Bb3b8HHv7lzRXTsnaUU1InY98K03ixUGWu1/uQfhqF" +
+                    "A5I8SA1dfE2RvoHDirUbyCA/hpVDmqhxbA8zZGNbIfHgtCumWeqoV9d3VhEEmgj4" +
+                    "XfuLA1hBMGSEf/21e13mB+A/1qUCgYEAwBJl9U6wSp6lAvG/x1td8DrN7KEucBdY" +
+                    "B0CJJNXEQLGUnCVSfAi0YGTD9oNglzuA9y4PmIi5R6P2lzlNUisRwIev/cEHpj1a" +
+                    "kmm0RArRg/0nZdfMJnjXmn8AAuZNxKN41JwKTRemXaxMfkgtLpmP7jtNS8Ibv1GH" +
+                    "eX1ZK7SF5XcCgYBDknCmOqnvMHXoFv5ysiT1rGBHio48GeKSdmZpfyjVU330W+fe" +
+                    "/+mwVcL/It5V1SsbbgPoUgmkxdZGLLbWEVp8LibbDHfS+juPmw/fI4k30rAlGkFW" +
+                    "jUOmEMmeRvqWr9xmGsbUhhMMVgG30SsqaI0b6OWBUX1ekH24qrQLnL+U9QKBgQCk" +
+                    "k18vuVQPLC5h/nkAPgaY4Bowhs9+llIELMUWfeBiOocG4Gf0BZVg/xZ2dI3gJ8lS" +
+                    "gvI0FfsEKrcRTrU1EdhtKxaejLacN/gSemZO4yIxQUpv1l+EG4lKRUXiNiouso/H" +
+                    "RUkCU6BmpUsJ7ZhhVI1iaQfLQTB7V0WI0OIGM/GC8wKBgAHqB+3iaG8j67x04PGU" +
+                    "2BOBV4DVtEK27v8crG4lhUwzwkh0tJ4fOUu87DkCkZXQZh3BjcxyTx9ztlk0tUk3" +
+                    "vTFABi5Awpv7C5PWXfQxsy9jTRNpRGduXKkl+blwJ7JkJAu77uxXB91LTenSGwSR" +
+                    "hYTV7d/EJUqzLUKlcOIWFk7w";
+
+    @GetMapping("/yewenjie/get/key/test")
+    public BaseResponse getCompanyInfo(@Param("data") String data) {
+
+        try {
+            String outStr = privateKeyEncrypt(data, privateKey);
+            return ResultVOUtils.success(outStr);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return ResultVOUtils.error(500, "服务器异常");
+    }
+
+    //私钥加密
+    public String privateKeyEncrypt(String str, String privateKey) throws Exception {
+        //base64编码的公钥
+        byte[] decoded = Base64.decodeBase64(privateKey);
+        PrivateKey priKey = KeyFactory.getInstance("RSA").
+                generatePrivate(new PKCS8EncodedKeySpec(decoded));
+        //RSA加密
+        Cipher cipher = Cipher.getInstance("RSA");
+        cipher.init(Cipher.ENCRYPT_MODE, priKey);
+        String outStr = Base64.encodeBase64String(cipher.doFinal(str.getBytes()));
+        return outStr;
+    }
+}

api-udims/src/main/java/com/glxp/udi/admin/controller/inout/BusRoleRlController.java

@@ -0,0 +1,159 @@
+package com.glxp.udi.admin.controller.inout;
+
+import com.github.pagehelper.PageInfo;
+import com.glxp.udi.admin.entity.auth.AuthAdmin;
+import com.glxp.udi.admin.entity.auth.CustomerInfoEntity;
+import com.glxp.udi.admin.entity.inout.BusRoleRlEntity;
+import com.glxp.udi.admin.entity.inout.BussinessTypeEntity;
+import com.glxp.udi.admin.exception.JsonException;
+import com.glxp.udi.admin.req.inout.BusRoleRlFilterRequest;
+import com.glxp.udi.admin.req.receipt.BussinessTypeFilterRequest;
+import com.glxp.udi.admin.res.PageSimpleResponse;
+import com.glxp.udi.admin.res.inout.BusRoleRlResponse;
+import com.glxp.udi.admin.service.auth.AuthAdminService;
+import com.glxp.udi.admin.service.auth.CustomerInfoService;
+import com.glxp.udi.admin.service.inout.BusRoleRlService;
+import com.glxp.udi.admin.service.inout.BussinessTypeService;
+import com.glxp.udi.common.enums.ResultEnum;
+import com.glxp.udi.common.res.BaseResponse;
+import com.glxp.udi.common.util.ResultVOUtils;
+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.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+@RestController
+public class BusRoleRlController {
+
+    @Resource
+    private BusRoleRlService busRoleRlService;
+    @Resource
+    private CustomerInfoService customerInfoService;
+    @Resource
+    private BussinessTypeService bussinessTypeService;
+    @Resource
+    private AuthAdminService authAdminService;
+
+    @GetMapping("/udiwms/busRl/filter")
+    public BaseResponse filterbBusRl(BusRoleRlFilterRequest busRoleRlFilterRequest,
+                                     BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BusRoleRlResponse> busRoleRlResponses;
+        busRoleRlResponses = busRoleRlService.filterJoinList(busRoleRlFilterRequest);
+        PageInfo<BusRoleRlResponse> pageInfo;
+        pageInfo = new PageInfo<>(busRoleRlResponses);
+        PageSimpleResponse<BusRoleRlResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(busRoleRlResponses);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+    @GetMapping("/udiwms/busRl/filterAll")
+    public BaseResponse filterbBusRlAll(BusRoleRlFilterRequest busRoleRlFilterRequest,
+                                        BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        BussinessTypeFilterRequest bussinessTypeFilterRequest = new BussinessTypeFilterRequest();
+        BeanUtils.copyProperties(busRoleRlFilterRequest, bussinessTypeFilterRequest);
+        List<BussinessTypeEntity> bussinessTypeEntities;
+        bussinessTypeEntities = bussinessTypeService.filterList(bussinessTypeFilterRequest);
+
+        List<BusRoleRlEntity> busRoleRlResponses;
+        busRoleRlResponses = busRoleRlService.filterList(busRoleRlFilterRequest);
+
+        for (BussinessTypeEntity bussinessTypeEntity : bussinessTypeEntities) {
+            for (BusRoleRlEntity busRoleRlResponse : busRoleRlResponses) {
+                if (bussinessTypeEntity.getAction().equals(busRoleRlResponse.getBusAction())) {
+                    bussinessTypeEntity.setCheck(true);
+                }
+            }
+        }
+
+        PageInfo<BussinessTypeEntity> pageInfo;
+        pageInfo = new PageInfo<>(bussinessTypeEntities);
+        PageSimpleResponse<BussinessTypeEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(bussinessTypeEntities);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+    @GetMapping("/udiwms/bussinessType/filter")
+    public BaseResponse filterByRole(BusRoleRlFilterRequest busRoleRlFilterRequest,
+                                     BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        if (attributes == null) {
+            throw new JsonException(ResultEnum.NOT_NETWORK);
+        }
+        HttpServletRequest request = attributes.getRequest();
+        String userId = request.getHeader("ADMIN_ID");
+        AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId));
+        if (authAdmin.getCustomerId() == 110) {//系统管理员角色
+            BussinessTypeFilterRequest bussinessTypeFilterRequest = new BussinessTypeFilterRequest();
+            BeanUtils.copyProperties(busRoleRlFilterRequest, bussinessTypeFilterRequest);
+            List<BussinessTypeEntity> bussinessTypeEntities;
+            bussinessTypeEntities = bussinessTypeService.filterList(bussinessTypeFilterRequest);
+            PageInfo<BussinessTypeEntity> pageInfo;
+            pageInfo = new PageInfo<>(bussinessTypeEntities);
+            PageSimpleResponse<BussinessTypeEntity> pageSimpleResponse = new PageSimpleResponse<>();
+            pageSimpleResponse.setTotal(pageInfo.getTotal());
+            pageSimpleResponse.setList(bussinessTypeEntities);
+            return ResultVOUtils.success(pageSimpleResponse);
+
+        } else {
+            CustomerInfoEntity customerInfoEntity = customerInfoService.
+                    selectById(authAdmin.getCustomerId());
+            busRoleRlFilterRequest.setRoleId(customerInfoEntity.getRoleId() + "");
+            List<BusRoleRlResponse> busRoleRlResponses;
+            busRoleRlResponses = busRoleRlService.filterJoinList(busRoleRlFilterRequest);
+            PageInfo<BusRoleRlResponse> pageInfo;
+            pageInfo = new PageInfo<>(busRoleRlResponses);
+            PageSimpleResponse<BusRoleRlResponse> pageSimpleResponse = new PageSimpleResponse<>();
+            pageSimpleResponse.setTotal(pageInfo.getTotal());
+            pageSimpleResponse.setList(busRoleRlResponses);
+            return ResultVOUtils.success(pageSimpleResponse);
+        }
+
+    }
+
+
+    @PostMapping("/udiwms/busRl/update")
+    public BaseResponse postBusRl(@RequestBody BusRoleRlFilterRequest busRoleRlFilterRequest, BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        busRoleRlService.deleteById(busRoleRlFilterRequest.getRoleId() + "");
+        if (busRoleRlFilterRequest.getActions() != null && busRoleRlFilterRequest.getActions().size() > 0) {
+            for (String action : busRoleRlFilterRequest.getActions()) {
+                BusRoleRlEntity busRoleRlEntity = new BusRoleRlEntity();
+                busRoleRlEntity.setRoleId(busRoleRlFilterRequest.getRoleId());
+                busRoleRlEntity.setBusAction(action);
+                busRoleRlService.insertBusRoleRl(busRoleRlEntity);
+            }
+
+            return ResultVOUtils.success("关联成功");
+        } else {
+            return ResultVOUtils.success("未选择业务单据类型！");
+        }
+
+
+    }
+
+}

api-udims/src/main/java/com/glxp/udi/admin/controller/inout/BussinessTypeController.java

@@ -0,0 +1,110 @@
+package com.glxp.udi.admin.controller.inout;
+
+import com.github.pagehelper.PageInfo;
+import com.glxp.udi.admin.entity.inout.BussinessTypeEntity;
+import com.glxp.udi.admin.req.inout.DeleteRequest;
+import com.glxp.udi.admin.req.receipt.BussinessTypeFilterRequest;
+import com.glxp.udi.admin.res.PageSimpleResponse;
+import com.glxp.udi.admin.res.basic.BussinessTypResponse;
+import com.glxp.udi.admin.service.inout.BussinessTypeService;
+import com.glxp.udi.common.enums.ResultEnum;
+import com.glxp.udi.common.res.BaseResponse;
+import com.glxp.udi.common.util.ResultVOUtils;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 业务类型维护
+ */
+
+@RestController
+public class BussinessTypeController {
+
+
+    @Resource
+    private BussinessTypeService bussinessTypeService;
+
+
+//    @GetMapping("/udiwms/bussinessType/filter")
+//    public BaseResponse filterBussinessType(BussinessTypeFilterRequest bussinessTypeFilterRequest,
+//                                            BindingResult bindingResult) {
+//
+//        if (bindingResult.hasErrors()) {
+//            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+//        }
+//        List<BussinessTypeEntity> bussinessTypeEntities;
+//        bussinessTypeEntities = bussinessTypeService.filterList(bussinessTypeFilterRequest);
+//        PageInfo<BussinessTypeEntity> pageInfo;
+//        pageInfo = new PageInfo<>(bussinessTypeEntities);
+//        PageSimpleResponse<BussinessTypeEntity> pageSimpleResponse = new PageSimpleResponse<>();
+//        pageSimpleResponse.setTotal(pageInfo.getTotal());
+//        pageSimpleResponse.setList(bussinessTypeEntities);
+//        return ResultVOUtils.success(pageSimpleResponse);
+//    }
+
+    @GetMapping("/udiwms/bussinessType/joinFilter")
+    public BaseResponse filterJoinBussinessType(BussinessTypeFilterRequest bussinessTypeFilterRequest,
+                                                BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<BussinessTypResponse> bussinessTypeEntities;
+        bussinessTypeEntities = bussinessTypeService.filterJoinList(bussinessTypeFilterRequest);
+        PageInfo<BussinessTypResponse> pageInfo;
+        pageInfo = new PageInfo<>(bussinessTypeEntities);
+        PageSimpleResponse<BussinessTypResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(bussinessTypeEntities);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+
+    @PostMapping("/udiwms/bussinessType/delete")
+    public BaseResponse deleteBussinessType(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        String id = deleteRequest.getId();
+        bussinessTypeService.deleteById(id);
+        return ResultVOUtils.success("删除成功");
+    }
+
+    @PostMapping("/udiwms/bussinessType/update")
+    public BaseResponse updateBussinessType(@RequestBody BussinessTypeEntity bussinessTypeEntity,
+                                            BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        if (bussinessTypeEntity != null) {
+            bussinessTypeService.updateBussinessType(bussinessTypeEntity);
+        } else {
+            ResultVOUtils.error(999, "参数错误");
+        }
+        return ResultVOUtils.success("更新成功");
+    }
+
+
+    @PostMapping("/udiwms/bussinessType/insert")
+    public BaseResponse insertBussinessType(@RequestBody BussinessTypeEntity bussinessTypeEntity, BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        if (bussinessTypeEntity != null) {
+            bussinessTypeService.insertBussinessType(bussinessTypeEntity);
+        } else {
+            ResultVOUtils.error(999, "参数错误");
+        }
+        return ResultVOUtils.success("添加成功");
+    }
+
+}

api-udims/src/main/java/com/glxp/udi/admin/controller/inout/CodeNeedRlController.java

@@ -0,0 +1,55 @@
+package com.glxp.udi.admin.controller.inout;
+
+import com.github.pagehelper.PageInfo;
+import com.glxp.udi.admin.entity.inout.CodeNeedRlEntity;
+import com.glxp.udi.admin.req.inout.CodeNeedRlFilterRequest;
+import com.glxp.udi.admin.req.inout.DeleteRequest;
+import com.glxp.udi.admin.res.PageSimpleResponse;
+import com.glxp.udi.admin.service.inout.CodeNeedRlService;
+import com.glxp.udi.common.enums.ResultEnum;
+import com.glxp.udi.common.res.BaseResponse;
+import com.glxp.udi.common.util.ResultVOUtils;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@RestController
+public class CodeNeedRlController {
+
+    @Resource
+    CodeNeedRlService codeNeedRlService;
+
+    @GetMapping("/udims/io/getNeedRlCodes")
+    public BaseResponse getNeedRlCodes(CodeNeedRlFilterRequest codeNeedRlFilterRequest,
+                                       BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<CodeNeedRlEntity> codeNeedRlEntities = codeNeedRlService.filterList(codeNeedRlFilterRequest);
+        PageInfo<CodeNeedRlEntity> pageInfo;
+        pageInfo = new PageInfo<>(codeNeedRlEntities);
+        PageSimpleResponse<CodeNeedRlEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(codeNeedRlEntities);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+    @PostMapping("/udims/io/delNeedRlCode")
+    public BaseResponse delNeedRlCode(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        String id = deleteRequest.getId();
+        codeNeedRlService.deleteById(id);
+        return ResultVOUtils.success("删除成功");
+    }
+
+
+}

api-udims/src/main/java/com/glxp/udi/admin/controller/inout/InoutUtils.java

@@ -1,28 +1,36 @@
 package com.glxp.udi.admin.controller.inout;
 
 
+import com.glxp.udi.admin.constant.Constant;
 import com.glxp.udi.admin.constant.TypeConstant;
 import com.glxp.udi.admin.entity.info.SetupEntity;
 import com.glxp.udi.admin.entity.inout.*;
 import com.glxp.udi.admin.entity.udid.UdiEntity;
+import com.glxp.udi.admin.mongo.service.OrderDetailMdService;
+import com.glxp.udi.admin.mongo.service.WarehouseMdService;
 import com.glxp.udi.admin.req.inout.FilterWarehouseRequest;
 import com.glxp.udi.admin.service.info.SetupService;
-import com.glxp.udi.admin.service.inout.MyErpOrderService;
 import com.glxp.udi.admin.service.inout.UdiInfoService;
 import com.glxp.udi.admin.service.inout.UdiRelevanceService;
-import com.glxp.udi.admin.service.inout.WarehouseService;
 import com.glxp.udi.admin.service.receipts.ProductInfoService;
 import com.glxp.udi.admin.util.FilterUdiUtils;
-import com.glxp.udi.admin.util.WarehousBeanUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+@Service
 public class InoutUtils {
     String udiUrl = "";
 
+
+    @Resource
+    UdiInfoService udiInfoService;
+
     public InoutUtils() {
 
     }
@@ -31,13 +39,15 @@ public class InoutUtils {
         this.udiUrl = udiUrl;
     }
 
-    public String filterCode(WarehouseService warehouseService, Warehousetemp warehousetemp, SetupService setupService) {
+    public String filterCode(WarehouseMdService warehouseService, WarehousetempEntity warehousetemp, SetupService setupService) {
         SetupEntity setupEntity = setupService.selectSetup();
         FilterWarehouseRequest filterWarehouseRequest = new FilterWarehouseRequest();
         filterWarehouseRequest.setCode(warehousetemp.getCode());
         filterWarehouseRequest.setCustomerId(warehousetemp.getCustomerId());
         List<WarehouseEntity> warehouseEntityList = warehouseService.findByCode(filterWarehouseRequest);
-        WarehouseEntity warehouseData = new WarehousBeanUtils().tempToEntity(warehousetemp);
+
+        WarehouseEntity warehouseData = new WarehouseEntity();
+        BeanUtils.copyProperties(warehousetemp, warehouseData);
         if (warehouseEntityList == null || warehouseEntityList.size() == 0) { //数据库为null,可以添加
             return nullVail(warehousetemp, setupEntity);
         }
@@ -104,7 +114,7 @@ public class InoutUtils {
         return null;
     }
 
-    public String nullVail(Warehousetemp warehousetemp, SetupEntity setupEntity) {
+    public String nullVail(WarehousetempEntity warehousetemp, SetupEntity setupEntity) {
         if (warehousetemp.getAction().equals(TypeConstant.TYPE_PUT_RETURN)) {
             if (setupEntity.isReturnWareHouseIn()) {
                 return null;
@@ -246,8 +256,20 @@ public class InoutUtils {
         return udiInfoEntity;
     }
 
+
+    public String vailIsUseDy(WarehousetempEntity warehouseEntity) {
+        UdiInfoEntity udiInfoEntity = getUdiInfo(udiInfoService, null, warehouseEntity.getCode());
+        if (udiInfoEntity.getDiType() == Constant.DITYPE_SYDY) {
+            if (udiInfoEntity.getIsUseDy() != Constant.USEDY_TRUE) {
+                return "该产品未勾选以使用单元入库";
+            }
+        }
+        return null;
+    }
+
+
     public void generateConstrastDetail(UdiInfoService udiInfoService, UdiRelevanceService udiRelevanceService,
-                                        MyErpOrderService myErpOrderService,
+                                        OrderDetailMdService orderDetailMdService,
                                         List<WarehouseEntity> warehouseEntityList) {
         if (warehouseEntityList != null && warehouseEntityList.size() > 0) {
             List<UdiInfoEntity> udiInfoEntities = new ArrayList<>();
@@ -271,6 +293,8 @@ public class InoutUtils {
                 if (temp != null) {
                     detailCodeEntity.setCount(temp.getCount() + detailCodeEntity.getCount());
                 }
+
+
                 sortMaps.put(key, detailCodeEntity);
             }
 
@@ -286,15 +310,19 @@ public class InoutUtils {
                 erpOrderEntity.setPackRatio(erpDetailCodeEntity.getPackRatio());
                 erpOrderEntity.setCoName(erpDetailCodeEntity.getCpmctymc());
                 erpOrderEntity.setLotno(erpDetailCodeEntity.getBatchNo());
+                erpOrderEntity.setProduceDate(erpDetailCodeEntity.getProduceDate());
+                erpOrderEntity.setExpireDate(erpDetailCodeEntity.getExpireDate());
                 erpOrderEntity.setCount(erpDetailCodeEntity.getCount());
                 erpOrderEntity.setOrderIdFk(warehouseEntityList.get(0).getOrderId());
                 erpOrderEntity.setProductCompany(erpDetailCodeEntity.getYlqxzcrbarmc());
                 erpOrderEntity.setAuthCode(erpDetailCodeEntity.getZczbhhzbapzbh());
+                erpOrderEntity.setUuidFk(erpDetailCodeEntity.getUuid());
                 erpOrderEntity.setPackSpec(erpDetailCodeEntity.getGgxh());
                 erpOrderEntities.add(erpOrderEntity);
             }
-            if (!erpOrderEntities.isEmpty())
+            if (!erpOrderEntities.isEmpty()) {
-                myErpOrderService.insertErpOrders(erpOrderEntities);
+                orderDetailMdService.insertOrderDetail(erpOrderEntities);
+            }
         }
     }
 

api-udims/src/main/java/com/glxp/udi/admin/controller/inout/InvProductsController.java

@@ -0,0 +1,100 @@
+package com.glxp.udi.admin.controller.inout;
+
+import com.glxp.udi.admin.entity.inout.InvProductDetailEntity;
+import com.glxp.udi.admin.entity.inout.InvProductEntity;
+import com.glxp.udi.admin.entity.inout.UdiInfoEntity;
+import com.glxp.udi.admin.mongo.service.InvProductDetailMdService;
+import com.glxp.udi.admin.mongo.service.InvProductMdService;
+import com.glxp.udi.admin.mongo.utils.PageResult;
+import com.glxp.udi.admin.req.inout.DeleteRequest;
+import com.glxp.udi.admin.req.inout.FilterInvProductDetailRequest;
+import com.glxp.udi.admin.req.inout.FilterInvProductRequest;
+import com.glxp.udi.admin.req.inout.FilterUdiInfoRequest;
+import com.glxp.udi.admin.res.PageSimpleResponse;
+import com.glxp.udi.admin.service.inout.UdiInfoService;
+import com.glxp.udi.common.enums.ResultEnum;
+import com.glxp.udi.common.res.BaseResponse;
+import com.glxp.udi.common.util.ResultVOUtils;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+@RestController
+public class InvProductsController {
+
+    @Resource
+    InvProductMdService invProductService;
+    @Resource
+    InvProductDetailMdService invProductDetailService;
+    @Resource
+    UdiInfoService udiInfoService;
+
+    @GetMapping("udims/inv/products/filter")
+    public BaseResponse filterInvProduct(FilterInvProductRequest filterInvProductRequest) {
+
+        if ((filterInvProductRequest.getProductsName() != null && !filterInvProductRequest.getProductsName().isEmpty())
+                || (filterInvProductRequest.getNameCode() != null && !filterInvProductRequest.getNameCode().isEmpty())) {
+            FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
+            filterUdiInfoRequest.setNameCode(filterInvProductRequest.getNameCode());
+            filterUdiInfoRequest.setCpmctymc(filterInvProductRequest.getProductsName());
+            List<UdiInfoEntity> udiInfoEntities = udiInfoService.filterAllUdiInfo(filterUdiInfoRequest);
+            List<String> uuids = new ArrayList<>();
+            for (UdiInfoEntity udiInfoEntity : udiInfoEntities) {
+                uuids.add(udiInfoEntity.getUuid());
+            }
+            filterInvProductRequest.setUuids(uuids);
+            if (uuids.size() <= 0)
+                return ResultVOUtils.success(new PageSimpleResponse<>());
+        }
+        PageResult<InvProductEntity> invProductEntityPageResult = invProductService.filterInvProduct(filterInvProductRequest);
+
+        List<InvProductEntity> invProductEntities = invProductEntityPageResult.getList();
+        for (InvProductEntity invProductEntity : invProductEntities) {
+            UdiInfoEntity udiInfoEntity = udiInfoService.findByUuid(invProductEntity.getRelIdFk());
+            invProductEntity.setNameCode(udiInfoEntity.getNameCode());
+            invProductEntity.setProductsName(udiInfoEntity.getCpmctymc());
+            invProductEntity.setGgxh(udiInfoEntity.getGgxh());
+        }
+
+        PageSimpleResponse<InvProductEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(invProductEntityPageResult.getTotal());
+        pageSimpleResponse.setList(invProductEntities);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+
+    @GetMapping("udims/inv/products/filterDetail")
+    public BaseResponse filterInvProductDetail(FilterInvProductDetailRequest filterInvProductRequest) {
+        PageResult<InvProductDetailEntity> pageResult = invProductDetailService.filterInvProduct(filterInvProductRequest);
+        PageSimpleResponse<InvProductDetailEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageResult.getTotal());
+        pageSimpleResponse.setList(pageResult.getList());
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+
+    @PostMapping("udims/inv/products/delete")
+    public BaseResponse deleteInvProduct(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        String id = deleteRequest.getId();
+        InvProductEntity invProductEntity = invProductService.selectById(id);
+        if (invProductEntity != null) {
+            invProductService.deleteById(id);
+            invProductDetailService.deleteByProductId(invProductEntity.getId() + "");
+            return ResultVOUtils.success("删除成功");
+        } else {
+            return ResultVOUtils.error(500, "删除失败！");
+        }
+
+
+    }
+}

api-udims/src/main/java/com/glxp/udi/admin/controller/inout/MyErpOrderController.java

@@ -2,6 +2,7 @@ package com.glxp.udi.admin.controller.inout;
 
 import com.github.pagehelper.PageInfo;
 import com.glxp.udi.admin.entity.inout.ErpOrderEntity;
+import com.glxp.udi.admin.mongo.service.OrderDetailMdService;
 import com.glxp.udi.admin.req.inout.DeleteRequest;
 import com.glxp.udi.admin.req.inout.FilterErpOrderRequest;
 import com.glxp.udi.admin.res.PageSimpleResponse;
@@ -25,6 +26,28 @@ public class MyErpOrderController {
     private String ucloudUrl;
     @Resource
     MyErpOrderService myErpOrderService;
+    @Resource
+    private OrderDetailMdService orderDetailMdService;
+
+    @GetMapping(value = "/warehouse/inout/order/detail")
+    public BaseResponse orderDetail(FilterErpOrderRequest filterErpOrderRequest,
+                                    BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        if (filterErpOrderRequest.getOrderId() == null || filterErpOrderRequest.getOrderId().equals("")) {
+            filterErpOrderRequest.setOrderId("1");
+        }
+        filterErpOrderRequest.setPage(1);
+        filterErpOrderRequest.setLimit(100);
+        List<ErpOrderEntity> erpOrderEntities = orderDetailMdService.filterOrderDetails(filterErpOrderRequest);
+        return ResultVOUtils.success(erpOrderEntities);
+    }
+
+    /**
+     * ------------------------------------------------(
+     **/
+
 
     @GetMapping("/warehouse/getMyErpOrders")
     public BaseResponse getMyErpOrders(FilterErpOrderRequest filterErpOrderRequest,
@@ -60,20 +83,5 @@ public class MyErpOrderController {
         }
     }
 
-    @GetMapping(value = "/warehouse/inout/order/detail")
-    public BaseResponse orderDetail(FilterErpOrderRequest filterErpOrderRequest,
-                                    BindingResult bindingResult) {
-        if (bindingResult.hasErrors()) {
-            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
-        }
-        if (filterErpOrderRequest.getOrderId() == null || filterErpOrderRequest.getOrderId().equals("")) {
-            filterErpOrderRequest.setOrderId("1");
-        }
-        filterErpOrderRequest.setPage(1);
-        filterErpOrderRequest.setLimit(100);
-        List<ErpOrderEntity> erpOrderEntities = myErpOrderService.filterMyErpOrder(filterErpOrderRequest);
-        return ResultVOUtils.success(erpOrderEntities);
-    }
-
 
 }

api-udims/src/main/java/com/glxp/udi/admin/controller/inout/OrderController.java

@@ -2,12 +2,17 @@ package com.glxp.udi.admin.controller.inout;
 
 import com.github.pagehelper.PageInfo;
 import com.glxp.udi.admin.annotation.AuthRuleAnnotation;
+import com.glxp.udi.admin.constant.Constant;
 import com.glxp.udi.admin.entity.auth.AuthAdmin;
-import com.glxp.udi.admin.entity.info.SetupEntity;
 import com.glxp.udi.admin.entity.inout.ErpOrderEntity;
 import com.glxp.udi.admin.entity.inout.OrderEntity;
+import com.glxp.udi.admin.entity.inout.OrderMdEntity;
 import com.glxp.udi.admin.entity.inout.WarehouseEntity;
 import com.glxp.udi.admin.exception.JsonException;
+import com.glxp.udi.admin.mongo.service.OrderDetailMdService;
+import com.glxp.udi.admin.mongo.service.OrderMdService;
+import com.glxp.udi.admin.mongo.service.WarehouseMdService;
+import com.glxp.udi.admin.mongo.utils.PageResult;
 import com.glxp.udi.admin.req.inout.*;
 import com.glxp.udi.admin.res.PageSimpleResponse;
 import com.glxp.udi.admin.service.auth.AuthAdminService;
@@ -53,6 +58,12 @@ public class OrderController {
     private SetupService setupService;
     @Resource
     AuthAdminService authAdminService;
+    @Resource
+    private OrderDetailMdService orderDetailMdService;
+    @Resource
+    private OrderMdService orderMdService;
+    @Resource
+    private WarehouseMdService warehouseMdService;
 
     @AuthRuleAnnotation("")
     @GetMapping("/warehouse/inout/order/filter")
@@ -69,23 +80,22 @@ public class OrderController {
         }
         AuthAdmin authAdmin = new GetAuthAdminUtil(authAdminService).getAuthAdmin(attributes);
         orderFilterRequest.setCustomerId(authAdmin.getCustomerId());
-        orderFilterRequest.setStatus("success");
+//        orderFilterRequest.setStatus(Constant.ORDER_STATUS_SUCCESS);
-        List<OrderEntity> orderEntityList;
+//        if (orderFilterRequest.getCode() != null && !orderFilterRequest.getCode().equals("")) {
-        if (orderFilterRequest.getCode() != null && !orderFilterRequest.getCode().equals("")) {
+//            FilterWarehouseRequest filterWarehouseRequest = new FilterWarehouseRequest();
-            FilterWarehouseRequest filterWarehouseRequest = new FilterWarehouseRequest();
+//            filterWarehouseRequest.setCustomerId(authAdmin.getCustomerId());
-            filterWarehouseRequest.setCustomerId(authAdmin.getCustomerId());
+//            filterWarehouseRequest.setCode(orderFilterRequest.getCode());
-            filterWarehouseRequest.setCode(orderFilterRequest.getCode());
+//            List<WarehouseEntity> warehouseEntityList = warehouseService.findByCode(filterWarehouseRequest);
-            List<WarehouseEntity> warehouseEntityList = warehouseService.findByCode(filterWarehouseRequest);
+//            orderEntityList = orderService.filterListByCode(warehouseEntityList);
-            orderEntityList = orderService.filterListByCode(warehouseEntityList);
+//        } else {
-        } else {
+//
-            orderEntityList = orderService.filterList(orderFilterRequest);
+//        }
-        }
 
-        PageInfo<OrderEntity> pageInfo;
+        PageResult<OrderMdEntity> pageResult =
-        pageInfo = new PageInfo<>(orderEntityList);
+                orderMdService.filterList(orderFilterRequest);
-        PageSimpleResponse<OrderEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        PageSimpleResponse<OrderMdEntity> pageSimpleResponse = new PageSimpleResponse<>();
-        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setTotal(pageResult.getTotal());
-        pageSimpleResponse.setList(orderEntityList);
+        pageSimpleResponse.setList(pageResult.getList());
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
@@ -116,6 +126,84 @@ public class OrderController {
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
+    @PostMapping("warehouse/inout/order/deleteOrder")
+    public BaseResponse deleteOrder(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+
+        orderMdService.deleteOrder(deleteRequest);
+        orderDetailMdService.deleteOrderDetail(deleteRequest);
+        warehouseMdService.deleteCode(deleteRequest);
+        return ResultVOUtils.success("删除成功");
+    }
+
+    @AuthRuleAnnotation("")
+    @GetMapping("admin/warehouse/inout/order/listerror")
+    public BaseResponse listOrderError(OrderFilterRequest orderFilterRequest) {
+
+        //        orderFilterRequest.setIsError("success");
+
+        orderFilterRequest.setStatus(Constant.ORDER_STATUS_ERROR);
+        PageResult<OrderMdEntity> pageResult =
+                orderMdService.filterList(orderFilterRequest);
+        PageSimpleResponse<OrderMdEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageResult.getTotal());
+        pageSimpleResponse.setList(pageResult.getList());
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/warehouse/inout/order/mergeOrder")
+    public BaseResponse mergeOrder(@RequestBody OrderMergeRequest orderMergeRequest, BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+
+        List<String> orderList = orderMergeRequest.getOrderList();
+
+        if (orderList != null && orderList.size() > 1) {
+            for (String orderId : orderList) {
+                DeleteRequest deleteRequest = new DeleteRequest();
+                deleteRequest.setOrderId(orderId);
+                orderDetailMdService.deleteOrderDetail(deleteRequest);
+            }
+            String mainOrder = orderList.get(0);
+            for (int i = 1; i < orderList.size(); i++) {
+                warehouseMdService.updateOrderId(orderList.get(i), mainOrder);
+                DeleteRequest deleteRequest = new DeleteRequest();
+                deleteRequest.setOrderId(orderList.get(i));
+                orderMdService.deleteOrder(deleteRequest);
+            }
+            new Thread(() -> {
+                WarehouseQueryRequest warehouseQueryRequest = new WarehouseQueryRequest();
+                warehouseQueryRequest.setOrderId(mainOrder);
+                List<WarehouseEntity> transData = warehouseMdService.filterWarehouse(warehouseQueryRequest);
+                new InoutUtils().generateConstrastDetail(udiInfoService, udiRelevanceService, orderDetailMdService, transData);
+            }).start();
+        }
+
+
+        return ResultVOUtils.success("合并成功,后台正在数据转换，请稍后刷新重试！");
+    }
+
+    @PostMapping("/warehouse/inout/order/unit")
+    public BaseResponse updateUnit(@RequestBody @Valid OrderMdEntity orderEntity,
+                                   BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+
+        orderMdService.updateOrder(orderEntity);
+        warehouseMdService.updateUnit(orderEntity.getOrderId(), orderEntity.getFromCorpId(), orderEntity.getFromCorp());
+
+        return ResultVOUtils.success("添加成功");
+    }
+
+
     /**
      * -----------------------暂不确定----------------------
      */
@@ -134,17 +222,6 @@ public class OrderController {
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
-    @AuthRuleAnnotation("")
-    @GetMapping("admin/warehouse/inout/order/listerror")
-    public BaseResponse listOrderError(OrderQueryRequest orderQueryRequest) {
-        List<OrderEntity> orderEntityList = orderService.listOrderError(orderQueryRequest);
-        PageInfo<OrderEntity> pageInfo;
-        pageInfo = new PageInfo<>(orderEntityList);
-        PageSimpleResponse<OrderEntity> pageSimpleResponse = new PageSimpleResponse<>();
-        pageSimpleResponse.setTotal(pageInfo.getTotal());
-        pageSimpleResponse.setList(orderEntityList);
-        return ResultVOUtils.success(pageSimpleResponse);
-    }
 
     @AuthRuleAnnotation("")
     @GetMapping("admin/warehouse/inout/order/listRepeat")
@@ -176,89 +253,6 @@ public class OrderController {
         return ResultVOUtils.success("添加成功");
     }
 
-    @AuthRuleAnnotation("")
-    @PostMapping("/warehouse/inout/order/mergeOrder")
-    public BaseResponse mergeOrder(@RequestBody OrderMergeRequest orderMergeRequest, BindingResult bindingResult) {
-
-        if (bindingResult.hasErrors()) {
-            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
-        }
-
-        List<String> orderList = orderMergeRequest.getOrderList();
-        SetupEntity setupEntity = setupService.selectSetup();
-        if (!setupEntity.isForbidSameErp()) {
-            List<ErpOrderEntity> mergeList = new ArrayList<>();
-            if (orderList != null && orderList.size() > 1) {
-                for (String orderId : orderList) {
-                    FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest();
-                    filterErpOrderRequest.setOrderId(orderId);
-                    List<ErpOrderEntity> erpOrderEntities = myErpOrderService.filterAllMyErpOrder(filterErpOrderRequest);
-                    if (erpOrderEntities != null && erpOrderEntities.size() > 0) {
-                        mergeList.addAll(erpOrderEntities);
-                    }
-                    myErpOrderService.deleteByOrderId(orderId);
-
-                }
-                String mainOrder = orderList.get(0);
-                for (int i = 1; i < orderList.size(); i++) {
-                    warehouseService.updateOrderId(orderList.get(i), mainOrder);
-                    orderService.deleteByOrderId(orderList.get(i));
-                }
-                OrderEntity mainOrderEntity = orderService.findById(mainOrder);
-                List<String> docids = getDocids(mergeList);
-                String docidStr = "";
-                if (docids != null && docids.size() > 0) {
-                    for (String temp : docids) {
-                        docidStr = docidStr + "," + temp;
-                    }
-                    docidStr = docidStr.substring(1);
-                }
-                mainOrderEntity.setErpFk(docidStr);
-                orderService.updateOrder(mainOrderEntity);
-//                List<ErpOrderEntity> erpOrderEntities = new UCloudHttpClient(ucloudUrl).getErpOrders(docids, mainOrderEntity.getAction());
-//                if (erpOrderEntities != null && erpOrderEntities.size() > 0) {
-//                    List<ErpOrderEntity> returnOrders = new ContrastErpUtil().transErp(erpOrderEntities, udiRelevanceService, mainOrder);
-//                    myErpOrderService.insertErpOrders(returnOrders);
-//                    List<WarehouseEntity> warehouseEntityList = warehouseService.findByReceiptId(mainOrder);
-//                    new ContrastErpUtil().contrastErp(udiInfoService, udiRelevanceService, myErpOrderService, orderService, warehouseEntityList,setupService);
-//                } else {
-//                    orderService.updateContrastStatus(mainOrder, "error");
-//                    orderService.updateRemark(mainOrder, "U8Cloud获取ERP单失败");
-//                    return ResultVOUtils.error(500, "U8Cloud获取ERP单失败");
-//                }
-            } else {
-                return ResultVOUtils.error(ResultEnum.DATA_ERROR);
-            }
-        } else {
-            if (orderList != null && orderList.size() > 1) {
-                for (String orderId : orderList) {
-                    FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest();
-                    filterErpOrderRequest.setOrderId(orderId);
-                    List<ErpOrderEntity> erpOrderEntities = myErpOrderService.filterAllMyErpOrder(filterErpOrderRequest);
-                    if (erpOrderEntities != null && erpOrderEntities.size() > 0) {
-                        for (ErpOrderEntity erpOrderEntity : erpOrderEntities) {
-                            if (erpOrderEntity.getDocid() != null) {
-                                return ResultVOUtils.error(500, "已校验过订单不能合并！");
-                            }
-                        }
-                    }
-                    myErpOrderService.deleteByOrderId(orderId);
-                }
-                String mainOrder = orderList.get(0);
-                for (int i = 1; i < orderList.size(); i++) {
-                    warehouseService.updateOrderId(orderList.get(i), mainOrder);
-                    orderService.deleteByOrderId(orderList.get(i));
-                }
-                new Thread(() -> {
-                    List<WarehouseEntity> datas = warehouseService.findByReceiptId(mainOrder);
-                    new InoutUtils().generateConstrastDetail(udiInfoService, udiRelevanceService, myErpOrderService, datas);
-                }).start();
-            }
-        }
-
-        return ResultVOUtils.success("合并成功,后台正在数据转换，请稍后刷新重试！");
-    }
-
 
     public List<String> getDocids(List<ErpOrderEntity> mergeList) {
         List<String> docids = new ArrayList<>();
@@ -274,39 +268,6 @@ public class OrderController {
         return false;
     }
 
-    @PostMapping("warehouse/inout/order/deleteOrder")
-    public BaseResponse deleteOrder(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
-
-        if (bindingResult.hasErrors()) {
-            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
-        }
-        String id = deleteRequest.getId();
-
-        orderService.deleteById(id);
-        myErpOrderService.deleteByOrderId(id);
-        return ResultVOUtils.success("删除成功");
-    }
-
-
-    @PostMapping("/warehouse/inout/order/unit")
-    public BaseResponse updateUnit(@RequestBody @Valid OrderEntity orderEntity,
-                                   BindingResult bindingResult) {
-
-        if (bindingResult.hasErrors()) {
-            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
-        }
-
-        boolean b = orderService.updateUnit(orderEntity);
-        if (!b) {
-            return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
-        }
-
-        b = warehouseService.updateUnit(orderEntity.getId(), orderEntity.getFromCorpId(), orderEntity.getFromCorp());
-        if (!b) {
-            return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
-        }
-        return ResultVOUtils.success("添加成功");
-    }
 
     @PostMapping("/warehouse/inout/order/updateExportStatus")
     public BaseResponse updateExportStatus(@RequestBody UpdateExportStatusRequest updateExportStatusRequest,

api-udims/src/main/java/com/glxp/udi/admin/controller/inout/UdiInfoController.java

@@ -1,13 +1,16 @@
 package com.glxp.udi.admin.controller.inout;
 
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
 import com.glxp.udi.admin.annotation.AuthRuleAnnotation;
 import com.glxp.udi.admin.entity.auth.AuthAdmin;
+import com.glxp.udi.admin.entity.inout.UdiCompanyEntity;
 import com.glxp.udi.admin.entity.inout.UdiInfoEntity;
 import com.glxp.udi.admin.entity.udid.UdiEntity;
 import com.glxp.udi.admin.exception.JsonException;
 import com.glxp.udi.admin.req.inout.FilterUdiInfoRequest;
 import com.glxp.udi.admin.res.PageSimpleResponse;
+import com.glxp.udi.admin.res.basic.ProductInfoResponse;
 import com.glxp.udi.admin.service.auth.AuthAdminService;
 import com.glxp.udi.admin.service.inout.UdiInfoService;
 import com.glxp.udi.admin.util.FilterUdiUtils;
@@ -26,6 +29,7 @@ import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -37,7 +41,6 @@ public class UdiInfoController {
     UdiInfoService udiInfoService;
     @Resource
     AuthAdminService authAdminService;
-
     @Value("${UDI_SERVER_URL}")
     private String udiUrl;
 
@@ -65,7 +68,49 @@ public class UdiInfoController {
 
         String response = HttpClient.mipsGet(udiUrl + "/udidl/device/filterUdi", paramMap);
         try {
-            BaseResponse<PageSimpleResponse<UdiInfoEntity>> udiDlDeviceResponse = (BaseResponse<PageSimpleResponse<UdiInfoEntity>>) JSONObject.parseObject(response, BaseResponse.class);
+
+            String customerId = getCustomerId();
+            BaseResponse<PageSimpleResponse<UdiInfoEntity>> udiDlDeviceResponse =
+                    JSONObject.parseObject(response, new TypeReference<BaseResponse<PageSimpleResponse<UdiInfoEntity>>>() {
+                    });
+
+            if (productInfoFilterRequest.getIsCheck() != null && productInfoFilterRequest.getIsCheck()) {
+                List<UdiInfoEntity> udiInfoEntities = udiDlDeviceResponse.getData().getList();
+
+                if (udiInfoEntities != null && udiInfoEntities.size() > 0) {
+                    for (UdiInfoEntity udiInfoEntity : udiInfoEntities) {
+                        FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
+                        filterUdiInfoRequest.setCustomerId(customerId);
+                        filterUdiInfoRequest.setUuid(udiInfoEntity.getUuid());
+                        List<UdiInfoEntity> udiRelevanceEntities = udiInfoService.filterUdiInfo(filterUdiInfoRequest);
+                        if (udiRelevanceEntities != null && udiRelevanceEntities.size() > 0) {
+                            udiInfoEntity.setCheck(true);
+                        } else {
+                            udiInfoEntity.setCheck(false);
+                        }
+                    }
+                }
+            }
+            return udiDlDeviceResponse;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResultVOUtils.error(500, "连接UDI数据下载服务出错！");
+        }
+    }
+
+
+    //获取同步库医疗器械注册人信息
+    @GetMapping("udiwms/udiinfo/filterCompany")
+    public BaseResponse filterCompany(FilterUdiInfoRequest productInfoFilterRequest) {
+
+        Map<String, Object> paramMap = new HashMap<>(16);
+        paramMap.put("page", productInfoFilterRequest.getPage());
+        paramMap.put("limit", productInfoFilterRequest.getLimit());
+        paramMap.put("ylqxzcrbarmc", productInfoFilterRequest.getYlqxzcrbarmc());
+
+        String response = HttpClient.mipsGet(udiUrl + "/udi/company/filter", paramMap);
+        try {
+            BaseResponse<PageSimpleResponse<UdiCompanyEntity>> udiDlDeviceResponse = (BaseResponse<PageSimpleResponse<UdiCompanyEntity>>) JSONObject.parseObject(response, BaseResponse.class);
             return udiDlDeviceResponse;
         } catch (Exception e) {
             e.printStackTrace();
@@ -112,4 +157,31 @@ public class UdiInfoController {
         udiInfoService.updateUdiInfoByUuid(udiInfoEntity);
         return ResultVOUtils.success("更新成功");
     }
+
+
+    @GetMapping("/udidl/wms/findBydi")
+    public BaseResponse findByDi(FilterUdiInfoRequest filterUdiInfoRequest) {
+        Map<String, Object> paramMap = new HashMap<>(16);
+        paramMap.put("nameCode", filterUdiInfoRequest.getNameCode());
+        String response = HttpClient.mipsGet(udiUrl + "/udidl/wms/findBydi", paramMap);
+        try {
+            BaseResponse<ProductInfoResponse> udiDlDeviceResponse = (BaseResponse<ProductInfoResponse>) JSONObject.parseObject(response, BaseResponse.class);
+            return udiDlDeviceResponse;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResultVOUtils.error(500, "连接UDI数据下载服务出错！");
+        }
+    }
+
+
+    public String getCustomerId() {
+        ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        if (attributes == null) {
+            throw new JsonException(ResultEnum.NOT_NETWORK);
+        }
+        HttpServletRequest request = attributes.getRequest();
+        String userId = request.getHeader("ADMIN_ID");
+        AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId));
+        return authAdmin.getCustomerId() + "";
+    }
 }

api-udims/src/main/java/com/glxp/udi/admin/controller/inout/UdiRelevanceController.java

@@ -14,6 +14,7 @@ import com.glxp.udi.admin.res.inout.UdiRelevanceResponse;
 import com.glxp.udi.admin.service.auth.AuthAdminService;
 import com.glxp.udi.admin.service.inout.UdiInfoService;
 import com.glxp.udi.admin.service.inout.WarehouseService;
+import com.glxp.udi.admin.thread.BasicUpdateProductService;
 import com.glxp.udi.admin.util.GetAuthAdminUtil;
 import com.glxp.udi.common.enums.ResultEnum;
 import com.glxp.udi.common.res.BaseResponse;
@@ -29,6 +30,7 @@ import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -43,6 +45,8 @@ public class UdiRelevanceController {
     WarehouseService warehouseService;
     @Resource
     AuthAdminService authAdminService;
+    @Resource
+    BasicUpdateProductService basicUpdateProductService;
 
     //客户端器械信息下载
     @GetMapping("/udi/udirel/download")
@@ -91,14 +95,15 @@ public class UdiRelevanceController {
         filterUdiInfoRequest.setCustomerId(authAdmin.getCustomerId() + "");
 
         List<UdiInfoEntity> udiRelevanceResponses = null;
+        filterUdiInfoRequest.setDiType(1);
         udiRelevanceResponses = udiInfoService.filterUdiInfoGp(filterUdiInfoRequest);
-        if (udiRelevanceResponses != null && udiRelevanceResponses.size() > 0) {
+//        if (udiRelevanceResponses != null && udiRelevanceResponses.size() > 0) {
-            for (UdiInfoEntity udiRelevanceResponse : udiRelevanceResponses) {
+//            for (UdiInfoEntity udiRelevanceResponse : udiRelevanceResponses) {
-                if (udiRelevanceResponse.getDiType() == 2 && udiRelevanceResponse.getIsUseDy() != 1) {
+//                if (udiRelevanceResponse.getDiType() == 2 && udiRelevanceResponse.getIsUseDy() != 1) {
-                    udiRelevanceResponse.setNameCode(udiRelevanceResponse.getSjcpbm());
+//                    udiRelevanceResponse.setNameCode(udiRelevanceResponse.getSjcpbm());
-                }
+//                }
-            }
+//            }
-        }
+//        }
         PageInfo<UdiInfoEntity> pageInfo;
         pageInfo = new PageInfo<>(udiRelevanceResponses);
         PageSimpleResponse<UdiInfoEntity> pageSimpleResponse = new PageSimpleResponse<>();
@@ -121,7 +126,7 @@ public class UdiRelevanceController {
         List<UdiInfoEntity> udiInfoEntities = udiInfoService.findByUuids(ids);
         if (udiInfoEntities != null && udiInfoEntities.size() > 0) {
             for (int i = 0; i < udiInfoEntities.size(); i++) {
-                List<WarehouseEntity> warehouseEntityList = warehouseService.searchCode(udiInfoEntities.get(i).getNameCode(),authAdmin.getCustomerId());
+                List<WarehouseEntity> warehouseEntityList = warehouseService.searchCode(udiInfoEntities.get(i).getNameCode(), authAdmin.getCustomerId());
                 if (warehouseEntityList != null && warehouseEntityList.size() > 0) {
                     return ResultVOUtils.error(500, "改产品已被" + warehouseEntityList.get(0).getOrderId() + "订单关联不能删除");
                 }
@@ -146,7 +151,7 @@ public class UdiRelevanceController {
             for (String key : keys) {
                 FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
                 filterUdiInfoRequest.setUuid(key);
-                filterUdiInfoRequest.setCustomerId(authAdmin.getCustomerId()+"");
+                filterUdiInfoRequest.setCustomerId(authAdmin.getCustomerId() + "");
                 List<UdiInfoEntity> udiInfoEntities = udiInfoService.filterAllUdiInfo(filterUdiInfoRequest);
                 if (udiInfoEntities == null || udiInfoEntities.isEmpty()) {
                     udiInfoEntities = new UdiDlHttpClient(udiUrl).getUdiByUuid(key);
@@ -164,5 +169,23 @@ public class UdiRelevanceController {
         return ResultVOUtils.success("合并成功");
     }
 
+    //选入查询结果的所有DI
+    @AuthRuleAnnotation("")
+    @GetMapping("/udi/udirel/combineAll")
+    public BaseResponse combineAll(FilterUdiInfoRequest productInfoFilterRequest) {
+        productInfoFilterRequest.setCustomerId(getCustomerId());
+        basicUpdateProductService.relAllUdi(productInfoFilterRequest);
+        return ResultVOUtils.success("后台已开始导入，请稍后刷新查看");
+    }
 
+    public String getCustomerId() {
+        ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        if (attributes == null) {
+            throw new JsonException(ResultEnum.NOT_NETWORK);
+        }
+        HttpServletRequest request = attributes.getRequest();
+        String userId = request.getHeader("ADMIN_ID");
+        AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId));
+        return authAdmin.getCustomerId() + "";
+    }
 }

api-udims/src/main/java/com/glxp/udi/admin/controller/inout/UdiTraceController.java

@@ -4,12 +4,16 @@ import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import com.github.pagehelper.PageInfo;
 import com.glxp.udi.admin.entity.auth.AuthAdmin;
+import com.glxp.udi.admin.entity.inout.OrderMdEntity;
 import com.glxp.udi.admin.entity.inout.TraceUploadEntity;
 import com.glxp.udi.admin.entity.inout.UdiInfoEntity;
 import com.glxp.udi.admin.entity.inout.WarehouseEntity;
 import com.glxp.udi.admin.entity.udid.UdiEntity;
 import com.glxp.udi.admin.exception.JsonException;
+import com.glxp.udi.admin.mongo.service.OrderMdService;
+import com.glxp.udi.admin.mongo.service.WarehouseMdService;
 import com.glxp.udi.admin.req.inout.FilterUdiInfoRequest;
+import com.glxp.udi.admin.req.inout.OrderFilterRequest;
 import com.glxp.udi.admin.req.inout.WarehouseQueryRequest;
 import com.glxp.udi.admin.res.PageSimpleResponse;
 import com.glxp.udi.admin.res.inout.UdiRelevanceResponse;
@@ -35,7 +39,7 @@ import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.annotation.Resource;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @RestController
@@ -44,6 +48,8 @@ public class UdiTraceController {
     @Resource
     private WarehouseService warehouseService;
     @Resource
+    private WarehouseMdService warehouseMdService;
+    @Resource
     UdiRelevanceService udiRelevanceService;
     @Resource
     UdiInfoService udiInfoService;
@@ -52,6 +58,8 @@ public class UdiTraceController {
     private static final Logger logger = LoggerFactory.getLogger(UdiTraceController.class);
     @Resource
     AuthAdminService authAdminService;
+    @Resource
+    private OrderMdService orderMdService;
 
     @GetMapping("/udiwarehouse/trace/filter")
     public BaseResponse list(WarehouseQueryRequest warehouseQueryRequest) {
@@ -60,18 +68,45 @@ public class UdiTraceController {
             throw new JsonException(ResultEnum.NOT_NETWORK);
         }
         AuthAdmin authAdmin = new GetAuthAdminUtil(authAdminService).getAuthAdmin(attributes);
+        if (authAdmin.getCustomerId() != 110)
             warehouseQueryRequest.setCustomerId(authAdmin.getCustomerId());
-        List<WarehouseEntity> warehouseEntityList = warehouseService.findByOrderId(warehouseQueryRequest);
+//        List<WarehouseEntity> warehouseEntityList = warehouseService.findByOrderId(warehouseQueryRequest);
+
+
+        List<WarehouseEntity> warehouseEntityList = warehouseMdService.filterWarehouse(warehouseQueryRequest);
         if (warehouseEntityList != null && warehouseEntityList.size() > 0) {
             WarehouseEntity warehouseEntity = warehouseEntityList.get(0);
             UdiEntity udiEntity = FilterUdiUtils.getUdi(warehouseEntity.getCode());
             String udi = udiEntity.getUdi();
             FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
             filterUdiInfoRequest.setNameCode(udi);
+            UdiInfoEntity udiInfoEntity = udiInfoService.findByNameCode(udi);
+//            List<UdiTraceResponse> udiTraceResponseList = warehouseEntityList.stream().map(item ->
+//            {
+//                UdiTraceResponse udiTraceResponse = new UdiTraceResponse();
+//                BeanUtils.copyProperties(item, udiTraceResponse);
+//                if (udiInfoEntity != null) {
+//                    udiTraceResponse.setYlqxzcrbarmc(udiInfoEntity.getYlqxzcrbarmc());
+//                    udiTraceResponse.setCpmctymc(udiInfoEntity.getCpmctymc());
+//                    udiTraceResponse.setGgxh(udiInfoEntity.getGgxh());
+//                }
+//                return udiTraceResponse;
+//            }).collect(Collectors.toList());
 
+            //查找父级或者子级
+            List<UdiInfoEntity> udiInfoEntities = udiInfoService.findByUuids(udiInfoEntity.getUuid());
+            List<UdiTraceResponse> udiTraceResponseList = new ArrayList<>();
+            if (udiInfoEntities != null && udiInfoEntities.size() > 0) {
 
-            UdiInfoEntity udiInfoEntity = udiInfoService.findByNameCode(udi);
+                for (UdiInfoEntity temp : udiInfoEntities) {
-            List<UdiTraceResponse> udiTraceResponseList = warehouseEntityList.stream().map(item ->
+                    WarehouseQueryRequest queryRequest = new WarehouseQueryRequest();
+                    queryRequest.setBatchNo(temp.getBatchNo());
+                    queryRequest.setUdi(temp.getNameCode());
+                    if (authAdmin.getCustomerId() != 110)
+                        queryRequest.setCustomerId(authAdmin.getCustomerId());
+                    List<WarehouseEntity> warehouseEntities = warehouseMdService.filterWarehouse(queryRequest);
+
+                    List<UdiTraceResponse> udiTraceResponses = warehouseEntities.stream().map(item ->
                     {
                         UdiTraceResponse udiTraceResponse = new UdiTraceResponse();
                         BeanUtils.copyProperties(item, udiTraceResponse);
@@ -82,6 +117,23 @@ public class UdiTraceController {
                         }
                         return udiTraceResponse;
                     }).collect(Collectors.toList());
+
+                    Map<String, UdiTraceResponse> filterMap = new HashMap<>();
+                    if (udiTraceResponses != null && udiTraceResponses.size() > 0) {
+                        for (UdiTraceResponse udiTraceResponse : udiTraceResponses) {
+                            filterMap.put(udiTraceResponse.getOrderId(), udiTraceResponse);
+                        }
+                        for (UdiTraceResponse udiTraceResponse : filterMap.values()) {
+                            udiTraceResponseList.add(udiTraceResponse);
+                        }
+
+                    }
+
+
+                }
+            }
+
+
             PageInfo<UdiTraceResponse> pageInfo;
             pageInfo = new PageInfo<>(udiTraceResponseList);
             PageSimpleResponse<UdiTraceResponse> pageSimpleResponse = new PageSimpleResponse<>();
@@ -93,6 +145,75 @@ public class UdiTraceController {
         }
     }
 
+
+    @GetMapping("/udims/trace/filter")
+    public BaseResponse filterTrace(WarehouseQueryRequest warehouseQueryRequest) {
+        ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        if (attributes == null) {
+            throw new JsonException(ResultEnum.NOT_NETWORK);
+        }
+        List<OrderMdEntity> orderMdEntities = new ArrayList<>();
+        AuthAdmin authAdmin = new GetAuthAdminUtil(authAdminService).getAuthAdmin(attributes);
+        if (authAdmin.getCustomerId() != 110)
+            warehouseQueryRequest.setCustomerId(authAdmin.getCustomerId());
+        if (warehouseQueryRequest.getCode() != null && !"".equals(warehouseQueryRequest.getCode())) {
+            if (warehouseQueryRequest.getFilterType() == null || warehouseQueryRequest.getFilterType() == 1) {
+                List<OrderMdEntity> temps = filterUdiTrace(warehouseQueryRequest);
+                orderMdEntities.addAll(temps);
+            } else {
+                UdiEntity udiEntity = FilterUdiUtils.getUdi(warehouseQueryRequest.getCode());
+                if (udiEntity == null)
+                    return ResultVOUtils.error(500, "UDI码格式错误！");
+                UdiInfoEntity udiInfoEntity = udiInfoService.findByNameCode(udiEntity.getUdi());
+                List<UdiInfoEntity> udiInfoEntities = udiInfoService.findByUuids(udiInfoEntity.getUuid());
+                if (udiInfoEntities != null && udiInfoEntities.size() > 0) {
+                    for (UdiInfoEntity temp : udiInfoEntities) {
+                        WarehouseQueryRequest queryRequest = new WarehouseQueryRequest();
+                        queryRequest.setBatchNo(udiEntity.getBatchNo());
+                        queryRequest.setUdi(temp.getNameCode());
+                        if (authAdmin.getCustomerId() != 110)
+                            queryRequest.setCustomerId(authAdmin.getCustomerId());
+
+                        List<OrderMdEntity> temps = filterUdiTrace(queryRequest);
+                        orderMdEntities.addAll(temps);
+                    }
+                }
+
+            }
+        }
+
+        PageInfo<OrderMdEntity> pageInfo;
+        pageInfo = new PageInfo<>(orderMdEntities);
+        PageSimpleResponse<OrderMdEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(orderMdEntities);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+    public List<OrderMdEntity> filterUdiTrace(WarehouseQueryRequest warehouseQueryRequest) {
+        List<OrderMdEntity> orderMdEntities = new ArrayList<>();
+        List<WarehouseEntity> warehouseEntityList = warehouseMdService.filterWarehouse(warehouseQueryRequest);
+        List<String> orderS = new ArrayList<>();
+        warehouseEntityList.stream().filter(
+                v -> {
+                    boolean flag = !orderS.contains(v.getOrderId());
+                    if (flag)
+                        orderS.add(v.getOrderId());
+                    return flag;
+                }
+        ).collect(Collectors.toList());
+
+
+        for (String orderId : orderS) {
+            OrderFilterRequest orderFilterRequest = new OrderFilterRequest();
+            orderFilterRequest.setId(orderId);
+            List<OrderMdEntity> temps = orderMdService.findAll(orderFilterRequest);
+            orderMdEntities.addAll(temps);
+        }
+        Collections.sort(orderMdEntities, Comparator.comparing(OrderMdEntity::getId));
+        return orderMdEntities;
+    }
+
     @GetMapping("/coor/trace/findCode")
     public BaseResponse findCode(WarehouseQueryRequest warehouseQueryRequest) {
         List<WarehouseEntity> warehouseEntityList = warehouseService.findByOrderId(warehouseQueryRequest);

api-udims/src/main/java/com/glxp/udi/admin/controller/inout/UnitMaintainController.java

@@ -88,6 +88,35 @@ public class UnitMaintainController {
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
+    @AuthRuleAnnotation("")
+    @GetMapping("/udiwms/unit/download")
+    public BaseResponse downloadUnitB(UnitMaintainFilterRequest unitMaintainFilterRequest,
+                                      BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+
+        ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        if (attributes == null) {
+            throw new JsonException(ResultEnum.NOT_NETWORK);
+        }
+        AuthAdmin authAdmin = new GetAuthAdminUtil(authAdminService).getAuthAdmin(attributes);
+        unitMaintainFilterRequest.setCustomerId(authAdmin.getCustomerId() + "");
+
+        List<UnitMaintainEntity> unitMaintainEntities;
+        unitMaintainEntities = unitMaintainService.filterList(unitMaintainFilterRequest);
+        for (UnitMaintainEntity unitMaintainEntity : unitMaintainEntities) {
+            unitMaintainEntity.setErpId(unitMaintainEntity.getUnitId());
+        }
+        PageInfo<UnitMaintainEntity> pageInfo;
+        pageInfo = new PageInfo<>(unitMaintainEntities);
+        PageSimpleResponse<UnitMaintainEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(unitMaintainEntities);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
     @PostMapping("/warehouse/unitMaintain/add")
     public BaseResponse addUnitMaintain(@RequestBody UnitMaintainEntity unitMaintainEntity, BindingResult bindingResult) {
 

api-udims/src/main/java/com/glxp/udi/admin/controller/inout/WareHouseController.java

@@ -3,19 +3,19 @@ package com.glxp.udi.admin.controller.inout;
 import com.github.pagehelper.PageInfo;
 import com.glxp.udi.admin.annotation.AuthRuleAnnotation;
 import com.glxp.udi.admin.entity.auth.AuthAdmin;
-import com.glxp.udi.admin.entity.inout.ErpOrderEntity;
 import com.glxp.udi.admin.entity.inout.WarehouseEntity;
-import com.glxp.udi.admin.entity.inout.Warehousetemp;
+import com.glxp.udi.admin.entity.inout.WarehousetempEntity;
 import com.glxp.udi.admin.exception.JsonException;
+import com.glxp.udi.admin.mongo.service.WarehouseMdService;
+import com.glxp.udi.admin.mongo.service.WarehouseTempMdService;
+import com.glxp.udi.admin.mongo.utils.PageResult;
 import com.glxp.udi.admin.req.inout.*;
 import com.glxp.udi.admin.res.PageSimpleResponse;
 import com.glxp.udi.admin.res.inout.WarehouseResponse;
 import com.glxp.udi.admin.service.auth.AuthAdminService;
-import com.glxp.udi.admin.service.info.SetupService;
+import com.glxp.udi.admin.service.inout.WarehouseService;
-import com.glxp.udi.admin.service.inout.*;
 import com.glxp.udi.admin.thread.TransInoutService;
 import com.glxp.udi.admin.util.GetAuthAdminUtil;
-import com.glxp.udi.admin.util.WarehousBeanUtils;
 import com.glxp.udi.common.enums.ResultEnum;
 import com.glxp.udi.common.res.BaseResponse;
 import com.glxp.udi.common.util.ResultVOUtils;
@@ -30,7 +30,6 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -39,17 +38,12 @@ public class WareHouseController {
     @Resource
     private WarehouseService warehouseService;
     @Resource
-    private OrderService orderService;
+    private WarehouseMdService warehouseMdService;
     @Resource
-    private MyErpOrderService myErpOrderService;
+    private WarehouseTempMdService warehouseTempMdService;
     @Resource
     private TransInoutService transInoutService;
-    @Resource
+
-    private UdiInfoService udiInfoService;
-    @Resource
-    private UdiRelevanceService udiRelevanceService;
-    @Resource
-    private SetupService setupService;
     @Resource
     AuthAdminService authAdminService;
 
@@ -73,6 +67,24 @@ public class WareHouseController {
         return ResultVOUtils.success("导入成功");
     }
 
+    @GetMapping("admin/warehouse/inout/findByOrderId")
+    public BaseResponse findByOrderId(WarehouseQueryRequest warehouseQueryRequest) {
+        PageResult<WarehouseEntity> pageResult = warehouseMdService.filterWarehouseByPage(warehouseQueryRequest);
+        PageSimpleResponse<WarehouseEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageResult.getTotal());
+        pageSimpleResponse.setList(pageResult.getList());
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+
+    @GetMapping("admin/warehouse/inout/findErrorByOrderId")
+    public BaseResponse findErrorByOrderId(WarehouseQueryRequest warehouseQueryRequest) {
+        PageResult<WarehousetempEntity> pageResult = warehouseTempMdService.filterWarehouseByPage(warehouseQueryRequest);
+        PageSimpleResponse<WarehousetempEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageResult.getTotal());
+        pageSimpleResponse.setList(pageResult.getList());
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
 
     /**
      * -----------------------暂不确定----------------------
@@ -131,22 +143,6 @@ public class WareHouseController {
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
-    @GetMapping("admin/warehouse/inout/findByOrderId")
-    public BaseResponse findByOrderId(WarehouseQueryRequest warehouseQueryRequest) {
-        List<WarehouseEntity> warehouseEntityList = warehouseService.findByOrderId(warehouseQueryRequest);
-        List<WarehouseResponse> warehouseResponses = warehouseEntityList.stream().map(item ->
-        {
-            WarehouseResponse warehouseResponse = new WarehouseResponse();
-            BeanUtils.copyProperties(item, warehouseResponse);
-            return warehouseResponse;
-        }).collect(Collectors.toList());
-        PageInfo<WarehouseEntity> pageInfo;
-        pageInfo = new PageInfo<>(warehouseEntityList);
-        PageSimpleResponse<WarehouseResponse> pageSimpleResponse = new PageSimpleResponse<>();
-        pageSimpleResponse.setTotal(pageInfo.getTotal());
-        pageSimpleResponse.setList(warehouseResponses);
-        return ResultVOUtils.success(pageSimpleResponse);
-    }
 
     @GetMapping("admin/warehouse/inout/findAllByOrderId")
     public BaseResponse findAllByOrderId(WarehouseQueryRequest warehouseQueryRequest) {
@@ -166,34 +162,6 @@ public class WareHouseController {
     }
 
 
-    @GetMapping("admin/warehouse/inout/findErrorByOrderId")
-    public BaseResponse findErrorByOrderId(WarehouseQueryRequest warehouseQueryRequest) {
-        List<Warehousetemp> warehousetempList = warehouseService.findErrorByOrderId(warehouseQueryRequest);
-        List<WarehouseResponse> warehouseResponses = WarehousBeanUtils.tempsToWarehouseResponse(warehousetempList);
-        PageInfo<Warehousetemp> pageInfo;
-        pageInfo = new PageInfo<>(warehousetempList);
-        PageSimpleResponse<WarehouseResponse> pageSimpleResponse = new PageSimpleResponse<>();
-        pageSimpleResponse.setTotal(pageInfo.getTotal());
-        pageSimpleResponse.setList(warehouseResponses);
-        return ResultVOUtils.success(pageSimpleResponse);
-    }
-
-
-    public void updateErpOrderId(List<ErpOrderEntity> erpOrderEntities, String oldId, String newId) {
-        if (erpOrderEntities != null) {
-            List<ErpOrderEntity> inserts = new ArrayList<>();
-            for (ErpOrderEntity erpOrderEntity : erpOrderEntities) {
-                if (erpOrderEntity.getOrderIdFk().equals(oldId)) {
-                    erpOrderEntity.setOrderIdFk(newId);
-                    inserts.add(erpOrderEntity);
-                }
-            }
-            myErpOrderService.insertErpOrders(inserts);
-        }
-
-    }
-
-
     @PostMapping("/admin/warehouse/inout/save")
     public BaseResponse save(@RequestBody @Valid WarehouseSaveRequest warehouseSaveRequest,
                              BindingResult bindingResult) {

api-udims/src/main/java/com/glxp/udi/admin/dao/inout/BusRoleRlDao.java

@@ -0,0 +1,24 @@
+package com.glxp.udi.admin.dao.inout;
+
+import com.glxp.udi.admin.entity.inout.BusRoleRlEntity;
+import com.glxp.udi.admin.req.inout.BusRoleRlFilterRequest;
+import com.glxp.udi.admin.res.inout.BusRoleRlResponse;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface BusRoleRlDao {
+
+    List<BusRoleRlEntity> filterList(BusRoleRlFilterRequest bussinessTypeFilterRequest);
+
+    List<BusRoleRlResponse> filterJoinList(BusRoleRlFilterRequest bussinessTypeFilterRequest);
+
+    boolean insertBusRoleRl(BusRoleRlEntity bussinessTypeEntity);
+
+    boolean updateBusRoleRl(BusRoleRlEntity bussinessTypeEntity);
+
+    boolean deleteById(@Param("id") String id);
+
+}

api-udims/src/main/java/com/glxp/udi/admin/dao/inout/BussinessTypeDao.java

@@ -0,0 +1,25 @@
+package com.glxp.udi.admin.dao.inout;
+
+import com.glxp.udi.admin.entity.inout.BussinessTypeEntity;
+import com.glxp.udi.admin.req.receipt.BussinessTypeFilterRequest;
+import com.glxp.udi.admin.res.basic.BussinessTypResponse;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface BussinessTypeDao {
+
+    List<BussinessTypeEntity> filterList(BussinessTypeFilterRequest bussinessTypeFilterRequest);
+
+    List<BussinessTypResponse> filterJoinList(BussinessTypeFilterRequest bussinessTypeFilterRequest);
+
+    boolean insertBussinessType(BussinessTypeEntity bussinessTypeEntity);
+
+    boolean updateBussinessType(BussinessTypeEntity bussinessTypeEntity);
+
+    boolean deleteById(@Param("id") String id);
+
+
+}

api-udims/src/main/java/com/glxp/udi/admin/dao/inout/CodeNeedRlDao.java

@@ -0,0 +1,20 @@
+package com.glxp.udi.admin.dao.inout;
+
+import com.glxp.udi.admin.entity.inout.CodeNeedRlEntity;
+import com.glxp.udi.admin.req.inout.CodeNeedRlFilterRequest;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface CodeNeedRlDao {
+
+    List<CodeNeedRlEntity> filterList(CodeNeedRlFilterRequest codeNeedRlFilterRequest);
+
+    boolean insertCodeNeedRl(CodeNeedRlEntity codeNeedRlEntity);
+
+    boolean updateCodeNeedRl(CodeNeedRlEntity codeNeedRlEntity);
+
+    boolean deleteById(@Param("id") String id);
+}

api-udims/src/main/java/com/glxp/udi/admin/dao/inout/ScheduledDao.java

@@ -0,0 +1,18 @@
+package com.glxp.udi.admin.dao.inout;
+
+import com.glxp.udi.admin.entity.inout.ScheduledEntity;
+import com.glxp.udi.admin.req.inout.ScheduledRequest;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface ScheduledDao {
+
+    ScheduledEntity findScheduled(ScheduledRequest scheduledRequest);
+
+    boolean modifyScheduled(ScheduledEntity scheduledEntity);
+
+    boolean insertScheduled(ScheduledEntity scheduledEntity);
+
+    boolean deleteScheduled(String id);
+
+}

api-udims/src/main/java/com/glxp/udi/admin/entity/inout/BusRoleRlEntity.java

@@ -0,0 +1,12 @@
+package com.glxp.udi.admin.entity.inout;
+
+import lombok.Data;
+
+@Data
+public class BusRoleRlEntity {
+    private Integer id;
+    private String roleId;
+    private String busAction;
+    private String busActionName;
+
+}

api-udims/src/main/java/com/glxp/udi/admin/entity/inout/BussinessTypeEntity.java

@@ -5,10 +5,14 @@ import lombok.Data;
 @Data
 public class BussinessTypeEntity {
     private Integer id;
-    private String thirdId;
+    private String action;
-    private String udiwmsType;
+    private String name;
-    private String thirdType;
+    private Boolean enable;
     private String remark;
+    private String mainAction;
+    private String thirdSysFk;
+    private String localAction;
+    private Boolean check;
 
 
 }

api-udims/src/main/java/com/glxp/udi/admin/entity/inout/CodeNeedRlEntity.java

@@ -0,0 +1,27 @@
+package com.glxp.udi.admin.entity.inout;
+
+import lombok.Data;
+
+@Data
+public class CodeNeedRlEntity {
+
+    private Integer id;
+    private String code;
+    private String batchNo;
+    private String produceDate;
+    private String expireDate;
+    private String serialNo;
+    private String udi;
+    private Integer count;
+    private String orderIdFk;
+    private String cpmctymc;
+    private String ggxh;
+    private String ylqxzcrbarmc;
+    private String zczbhhzbapzbh;
+    private String diType;
+    private Long customerId;
+    private String cplb;
+    private String flbm;
+
+
+}

api-udims/src/main/java/com/glxp/udi/admin/entity/inout/ErpOrderEntity.java

@@ -6,22 +6,7 @@ import lombok.Data;
 public class ErpOrderEntity {
 
 
-    /**
+    private String id;
-     * companyid : 31443
-     * docid : 200959
-     * iodtlid : 1108752
-     * inoutid : 1064084
-     * credate : 2020-10-14 10:24:56.0
-     * goodsunit : 瓶
-     * goodsid : 26
-     * lotid : 84392
-     * goodsname : 川贝清肺糖浆（120ml）
-     * companyname : 安徽阜阳医药集团有限公司
-     * lotno : 1912198
-     * dtlgoodsqty : 4000
-     */
-
-    private long id;
     private String companyid;
     private String docid;
     private String iodtlid;
@@ -32,22 +17,24 @@ public class ErpOrderEntity {
     private String goodsname;
     private String companyname;
     private String lotno;
-    private int dtlgoodsqty;
+    private Integer dtlgoodsqty;
     private String credate;
-    private int reCount;
+    private Integer reCount;
-
+    private String uuidFk;
 
     private String nameCode;
     private String productCompany;
     private String coName;
+    private String produceDate;
+    private String expireDate;
     private String authCode;
     private String packSpec;
     private String packRatio;
-    private int bhzxxsbzsl;
+    private Integer bhzxxsbzsl;
-    private int zxxsbzbhsydysl;
+    private Integer zxxsbzbhsydysl;
     private String isDownload;
     private String orderIdFk;
-    private int count;
+    private Integer count;
     private String nameCodes;
     private String status;
 

api-udims/src/main/java/com/glxp/udi/admin/entity/inout/InvProductDetailEntity.java

@@ -0,0 +1,19 @@
+package com.glxp.udi.admin.entity.inout;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class InvProductDetailEntity {
+    private String id;
+    private String code;
+    private String productIdFk;
+    private String orderIdFk;
+    private String customerId;
+    private String mainAction;
+    private String action;
+    private Integer count;
+    private Date updateTime;
+
+}

api-udims/src/main/java/com/glxp/udi/admin/entity/inout/InvProductEntity.java

@@ -0,0 +1,34 @@
+package com.glxp.udi.admin.entity.inout;
+
+import lombok.Data;
+
+@Data
+public class InvProductEntity {
+    private String id;
+    private String productsName;
+    private String nameCode;
+    private String relIdFk;
+    private String ggxh;
+    private String batchNo;
+    private String productionDate;
+    private String expireDate;
+    private String ylqxzcrbarmc;
+    private String zczbhhzbapzbh;
+    private Integer inCount;
+    private Integer outCount;
+    private Integer reCount;
+    private String customerId;
+
+    public Integer getInCount() {
+        if (inCount == null)
+            return 0;
+        return inCount;
+    }
+
+    public Integer getOutCount() {
+        if (outCount == null)
+            return 0;
+        return outCount;
+    }
+
+}

api-udims/src/main/java/com/glxp/udi/admin/entity/inout/OrderMdEntity.java

@@ -0,0 +1,29 @@
+package com.glxp.udi.admin.entity.inout;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class OrderMdEntity {
+
+    private String id;
+    private String orderId;
+    private String action;
+    private String corpOrderId;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date actDate;
+    private String fromCorpId;
+    private String actor;
+    private String mainAction;
+    private String fromCorp;
+    private String status;
+    private String remark;
+    private String exportStatus;
+    private String fromType;
+    private String contrastStatus;
+    private String erpFk;
+    private Long customerId;
+
+}

api-udims/src/main/java/com/glxp/udi/admin/entity/inout/ScheduledEntity.java

@@ -0,0 +1,12 @@
+package com.glxp.udi.admin.entity.inout;
+
+import lombok.Data;
+
+@Data
+public class ScheduledEntity {
+
+    private int id;
+    private String cronName;
+    private String cron;
+    private String customerId;
+}

api-udims/src/main/java/com/glxp/udi/admin/entity/inout/UdiCompanyEntity.java

@@ -0,0 +1,20 @@
+package com.glxp.udi.admin.entity.inout;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class UdiCompanyEntity {
+
+    private int id;
+    private String tyshxydm;
+    private String ylqxzcrbarmc;
+    private String ylqxzcrbarywmc;
+    private String qylxrdh;
+    private String qylxrcz;
+    private String qylxryx;
+    private String deviceRecordKey;
+    private Date updateTime;
+
+}

api-udims/src/main/java/com/glxp/udi/admin/entity/inout/UdiInfoEntity.java

@@ -41,6 +41,8 @@ public class UdiInfoEntity {
     private String code;
     private Integer count;
 
+    private Boolean isCheck;
+
     public Integer getId() {
         return id;
     }
@@ -339,4 +341,12 @@ public class UdiInfoEntity {
     public void setCustomerId(String customerId) {
         this.customerId = customerId;
     }
+
+    public Boolean getCheck() {
+        return isCheck;
+    }
+
+    public void setCheck(Boolean check) {
+        isCheck = check;
+    }
 }

api-udims/src/main/java/com/glxp/udi/admin/entity/inout/UnitMaintainEntity.java

@@ -15,5 +15,6 @@ public class UnitMaintainEntity {
     private String type;
     private String customerId;
     private String creditNo;
+    private String erpId;
 
 }

api-udims/src/main/java/com/glxp/udi/admin/entity/inout/WarehouseEntity.java

@@ -14,7 +14,7 @@ public class WarehouseEntity {
     private Integer wrongCode;
     private String upperCorpOrderId;
     private String fromCorpId;
-    private Long id;
+    private String id;
     private String fromCorp;
     private String orderId;
     private String batchNo;

api-udims/src/main/java/com/glxp/udi/admin/entity/inout/WarehousetempEntity.java

@@ -11,10 +11,10 @@ public class WarehousetempEntity {
     private String corpOrderId;
     private String actor;
     private String actDate;
-    private int wrongCode;
+    private Integer wrongCode;
     private String upperCorpOrderId;
-    private String fromCorpID;
+    private String fromCorpId;
-    private long id;
+    private String id;
     private String fromCorp;
     private String orderId;
     private String batchNo;
@@ -23,7 +23,8 @@ public class WarehousetempEntity {
     private String serialNo;
     private String udi;
     private Integer count;
-    private int type;
+    private Integer type;
-    private int oddCount;
     private Long customerId;
+
+
 }

api-udims/src/main/java/com/glxp/udi/admin/entity/receipt/BussinessTypeEntity.java

@@ -1,14 +0,0 @@
-package com.glxp.udi.admin.entity.receipt;
-
-import lombok.Data;
-
-@Data
-public class BussinessTypeEntity {
-    private Integer id;
-    private String thirdId;
-    private String udiwmsType;
-    private String thirdType;
-    private String remark;
-
-
-}

api-udims/src/main/java/com/glxp/udi/admin/entity/udid/DeviceEntity.java

@@ -117,6 +117,20 @@ public class DeviceEntity {
 
     private String tsrq;
 
+    public String getTsrq() {
+
+        if(tsrq!=null && tsrq.length()>=4){
+            if(Integer.parseInt(tsrq)<2000){
+                return null;
+            }
+        }
+        return tsrq;
+    }
+
+    public void setTsrq(String tsrq) {
+        this.tsrq = tsrq;
+    }
+
     private String tyshxydm;
 
     private Integer versionnumber;

api-udims/src/main/java/com/glxp/udi/admin/mongo/MongoDBClient.java

@@ -0,0 +1,93 @@
+package com.glxp.udi.admin.mongo;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.Update;
+import org.springframework.stereotype.Component;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * @Desc TODO   MongoDB 工具类
+ */
+@Component
+public class MongoDBClient {
+
+    @Autowired
+    private MongoTemplate mongoTemplate;
+
+    /*
+     * @ClassName MongoDBClient
+     * @Desc TODO   创建集合，并返回是否创建成功  -2：已存在 / -1：创建失败 / 1：创建成功
+     * @Date 2019/4/1 10:59
+     * @Version 1.0
+     */
+    public Integer createCollection(String collectionName){
+        // 先判断集合是否存在
+        if(mongoTemplate.collectionExists(collectionName)){
+            return -2;
+        }else{
+            // 创建一个集合
+            mongoTemplate.createCollection(collectionName);
+            // 判断集合是否存在
+            if(mongoTemplate.collectionExists(collectionName)){
+                return 1;
+            }else{
+                return -1;
+            }
+        }
+    }
+
+    /*
+     * @ClassName MongoDBClient
+     * @Desc TODO   在指定集合中添加数据
+     * @Date 2019/4/1 11:12
+     * @Version 1.0
+     */
+    public void add(Collection<?> batchToSave , String collectionName){
+        mongoTemplate.insert(batchToSave,collectionName);
+    }
+
+    /*
+     * @ClassName MongoDBClient
+     * @Desc TODO   根据条件和指定集合删除数据
+     * @Date 2019/4/1 14:20
+     * @Version 1.0
+     */
+    public void delete(Query query , Object obj , String collectionName){
+        mongoTemplate.remove(query, obj.getClass(), collectionName);
+    }
+
+    /*
+     * @ClassName MongoDBClient
+     * @Desc TODO   根据条件更新数据
+     * @Date 2019/4/1 14:30
+     * @Version 1.0
+     */
+    public void update(Query query , Update update , Object obj , String collectionName){
+        mongoTemplate.updateMulti(query , update , obj.getClass() , collectionName);
+    }
+
+    /*
+     * @ClassName MongoDBClient
+     * @Desc TODO   获取指定集合下的全部数据
+     * @Date 2019/4/1 11:18
+     * @Version 1.0
+     */
+    public List<?> getAllByCollectionName(Object obj , String collectionName){
+        return mongoTemplate.findAll(obj.getClass(),collectionName);
+    }
+
+    /*
+     * @ClassName MongoDBClient
+     * @Desc TODO   根据条件和集合名称查询数据
+     * @Date 2019/4/1 11:31
+     * @Version 1.0
+     */
+    public List<?> getByConditionAndCollectionName(Query query , Object obj , String collectionName){
+        return mongoTemplate.find(query, obj.getClass() , collectionName);
+    }
+
+}

api-udims/src/main/java/com/glxp/udi/admin/mongo/MongoDBName.java

@@ -0,0 +1,12 @@
+package com.glxp.udi.admin.mongo;
+
+public class MongoDBName {
+
+    public static final String NAME_ORDER = "io_order";        //订单表
+    public static final String NAME_CODE_ERROR = "io_code_temp";  //临时码表
+    public static final String NAME_CODE = "io_code";      //正式码表
+    public static final String NAME_ORDER_DETAIL = "io_order_detail";      //正式码表
+    public static final String NAME_INV_PRODUCT = "io_inv_product";
+    public static final String NAME_INV_PRODUCT_DETAIL = "io_inv_product_detail";
+
+}

api-udims/src/main/java/com/glxp/udi/admin/mongo/service/InvProductDetailMdService.java

@@ -0,0 +1,105 @@
+package com.glxp.udi.admin.mongo.service;
+
+import com.glxp.udi.admin.entity.inout.InvProductDetailEntity;
+import com.glxp.udi.admin.mongo.MongoDBName;
+import com.glxp.udi.admin.mongo.utils.MongoPageHelper;
+import com.glxp.udi.admin.mongo.utils.PageResult;
+import com.glxp.udi.admin.req.inout.FilterInvProductDetailRequest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.Update;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+@Service
+public class InvProductDetailMdService {
+
+    @Autowired
+    private MongoTemplate mongoTemplate;
+    @Resource
+    MongoPageHelper mongoPageHelper;
+
+    public PageResult<InvProductDetailEntity> filterInvProduct(FilterInvProductDetailRequest filterInvProductDetailRequest) {
+        Query query = new Query();
+        if (filterInvProductDetailRequest.getCode() != null && !filterInvProductDetailRequest.getCode().isEmpty()) {
+            query.addCriteria(Criteria.where("code").is(filterInvProductDetailRequest.getCode()));
+        }
+        if (filterInvProductDetailRequest.getProductIdFk() != null && !filterInvProductDetailRequest.getProductIdFk().isEmpty()) {
+            query.addCriteria(Criteria.where("productIdFk").is(filterInvProductDetailRequest.getProductIdFk()));
+        }
+        if (filterInvProductDetailRequest.getMainAction() != null && !filterInvProductDetailRequest.getMainAction().isEmpty()) {
+            query.addCriteria(Criteria.where("mainAction").is(filterInvProductDetailRequest.getMainAction()));
+        }
+        if (filterInvProductDetailRequest.getCustomerId() != null && !filterInvProductDetailRequest.getCustomerId().isEmpty()) {
+            query.addCriteria(Criteria.where("customerId").is(filterInvProductDetailRequest.getCustomerId()));
+        }
+        return mongoPageHelper.pageQuery(query, InvProductDetailEntity.class,
+                filterInvProductDetailRequest.getLimit(), filterInvProductDetailRequest.getPage(),
+                filterInvProductDetailRequest.getLastId(), MongoDBName.NAME_INV_PRODUCT_DETAIL);
+
+    }
+
+    public void insertInvProduct(InvProductDetailEntity invProductDetailEntity) {
+        mongoTemplate.insert(invProductDetailEntity, MongoDBName.NAME_INV_PRODUCT_DETAIL);
+    }
+
+    public void insertInvProducts(List<InvProductDetailEntity> invProductDetailEntitys) {
+        if (invProductDetailEntitys != null) {
+            Collection<InvProductDetailEntity> invProductDetailEntityCollection = new ArrayList<>();
+            invProductDetailEntityCollection.addAll(invProductDetailEntitys);
+            mongoTemplate.insert(invProductDetailEntityCollection, MongoDBName.NAME_INV_PRODUCT_DETAIL);
+        }
+
+    }
+
+    public void updateInvProduct(InvProductDetailEntity invProductDetailEntity) {
+        Query query = new Query();
+        query.addCriteria(new Criteria().and("id").is(invProductDetailEntity.getId()));
+        Update update = new Update();
+
+        if (invProductDetailEntity.getCount() != null) {
+            update.set("count", invProductDetailEntity.getCount());
+        }
+        if (invProductDetailEntity.getCode() != null) {
+            update.set("code", invProductDetailEntity.getCode());
+        }
+        if (invProductDetailEntity.getProductIdFk() != null) {
+            update.set("productIdFk", invProductDetailEntity.getProductIdFk());
+        }
+        if (invProductDetailEntity.getOrderIdFk() != null) {
+            update.set("orderIdFk", invProductDetailEntity.getOrderIdFk());
+        }
+        if (invProductDetailEntity.getCustomerId() != null) {
+            update.set("customerId", invProductDetailEntity.getCustomerId());
+        }
+        if (invProductDetailEntity.getMainAction() != null) {
+            update.set("mainAction", invProductDetailEntity.getMainAction());
+        }
+        if (invProductDetailEntity.getAction() != null) {
+            update.set("action", invProductDetailEntity.getAction());
+        }
+        mongoTemplate.updateMulti(query, update, MongoDBName.NAME_INV_PRODUCT_DETAIL);
+    }
+
+    public void deleteById(String id) {
+        Query query = new Query();
+        if (id != null) {
+            query.addCriteria(Criteria.where("id").is(id));
+        }
+        mongoTemplate.remove(query, InvProductDetailEntity.class, MongoDBName.NAME_INV_PRODUCT_DETAIL);
+    }
+
+    public void deleteByProductId(String productIdFk) {
+        Query query = new Query();
+        if (productIdFk != null) {
+            query.addCriteria(Criteria.where("productIdFk").is(productIdFk));
+        }
+        mongoTemplate.remove(query, InvProductDetailEntity.class, MongoDBName.NAME_INV_PRODUCT_DETAIL);
+    }
+}

api-udims/src/main/java/com/glxp/udi/admin/mongo/service/InvProductMdService.java

@@ -0,0 +1,129 @@
+package com.glxp.udi.admin.mongo.service;
+
+import com.glxp.udi.admin.entity.inout.InvProductEntity;
+import com.glxp.udi.admin.mongo.MongoDBName;
+import com.glxp.udi.admin.mongo.utils.MongoPageHelper;
+import com.glxp.udi.admin.mongo.utils.PageResult;
+import com.glxp.udi.admin.req.inout.FilterInvProductRequest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.Update;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+public class InvProductMdService {
+    @Autowired
+    private MongoTemplate mongoTemplate;
+    @Resource
+    MongoPageHelper mongoPageHelper;
+
+    public PageResult<InvProductEntity> filterInvProduct(FilterInvProductRequest filterInvProductRequest) {
+        Query query = new Query();
+        if (filterInvProductRequest.getUuids() != null && filterInvProductRequest.getUuids().size() > 0) {
+            query.addCriteria(Criteria.where("relIdFk").in(filterInvProductRequest.getUuids()));
+        }
+        if (filterInvProductRequest.getBatchNo() != null && !filterInvProductRequest.getBatchNo().isEmpty()) {
+            query.addCriteria(Criteria.where("batchNo").is(filterInvProductRequest.getBatchNo()));
+        }
+        if (filterInvProductRequest.getCustomerId() != null && !filterInvProductRequest.getCustomerId().isEmpty()) {
+            query.addCriteria(Criteria.where("customerId").is(filterInvProductRequest.getCustomerId()));
+        }
+        return mongoPageHelper.pageQuery(query, InvProductEntity.class,
+                filterInvProductRequest.getLimit(), filterInvProductRequest.getPage(), filterInvProductRequest.getLastId(), MongoDBName.NAME_INV_PRODUCT);
+    }
+
+
+    public InvProductEntity selectByUuid(String relIdFk, String batchNo) {
+        Query query = new Query();
+        if (relIdFk != null && !relIdFk.isEmpty()) {
+            query.addCriteria(Criteria.where("relIdFk").is(relIdFk));
+        }
+        if (batchNo != null && !batchNo.isEmpty()) {
+            query.addCriteria(Criteria.where("batchNo").is(batchNo));
+        }
+        List<InvProductEntity> invProductEntities = mongoTemplate.find(query, InvProductEntity.class, MongoDBName.NAME_INV_PRODUCT);
+        if (invProductEntities != null && invProductEntities.size() > 0) {
+            return invProductEntities.get(0);
+        }
+        return null;
+    }
+
+    public InvProductEntity selectById(String id) {
+        Query query = new Query();
+        if (id != null && !id.isEmpty()) {
+            query.addCriteria(Criteria.where("id").is(id));
+        }
+        List<InvProductEntity> invProductEntities = mongoTemplate.find(query, InvProductEntity.class, MongoDBName.NAME_INV_PRODUCT);
+        if (invProductEntities != null && invProductEntities.size() > 0) {
+            return invProductEntities.get(0);
+        }
+        return null;
+    }
+
+
+    public void insertInvProduct(InvProductEntity invProductEntity) {
+        mongoTemplate.insert(invProductEntity, MongoDBName.NAME_INV_PRODUCT);
+    }
+
+    public void updateInvProduct(InvProductEntity invProductEntity) {
+        Query query = new Query();
+        query.addCriteria(new Criteria().and("id").is(invProductEntity.getId()));
+        Update update = new Update();
+
+        if (invProductEntity.getInCount() != null) {
+            update.set("inCount", invProductEntity.getInCount());
+        }
+        if (invProductEntity.getOutCount() != null) {
+            update.set("outCount", invProductEntity.getOutCount());
+        }
+        if (invProductEntity.getProductsName() != null) {
+            update.set("productsName", invProductEntity.getProductsName());
+        }
+        if (invProductEntity.getNameCode() != null) {
+            update.set("nameCode", invProductEntity.getNameCode());
+        }
+        if (invProductEntity.getRelIdFk() != null) {
+            update.set("relIdFk", invProductEntity.getRelIdFk());
+        }
+        if (invProductEntity.getGgxh() != null) {
+            update.set("ggxh", invProductEntity.getGgxh());
+        }
+        if (invProductEntity.getBatchNo() != null) {
+            update.set("batchNo", invProductEntity.getBatchNo());
+        }
+        if (invProductEntity.getProductionDate() != null) {
+            update.set("productionDate", invProductEntity.getProductionDate());
+        }
+        if (invProductEntity.getExpireDate() != null) {
+            update.set("expireDate", invProductEntity.getExpireDate());
+        }
+        if (invProductEntity.getYlqxzcrbarmc() != null) {
+            update.set("ylqxzcrbarmc", invProductEntity.getYlqxzcrbarmc());
+        }
+        if (invProductEntity.getZczbhhzbapzbh() != null) {
+            update.set("zczbhhzbapzbh", invProductEntity.getZczbhhzbapzbh());
+        }
+        if (invProductEntity.getReCount() != null) {
+            update.set("reCount", invProductEntity.getReCount());
+        }
+        if (invProductEntity.getCustomerId() != null) {
+            update.set("customerId", invProductEntity.getCustomerId());
+        }
+        mongoTemplate.updateMulti(query, update, MongoDBName.NAME_INV_PRODUCT);
+    }
+
+
+    public void deleteById(String id) {
+        Query query = new Query();
+        if (id != null) {
+            query.addCriteria(Criteria.where("id").is(id));
+        }
+        mongoTemplate.remove(query, InvProductEntity.class, MongoDBName.NAME_INV_PRODUCT);
+    }
+
+}

api-udims/src/main/java/com/glxp/udi/admin/mongo/service/OrderDetailMdService.java

@@ -0,0 +1,71 @@
+package com.glxp.udi.admin.mongo.service;
+
+import com.glxp.udi.admin.entity.inout.ErpOrderEntity;
+import com.glxp.udi.admin.mongo.MongoDBName;
+import com.glxp.udi.admin.mongo.utils.MongoPageHelper;
+import com.glxp.udi.admin.req.inout.DeleteRequest;
+import com.glxp.udi.admin.req.inout.FilterErpOrderRequest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.Update;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+@Service
+public class OrderDetailMdService {
+    @Autowired
+    private MongoTemplate mongoTemplate;
+    @Resource
+    MongoPageHelper mongoPageHelper;
+
+    public List<ErpOrderEntity> filterOrderDetails(FilterErpOrderRequest filterErpOrderRequest) {
+
+        Query query = new Query();
+        if (filterErpOrderRequest.getOrderId() != null && !filterErpOrderRequest.getOrderId().isEmpty()) {
+            query.addCriteria(Criteria.where("orderIdFk").is(filterErpOrderRequest.getOrderId()));
+        }
+        if (filterErpOrderRequest.getCustomerId() != null) {
+            query.addCriteria(Criteria.where("customerId").is(filterErpOrderRequest.getCustomerId()));
+        }
+        return mongoTemplate.find(query, ErpOrderEntity.class, MongoDBName.NAME_ORDER_DETAIL);
+    }
+
+    public void insertOrderDetail(List<ErpOrderEntity> erpOrderEntities) {
+        if (erpOrderEntities != null) {
+            Collection<ErpOrderEntity> warehouseEntityCollection = new ArrayList<>();
+            warehouseEntityCollection.addAll(erpOrderEntities);
+            mongoTemplate.insert(warehouseEntityCollection, MongoDBName.NAME_ORDER_DETAIL);
+        }
+    }
+
+    public void deleteOrderDetail(DeleteRequest deleteRequest) {
+        Query query = new Query();
+        if (deleteRequest.getId() != null) {
+            query.addCriteria(Criteria.where("id").is(deleteRequest.getId()));
+        }
+        if (deleteRequest.getOrderId() != null) {
+            query.addCriteria(Criteria.where("orderIdFk").is(deleteRequest.getOrderId()));
+        }
+        mongoTemplate.remove(query, ErpOrderEntity.class, MongoDBName.NAME_ORDER_DETAIL);
+    }
+
+    public void updateOrderDetail(ErpOrderEntity erpOrderEntity) {
+        Query query = new Query();
+        query.addCriteria(new Criteria().and("id").is(erpOrderEntity.getId()));
+        Update update = new Update();
+
+        if (erpOrderEntity.getCount() != null) {
+            update.set("count", erpOrderEntity.getCount());
+        }
+        if (erpOrderEntity.getReCount() != null) {
+            update.set("reCount", erpOrderEntity.getReCount());
+        }
+        mongoTemplate.updateMulti(query, update, MongoDBName.NAME_ORDER_DETAIL);
+    }
+}

api-udims/src/main/java/com/glxp/udi/admin/mongo/service/OrderMdService.java

@@ -0,0 +1,192 @@
+package com.glxp.udi.admin.mongo.service;
+
+import com.glxp.udi.admin.entity.inout.OrderMdEntity;
+import com.glxp.udi.admin.mongo.MongoDBName;
+import com.glxp.udi.admin.mongo.utils.MongoPageHelper;
+import com.glxp.udi.admin.mongo.utils.PageResult;
+import com.glxp.udi.admin.req.inout.DeleteRequest;
+import com.glxp.udi.admin.req.inout.OrderFilterRequest;
+import com.glxp.udi.admin.util.DateUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.Update;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class OrderMdService {
+
+    @Autowired
+    private MongoTemplate mongoTemplate;
+    @Resource
+    MongoPageHelper mongoPageHelper;
+
+    private static final Logger log = LoggerFactory.getLogger(OrderMdService.class);
+
+    public PageResult<OrderMdEntity> filterList(OrderFilterRequest orderFilterRequest) {
+        Query query = new Query();
+        if (orderFilterRequest.getId() != null && !orderFilterRequest.getId().isEmpty()) {
+            query.addCriteria(Criteria.where("id").is(orderFilterRequest.getId()));
+        }
+        if (orderFilterRequest.getMainAction() != null && !orderFilterRequest.getMainAction().isEmpty()) {
+            query.addCriteria(Criteria.where("mainAction").is(orderFilterRequest.getMainAction()));
+        }
+        if (orderFilterRequest.getAction() != null && !orderFilterRequest.getAction().isEmpty()) {
+            query.addCriteria(Criteria.where("action").is(orderFilterRequest.getAction()));
+        }
+        if (orderFilterRequest.getAction() == null || orderFilterRequest.getAction().isEmpty()) {
+            query.addCriteria(Criteria.where("action").ne("StockCheck"));
+        }
+        if (orderFilterRequest.getStatus() != null && !orderFilterRequest.getStatus().isEmpty()) {
+            query.addCriteria(Criteria.where("status").is(orderFilterRequest.getStatus()));
+        }
+        if (orderFilterRequest.getExportStatus() != null && !orderFilterRequest.getExportStatus().isEmpty()) {
+            query.addCriteria(Criteria.where("exportStatus").is(orderFilterRequest.getExportStatus()));
+        }
+        if (orderFilterRequest.getCustomerId() != null) {
+            if (orderFilterRequest.getStartTime() != null && !orderFilterRequest.getStartTime().isEmpty()
+                    && orderFilterRequest.getEndTime() != null && !orderFilterRequest.getEndTime().isEmpty()) {
+                Date sdate, edate = null;
+                if (orderFilterRequest.getStartTime().contains("T")) {
+                    sdate = DateUtil.convertTimeFormat(orderFilterRequest.getStartTime());
+                } else {
+                    sdate = DateUtil.parseDate(orderFilterRequest.getStartTime());
+                }
+                if (orderFilterRequest.getEndTime().contains("T")) {
+                    edate = DateUtil.convertTimeFormat(orderFilterRequest.getEndTime());
+                } else {
+                    edate = DateUtil.parseDate(orderFilterRequest.getEndTime());
+                }
+                query.addCriteria(Criteria.where("customerId").is(orderFilterRequest.getCustomerId()).andOperator(Criteria.where("actDate").gte(DateUtil.dateToISODate(sdate)
+                ), Criteria.where("actDate").lt(DateUtil.dateToISODate(edate))));
+            } else
+                query.addCriteria(Criteria.where("customerId").is(orderFilterRequest.getCustomerId()));
+        }
+
+
+        if (orderFilterRequest.getIsError() != null) {
+            query.addCriteria(Criteria.where("status").ne(orderFilterRequest.getIsError()));
+        }
+
+        return mongoPageHelper.pageQuery(query, OrderMdEntity.class,
+                orderFilterRequest.getLimit(), orderFilterRequest.getPage(), orderFilterRequest.getLastId(), MongoDBName.NAME_ORDER);
+
+    }
+
+    public List<OrderMdEntity> findAll(OrderFilterRequest orderFilterRequest) {
+        Query query = new Query();
+        if (orderFilterRequest.getId() != null && !orderFilterRequest.getId().isEmpty()) {
+            query.addCriteria(Criteria.where("orderId").is(orderFilterRequest.getId()));
+        }
+        if (orderFilterRequest.getMainAction() != null && !orderFilterRequest.getMainAction().isEmpty()) {
+            query.addCriteria(Criteria.where("mainAction").is(orderFilterRequest.getMainAction()));
+        }
+        if (orderFilterRequest.getAction() != null && !orderFilterRequest.getAction().isEmpty()) {
+            query.addCriteria(Criteria.where("action").is(orderFilterRequest.getAction()));
+        }
+        if (orderFilterRequest.getAction() == null || orderFilterRequest.getAction().isEmpty()) {
+            query.addCriteria(Criteria.where("action").ne("StockCheck"));
+        }
+        if (orderFilterRequest.getStatus() != null && !orderFilterRequest.getStatus().isEmpty()) {
+            query.addCriteria(Criteria.where("status").is(orderFilterRequest.getStatus()));
+        }
+        if (orderFilterRequest.getExportStatus() != null && !orderFilterRequest.getExportStatus().isEmpty()) {
+            query.addCriteria(Criteria.where("exportStatus").is(orderFilterRequest.getExportStatus()));
+        }
+        if (orderFilterRequest.getCustomerId() != null) {
+            if (orderFilterRequest.getStartTime() != null && !orderFilterRequest.getStartTime().isEmpty()
+                    && orderFilterRequest.getEndTime() != null && !orderFilterRequest.getEndTime().isEmpty()) {
+                Date sdate, edate = null;
+                if (orderFilterRequest.getStartTime().contains("T")) {
+                    sdate = DateUtil.convertTimeFormat(orderFilterRequest.getStartTime());
+                } else {
+                    sdate = DateUtil.parseDate(orderFilterRequest.getStartTime());
+                }
+                if (orderFilterRequest.getEndTime().contains("T")) {
+                    edate = DateUtil.convertTimeFormat(orderFilterRequest.getEndTime());
+                } else {
+                    edate = DateUtil.parseDate(orderFilterRequest.getEndTime());
+                }
+                query.addCriteria(Criteria.where("customerId").is(orderFilterRequest.getCustomerId()).andOperator(Criteria.where("actDate").gte(DateUtil.dateToISODate(sdate)
+                ), Criteria.where("actDate").lt(DateUtil.dateToISODate(edate))));
+            } else
+                query.addCriteria(Criteria.where("customerId").is(orderFilterRequest.getCustomerId()));
+        }
+
+        if (orderFilterRequest.getIsError() != null) {
+            query.addCriteria(Criteria.where("status").ne(orderFilterRequest.getIsError()));
+        }
+        return mongoTemplate.find(query, OrderMdEntity.class, MongoDBName.NAME_ORDER);
+    }
+
+    public void updateOrder(OrderMdEntity orderMdEntity) {
+        Query query = new Query();
+        if (orderMdEntity.getOrderId() != null && !orderMdEntity.getOrderId().isEmpty()) {
+            query.addCriteria(new Criteria().and("orderId").is(orderMdEntity.getOrderId()));
+        } else if (orderMdEntity.getId() != null && !orderMdEntity.getId().isEmpty()) {
+            query.addCriteria(new Criteria().and("id").is(orderMdEntity.getId()));
+        } else {
+            log.error("更新失败，未指定orderId");
+            return;
+        }
+
+        Update update = new Update();
+        if (orderMdEntity.getId() != null) {
+            update.set("fromCorp", orderMdEntity.getFromCorp());
+        }
+        if (orderMdEntity.getFromCorp() != null) {
+            update.set("fromCorp", orderMdEntity.getFromCorp());
+        }
+        if (orderMdEntity.getFromCorpId() != null) {
+            update.set("fromCorpId", orderMdEntity.getFromCorpId());
+        }
+        if (orderMdEntity.getActDate() != null) {
+            update.set("actDate", orderMdEntity.getActDate());
+        }
+        if (orderMdEntity.getStatus() != null) {
+            update.set("status", orderMdEntity.getStatus());
+        }
+        if (orderMdEntity.getRemark() != null) {
+            update.set("remark", orderMdEntity.getRemark());
+        }
+        if (orderMdEntity.getExportStatus() != null) {
+            update.set("exportStatus", orderMdEntity.getExportStatus());
+        }
+        if (orderMdEntity.getContrastStatus() != null) {
+            update.set("contrastStatus", orderMdEntity.getContrastStatus());
+        }
+        if (orderMdEntity.getErpFk() != null) {
+            update.set("erpFk", orderMdEntity.getErpFk());
+        }
+        mongoTemplate.updateMulti(query, update, MongoDBName.NAME_ORDER);
+    }
+
+    public void deleteOrder(DeleteRequest deleteRequest) {
+        Query query = new Query();
+        if (deleteRequest.getId() != null) {
+            query.addCriteria(Criteria.where("id").is(deleteRequest.getId()));
+        }
+        if (deleteRequest.getOrderId() != null) {
+            query.addCriteria(Criteria.where("orderId").is(deleteRequest.getOrderId()));
+        }
+        mongoTemplate.remove(query, OrderMdEntity.class, MongoDBName.NAME_ORDER);
+    }
+
+
+    public void insertOrder(OrderMdEntity orderMdEntity) {
+        if (orderMdEntity != null) {
+            Collection<OrderMdEntity> orderMdEntities = new ArrayList<>();
+            orderMdEntities.add(orderMdEntity);
+            mongoTemplate.insert(orderMdEntities, MongoDBName.NAME_ORDER);
+        }
+    }
+}

api-udims/src/main/java/com/glxp/udi/admin/mongo/service/WarehouseMdService.java

@@ -0,0 +1,136 @@
+package com.glxp.udi.admin.mongo.service;
+
+import com.glxp.udi.admin.entity.inout.WarehouseEntity;
+import com.glxp.udi.admin.mongo.MongoDBName;
+import com.glxp.udi.admin.mongo.utils.MongoPageHelper;
+import com.glxp.udi.admin.mongo.utils.PageResult;
+import com.glxp.udi.admin.req.inout.DeleteRequest;
+import com.glxp.udi.admin.req.inout.FilterWarehouseRequest;
+import com.glxp.udi.admin.req.inout.WarehouseQueryRequest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.Update;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+@Service
+public class WarehouseMdService {
+
+    @Autowired
+    private MongoTemplate mongoTemplate;
+    @Resource
+    MongoPageHelper mongoPageHelper;
+
+
+    public PageResult<WarehouseEntity> filterWarehouseByPage(WarehouseQueryRequest warehouseQueryRequest) {
+
+        Query query = new Query();
+        if (warehouseQueryRequest.getCode() != null && !warehouseQueryRequest.getCode().isEmpty()) {
+            query.addCriteria(Criteria.where("code").is(warehouseQueryRequest.getCode()));
+        }
+        if (warehouseQueryRequest.getCorpOrderId() != null && !warehouseQueryRequest.getCorpOrderId().isEmpty()) {
+            query.addCriteria(Criteria.where("corpOrderId").is(warehouseQueryRequest.getCorpOrderId()));
+        }
+        if (warehouseQueryRequest.getOrderId() != null && !warehouseQueryRequest.getOrderId().isEmpty()) {
+            query.addCriteria(Criteria.where("orderId").is(warehouseQueryRequest.getOrderId()));
+        }
+//        if (warehouseQueryRequest.getCustomerId() != null) {
+//            query.addCriteria(Criteria.where("customerId").is(warehouseQueryRequest.getCustomerId()));
+//        }
+        return mongoPageHelper.pageQuery(query, WarehouseEntity.class,
+                warehouseQueryRequest.getLimit(), warehouseQueryRequest.getPage(), warehouseQueryRequest.getLastId(), MongoDBName.NAME_CODE);
+    }
+
+    public List<WarehouseEntity> filterWarehouse(WarehouseQueryRequest warehouseQueryRequest) {
+
+        Query query = new Query();
+        if (warehouseQueryRequest.getCode() != null && !warehouseQueryRequest.getCode().isEmpty()) {
+            query.addCriteria(Criteria.where("code").is(warehouseQueryRequest.getCode()));
+        }
+        if (warehouseQueryRequest.getCorpOrderId() != null && !warehouseQueryRequest.getCorpOrderId().isEmpty()) {
+            query.addCriteria(Criteria.where("corpOrderId").is(warehouseQueryRequest.getCorpOrderId()));
+        }
+        if (warehouseQueryRequest.getOrderId() != null && !warehouseQueryRequest.getOrderId().isEmpty()) {
+            query.addCriteria(Criteria.where("orderId").is(warehouseQueryRequest.getOrderId()));
+        }
+        if (warehouseQueryRequest.getCustomerId() != null) {
+            query.addCriteria(Criteria.where("customerId").is(warehouseQueryRequest.getCustomerId()));
+        }
+        if (warehouseQueryRequest.getBatchNo() != null) {
+            query.addCriteria(Criteria.where("batchNo").is(warehouseQueryRequest.getBatchNo()));
+        }
+        if (warehouseQueryRequest.getUdi() != null) {
+            query.addCriteria(Criteria.where("udi").is(warehouseQueryRequest.getUdi()));
+        }
+
+
+        return mongoTemplate.find(query, WarehouseEntity.class, MongoDBName.NAME_CODE);
+    }
+
+
+    public void insertWarehouses(List<WarehouseEntity> warehouseEntities) {
+        if (warehouseEntities != null) {
+            Collection<WarehouseEntity> warehouseEntityCollection = new ArrayList<>();
+            warehouseEntityCollection.addAll(warehouseEntities);
+            mongoTemplate.insert(warehouseEntityCollection, MongoDBName.NAME_CODE);
+        }
+    }
+
+
+    public List<WarehouseEntity> findByCode(FilterWarehouseRequest filterWarehouseRequest) {
+        Query query = new Query();
+        query.addCriteria(
+                Criteria.where("customerId").is(filterWarehouseRequest.getCustomerId())
+                        .and("code").is(filterWarehouseRequest.getCode())
+        );
+        return mongoTemplate.find(query, WarehouseEntity.class, MongoDBName.NAME_CODE);
+    }
+
+
+    public List<WarehouseEntity> searchCode(String code, Long customerId) {
+        Query query = new Query();
+        query.addCriteria(
+                Criteria.where("customerId").is(customerId)
+                        .and("code").is(code)
+                        .and("action").ne("StockCheck")
+        );
+        return mongoTemplate.find(query, WarehouseEntity.class, MongoDBName.NAME_CODE);
+    }
+
+    public void updateUnit(String orderId, String fromCorpId, String fromCorp) {
+
+        Query query = new Query();
+        query.addCriteria(new Criteria().and("orderId").is(orderId));
+        Update update = new Update();
+        update.set("fromCorp", fromCorp);
+        update.set("fromCorpId", fromCorpId);
+        mongoTemplate.updateMulti(query, update, MongoDBName.NAME_CODE);
+    }
+
+    public void updateOrderId(String orderId, String newOrderId) {
+
+        Query query = new Query();
+        query.addCriteria(new Criteria().and("orderId").is(orderId));
+        Update update = new Update();
+        update.set("orderId", newOrderId);
+        mongoTemplate.updateMulti(query, update, MongoDBName.NAME_CODE);
+    }
+
+    public void deleteCode(DeleteRequest deleteRequest) {
+        Query query = new Query();
+        if (deleteRequest.getId() != null) {
+            query.addCriteria(Criteria.where("id").is(deleteRequest.getId()));
+        }
+        if (deleteRequest.getOrderId() != null) {
+            query.addCriteria(Criteria.where("orderId").is(deleteRequest.getOrderId()));
+        }
+        mongoTemplate.remove(query, WarehouseEntity.class, MongoDBName.NAME_CODE);
+    }
+
+}

api-udims/src/main/java/com/glxp/udi/admin/mongo/service/WarehouseTempMdService.java

@@ -0,0 +1,103 @@
+package com.glxp.udi.admin.mongo.service;
+
+import com.glxp.udi.admin.entity.inout.WarehouseEntity;
+import com.glxp.udi.admin.entity.inout.WarehousetempEntity;
+import com.glxp.udi.admin.mongo.MongoDBName;
+import com.glxp.udi.admin.mongo.utils.MongoPageHelper;
+import com.glxp.udi.admin.mongo.utils.PageResult;
+import com.glxp.udi.admin.req.inout.DeleteRequest;
+import com.glxp.udi.admin.req.inout.WarehouseQueryRequest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+@Service
+public class WarehouseTempMdService {
+    @Autowired
+    private MongoTemplate mongoTemplate;
+    @Resource
+    MongoPageHelper mongoPageHelper;
+
+
+    public PageResult<WarehousetempEntity> filterWarehouseByPage(WarehouseQueryRequest warehouseQueryRequest) {
+
+        Query query = new Query();
+        if (warehouseQueryRequest.getCode() != null && !warehouseQueryRequest.getCode().isEmpty()) {
+            query.addCriteria(Criteria.where("code").is(warehouseQueryRequest.getCode()));
+        }
+        if (warehouseQueryRequest.getCorpOrderId() != null && !warehouseQueryRequest.getCorpOrderId().isEmpty()) {
+            query.addCriteria(Criteria.where("corpOrderId").is(warehouseQueryRequest.getCorpOrderId()));
+        }
+        if (warehouseQueryRequest.getOrderId() != null && !warehouseQueryRequest.getOrderId().isEmpty()) {
+            query.addCriteria(Criteria.where("orderId").is(warehouseQueryRequest.getOrderId()));
+        }
+        if (warehouseQueryRequest.getCustomerId() != null) {
+            query.addCriteria(Criteria.where("customerId").is(warehouseQueryRequest.getCustomerId()));
+        }
+        return mongoPageHelper.pageQuery(query, WarehousetempEntity.class,
+                warehouseQueryRequest.getLimit(), warehouseQueryRequest.getPage(), warehouseQueryRequest.getLastId(), MongoDBName.NAME_CODE_ERROR);
+    }
+
+    public List<WarehousetempEntity> filterWarehouse(WarehouseQueryRequest warehouseQueryRequest) {
+
+        Query query = new Query();
+        if (warehouseQueryRequest.getCode() != null && !warehouseQueryRequest.getCode().isEmpty()) {
+            query.addCriteria(Criteria.where("code").is(warehouseQueryRequest.getCode()));
+        }
+        if (warehouseQueryRequest.getCorpOrderId() != null && !warehouseQueryRequest.getCorpOrderId().isEmpty()) {
+            query.addCriteria(Criteria.where("corpOrderId").is(warehouseQueryRequest.getCorpOrderId()));
+        }
+        if (warehouseQueryRequest.getOrderId() != null && !warehouseQueryRequest.getOrderId().isEmpty()) {
+            query.addCriteria(Criteria.where("orderId").is(warehouseQueryRequest.getOrderId()));
+        }
+        if (warehouseQueryRequest.getCustomerId() != null) {
+            query.addCriteria(Criteria.where("customerId").is(warehouseQueryRequest.getCustomerId()));
+        }
+        return mongoTemplate.find(query, WarehousetempEntity.class, MongoDBName.NAME_CODE_ERROR);
+    }
+
+    public List<WarehousetempEntity> findTempByOrderId(String orderId) {
+        Query query = new Query(Criteria.where("orderId").is(orderId));
+        List<WarehousetempEntity> result = mongoTemplate.find(query, WarehousetempEntity.class, MongoDBName.NAME_CODE_ERROR);
+        return result;
+    }
+
+    public void insertTempWarehouses(List<WarehousetempEntity> warehouseEntities) {
+        if (warehouseEntities != null) {
+            Collection<WarehousetempEntity> warehousetempEntityCollection = new ArrayList<>();
+            warehousetempEntityCollection.addAll(warehouseEntities);
+            mongoTemplate.insert(warehousetempEntityCollection, MongoDBName.NAME_CODE_ERROR);
+        }
+    }
+
+    public void deleteTempWarehouses(List<String> ids) {
+        if (ids != null) {
+            for (String id : ids) {
+                Query query = new Query();
+                query.addCriteria(Criteria.where("id").is(id));
+                mongoTemplate.remove(query, MongoDBName.NAME_CODE_ERROR);
+            }
+        }
+    }
+
+
+    public void deleteCode(DeleteRequest deleteRequest) {
+        Query query = new Query();
+        if (deleteRequest.getId() != null) {
+            query.addCriteria(Criteria.where("id").is(deleteRequest.getId()));
+        }
+        if (deleteRequest.getOrderId() != null) {
+            query.addCriteria(Criteria.where("orderId").is(deleteRequest.getOrderId()));
+        }
+        mongoTemplate.remove(query, WarehouseEntity.class, MongoDBName.NAME_CODE_ERROR);
+    }
+
+
+}

api-udims/src/main/java/com/glxp/udi/admin/mongo/utils/MongoPageHelper.java

@@ -0,0 +1,109 @@
+package com.glxp.udi.admin.mongo.utils;
+
+import org.apache.commons.lang3.StringUtils;
+import org.bson.types.ObjectId;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Sort.Direction;
+import org.springframework.data.domain.Sort.Order;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * MongoDB分页插件，需要结合Spring-data使用.
+ *
+ * @author Ryan Miao at 2018-06-07 15:19
+ **/
+public class MongoPageHelper {
+
+    private static final int FIRST_PAGE_NUM = 1;
+    private static final String ID = "_id";
+    private final MongoTemplate mongoTemplate;
+
+    public MongoPageHelper(MongoTemplate mongoTemplate) {
+        this.mongoTemplate = mongoTemplate;
+    }
+
+
+    /**
+     * 分页查询，直接返回集合类型的结果.
+     *
+     * @see MongoPageHelper#pageQuery(Query,
+     * Class, Integer, Integer, Function,
+     * String)
+     */
+    public <T> PageResult<T> pageQuery(Query query, Class<T> entityClass, Integer pageSize,
+                                       Integer pageNum, String tableName) {
+        return pageQuery(query, entityClass, pageSize, pageNum, Function.identity(), null, tableName);
+    }
+
+    /**
+     * 分页查询，不考虑条件分页，直接使用skip-limit来分页.
+     *
+     * @see MongoPageHelper#pageQuery(Query,
+     * Class, Integer, Integer, Function,
+     * String)
+     */
+    public <T, R> PageResult<R> pageQuery(Query query, Class<T> entityClass,
+                                          Integer pageSize, Integer pageNum, Function<T, R> mapper, String tableName) {
+        return pageQuery(query, entityClass, pageSize, pageNum, mapper, null);
+    }
+
+    public <T> PageResult<T> pageQuery(Query query, Class<T> entityClass, Integer pageSize,
+                                       Integer pageNum, String lastId, String tableName) {
+        return pageQuery(query, entityClass, pageSize, pageNum, Function.identity(), null, tableName);
+    }
+
+    /**
+     * 分页查询.
+     *
+     * @param query       Mongo Query对象，构造你自己的查询条件.
+     * @param entityClass Mongo collection定义的entity class，用来确定查询哪个集合.
+     * @param mapper      映射器，你从db查出来的list的元素类型是entityClass, 如果你想要转换成另一个对象，比如去掉敏感字段等，可以使用mapper来决定如何转换.
+     * @param pageSize    分页的大小.
+     * @param pageNum     当前页.
+     * @param lastId      条件分页参数, 区别于skip-limit，采用find(_id>lastId).limit分页.
+     *                    如果不跳页，像朋友圈，微博这样下拉刷新的分页需求，需要传递上一页的最后一条记录的ObjectId。 如果是null，则返回pageNum那一页.
+     * @param <T>         collection定义的class类型.
+     * @param <R>         最终返回时，展现给页面时的一条记录的类型。
+     * @return PageResult，一个封装page信息的对象.
+     */
+    public <T, R> PageResult<R> pageQuery(Query query, Class<T> entityClass,
+                                          Integer pageSize, Integer pageNum, Function<T, R> mapper, String lastId, String tableName) {
+        //分页逻辑
+        long total = mongoTemplate.count(query, entityClass,tableName);
+        final Integer pages = (int) Math.ceil(total / (double) pageSize);
+        if (pageNum <= 0 || pageNum > pages) {
+            pageNum = FIRST_PAGE_NUM;
+        }
+        final Criteria criteria = new Criteria();
+        if (StringUtils.isNotBlank(lastId)) {
+            if (pageNum != FIRST_PAGE_NUM) {
+                criteria.and(ID).gt(new ObjectId(lastId));
+            }
+            query.limit(pageSize);
+        } else {
+            int skip = pageSize * (pageNum - 1);
+            query.skip(skip).limit(pageSize);
+        }
+
+        final List<T> entityList = mongoTemplate
+                .find(query.addCriteria(criteria)
+                                .with(new Sort(Collections.singletonList(new Order(Direction.DESC, ID)))),
+                        entityClass, tableName);
+
+        final PageResult<R> pageResult = new PageResult<>();
+        pageResult.setTotal(total);
+        pageResult.setPages(pages);
+        pageResult.setPageSize(pageSize);
+        pageResult.setPageNum(pageNum);
+        pageResult.setList(entityList.stream().map(mapper).collect(Collectors.toList()));
+        return pageResult;
+    }
+
+}

api-udims/src/main/java/com/glxp/udi/admin/mongo/utils/PageResult.java

@@ -0,0 +1,44 @@
+package com.glxp.udi.admin.mongo.utils;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 分页结果.
+ *
+ * @author Ryan
+ */
+@Data
+//@AllArgsConstructor
+//@NoArgsConstructor
+//@JsonInclude(Include.NON_NULL)
+public class PageResult<T> {
+
+    /**
+     * 页码，从1开始
+     */
+    private Integer pageNum;
+
+    /**
+     * 页面大小
+     */
+    private Integer pageSize;
+
+
+    /**
+     * 总数
+     */
+    private Long total;
+
+    /**
+     * 总页数
+     */
+    private Integer pages;
+
+    /**
+     * 数据
+     */
+    private List<T> list;
+
+}

api-udims/src/main/java/com/glxp/udi/admin/req/inout/BusRoleRlFilterRequest.java

@@ -0,0 +1,21 @@
+package com.glxp.udi.admin.req.inout;
+
+import com.glxp.udi.admin.req.ListPageRequest;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class BusRoleRlFilterRequest extends ListPageRequest {
+
+    private Integer id;
+    private String roleId;
+    List<String> actions;
+    private String busAction;
+    private String busActionName;
+    private String customerId;
+    private String action;
+    private String name;
+    private String mainAction;
+    private Boolean enabled;
+}

api-udims/src/main/java/com/glxp/udi/admin/req/inout/CodeNeedRlFilterRequest.java

@@ -0,0 +1,12 @@
+package com.glxp.udi.admin.req.inout;
+
+import com.glxp.udi.admin.req.ListPageRequest;
+import lombok.Data;
+
+@Data
+public class CodeNeedRlFilterRequest extends ListPageRequest {
+
+    private String code;
+    private String ylqxzcrbarmc;
+    private Long customerId;
+}

api-udims/src/main/java/com/glxp/udi/admin/req/inout/DeleteRequest.java

@@ -7,5 +7,7 @@ public class DeleteRequest {
 
     String id;
     Long customerId;
+    String orderId;
+    String orderIdFk;
 
 }

api-udims/src/main/java/com/glxp/udi/admin/req/inout/FilterErpOrderRequest.java

@@ -18,6 +18,7 @@ public class FilterErpOrderRequest extends ListPageRequest {
     private String billAction;
     private String billcode;
     private String fbillflag;
+    Long customerId;
     List<String> orderIds;
 
 }

api-udims/src/main/java/com/glxp/udi/admin/req/inout/FilterInvProductDetailRequest.java

@@ -0,0 +1,17 @@
+package com.glxp.udi.admin.req.inout;
+
+import com.glxp.udi.admin.req.ListPageRequest;
+import lombok.Data;
+
+@Data
+public class FilterInvProductDetailRequest extends ListPageRequest {
+
+    private String id;
+    private String code;
+    private String productIdFk;
+    private String customerId;
+    private String mainAction;
+    private String action;
+    private Integer count;
+    private String lastId;
+}

api-udims/src/main/java/com/glxp/udi/admin/req/inout/FilterInvProductRequest.java

@@ -0,0 +1,28 @@
+package com.glxp.udi.admin.req.inout;
+
+import com.glxp.udi.admin.req.ListPageRequest;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class FilterInvProductRequest extends ListPageRequest {
+
+    private String id;
+    private String cpmctymc;
+    private String productsName;
+    private String nameCode;
+    private String relIdFk;
+    private String ggxh;
+    private String batchNo;
+    private String productionDate;
+    private String expireDate;
+    private String ylqxzcrbarmc;
+    private String zczbhhzbapzbh;
+    private String customerId;
+    private String lastId;
+
+    private List<String> uuids;
+
+
+}

api-udims/src/main/java/com/glxp/udi/admin/req/inout/FilterUdiInfoRequest.java

@@ -13,5 +13,24 @@ public class FilterUdiInfoRequest extends ListPageRequest {
     private String ggxh;
     private String thirdId;
     private String customerId;
+    private Integer diType;
+    private Boolean isCheck;
 
+
+
+    private String thirdCode;
+    private String thirdSys;
+
+    private String lastUpdateTime;
+    private String zczbhhzbapzbh;
+
+
+    private String unionCode;
+    private String udiCode;
+    private String thrPiId;
+    private String unionFilterStr;//产品名称，规格，批文，生产厂家联合查询
+
+
+
+    private Integer filterType;         //0:全部，1.对照完成，2.未对照DI，3.未对照产品编码，4.未对照其他产品编码
 }

api-udims/src/main/java/com/glxp/udi/admin/req/inout/OrderFilterRequest.java

@@ -19,5 +19,7 @@ public class OrderFilterRequest extends ListPageRequest {
     private String endTime;
     private String stockCheckFk;
     private Long customerId;
+    private String lastId;
+    private String isError;
 
 }

api-udims/src/main/java/com/glxp/udi/admin/req/inout/PostOrderRequest.java

@@ -1,6 +1,6 @@
 package com.glxp.udi.admin.req.inout;
 
-import com.glxp.udi.admin.entity.inout.WarehouseEntity;
+import com.glxp.udi.admin.entity.inout.WarehousetempEntity;
 import lombok.Data;
 
 import java.util.List;
@@ -19,7 +19,7 @@ public class PostOrderRequest {
 
     public static class PostOrder {
         public List<String> erpOrders;
-        List<WarehouseEntity> codes;
+        List<WarehousetempEntity> codes;
         private String billType;
         private String orderId;
 
@@ -57,11 +57,11 @@ public class PostOrderRequest {
             this.erpOrders = erpOrders;
         }
 
-        public List<WarehouseEntity> getCodes() {
+        public List<WarehousetempEntity> getCodes() {
             return codes;
         }
 
-        public void setCodes(List<WarehouseEntity> codes) {
+        public void setCodes(List<WarehousetempEntity> codes) {
             this.codes = codes;
         }
     }

api-udims/src/main/java/com/glxp/udi/admin/req/inout/ScheduledRequest.java

@@ -0,0 +1,9 @@
+package com.glxp.udi.admin.req.inout;
+
+import lombok.Data;
+
+@Data
+public class ScheduledRequest {
+    private String cronName;
+    private String customerId;
+}

api-udims/src/main/java/com/glxp/udi/admin/req/inout/WarehouseQueryRequest.java

@@ -7,6 +7,11 @@ import lombok.Data;
 public class WarehouseQueryRequest extends ListPageRequest {
 
     private String corpOrderId;
+    private String orderId;
     private String code;
     private Long customerId;
+    private String batchNo;
+    private String udi;
+    private String lastId;
+    private Integer filterType;
 }

api-udims/src/main/java/com/glxp/udi/admin/req/receipt/BussinessTypeFilterRequest.java

@@ -6,7 +6,10 @@ import lombok.Data;
 @Data
 public class BussinessTypeFilterRequest extends ListPageRequest {
 
-    private String udiwmsType;
+
-    private String thirdType;
+    private String action;
+    private String name;
+    private String mainAction;
+    private Boolean enabled;
 
 }

api-udims/src/main/java/com/glxp/udi/admin/res/basic/BussinessTypResponse.java

@@ -0,0 +1,22 @@
+package com.glxp.udi.admin.res.basic;
+
+import lombok.Data;
+
+@Data
+public class BussinessTypResponse {
+
+    private Integer id;
+    private String action;
+    private String name;
+    private Boolean enable;
+    private String remark;
+    private String mainAction;
+    private String thirdSysFk;
+    private String thirdId;
+    private String thirdName;
+    private Boolean enabled;
+    private String localAction;
+
+
+
+}

api-udims/src/main/java/com/glxp/udi/admin/res/basic/ProductInfoResponse.java

@@ -0,0 +1,12 @@
+package com.glxp.udi.admin.res.basic;
+
+import com.glxp.udi.admin.entity.receipt.ProductInfoEntity;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ProductInfoResponse {
+    ProductInfoEntity productInfoEntity;
+    List<ProductInfoEntity> packages;
+}

api-udims/src/main/java/com/glxp/udi/admin/res/inout/BusRoleRlResponse.java

@@ -0,0 +1,21 @@
+package com.glxp.udi.admin.res.inout;
+
+import lombok.Data;
+
+@Data
+public class BusRoleRlResponse {
+
+
+    private Integer id;
+    private String action;
+    private String name;
+    private Boolean enable;
+    private String remark;
+    private String mainAction;
+    private String thirdSysFk;
+    private String localAction;
+    private Boolean check;
+    private Integer roleId;
+    private String busAction;
+    private String busActionName;
+}

api-udims/src/main/java/com/glxp/udi/admin/service/inout/BusRoleRlService.java

@@ -0,0 +1,21 @@
+package com.glxp.udi.admin.service.inout;
+
+import com.glxp.udi.admin.entity.inout.BusRoleRlEntity;
+import com.glxp.udi.admin.req.inout.BusRoleRlFilterRequest;
+import com.glxp.udi.admin.res.inout.BusRoleRlResponse;
+
+import java.util.List;
+
+public interface BusRoleRlService {
+
+
+    List<BusRoleRlEntity> filterList(BusRoleRlFilterRequest bussinessTypeFilterRequest);
+
+    List<BusRoleRlResponse> filterJoinList(BusRoleRlFilterRequest bussinessTypeFilterRequest);
+
+    boolean insertBusRoleRl(BusRoleRlEntity bussinessTypeEntity);
+
+    boolean updateBusRoleRl(BusRoleRlEntity bussinessTypeEntity);
+
+    boolean deleteById(String id);
+}

api-udims/src/main/java/com/glxp/udi/admin/service/inout/BussinessTypeService.java

@@ -1,8 +1,9 @@
 package com.glxp.udi.admin.service.inout;
 
 
-import com.glxp.udi.admin.entity.receipt.BussinessTypeEntity;
+import com.glxp.udi.admin.entity.inout.BussinessTypeEntity;
 import com.glxp.udi.admin.req.receipt.BussinessTypeFilterRequest;
+import com.glxp.udi.admin.res.basic.BussinessTypResponse;
 
 import java.util.List;
 
@@ -10,6 +11,15 @@ public interface BussinessTypeService {
 
     List<BussinessTypeEntity> filterList(BussinessTypeFilterRequest bussinessTypeFilterRequest);
 
+    List<BussinessTypResponse> filterJoinList(BussinessTypeFilterRequest bussinessTypeFilterRequest);
+
+    BussinessTypeEntity findBTByAction(String action);
+
+    BussinessTypeEntity findBTByName(String name);
+
+    BussinessTypResponse findJoinBTByAction(String action);
+
+
     boolean insertBussinessType(BussinessTypeEntity bussinessTypeEntity);
 
     boolean updateBussinessType(BussinessTypeEntity bussinessTypeEntity);

api-udims/src/main/java/com/glxp/udi/admin/service/inout/CodeNeedRlService.java

@@ -0,0 +1,18 @@
+package com.glxp.udi.admin.service.inout;
+
+import com.glxp.udi.admin.entity.inout.CodeNeedRlEntity;
+import com.glxp.udi.admin.req.inout.CodeNeedRlFilterRequest;
+
+import java.util.List;
+
+public interface CodeNeedRlService {
+
+
+    List<CodeNeedRlEntity> filterList(CodeNeedRlFilterRequest codeNeedRlFilterRequest);
+
+    boolean insertCodeNeedRl(CodeNeedRlEntity codeNeedRlEntity);
+
+    boolean updateCodeNeedRl(CodeNeedRlEntity codeNeedRlEntity);
+
+    boolean deleteById(String id);
+}

api-udims/src/main/java/com/glxp/udi/admin/service/inout/impl/BusRoleRlServiceImpl.java

@@ -0,0 +1,63 @@
+package com.glxp.udi.admin.service.inout.impl;
+
+import com.github.pagehelper.PageHelper;
+import com.glxp.udi.admin.dao.inout.BusRoleRlDao;
+import com.glxp.udi.admin.entity.inout.BusRoleRlEntity;
+import com.glxp.udi.admin.req.inout.BusRoleRlFilterRequest;
+import com.glxp.udi.admin.res.inout.BusRoleRlResponse;
+import com.glxp.udi.admin.service.inout.BusRoleRlService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Collections;
+import java.util.List;
+
+@Service
+public class BusRoleRlServiceImpl implements BusRoleRlService {
+
+
+    @Resource
+    BusRoleRlDao busRoleRlDao;
+
+    @Override
+
+    public List<BusRoleRlEntity> filterList(BusRoleRlFilterRequest bussinessTypeFilterRequest) {
+        if (bussinessTypeFilterRequest == null) {
+            return Collections.emptyList();
+        }
+        if (bussinessTypeFilterRequest.getPage() != null) {
+            int offset = (bussinessTypeFilterRequest.getPage() - 1) * bussinessTypeFilterRequest.getLimit();
+            PageHelper.offsetPage(offset, bussinessTypeFilterRequest.getLimit());
+        }
+        List<BusRoleRlEntity> data = busRoleRlDao.filterList(bussinessTypeFilterRequest);
+        return data;
+    }
+
+    @Override
+    public List<BusRoleRlResponse> filterJoinList(BusRoleRlFilterRequest bussinessTypeFilterRequest) {
+        if (bussinessTypeFilterRequest == null) {
+            return Collections.emptyList();
+        }
+        if (bussinessTypeFilterRequest.getPage() != null) {
+            int offset = (bussinessTypeFilterRequest.getPage() - 1) * bussinessTypeFilterRequest.getLimit();
+            PageHelper.offsetPage(offset, bussinessTypeFilterRequest.getLimit());
+        }
+        List<BusRoleRlResponse> data = busRoleRlDao.filterJoinList(bussinessTypeFilterRequest);
+        return data;
+    }
+
+    @Override
+    public boolean insertBusRoleRl(BusRoleRlEntity bussinessTypeEntity) {
+        return busRoleRlDao.insertBusRoleRl(bussinessTypeEntity);
+    }
+
+    @Override
+    public boolean updateBusRoleRl(BusRoleRlEntity bussinessTypeEntity) {
+        return busRoleRlDao.updateBusRoleRl(bussinessTypeEntity);
+    }
+
+    @Override
+    public boolean deleteById(String id) {
+        return busRoleRlDao.deleteById(id);
+    }
+}

api-udims/src/main/java/com/glxp/udi/admin/service/inout/impl/BussinessTypeServiceImpl.java

@@ -0,0 +1,96 @@
+package com.glxp.udi.admin.service.inout.impl;
+
+import com.github.pagehelper.PageHelper;
+import com.glxp.udi.admin.dao.inout.BussinessTypeDao;
+import com.glxp.udi.admin.entity.inout.BussinessTypeEntity;
+import com.glxp.udi.admin.req.receipt.BussinessTypeFilterRequest;
+import com.glxp.udi.admin.res.basic.BussinessTypResponse;
+import com.glxp.udi.admin.service.inout.BussinessTypeService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Collections;
+import java.util.List;
+
+@Service
+public class BussinessTypeServiceImpl implements BussinessTypeService {
+
+    @Resource
+    BussinessTypeDao bussinessTypeDao;
+
+    @Override
+    public List<BussinessTypeEntity> filterList(BussinessTypeFilterRequest bussinessTypeFilterRequest) {
+        if (bussinessTypeFilterRequest == null) {
+            return Collections.emptyList();
+        }
+        if (bussinessTypeFilterRequest.getPage() != null) {
+            int offset = (bussinessTypeFilterRequest.getPage() - 1) * bussinessTypeFilterRequest.getLimit();
+            PageHelper.offsetPage(offset, bussinessTypeFilterRequest.getLimit());
+        }
+        List<BussinessTypeEntity> data = bussinessTypeDao.filterList(bussinessTypeFilterRequest);
+        return data;
+    }
+
+    @Override
+    public List<BussinessTypResponse> filterJoinList(BussinessTypeFilterRequest bussinessTypeFilterRequest) {
+        if (bussinessTypeFilterRequest == null) {
+            return Collections.emptyList();
+        }
+        if (bussinessTypeFilterRequest.getPage() != null) {
+            int offset = (bussinessTypeFilterRequest.getPage() - 1) * bussinessTypeFilterRequest.getLimit();
+            PageHelper.offsetPage(offset, bussinessTypeFilterRequest.getLimit());
+        }
+        List<BussinessTypResponse> data = bussinessTypeDao.filterJoinList(bussinessTypeFilterRequest);
+        return data;
+    }
+
+    @Override
+    public BussinessTypeEntity findBTByAction(String action) {
+        BussinessTypeFilterRequest bussinessTypeFilterRequest = new BussinessTypeFilterRequest();
+        bussinessTypeFilterRequest.setAction(action);
+        List<BussinessTypeEntity> data = bussinessTypeDao.filterList(bussinessTypeFilterRequest);
+        if (data != null && data.size() > 0) {
+            return data.get(0);
+        }
+        return null;
+    }
+
+    @Override
+    public BussinessTypeEntity findBTByName(String action) {
+        BussinessTypeFilterRequest bussinessTypeFilterRequest = new BussinessTypeFilterRequest();
+        bussinessTypeFilterRequest.setName(action);
+        List<BussinessTypeEntity> data = bussinessTypeDao.filterList(bussinessTypeFilterRequest);
+        if (data != null && data.size() > 0) {
+            return data.get(0);
+        }
+        return null;
+    }
+
+    @Override
+    public BussinessTypResponse findJoinBTByAction(String action) {
+        BussinessTypeFilterRequest bussinessTypeFilterRequest = new BussinessTypeFilterRequest();
+        bussinessTypeFilterRequest.setAction(action);
+        bussinessTypeFilterRequest.setEnabled(true);
+        List<BussinessTypResponse> data = bussinessTypeDao.filterJoinList(bussinessTypeFilterRequest);
+        if (data != null && data.size() > 0) {
+            return data.get(0);
+        }
+        return null;
+    }
+
+
+    @Override
+    public boolean insertBussinessType(BussinessTypeEntity bussinessTypeEntity) {
+        return bussinessTypeDao.insertBussinessType(bussinessTypeEntity);
+    }
+
+    @Override
+    public boolean updateBussinessType(BussinessTypeEntity bussinessTypeEntity) {
+        return bussinessTypeDao.updateBussinessType(bussinessTypeEntity);
+    }
+
+    @Override
+    public boolean deleteById(String id) {
+        return bussinessTypeDao.deleteById(id);
+    }
+}

api-udims/src/main/java/com/glxp/udi/admin/service/inout/impl/CodeNeedRlServiceImpl.java

@@ -0,0 +1,45 @@
+package com.glxp.udi.admin.service.inout.impl;
+
+import com.github.pagehelper.PageHelper;
+import com.glxp.udi.admin.dao.inout.CodeNeedRlDao;
+import com.glxp.udi.admin.entity.inout.CodeNeedRlEntity;
+import com.glxp.udi.admin.req.inout.CodeNeedRlFilterRequest;
+import com.glxp.udi.admin.service.inout.CodeNeedRlService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Collections;
+import java.util.List;
+
+@Service
+public class CodeNeedRlServiceImpl implements CodeNeedRlService {
+
+    @Resource
+    CodeNeedRlDao codeNeedRlDao;
+
+    @Override
+    public List<CodeNeedRlEntity> filterList(CodeNeedRlFilterRequest codeNeedRlFilterRequest) {
+        if (codeNeedRlFilterRequest == null) {
+            return Collections.emptyList();
+        }
+        int offset = (codeNeedRlFilterRequest.getPage() - 1) * codeNeedRlFilterRequest.getLimit();
+        PageHelper.offsetPage(offset, codeNeedRlFilterRequest.getLimit());
+        List<CodeNeedRlEntity> data = codeNeedRlDao.filterList(codeNeedRlFilterRequest);
+        return data;
+    }
+
+    @Override
+    public boolean insertCodeNeedRl(CodeNeedRlEntity codeNeedRlEntity) {
+        return codeNeedRlDao.insertCodeNeedRl(codeNeedRlEntity);
+    }
+
+    @Override
+    public boolean updateCodeNeedRl(CodeNeedRlEntity codeNeedRlEntity) {
+        return codeNeedRlDao.updateCodeNeedRl(codeNeedRlEntity);
+    }
+
+    @Override
+    public boolean deleteById(String id) {
+        return codeNeedRlDao.deleteById(id);
+    }
+}

api-udims/src/main/java/com/glxp/udi/admin/service/inout/impl/UdiInfoServiceImpl.java

@@ -23,8 +23,10 @@ public class UdiInfoServiceImpl implements UdiInfoService {
         if (filterUdiInfoRequest == null) {
             return Collections.emptyList();
         }
+        if(filterUdiInfoRequest.getPage()!=null){
             int offset = (filterUdiInfoRequest.getPage() - 1) * filterUdiInfoRequest.getLimit();
             PageHelper.offsetPage(offset, filterUdiInfoRequest.getLimit());
+        }
         List<UdiInfoEntity> data = udiInfoDao.filterUdiInfo(filterUdiInfoRequest);
         return data;
     }

api-udims/src/main/java/com/glxp/udi/admin/thread/BasicUpdateProductService.java

@@ -0,0 +1,96 @@
+package com.glxp.udi.admin.thread;
+
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
+import com.glxp.udi.admin.entity.inout.UdiInfoEntity;
+import com.glxp.udi.admin.entity.udid.UdiEntity;
+import com.glxp.udi.admin.req.inout.FilterUdiInfoRequest;
+import com.glxp.udi.admin.res.PageSimpleResponse;
+import com.glxp.udi.admin.service.inout.UdiInfoService;
+import com.glxp.udi.admin.util.FilterUdiUtils;
+import com.glxp.udi.admin.util.HttpClient;
+import com.glxp.udi.common.res.BaseResponse;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class BasicUpdateProductService {
+
+    @Value("${UDI_SERVER_URL}")
+    private String udiUrl;
+    @Resource
+    UdiInfoService udiInfoService;
+
+
+    @Async
+    public void relAllUdi(FilterUdiInfoRequest productInfoFilterRequest) {
+        int page = 1;
+        int limit = 100;
+        while (true) {
+            productInfoFilterRequest.setPage(page);
+            productInfoFilterRequest.setLimit(limit);
+            List<UdiInfoEntity> udiInfoEntities = getUdiInfoEntity(productInfoFilterRequest);
+            if (udiInfoEntities != null && udiInfoEntities.size() > 0) {
+                for(UdiInfoEntity udiInfoEntity:udiInfoEntities){
+                    udiInfoEntity.setCustomerId(productInfoFilterRequest.getCustomerId());
+                }
+                udiInfoService.insertUdiInfos(udiInfoEntities);
+                if (udiInfoEntities.size() < limit) {
+                    break;
+                } else {
+                    page++;
+                }
+            } else {
+                break;
+            }
+
+        }
+
+
+    }
+
+
+    public List<UdiInfoEntity> getUdiInfoEntity(FilterUdiInfoRequest productInfoFilterRequest) {
+        String nameCode = null;
+        if (productInfoFilterRequest.getNameCode() != null) {
+            UdiEntity udiEntity = FilterUdiUtils.getUdi(productInfoFilterRequest.getNameCode());
+            if (udiEntity != null) {
+                nameCode = udiEntity.getUdi();
+            } else {
+                nameCode = productInfoFilterRequest.getNameCode();
+            }
+        }
+        Map<String, Object> paramMap = new HashMap<>(16);
+        paramMap.put("page", productInfoFilterRequest.getPage());
+        paramMap.put("limit", productInfoFilterRequest.getLimit());
+        paramMap.put("ylqxzcrbarmc", productInfoFilterRequest.getYlqxzcrbarmc());
+        paramMap.put("cpmctymc", productInfoFilterRequest.getCpmctymc());
+        paramMap.put("nameCode", nameCode);
+        paramMap.put("ggxh", productInfoFilterRequest.getGgxh());
+        paramMap.put("zczbhhzbapzbh", productInfoFilterRequest.getZczbhhzbapzbh());
+        paramMap.put("uuid", productInfoFilterRequest.getUuid());
+
+        String response = HttpClient.mipsGet(udiUrl + "/udidl/device/filterUdi", paramMap);
+        try {
+
+            BaseResponse<PageSimpleResponse<UdiInfoEntity>> udiDlDeviceResponse =
+                    JSONObject.parseObject(response, new TypeReference<BaseResponse<PageSimpleResponse<UdiInfoEntity>>>() {
+
+                    });
+            if (udiDlDeviceResponse != null) {
+                List<UdiInfoEntity> udiInfoEntities = udiDlDeviceResponse.getData().getList();
+                return udiInfoEntities;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+        return null;
+    }
+}

api-udims/src/main/java/com/glxp/udi/admin/thread/InvProductsTrService.java

@@ -0,0 +1,108 @@
+package com.glxp.udi.admin.thread;
+
+import com.glxp.udi.admin.constant.TypeConstant;
+import com.glxp.udi.admin.entity.inout.*;
+import com.glxp.udi.admin.mongo.service.*;
+import com.glxp.udi.admin.req.inout.FilterErpOrderRequest;
+import com.glxp.udi.admin.req.inout.OrderFilterRequest;
+import com.glxp.udi.admin.req.inout.WarehouseQueryRequest;
+import com.glxp.udi.admin.service.inout.UdiInfoService;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.*;
+
+@Service
+public class InvProductsTrService {
+
+
+    @Resource
+    private OrderMdService orderService;
+    @Resource
+    private OrderDetailMdService myErpOrderService;
+    @Resource
+    private WarehouseMdService codesService;
+    @Resource
+    private UdiInfoService udiInfoService;
+
+    @Resource
+    private InvProductMdService invProductService;
+    @Resource
+    private InvProductDetailMdService invProductDetailService;
+
+
+    @Async
+    public void genInvProducts(String orderId) {
+        OrderFilterRequest orderFilterRequest = new OrderFilterRequest();
+        orderFilterRequest.setId(orderId);
+        List<OrderMdEntity> orderMdEntities = orderService.findAll(orderFilterRequest);
+        OrderMdEntity orderEntity = orderMdEntities.get(0);
+        if (orderEntity.getStatus().equals("success")) {
+            FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest();
+            filterErpOrderRequest.setOrderId(orderId);
+            List<ErpOrderEntity> erpOrderEntities = myErpOrderService.filterOrderDetails(filterErpOrderRequest);
+            if (erpOrderEntities != null && erpOrderEntities.size() > 0) {
+                for (ErpOrderEntity erpOrderEntity : erpOrderEntities) {
+
+                    String nameCode = erpOrderEntity.getNameCode();
+                    UdiInfoEntity udiInfoEntity = udiInfoService.findByNameCode(nameCode);
+                    InvProductEntity invProductEntity = invProductService.selectByUuid(udiInfoEntity.getUuid(), erpOrderEntity.getLotno());
+                    if (invProductEntity == null) {
+                        invProductEntity = new InvProductEntity();
+                        invProductEntity.setRelIdFk(udiInfoEntity.getUuid());
+                        invProductEntity.setBatchNo(erpOrderEntity.getLotno());
+                        invProductEntity.setCustomerId(orderEntity.getCustomerId() + "");
+                        invProductEntity.setExpireDate(erpOrderEntity.getExpireDate());
+                        invProductEntity.setProductionDate(erpOrderEntity.getProduceDate());
+                        invProductEntity.setGgxh(erpOrderEntity.getPackSpec());
+                        invProductEntity.setNameCode(erpOrderEntity.getNameCode());
+                        invProductEntity.setProductsName(erpOrderEntity.getCoName());
+                        invProductEntity.setYlqxzcrbarmc(erpOrderEntity.getProductCompany());
+                        invProductEntity.setZczbhhzbapzbh(erpOrderEntity.getAuthCode());
+                        if (orderEntity.getMainAction().equals(TypeConstant.TYPE_OUT)) {
+                            invProductEntity.setOutCount(erpOrderEntity.getCount());
+                        } else if (orderEntity.getMainAction().equals(TypeConstant.TYPE_PUT)) {
+                            invProductEntity.setInCount(erpOrderEntity.getCount());
+                        }
+                        invProductService.insertInvProduct(invProductEntity);
+                        invProductEntity = invProductService.selectByUuid(invProductEntity.getRelIdFk(), invProductEntity.getBatchNo());
+                    } else {
+                        if (orderEntity.getMainAction().equals(TypeConstant.TYPE_OUT)) {
+                            invProductEntity.setOutCount(invProductEntity.getOutCount() + erpOrderEntity.getCount());
+                        } else if (orderEntity.getMainAction().equals(TypeConstant.TYPE_PUT)) {
+                            invProductEntity.setInCount(invProductEntity.getInCount() + erpOrderEntity.getCount());
+                        }
+                        invProductService.updateInvProduct(invProductEntity);
+                    }
+                    WarehouseQueryRequest warehouseQueryRequest = new WarehouseQueryRequest();
+                    warehouseQueryRequest.setOrderId(orderId);
+                    List<WarehouseEntity> warehouseEntities = codesService.filterWarehouse(warehouseQueryRequest);
+                    if (warehouseEntities != null && warehouseEntities.size() > 0) {
+
+                        for (WarehouseEntity warehouseEntity : warehouseEntities) {
+                            UdiInfoEntity tempUdi = udiInfoService.findByNameCode(warehouseEntity.getUdi());
+                            if (tempUdi.getUuid().equals(erpOrderEntity.getUuidFk())) {
+                                if ((warehouseEntity.getBatchNo() == null && erpOrderEntity.getLotno() == null) ||
+                                        warehouseEntity.getBatchNo().equals(erpOrderEntity.getLotno())) {
+                                    InvProductDetailEntity invProductDetailEntity = new InvProductDetailEntity();
+                                    invProductDetailEntity.setProductIdFk(invProductEntity.getId() + "");
+                                    invProductDetailEntity.setCode(warehouseEntity.getCode());
+                                    invProductDetailEntity.setOrderIdFk(warehouseEntity.getOrderId());
+                                    invProductDetailEntity.setCount(warehouseEntity.getCount());
+                                    invProductDetailEntity.setAction(warehouseEntity.getAction());
+                                    invProductDetailEntity.setMainAction(warehouseEntity.getMainAction());
+                                    invProductDetailEntity.setUpdateTime(new Date());
+                                    invProductDetailEntity.setCustomerId(orderEntity.getCustomerId() + "");
+                                    invProductDetailService.insertInvProduct(invProductDetailEntity);
+                                }
+                            }
+                        }
+
+                    }
+                }
+            }
+        }
+
+    }
+}

api-udims/src/main/java/com/glxp/udi/admin/thread/TransInoutService.java

@@ -1,51 +1,44 @@
 package com.glxp.udi.admin.thread;
 
+import com.glxp.udi.admin.constant.Constant;
 import com.glxp.udi.admin.controller.inout.InoutUtils;
-import com.glxp.udi.admin.entity.inout.ErpOrderEntity;
+import com.glxp.udi.admin.entity.inout.*;
-import com.glxp.udi.admin.entity.inout.OrderEntity;
+import com.glxp.udi.admin.entity.udid.UdiEntity;
-import com.glxp.udi.admin.entity.inout.WarehouseEntity;
+import com.glxp.udi.admin.mongo.service.OrderDetailMdService;
-import com.glxp.udi.admin.entity.inout.Warehousetemp;
+import com.glxp.udi.admin.mongo.service.OrderMdService;
+import com.glxp.udi.admin.mongo.service.WarehouseMdService;
+import com.glxp.udi.admin.mongo.service.WarehouseTempMdService;
 import com.glxp.udi.admin.req.inout.CommitRequest;
-import com.glxp.udi.admin.req.inout.FilterErpOrderRequest;
+import com.glxp.udi.admin.req.inout.DeleteRequest;
-import com.glxp.udi.admin.req.inout.OrderFilterRequest;
 import com.glxp.udi.admin.req.inout.PostOrderRequest;
+import com.glxp.udi.admin.req.inout.WarehouseQueryRequest;
 import com.glxp.udi.admin.service.info.SetupService;
-import com.glxp.udi.admin.service.inout.*;
+import com.glxp.udi.admin.service.inout.CodeNeedRlService;
-import com.glxp.udi.admin.service.receipts.MipsBarcodeService;
+import com.glxp.udi.admin.service.inout.UdiInfoService;
-import com.glxp.udi.admin.service.receipts.ProductInfoService;
+import com.glxp.udi.admin.service.inout.UdiRelevanceService;
-import com.glxp.udi.admin.service.receipts.ProductService;
+import com.glxp.udi.admin.util.DateUtil;
-import com.glxp.udi.admin.util.WarehousBeanUtils;
+import com.glxp.udi.admin.util.FilterUdiUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.Date;
 import java.util.List;
-import java.util.Map;
+import java.util.stream.Collectors;
 
 @Service
 public class TransInoutService {
 
     private static final Logger logger = LoggerFactory.getLogger(TransInoutService.class);
-    @Resource
+
-    private WarehouseService warehouseService;
-    @Resource
-    private OrderService orderService;
-    @Resource
-    private MipsBarcodeService mipsBarcodeService;
-    @Resource
-    private ProductInfoService productInfoService;
-    @Resource
-    private MyErpOrderService myErpOrderService;
     @Resource
     UdiRelevanceService udiRelevanceService;
     @Resource
-    ProductService productService;
-    @Resource
     SetupService setupService;
     @Resource
     private UdiInfoService udiInfoService;
@@ -54,6 +47,22 @@ public class TransInoutService {
     @Value("${UDI_SERVER_URL}")
     private String udiUrl;
 
+
+    @Resource
+    private OrderMdService orderService;
+    @Resource
+    private WarehouseTempMdService warehouseTempMdService;
+    @Resource
+    private WarehouseMdService warehouseMdService;
+    @Resource
+    private OrderDetailMdService orderDetailMdService;
+    @Resource
+    private CodeNeedRlService codeNeedRlService;
+    @Resource
+    private InoutUtils inoutUtilService;
+    @Resource
+    private InvProductsTrService invProductsTrService;
+
     @Async
     public void transInout(PostOrderRequest postOrderRequest, long customerId) {
 
@@ -61,181 +70,134 @@ public class TransInoutService {
         if (postOrders != null && postOrders.size() > 0) {
             for (int i = 0; i < postOrders.size(); i++) {
                 PostOrderRequest.PostOrder postOrder = postOrders.get(i);
-                List<WarehouseEntity> warehouseEntityList = postOrder.getCodes();
+                List<WarehousetempEntity> warehousetempList = postOrder.getCodes();
-                List<Warehousetemp> warehousetempList = new WarehousBeanUtils().entityToTemp(warehouseEntityList, customerId);
                 if (warehousetempList != null && warehousetempList.size() > 0) {
-                    Warehousetemp warehouseEntity = warehousetempList.get(0);
+                    WarehousetempEntity warehousetempEntity = warehousetempList.get(0);
                     String orderId = System.currentTimeMillis() + i + "";
-                    OrderEntity orderSaveRequest = new OrderEntity();
+                    OrderMdEntity orderSaveRequest = new OrderMdEntity();
-                    orderSaveRequest.setId(orderId);
+                    orderSaveRequest.setOrderId(orderId);
-                    if (warehouseEntity.getActdate() != null) {
+                    Date actDate = DateUtil.parseDate(warehousetempEntity.getActDate());
-                        orderSaveRequest.setActDate(warehouseEntity.getActdate());
+                    orderSaveRequest.setActDate(DateUtil.dateToISODate(actDate));
-                    }
                     orderSaveRequest.setCustomerId(customerId);
-                    orderSaveRequest.setAction(warehouseEntity.getAction());
+                    orderSaveRequest.setAction(warehousetempEntity.getAction());
-                    orderSaveRequest.setActor(warehouseEntity.getActor());
+                    orderSaveRequest.setActor(warehousetempEntity.getActor());
-                    orderSaveRequest.setCorpOrderId(warehouseEntity.getCorporderid());
+                    orderSaveRequest.setCorpOrderId(warehousetempEntity.getCorpOrderId());
-                    orderSaveRequest.setFromCorpId(warehouseEntity.getFromcorpid());
+                    orderSaveRequest.setFromCorpId(warehousetempEntity.getFromCorpId());
-                    orderSaveRequest.setMainAction(warehouseEntity.getMainaction());
+                    orderSaveRequest.setMainAction(warehousetempEntity.getMainAction());
-                    orderSaveRequest.setFromCorp(warehouseEntity.getFromcorp());
+                    orderSaveRequest.setFromCorp(warehousetempEntity.getFromCorp());
                     orderSaveRequest.setFromType("手持终端");
-                    orderSaveRequest.setStatus("process");
+                    orderSaveRequest.setStatus(Constant.ORDER_STATUS_PROCESS);
                     orderSaveRequest.setExportStatus("未上传");
-                    orderSaveRequest.setStockCheckFk(postOrder.getStockIdFk());
-                    orderSaveRequest.setSignStatus("0");
-                    List<String> docidsList = postOrder.getErpOrders();
-                    String docidStr = "";
-                    if (docidsList != null) {
-                        for (String key : docidsList) {
-                            docidStr = docidStr + "," + key;
-                        }
-                        if (docidStr.length() > 1) {
-                            docidStr = docidStr.substring(1);
-                            orderSaveRequest.setErpFk(docidStr);
-                        }
-                    }
-
                     orderService.insertOrder(orderSaveRequest);
                     for (int index = 0; index < warehousetempList.size(); index++) {
-                        warehousetempList.get(index).setOrderid(orderId);
+                        warehousetempList.get(index).setOrderId(orderId);
+                        warehousetempList.get(index).setCustomerId(customerId);
                     }
-                    warehouseService.insertTempWarehouses(warehousetempList);
+                    warehouseTempMdService.insertTempWarehouses(warehousetempList);
-                    List<Warehousetemp> filterList = warehousetempList;
+                    List<WarehousetempEntity> filterList = warehousetempList;
-                    List<Warehousetemp> insertList = new ArrayList<>();
+
-                    String result;
+                    //更新状态，正在处理
-                    orderService.updateRemark(filterList.get(0).getOrderid(), "正在处理");
+                    OrderMdEntity tempEntity = new OrderMdEntity();
-                    for (int j = 0; j < filterList.size(); j++) {
+                    tempEntity.setOrderId(filterList.get(0).getOrderId());
-                        Warehousetemp warehousetemp = filterList.get(j);
+                    tempEntity.setRemark("正在处理");
-                        result = new InoutUtils().filterCode(warehouseService, warehousetemp, setupService);
+                    orderService.updateOrder(tempEntity);
-                        if (result == null) {
-                            insertList.add(warehousetemp);
-                        } else {
-                            orderService.updateOrderStatus(warehousetemp.getOrderid(), "error");
-                            orderService.updateRemark(warehousetemp.getOrderid(), result);
-                            insertList.clear();
-                            break;
-                        }
-                    }
-                    postOrders.get(i).setOrderId(orderId);
 
-                    if (insertList.size() > 0) {
-                        orderId = insertList.get(0).getOrderid();
-                        warehouseService.insertWarehouses(new WarehousBeanUtils().tempsToEntitys(insertList));
-                        Warehousetemp warehousetemp = insertList.get(0);
-                        CommitRequest commitRequest = new CommitRequest();
-                        commitRequest.setOrderId(warehousetemp.getOrderid());
-                        List<Warehousetemp> warehousetemps = warehouseService.findTempByOrderId(commitRequest);
-                        orderService.updateOrderStatus(orderId, "success");
-                        List<Long> ids = new ArrayList<>();
-                        for (Warehousetemp w : warehousetemps) {
-                            ids.add(w.getId());
-                        }
-                        warehouseService.deleteTempWarehouses(ids);
-                        insertList.clear();
-                    }
                 }
             }
 
-            //生成对照表
-            for (int i = 0; i < postOrders.size(); i++) {
-                PostOrderRequest.PostOrder postOrder = postOrders.get(i);
-                List<WarehouseEntity> transData = warehouseService.findByReceiptId(postOrder.getOrderId());
-                new InoutUtils(udiUrl).generateConstrastDetail(udiInfoService, udiRelevanceService, myErpOrderService, transData);
-
-            }
         }
     }
 
 
     @Async
     public void repeatCommit(CommitRequest commitRequest) {
-        List<Warehousetemp> warehousetempList = warehouseService.findTempByOrderId(commitRequest);
+        String orderId = commitRequest.getOrderId();
+        List<WarehousetempEntity> warehousetempList = warehouseTempMdService.findTempByOrderId(commitRequest.getOrderId());
         if (warehousetempList != null && warehousetempList.size() > 0) {
             String result;
-
+            List<WarehousetempEntity> insertList = new ArrayList<>();
-            List<Warehousetemp> insertList = new ArrayList<>();
             for (int j = 0; j < warehousetempList.size(); j++) {
-                Warehousetemp warehousetemp = warehousetempList.get(j);
+                WarehousetempEntity warehousetemp = warehousetempList.get(j);
-                result = new InoutUtils().filterCode(warehouseService, warehousetemp, setupService);
+                result = new InoutUtils().filterCode(warehouseMdService, warehousetemp, setupService);
+
                 if (result == null) {
+                    result = inoutUtilService.vailIsUseDy(warehousetemp);
+                    if (result == null)
                         insertList.add(warehousetemp);
-                } else {
+                    else {
-                    orderService.updateRemark(warehousetemp.getOrderid(), result);
+                        OrderMdEntity tempEntity = new OrderMdEntity();
+                        tempEntity.setOrderId(orderId);
+                        tempEntity.setRemark(result);
+                        orderService.updateOrder(tempEntity);
                         insertList.clear();
                         return;
                     }
-            }
-            if (insertList.size() > 0) {
-                warehouseService.insertWarehouses(new WarehousBeanUtils().tempsToEntitys(insertList));
-                orderService.updateOrderStatus(insertList.get(0).getOrderid(), "success");
-                List<Long> ids = new ArrayList<>();
-                for (Warehousetemp warehousetemp : insertList) {
-                    ids.add(warehousetemp.getId());
-                }
-                warehouseService.deleteTempWarehouses(ids);
-                String orderId = insertList.get(0).getOrderid();
-                String type = insertList.get(0).getAction();
-
-                OrderFilterRequest orderFilterRequest = new OrderFilterRequest();
-                orderFilterRequest.setId(orderId);
-                OrderEntity orderEntity = orderService.findOne(orderFilterRequest);
-                String docidStr = orderEntity.getErpFk();
-                String[] docidArray;
-                List<String> docids = new ArrayList<>();
-                if (docidStr != null && docidStr.length() > 0) {
-                    docidArray = docidStr.split(",");
-                    for (int i = 0; i < docidArray.length; i++) {
-                        docids.add(docidArray[i]);
-                    }
-                }
-                if (docids == null || docids.size() == 0) {
-                    FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest();
-                    filterErpOrderRequest.setOrderId(orderId);
-                    docids = myErpOrderService.filterAllDocid(filterErpOrderRequest);
-                    docids = getDocids(docids);
-                }
-                List<WarehouseEntity> datas = warehouseService.findByReceiptId(orderId);
-                new InoutUtils(udiUrl).generateConstrastDetail(udiInfoService, udiRelevanceService, myErpOrderService, datas);
-            }
                 } else {
+                    OrderMdEntity tempEntity = new OrderMdEntity();
+                    tempEntity.setOrderId(orderId);
+                    tempEntity.setRemark(result);
+                    orderService.updateOrder(tempEntity);
+                    insertList.clear();
                     return;
                 }
             }
+            if (insertList.size() > 0) {
+                List<WarehouseEntity> warehouseEntities = insertList.stream().map(e -> {
+                    WarehouseEntity warehouseEntity = new WarehouseEntity();
+                    BeanUtils.copyProperties(e, warehouseEntity);
+                    filterNeedRlCode(warehouseEntity);
+                    return warehouseEntity;
+                }).collect(Collectors.toList());
+                warehouseMdService.insertWarehouses(warehouseEntities);
+
 
+                //更新状态，成功
+                OrderMdEntity tempEntity2 = new OrderMdEntity();
+                tempEntity2.setOrderId(orderId);
+                tempEntity2.setStatus("success");
+                orderService.updateOrder(tempEntity2);
 
-    public void updateErpOrderId(List<ErpOrderEntity> erpOrderEntities, String oldId, String newId) {
+
-        if (erpOrderEntities != null) {
+                //删除零时表数据
-            List<ErpOrderEntity> inserts = new ArrayList<>();
+                DeleteRequest deleteRequest = new DeleteRequest();
-            for (ErpOrderEntity erpOrderEntity : erpOrderEntities) {
+                deleteRequest.setOrderId(orderId);
-                if (erpOrderEntity.getOrderIdFk() == null || erpOrderEntity.getOrderIdFk().equals(oldId)) {
+                warehouseTempMdService.deleteCode(deleteRequest);
-                    erpOrderEntity.setOrderIdFk(newId);
+
-                    inserts.add(erpOrderEntity);
+                WarehouseQueryRequest warehouseQueryRequest = new WarehouseQueryRequest();
+                warehouseQueryRequest.setOrderId(orderId);
+                List<WarehouseEntity> transData = warehouseMdService.filterWarehouse(warehouseQueryRequest);
+                new InoutUtils(udiUrl).generateConstrastDetail(udiInfoService, udiRelevanceService, orderDetailMdService, transData);
+                invProductsTrService.genInvProducts(orderId);
             }
+        } else {
+            return;
         }
-            myErpOrderService.insertErpOrders(inserts);
     }
 
-    }
 
-    public List<String> getDocids(List<String> ids) {
+    @Async
-        Map<String, String> filter = new HashMap<>();
+    public void filterNeedRlCode(WarehouseEntity warehouseEntity) {
-        List<String> docids = new ArrayList<>();
+        UdiEntity udiEntity = FilterUdiUtils.getUdi(warehouseEntity.getCode());
-        for (String id : ids) {
+        if (udiEntity != null) {
-            if (id.contains(",")) {
+            String udi = udiEntity.getUdi();
-                String[] dociArray = id.split(",");
+            UdiInfoEntity udiInfoEntity = udiInfoService.findByNameCode(udi);
-                if (dociArray != null && dociArray.length > 0) {
+            if (udiInfoEntity != null && (udiInfoEntity.getDiType() == 4
-                    for (int i = 0; i < dociArray.length; i++) {
+                    || (udiInfoEntity.getDiType() == 1 && udiInfoEntity.getIsUseDy() == 1))) {
-                        filter.put(dociArray[i], dociArray[i]);
+                CodeNeedRlEntity codeNeedRlEntity = new CodeNeedRlEntity();
-                    }
+                codeNeedRlEntity.setCode(warehouseEntity.getCode());
-                }
+                codeNeedRlEntity.setOrderIdFk(warehouseEntity.getOrderId());
+                BeanUtils.copyProperties(udiInfoEntity, codeNeedRlEntity);
+                BeanUtils.copyProperties(udiEntity, codeNeedRlEntity);
+                codeNeedRlEntity.setCount(warehouseEntity.getCount());
+                codeNeedRlEntity.setCode(warehouseEntity.getCode());
+                codeNeedRlEntity.setCustomerId(warehouseEntity.getCustomerId());
+                codeNeedRlService.insertCodeNeedRl(codeNeedRlEntity);
             } else {
-                filter.put(id, id);
+                logger.error(udi + "产品信息未维护！");
             }
+
         }
-        for (String docid : filter.keySet()) {
-            docids.add(docid);
     }
-        return docids;
 
-    }
+
 }

api-udims/src/main/java/com/glxp/udi/admin/thread/TransInoutTask.java

@@ -0,0 +1,152 @@
+package com.glxp.udi.admin.thread;
+
+import com.glxp.udi.admin.controller.inout.InoutUtils;
+import com.glxp.udi.admin.dao.inout.ScheduledDao;
+import com.glxp.udi.admin.entity.inout.OrderMdEntity;
+import com.glxp.udi.admin.entity.inout.ScheduledEntity;
+import com.glxp.udi.admin.entity.inout.WarehouseEntity;
+import com.glxp.udi.admin.entity.inout.WarehousetempEntity;
+import com.glxp.udi.admin.mongo.service.OrderDetailMdService;
+import com.glxp.udi.admin.mongo.service.OrderMdService;
+import com.glxp.udi.admin.mongo.service.WarehouseMdService;
+import com.glxp.udi.admin.mongo.service.WarehouseTempMdService;
+import com.glxp.udi.admin.req.inout.*;
+import com.glxp.udi.admin.service.info.SetupService;
+import com.glxp.udi.admin.service.inout.UdiInfoService;
+import com.glxp.udi.admin.service.inout.UdiRelevanceService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.SchedulingConfigurer;
+import org.springframework.scheduling.config.ScheduledTaskRegistrar;
+import org.springframework.scheduling.support.CronTrigger;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Component
+@EnableScheduling
+public class TransInoutTask implements SchedulingConfigurer {
+
+    final Logger logger = LoggerFactory.getLogger(TransInoutTask.class);
+
+    @Resource
+    UdiRelevanceService udiRelevanceService;
+    @Resource
+    SetupService setupService;
+    @Resource
+    private UdiInfoService udiInfoService;
+    @Value("${UCLOD_SERVER_URL}")
+    private String ucloudUrl;
+    @Value("${UDI_SERVER_URL}")
+    private String udiUrl;
+
+
+    @Resource
+    private OrderMdService orderService;
+    @Resource
+    private WarehouseTempMdService warehouseTempMdService;
+    @Resource
+    private WarehouseMdService warehouseMdService;
+    @Resource
+    private OrderDetailMdService orderDetailMdService;
+    @Resource
+    protected ScheduledDao scheduledDao;
+    @Resource
+    TransInoutService transInoutService;
+    @Resource
+    private InoutUtils inoutUtilService;
+    @Resource
+    private InvProductsTrService invProductsTrService;
+
+    @Override
+    public void configureTasks(ScheduledTaskRegistrar scheduledTaskRegistrar) {
+        scheduledTaskRegistrar.addTriggerTask(() -> process(),
+                triggerContext -> {
+                    ScheduledRequest scheduledRequest = new ScheduledRequest();
+                    scheduledRequest.setCronName("transInout");
+                    ScheduledEntity scheduledEntity = scheduledDao.findScheduled(scheduledRequest);
+                    String cron = scheduledEntity.getCron();
+                    if (cron.isEmpty()) {
+                        logger.error("cron is null");
+                    }
+                    return new CronTrigger(cron).nextExecutionTime(triggerContext);
+                });
+    }
+
+
+    private void process() {
+        logger.info("定时任务：零时表转正式表");
+        OrderFilterRequest orderFilterRequest = new OrderFilterRequest();
+        orderFilterRequest.setStatus("process");
+        List<OrderMdEntity> orderMdEntities = orderService.findAll(orderFilterRequest);
+        if (orderMdEntities != null && orderMdEntities.size() > 0) {
+            for (OrderMdEntity orderMdEntity : orderMdEntities) {
+                //读数据库最新数据，避免异步时处理两次
+                OrderFilterRequest temp = new OrderFilterRequest();
+                temp.setId(orderMdEntity.getId());
+                List<OrderMdEntity> currents = orderService.findAll(orderFilterRequest);
+                if (currents != null && currents.size() > 0) {
+                    OrderMdEntity currentEntity = currents.get(0);
+                    if (currentEntity.getStatus().equals("process")) {
+                        List<WarehousetempEntity> insertList = new ArrayList<>();
+                        List<WarehousetempEntity> filterList = warehouseTempMdService.findTempByOrderId(currentEntity.getOrderId());
+                        String result;
+                        for (int j = 0; j < filterList.size(); j++) {
+                            WarehousetempEntity warehousetemp = filterList.get(j);
+                            result = new InoutUtils().filterCode(warehouseMdService, warehousetemp, setupService);
+                            if (result == null) {
+                                result = inoutUtilService.vailIsUseDy(warehousetemp);
+                                if (result == null)
+                                    insertList.add(warehousetemp);
+                                else {
+                                    currentEntity.setStatus("error");
+                                    orderService.updateOrder(currentEntity);
+                                    insertList.clear();
+                                    return;
+                                }
+                            } else {
+                                //更新状态，失败
+                                currentEntity.setStatus("error");
+                                orderService.updateOrder(currentEntity);
+                                insertList.clear();
+                                break;
+                            }
+                        }
+                        if (insertList.size() > 0) {
+                            List<WarehouseEntity> warehouseEntities = insertList.stream().map(e -> {
+                                WarehouseEntity warehouseEntity = new WarehouseEntity();
+                                BeanUtils.copyProperties(e, warehouseEntity);
+                                transInoutService.filterNeedRlCode(warehouseEntity);
+                                return warehouseEntity;
+                            }).collect(Collectors.toList());
+                            warehouseMdService.insertWarehouses(warehouseEntities);
+
+                            //更新状态，成功
+                            currentEntity.setStatus("success");
+                            orderService.updateOrder(currentEntity);
+
+                            //删除零时表数据
+                            DeleteRequest deleteRequest = new DeleteRequest();
+                            deleteRequest.setOrderId(currentEntity.getOrderId());
+                            warehouseTempMdService.deleteCode(deleteRequest);
+                            insertList.clear();
+
+                            //生成订单详情
+                            new InoutUtils(udiUrl).generateConstrastDetail(udiInfoService, udiRelevanceService, orderDetailMdService, warehouseEntities);
+                            invProductsTrService.genInvProducts(currentEntity.getOrderId());
+                        }
+
+                    }
+                }
+            }
+        }
+
+
+    }
+}

api-udims/src/main/java/com/glxp/udi/admin/thread/VailIsUseDy.java

@@ -0,0 +1,10 @@
+package com.glxp.udi.admin.thread;
+
+import org.springframework.stereotype.Service;
+
+@Service
+public class VailIsUseDy {
+
+
+
+}

api-udims/src/main/java/com/glxp/udi/admin/util/DateUtil.java

@@ -19,7 +19,7 @@ public class DateUtil extends org.apache.commons.lang3.time.DateUtils {
             "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM/dd HH", "yyyy/MM",
             "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM.dd HH", "yyyy.MM",
             "yyyy年MM月dd日", "yyyy年MM月dd日 HH时mm分ss秒", "yyyy年MM月dd日 HH时mm分", "yyyy年MM月dd日 HH时", "yyyy年MM月",
-            "yyyy"};
+            "yyyy", "yyyy-MM-dd'T'HH:mm:ss:sssZ"};
 
     /**
      * 得到日期字符串 ，转换格式（yyyy-MM-dd）
@@ -149,17 +149,42 @@ public class DateUtil extends org.apache.commons.lang3.time.DateUtils {
     /**
      * 日期型字符串转化为日期 格式   see to DateUtils#parsePatterns
      */
-    public static Date parseDate(Object str) {
+    public static Date parseDate(String str) {
         if (str == null) {
             return null;
         }
+        String tempTime = str.replace("Z", "UTC");
         try {
-            return parseDate(str.toString(), parsePatterns);
+            return parseDate(tempTime, parsePatterns);
         } catch (ParseException e) {
             return null;
         }
     }
 
+    public static Date convertTimeFormat(String sourceTime) {
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ");//注意格式化的表达式
+        sourceTime = sourceTime.replace("Z", " UTC");//注意是空格+UTC
+        Date resDate = null;
+        try {
+            resDate = format.parse(sourceTime);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return resDate;
+    }
+
+
+    public static Date dateToISODate(Date dateStr) {
+        Date parse = null;
+        try {
+            // 解析字符串时间
+            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+            parse = format.parse(format.format(dateStr));
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return parse;
+    }
 
     /**
      * 获取过去的天数

api-udims/src/main/resources/application-pro.properties

@@ -1,23 +1,26 @@
 # 生产环境
-
 server.port=9995
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udims?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
 spring.datasource.username=root
-#spring.datasource.password=mysql@2020
+spring.datasource.password=mysql@2020
-spring.datasource.password=123456
+#spring.datasource.password=123456
 server.servlet.context-path=
+spring.data.mongodb.database=udiwms
+spring.data.mongodb.username=root
+spring.data.mongodb.password=123456
+spring.data.mongodb.host=localhost
+spring.data.mongodb.port=27017
+logging.level.org.springframework.data.mongodb.core.MongoTemplate=debug
 logging.level.com.glxp.udi.admin.dao=debug
 # 跨域设置
 cors.allowed-origins=*
 cors.allowed-headers=Content-Type,ADMIN_ID,ADMIN_TOKEN
 cors.allowed-methods=GET,POST,PUT,DELETE,PATCH,OPTIONS
-cors.allowed-Credentials = true
+cors.allowed-Credentials=true
-
-
 #mips服务地址
-UDIC_MIPSDOWNLOAD_URL = http://127.0.0.1:8080/UDIC_MIPSDL_Server
+UDIC_MIPSDOWNLOAD_URL=http://127.0.0.1:8080/UDIC_MIPSDL_Server
-UDI_SERVER_URL=http://127.0.0.1:8080/UDI_DL_Server
+#UDI_SERVER_URL=http://127.0.0.1:8080/UDI_DL_Server
 UCLOD_SERVER_URL=http://127.0.0.1:9997
-#UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server
+UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server
 COOR_UPLOAD_ORDER=http://127.0.0.1:9987/udi/upload

api-udims/src/main/resources/mybatis/mapper/inout/BusRoleRlDao.xml

@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+
+<mapper namespace="com.glxp.udi.admin.dao.inout.BusRoleRlDao">
+
+    <select id="filterList" parameterType="com.glxp.udi.admin.req.receipt.BussinessTypeFilterRequest"
+            resultType="com.glxp.udi.admin.entity.inout.BusRoleRlEntity">
+        SELECT * FROM basic_bussiness_role
+        <where>
+            <if test="busAction != ''and busAction != null">
+                AND busAction LIKE concat(#{busAction},'%')
+            </if>
+            <if test="roleId != ''and roleId != null">
+                AND roleId =#{roleId}
+            </if>
+
+        </where>
+
+    </select>
+    <select id="filterJoinList" parameterType="com.glxp.udi.admin.req.inout.BusRoleRlFilterRequest"
+            resultType="com.glxp.udi.admin.res.inout.BusRoleRlResponse">
+        select basic_bussiness_type.id,basic_bussiness_role.roleId,basic_bussiness_role.busAction,basic_bussiness_role.busActionName,
+        basic_bussiness_type.name,basic_bussiness_type.mainAction,basic_bussiness_type.action from basic_bussiness_role LEFT JOIN
+        basic_bussiness_type
+        on basic_bussiness_role.busAction =basic_bussiness_type.action
+        <where>
+            <if test="name != ''and name != null">
+                AND name LIKE concat(#{name},'%')
+            </if>
+            <if test="action != ''and action != null">
+                AND `action` LIKE concat(#{action},'%')
+            </if>
+            <if test="mainAction != ''and mainAction != null">
+                AND mainAction LIKE concat(#{mainAction},'%')
+            </if>
+            <if test="roleId != ''and roleId != null">
+                AND roleId = #{roleId}
+            </if>
+
+        </where>
+
+    </select>
+
+
+    <insert id="insertBusRoleRl" keyProperty="id"
+            parameterType="com.glxp.udi.admin.entity.inout.BusRoleRlEntity">
+        replace INTO basic_bussiness_role
+        (roleId,busAction,busActionName)
+        values
+            (
+            #{roleId},#{busAction},#{busActionName}
+            )
+    </insert>
+
+    <update id="updateBusRoleRl" parameterType="com.glxp.udi.admin.entity.inout.BusRoleRlEntity">
+        UPDATE basic_bussiness_role
+        <trim prefix="set" suffixOverrides=",">
+            <if test="roleId != null">roleId = #{roleId},</if>
+            <if test="busAction != null">busAction = #{busAction},</if>
+            <if test="busActionName != null">busActionName = #{busActionName},</if>
+        </trim>
+        WHERE id = #{id}
+    </update>
+
+    <delete id="deleteById" parameterType="Map">
+        DELETE FROM basic_bussiness_role  WHERE roleId =  #{id}
+    </delete>
+
+
+</mapper>

api-udims/src/main/resources/mybatis/mapper/inout/BussinessTypeDao.xml

@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+
+<mapper namespace="com.glxp.udi.admin.dao.inout.BussinessTypeDao">
+
+    <select id="filterList" parameterType="com.glxp.udi.admin.req.receipt.BussinessTypeFilterRequest"
+            resultType="com.glxp.udi.admin.entity.inout.BussinessTypeEntity">
+        SELECT * FROM basic_bussiness_type
+        <where>
+            <if test="name != ''and name != null">
+                AND name LIKE concat(#{name},'%')
+            </if>
+            <if test="action != ''and action != null">
+                AND action LIKE concat(#{action},'%')
+            </if>
+            <if test="mainAction != ''and mainAction != null">
+                AND action LIKE concat(#{mainAction},'%')
+            </if>
+            <if test="enabled != ''and enabled != null">
+                AND enable =#{enabled}
+            </if>
+
+        </where>
+
+    </select>
+    <select id="filterJoinList" parameterType="com.glxp.udi.admin.req.receipt.BussinessTypeFilterRequest"
+            resultType="com.glxp.udi.admin.res.basic.BussinessTypResponse">
+        select * from basic_bussiness_type LEFT JOIN basic_third_sys on basic_bussiness_type.thirdSysFk =
+        basic_third_sys.thirdId
+        <where>
+            <if test="name != ''and name != null">
+                AND name LIKE concat(#{name},'%')
+            </if>
+            <if test="action != ''and action != null">
+                AND `action` LIKE concat(#{action},'%')
+            </if>
+            <if test="mainAction != ''and mainAction != null">
+                AND mainAction LIKE concat(#{mainAction},'%')
+            </if>
+            <if test="enabled != ''and enabled != null">
+                AND basic_third_sys.enabled =#{enabled}
+            </if>
+
+        </where>
+
+    </select>
+
+
+    <insert id="insertBussinessType" keyProperty="id"
+            parameterType="com.glxp.udi.admin.entity.inout.BussinessTypeEntity">
+        replace INTO basic_bussiness_type
+        (action,name,enable,remark,mainAction,localAction,thirdSysFk)
+        values
+            (
+            #{action},
+            #{name},
+            #{enable},
+            #{remark},
+            #{mainAction},#{localAction},#{thirdSysFk}
+            )
+    </insert>
+
+    <update id="updateBussinessType" parameterType="com.glxp.udi.admin.entity.inout.BussinessTypeEntity">
+        UPDATE basic_bussiness_type
+        <trim prefix="set" suffixOverrides=",">
+            <if test="action != null">action = #{action},</if>
+            <if test="name != null">name = #{name},</if>
+            <if test="enable != null">enable = #{enable},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="mainAction != null">mainAction = #{mainAction},</if>
+            <if test="localAction != null">localAction=#{localAction},</if>
+            thirdSysFk=#{thirdSysFk},
+        </trim>
+        WHERE id = #{id}
+    </update>
+
+    <delete id="deleteById" parameterType="Map">
+        DELETE FROM basic_bussiness_type  WHERE id =  #{id}
+    </delete>
+
+
+    <select id="selectById" parameterType="Map" resultType="com.glxp.udi.admin.entity.inout.BussinessTypeEntity">
+         select * FROM basic_bussiness_type  WHERE id =  #{id}
+    </select>
+</mapper>

api-udims/src/main/resources/mybatis/mapper/inout/CodeNeedRlDao.xml

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.glxp.udi.admin.dao.inout.CodeNeedRlDao">
+    <select id="filterList" parameterType="com.glxp.udi.admin.req.inout.CodeNeedRlFilterRequest"
+            resultType="com.glxp.udi.admin.entity.inout.CodeNeedRlEntity">
+        SELECT * FROM io_code_need_rl
+        <where>
+            <if test="code != '' and code != null">
+                AND code LIKE concat('%',#{code},'%')
+            </if>
+            <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
+                AND ylqxzcrbarmc LIKE concat(#{ylqxzcrbarmc},'%')
+            </if>
+            <if test="customerId != '' and customerId != null">
+                AND customerId = #{customerId}
+            </if>
+        </where>
+    </select>
+
+    <insert id="insertCodeNeedRl" keyProperty="id" parameterType="com.glxp.udi.admin.entity.inout.CodeNeedRlEntity">
+        replace INTO io_code_need_rl
+        (
+      code,batchNo,produceDate,expireDate,serialNo,udi,count,
+      orderIdFk,cpmctymc,ggxh,ylqxzcrbarmc,zczbhhzbapzbh,diType,customerId,cplb,flbm
+        )
+        values
+        (
+           #{code},#{batchNo},#{produceDate},#{expireDate},#{serialNo},#{udi},#{count},#{orderIdFk},#{cpmctymc},
+           #{ggxh},#{ylqxzcrbarmc},#{zczbhhzbapzbh},#{diType},#{customerId},#{cplb},#{flbm}
+        )
+    </insert>
+
+
+    <update id="updateCodeNeedRl" parameterType="com.glxp.udi.admin.entity.inout.CodeNeedRlEntity">
+        UPDATE io_code_need_rl
+        <trim prefix="set" suffixOverrides=",">
+            <if test="code != null">code=#{code},</if>
+            <if test="batchNo != null">batchNo=#{batchNo},</if>
+            <if test="produceDate != null">produceDate=#{produceDate},</if>
+            <if test="expireDate != null">expireDate=#{expireDate},</if>
+            <if test="serialNo != null">serialNo=#{serialNo},</if>
+            <if test="udi != null">udi=#{udi},</if>
+            <if test="count != null">count=#{count},</if>
+            <if test="orderIdFk != null">orderIdFk=#{orderIdFk},</if>
+            <if test="cpmctymc != null">cpmctymc=#{cpmctymc},</if>
+            <if test="ggxh != null">ggxh=#{ggxh},</if>
+            <if test="ylqxzcrbarmc != null">ylqxzcrbarmc=#{ylqxzcrbarmc},</if>
+            <if test="zczbhhzbapzbh != null">zczbhhzbapzbh=#{zczbhhzbapzbh},</if>
+            <if test="flbm != null">flbm=#{flbm},</if>
+            <if test="qxlb != null">qxlb=#{qxlb},</if>
+            <if test="diType != null">diType=#{diType},</if>
+        </trim>
+        WHERE id = #{id}
+    </update>
+
+
+    <delete id="deleteById" parameterType="Map">
+        DELETE FROM io_code_need_rl  WHERE id =  #{id}
+    </delete>
+</mapper>

api-udims/src/main/resources/mybatis/mapper/inout/DruginfoMapper.xml

@@ -321,7 +321,7 @@
     where nameCode = #{namecode,jdbcType=VARCHAR}
   </update>
 
-    <!--<insert id="insertDrugs" parameterType="java.util.List">-->
+    <!--<insert id="insertDrugs" parameterType="java.utils.List">-->
     <!--INSERT INTO druginfo-->
     <!--(-->
     <!--type,-->

api-udims/src/main/resources/mybatis/mapper/inout/ScheduleDao.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+
+<mapper namespace="com.glxp.udi.admin.dao.inout.ScheduledDao">
+
+
+    <insert id="insertScheduled" keyProperty="id"
+            parameterType="com.glxp.udi.admin.entity.inout.ScheduledEntity">
+        insert INTO io_scheduled
+        (cronName,cron,customerId)
+        values
+            (
+          #{cronName},
+          #{cron},
+          #{customerId}
+            )
+    </insert>
+
+
+    <delete id="deleteScheduled" parameterType="java.lang.String">
+        delete from io_scheduled where id = #{id}
+    </delete>
+
+
+    <select id="findScheduled" parameterType="com.glxp.udi.admin.req.inout.ScheduledRequest"
+            resultType="com.glxp.udi.admin.entity.inout.ScheduledEntity">
+        select * from io_scheduled
+        <where>
+            <if test="cronName != null and cronName != ''">
+                and cronName = #{cronName}
+            </if>
+            <if test="customerId != null and customerId != ''">
+                and customerId = #{customerId}
+            </if>
+        </where>
+
+    </select>
+
+
+</mapper>

api-udims/src/main/resources/mybatis/mapper/inout/UdiInfoDao.xml

@@ -44,6 +44,9 @@
             <if test="customerId != '' and customerId != null">
                 AND customerId = #{customerId}
             </if>
+            <if test="diType != '' and diType != null">
+                AND diType = #{diType}
+            </if>
         </where>
         group by uuid
 
@@ -51,7 +54,7 @@
     <select id="findByUuid" parameterType="java.lang.String"
             resultType="com.glxp.udi.admin.entity.inout.UdiInfoEntity">
         SELECT *   FROM  io_productinfo WHERE (
-        uuid = #{uuid} ) limit 1
+        uuid = #{uuid} and diType=1 ) limit 1
     </select>
 
     <select id="findByUuids" parameterType="java.lang.String"