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.propertiesmaster
hongtianzai
4 years ago
commit
6c1c70d004
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,4 +0,0 @@
|
||||
#Created by Apache Maven 3.5.4
|
||||
groupId=com.glxp
|
||||
artifactId=api-common
|
||||
version=0.0.1
|
||||
@ -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
|
||||
@ -1 +0,0 @@
|
||||
D:\ylswork\SaleWarehouse\api-common\src\test\java\com\glxp\sale\common\util\ResultVOUtilsTest.java
|
||||
@ -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=" "/>
|
||||
<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>
|
||||
@ -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
|
||||
Binary file not shown.
@ -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);
|
||||
}
|
||||
}
|
||||
@ -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";
|
||||
|
||||
|
||||
}
|
||||
@ -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;
|
||||
}
|
||||
}
|
||||
@ -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("未选择业务单据类型！");
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@ -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("添加成功");
|
||||
}
|
||||
|
||||
}
|
||||
@ -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("删除成功");
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -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, "删除失败！");
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
@ -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);
|
||||
|
||||
}
|
||||
@ -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);
|
||||
|
||||
|
||||
}
|
||||
@ -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);
|
||||
}
|
||||
@ -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);
|
||||
|
||||
}
|
||||
@ -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;
|
||||
|
||||
}
|
||||
@ -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;
|
||||
|
||||
|
||||
}
|
||||
@ -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;
|
||||
|
||||
}
|
||||
@ -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;
|
||||
}
|
||||
|
||||
}
|
||||
@ -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;
|
||||
|
||||
}
|
||||
@ -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;
|
||||
}
|
||||
@ -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;
|
||||
|
||||
}
|
||||
@ -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;
|
||||
|
||||
|
||||
}
|
||||
@ -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";
|
||||
|
||||
}
|
||||
@ -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);
|
||||
}
|
||||
}
|
||||
@ -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);
|
||||
}
|
||||
|
||||
}
|
||||
@ -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);
|
||||
}
|
||||
}
|
||||
@ -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);
|
||||
}
|
||||
|
||||
}
|
||||
@ -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);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -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;
|
||||
}
|
||||
@ -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;
|
||||
}
|
||||
@ -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;
|
||||
}
|
||||
@ -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;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,9 @@
|
||||
package com.glxp.udi.admin.req.inout;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class ScheduledRequest {
|
||||
private String cronName;
|
||||
private String customerId;
|
||||
}
|
||||
@ -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;
|
||||
|
||||
|
||||
|
||||
}
|
||||
@ -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;
|
||||
}
|
||||
@ -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;
|
||||
}
|
||||
@ -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);
|
||||
}
|
||||
@ -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);
|
||||
}
|
||||
@ -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);
|
||||
}
|
||||
}
|
||||
@ -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);
|
||||
}
|
||||
}
|
||||
@ -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);
|
||||
}
|
||||
}
|
||||
@ -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;
|
||||
}
|
||||
}
|
||||
@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@ -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());
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,10 @@
|
||||
package com.glxp.udi.admin.thread;
|
||||
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
public class VailIsUseDy {
|
||||
|
||||
|
||||
|
||||
}
|
||||
@ -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=123456
|
||||
spring.datasource.password=mysql@2020
|
||||
#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
|
||||
UDI_SERVER_URL=http://127.0.0.1:8080/UDI_DL_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
|
||||
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
|
||||
|
||||
@ -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>
|
||||
@ -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>
|
||||
@ -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>
|
||||
@ -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>
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue