commit 898e1955da58deb77d63521186d9fe1c3ad9e089 Author: anthonywj Date: Mon Jul 19 08:58:04 2021 +0800 first commit diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..82eca336 --- /dev/null +++ b/.gitignore @@ -0,0 +1,25 @@ +/target/ +!.mvn/wrapper/maven-wrapper.jar + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/build/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 00000000..e69de29b diff --git a/api-admin/pom.xml b/api-admin/pom.xml new file mode 100644 index 00000000..deaec4c7 --- /dev/null +++ b/api-admin/pom.xml @@ -0,0 +1,228 @@ + + + + api + com.glxp + 0.0.1 + + 4.0.0 + war + api-admin + + + + + + com.glxp + api-common + + + + org.apache.commons + commons-lang3 + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-tomcat + + + + + javax.servlet + javax.servlet-api + 3.1.0 + provided + + + + org.springframework.boot + spring-boot-configuration-processor + true + + + + + org.springframework.boot + spring-boot-starter-aop + + + + + org.springframework.boot + spring-boot-starter-data-redis + + + + + org.springframework.boot + spring-boot-devtools + true + + + + + + org.springframework.boot + spring-boot-starter-jdbc + + + mysql + mysql-connector-java + 8.0.21 + runtime + + + + + com.oracle + ojdbc6 + 11.2.0.4 + runtime + + + + com.alibaba + druid-spring-boot-starter + 1.1.10 + + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + 1.3.2 + + + com.itfsw + mybatis-generator-plugin + 1.3.8 + + + + com.github.pagehelper + pagehelper + 5.1.7 + + + + + org.projectlombok + lombok + true + + + + + io.jsonwebtoken + jjwt + 0.9.1 + + + + + com.alibaba + fastjson + + + + + org.springframework.boot + spring-boot-starter-test + test + + + + org.springframework.boot + spring-boot-starter-tomcat + provided + + + javax.xml.bind + jaxb-api + 2.3.0 + + + com.fasterxml.jackson.core + jackson-databind + 2.9.2 + + + com.github.pagehelper + pagehelper-spring-boot-autoconfigure + 1.2.5 + + + + + + UDI_WMS_MC + + + + org.springframework.boot + spring-boot-maven-plugin + + + + maven-compiler-plugin + + 1.8 + 1.8 + true + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + true + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.4.2 + + true + + + + org.mybatis.generator + mybatis-generator-maven-plugin + 1.4.0 + + src/main/resources/mybatis/configuration.xml + true + true + + + + Generate MyBatis Artifacts + + generate + + + + + + org.mybatis.generator + mybatis-generator-core + 1.4.0 + + + + + + + + + \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/api/ApiAdminApplication.java b/api-admin/src/main/java/com/glxp/api/ApiAdminApplication.java new file mode 100644 index 00000000..2131c75c --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/ApiAdminApplication.java @@ -0,0 +1,25 @@ +package com.glxp.api; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.boot.web.servlet.ServletComponentScan; +import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; + + +@SpringBootApplication +@ServletComponentScan +public class ApiAdminApplication extends SpringBootServletInitializer { + + + + public static void main(String[] args) { + SpringApplication.run(ApiAdminApplication.class, args); + } + + @Override + protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) { + return builder.sources(ApiAdminApplication.class); + } + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/annotation/AuthRuleAnnotation.java b/api-admin/src/main/java/com/glxp/api/admin/annotation/AuthRuleAnnotation.java new file mode 100644 index 00000000..b12bb811 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/annotation/AuthRuleAnnotation.java @@ -0,0 +1,17 @@ +package com.glxp.api.admin.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * 后台登录授权/权限验证的注解 + */ +//此注解只能修饰方法 +@Target(ElementType.METHOD) +//当前注解如何去保持 +@Retention(RetentionPolicy.RUNTIME) +public @interface AuthRuleAnnotation { + String value(); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/aspect/AuthorizeAspect.java b/api-admin/src/main/java/com/glxp/api/admin/aspect/AuthorizeAspect.java new file mode 100644 index 00000000..aa86ec1c --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/aspect/AuthorizeAspect.java @@ -0,0 +1,108 @@ +package com.glxp.api.admin.aspect; + +import com.glxp.api.admin.annotation.AuthRuleAnnotation; +import com.glxp.api.admin.exception.JsonException; +import com.glxp.api.admin.service.auth.AuthLoginService; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.admin.util.JwtUtils; +import io.jsonwebtoken.Claims; +import lombok.extern.slf4j.Slf4j; +import org.aspectj.lang.JoinPoint; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Before; +import org.aspectj.lang.annotation.Pointcut; +import org.aspectj.lang.reflect.MethodSignature; +import org.springframework.stereotype.Component; +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.lang.reflect.Method; +import java.util.List; + +/** + * 登录验证 AOP + */ +@Aspect +@Component +@Slf4j +public class AuthorizeAspect { + + @Resource + private AuthLoginService authLoginService; + + @Pointcut("@annotation(com.glxp.api.admin.annotation.AuthRuleAnnotation)") + public void adminLoginVerify() { + } + + /** + * 登录验证 + * + * @param joinPoint + */ + @Before("adminLoginVerify()") + public void doAdminAuthVerify(JoinPoint joinPoint) { + + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + if (attributes == null) { + throw new JsonException(ResultEnum.NOT_NETWORK); + } + HttpServletRequest request = attributes.getRequest(); + + String id = request.getHeader("ADMIN_ID"); + String query = request.getQueryString(); + Long adminId = null; + try { + adminId = Long.valueOf(id); + }catch (Exception e) { + throw new JsonException(ResultEnum.LOGIN_VERIFY_FALL); + } + + String token = request.getHeader("ADMIN_TOKEN"); + if (token == null) { + throw new JsonException(ResultEnum.LOGIN_VERIFY_FALL); + } + + // 验证 token + Claims claims = JwtUtils.parse(token); + if (claims == null) { + throw new JsonException(ResultEnum.LOGIN_VERIFY_FALL); + } + Long jwtAdminId = Long.valueOf(claims.get("admin_id").toString()); + if (adminId.compareTo(jwtAdminId) != 0) { + throw new JsonException(ResultEnum.LOGIN_VERIFY_FALL); + } + + // 判断是否进行权限验证 + MethodSignature signature = (MethodSignature) joinPoint.getSignature(); + //从切面中获取当前方法 + Method method = signature.getMethod(); + //得到了方,提取出他的注解 + AuthRuleAnnotation action = method.getAnnotation(AuthRuleAnnotation.class); + // 进行权限验证 +// authRuleVerify(action.value(), adminId); + } + + /** + * 权限验证 + * + * @param authRule + */ + private void authRuleVerify(String authRule, Long adminId) { + + if (authRule != null && authRule.length() > 0) { + + List authRules = authLoginService.listRuleByAdminId(adminId); + // admin 为最高权限 + for (String item : authRules) { + if (item.equals("admin") || item.equals(authRule)) { + return; + } + } + throw new JsonException(ResultEnum.AUTH_FAILED); + } + + } + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/config/CorsConfig.java b/api-admin/src/main/java/com/glxp/api/admin/config/CorsConfig.java new file mode 100644 index 00000000..8d57673d --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/config/CorsConfig.java @@ -0,0 +1,24 @@ +package com.glxp.api.admin.config; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Configuration; +import org.springframework.stereotype.Component; + +/** + * 跨域配置 + */ +@Data +@Configuration +@Component +@ConfigurationProperties(prefix = "cors") +public class CorsConfig { + + // 允许的域 + private String allowedOrigins; + // 允许的方法 + private String allowedMethods; + // 允许的头信息 + private String allowedHeaders; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/config/CorsFilter.java b/api-admin/src/main/java/com/glxp/api/admin/config/CorsFilter.java new file mode 100644 index 00000000..5c4ef95e --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/config/CorsFilter.java @@ -0,0 +1,39 @@ +package com.glxp.api.admin.config; + +import org.springframework.beans.factory.annotation.Autowired; + +import javax.servlet.*; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +//@WebFilter(urlPatterns = "/*", filterName = "corsFilter") +public class CorsFilter implements Filter { + + @Autowired + private CorsConfig corsConfig; + + @Override + public void destroy() { + + } + + @Override + public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) + throws IOException, ServletException { + HttpServletResponse response = (HttpServletResponse) res; + response.setHeader("Access-Control-Allow-Origin", corsConfig.getAllowedOrigins()); + response.setHeader("Access-Control-Allow-Methods", corsConfig.getAllowedMethods()); + response.setHeader("Access-Control-Allow-Headers", corsConfig.getAllowedHeaders()); + response.setHeader("Access-Control-Allow-Credentials", "true"); +// response.setHeader("Access-Control-Allow-Origin", "*"); +// response.setHeader("Access-Control-Allow-Methods", "Content-Type,ADMIN_ID,ADMIN_TOKEN"); +// response.setHeader("Access-Control-Allow-Headers", "GET,POST"); + chain.doFilter(req, res); + } + + @Override + public void init(FilterConfig arg0) throws ServletException { + + } + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/config/DruidStatFilter.java b/api-admin/src/main/java/com/glxp/api/admin/config/DruidStatFilter.java new file mode 100644 index 00000000..1f1ebcd1 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/config/DruidStatFilter.java @@ -0,0 +1,18 @@ +package com.glxp.api.admin.config; + +import com.alibaba.druid.support.http.WebStatFilter; + +import javax.servlet.annotation.WebFilter; +import javax.servlet.annotation.WebInitParam; + +/** + * 配置监控拦截器 (过滤不需要监控的后缀) + * druid监控拦截器 + */ +@WebFilter(filterName = "druidWebStatFilter", urlPatterns = "/*", + initParams = { + @WebInitParam(name = "exclusions", value = "*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*")//忽略资源 + } +) +public class DruidStatFilter extends WebStatFilter { +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/config/DruidStatViewServlet.java b/api-admin/src/main/java/com/glxp/api/admin/config/DruidStatViewServlet.java new file mode 100644 index 00000000..e9ae3028 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/config/DruidStatViewServlet.java @@ -0,0 +1,21 @@ +package com.glxp.api.admin.config; + +import com.alibaba.druid.support.http.StatViewServlet; + +import javax.servlet.annotation.WebInitParam; +import javax.servlet.annotation.WebServlet; + +/** + * druid监控视图配置 (监控视图配置) + */ +@WebServlet(urlPatterns = "/druid/*", initParams={ + @WebInitParam(name="allow",value="127.0.0.1"),// IP白名单 (没有配置或者为空，则允许所有访问) + @WebInitParam(name="deny",value="192.168.16.111"),// IP黑名单 (存在共同时，deny优先于allow) + @WebInitParam(name="loginUsername",value="api"),// 用户名 + @WebInitParam(name="loginPassword",value="api"),// 密码 + @WebInitParam(name="resetEnable",value="true")// 禁用HTML页面上的“Reset All”功能 +}) +public class DruidStatViewServlet extends StatViewServlet { + private static final long serialVersionUID = 2359758657306626394L; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/config/MasterDataSourceConfig.java b/api-admin/src/main/java/com/glxp/api/admin/config/MasterDataSourceConfig.java new file mode 100644 index 00000000..129fce3d --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/config/MasterDataSourceConfig.java @@ -0,0 +1,49 @@ +package com.glxp.api.admin.config; + +import org.apache.ibatis.session.SqlSessionFactory; +import org.mybatis.spring.SqlSessionFactoryBean; +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.boot.jdbc.DataSourceBuilder; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; +import org.springframework.core.io.support.PathMatchingResourcePatternResolver; +import org.springframework.jdbc.datasource.DataSourceTransactionManager; + +import javax.sql.DataSource; + +@Configuration +// 扫描 Mapper 接口并容器管理 +@MapperScan(basePackages = MasterDataSourceConfig.PACKAGE, sqlSessionFactoryRef = "masterSqlSessionFactory") +public class MasterDataSourceConfig { + + // 精确到 master 目录，以便跟其他数据源隔离 + static final String PACKAGE = "com.glxp.api.admin.dao"; + static final String MAPPER_LOCATION = "classpath:mybatis/mapper/*/*.xml"; + + @Bean(name = "masterDataSource") + @ConfigurationProperties(prefix = "spring.datasource") + @Primary + public DataSource masterDataSource() { + return DataSourceBuilder.create().build(); + } + + @Bean(name = "masterTransactionManager") + @Primary + public DataSourceTransactionManager masterTransactionManager() { + return new DataSourceTransactionManager(masterDataSource()); + } + + @Bean(name = "masterSqlSessionFactory") + @Primary + public SqlSessionFactory masterSqlSessionFactory(@Qualifier("masterDataSource") DataSource masterDataSource) + throws Exception { + final SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean(); + sessionFactory.setDataSource(masterDataSource); + sessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver() + .getResources(MasterDataSourceConfig.MAPPER_LOCATION)); + return sessionFactory.getObject(); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/config/PageHelperConfig.java b/api-admin/src/main/java/com/glxp/api/admin/config/PageHelperConfig.java new file mode 100644 index 00000000..74d5ed39 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/config/PageHelperConfig.java @@ -0,0 +1,34 @@ +package com.glxp.api.admin.config; + +import com.github.pagehelper.PageHelper; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import java.util.Properties; + +@Configuration +public class PageHelperConfig { + + /** + * 注入pagehelper配置 + * + * @return + */ + @Bean + public PageHelper getPageHelper() { + PageHelper pageHelper = new PageHelper(); + Properties properties = new Properties(); + properties.setProperty("offsetAsPageNum", "false"); + properties.setProperty("rowBoundsWithCount", "false"); + properties.setProperty("pageSizeZero", "true"); + properties.setProperty("reasonable", "false"); + properties.setProperty("supportMethodsArguments", "false"); + properties.setProperty("returnPageInfo", "none"); + properties.setProperty("autoDialect", "true"); + properties.setProperty("autoRuntimeDialect", "true"); //处理多数据源数据库 + System.out.println("配置多数据"+properties.getProperty("autoRuntimeDialect")); + pageHelper.setProperties(properties); + return pageHelper; + } + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/config/PublicFileUrlConfig.java b/api-admin/src/main/java/com/glxp/api/admin/config/PublicFileUrlConfig.java new file mode 100644 index 00000000..a2faf06a --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/config/PublicFileUrlConfig.java @@ -0,0 +1,39 @@ +package com.glxp.api.admin.config; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Configuration; + +/** + * 公共文件的配置 + */ + +@Configuration +@ConfigurationProperties(prefix = "public-file") +public class PublicFileUrlConfig { + + /** + * 上传的地址 + */ + private static String uploadUrl; + + public void setUploadUrl(String uploadUrl) { + PublicFileUrlConfig.uploadUrl = uploadUrl; + } + + public static String getUploadUrl() { + return uploadUrl; + } + + /** + * 资源的域名 + */ + private static String domain; + + public void setDomain(String domain) { + PublicFileUrlConfig.domain = domain; + } + + public static String getDomain() { + return domain; + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/config/WebMvcConfig.java b/api-admin/src/main/java/com/glxp/api/admin/config/WebMvcConfig.java new file mode 100644 index 00000000..84edbe56 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/config/WebMvcConfig.java @@ -0,0 +1,24 @@ +package com.glxp.api.admin.config; + + +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.CorsRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@Configuration +public class WebMvcConfig implements WebMvcConfigurer { + + @Override + public void addCorsMappings(CorsRegistry registry) { + //设置允许跨域的路径 + registry.addMapping("/**") + //设置允许跨域请求的域名 + .allowedOrigins("*") + //是否允许证书 不再默认开启 + .allowCredentials(true) + //设置允许的方法 + .allowedMethods("*") + //跨域允许时间 + .maxAge(3600); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/constant/BussinessTypeUtils.java b/api-admin/src/main/java/com/glxp/api/admin/constant/BussinessTypeUtils.java new file mode 100644 index 00000000..37f129ad --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/constant/BussinessTypeUtils.java @@ -0,0 +1,49 @@ +package com.glxp.api.admin.constant; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class BussinessTypeUtils { + + public static List getBusssinessTypes() { + List types = new ArrayList<>(); + types.add(ConstantType.TYPE_PUT_PRODUCT); + types.add(ConstantType.TYPE_PUT_PURCHASE); + types.add(ConstantType.TYPE_PUT_RETURN); + types.add(ConstantType.TYPE_PUT_ALLOT); + types.add(ConstantType.TYPE_OUT_RETURN); + types.add(ConstantType.TYPE_OUT_DESTORY); + types.add(ConstantType.TYPE_OUT_STRAIGHT); + types.add(ConstantType.TYPE_OUT_REWORK); + types.add(ConstantType.TYPE_OUT_CHECK); + types.add(ConstantType.TYPE_CODE_REPLACE); + types.add(ConstantType.TYPE_CODE_DESTORY); + types.add(ConstantType.TYPE_STOCK_CHECK); + types.add(ConstantType.TYPE_OUT_SALE); + types.add(ConstantType.TYPE_OUT_ALLOT); + return types; + } + + public static Map getBusssinessTypeMap() { + Map types = new HashMap<>(); + types.put("生产入库", ConstantType.TYPE_PUT_PRODUCT); + types.put("采购入库", ConstantType.TYPE_PUT_PURCHASE); + types.put("退货入库", ConstantType.TYPE_PUT_RETURN); + types.put("调拨入库", ConstantType.TYPE_PUT_ALLOT); + types.put("退货出库", ConstantType.TYPE_OUT_RETURN); + types.put("销毁出库", ConstantType.TYPE_OUT_DESTORY); + types.put("直调出库", ConstantType.TYPE_OUT_STRAIGHT); + types.put("返工出库", ConstantType.TYPE_OUT_REWORK); + types.put("抽检出库", ConstantType.TYPE_OUT_CHECK); + types.put("码替换", ConstantType.TYPE_CODE_REPLACE); + types.put("码注销", ConstantType.TYPE_CODE_DESTORY); + types.put("盘点", ConstantType.TYPE_STOCK_CHECK); + types.put("销售出库", ConstantType.TYPE_OUT_SALE); + types.put("调拨出库", ConstantType.TYPE_OUT_ALLOT); + return types; + } + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/constant/ConstantStatus.java b/api-admin/src/main/java/com/glxp/api/admin/constant/ConstantStatus.java new file mode 100644 index 00000000..8dd67cf3 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/constant/ConstantStatus.java @@ -0,0 +1,24 @@ +package com.glxp.api.admin.constant; + +public class ConstantStatus { + + //订单状态 + public static final Integer ORDER_STATUS_PROCESS = 1; //等待处理 + public static final Integer ORDER_STATUS_CHECK = 2; //等待校验 + public static final Integer ORDER_STATUS_FAIL = 3; //重码校验失败 + public static final Integer ORDER_STATUS_SUCCESS = 4; //已校验 + + //ERP校验状态 + public static final Integer ORDER_CHECK_SUCCESS = 1; //校验成功 + public static final Integer ORDER_CHECK_FAIL = 0; //校验失败 + + //ERP订单上传状态 + public static final Integer ORDER_EXPORT_UN = 0; //未导出 + public static final Integer ORDER_EXPORT_ED = 1; //已导出 + public static final Integer ORDER_EXPORT_FAIL = 2; //导出失败 + + //ERP订单签字状态 + public static final Integer ORDER_SIGN_UN = 0; //未签字 + public static final Integer ORDER_SIGN_ED = 1; //已签字 + public static final Integer ORDER_SIGN_FAIL = 2; //签字失败 +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/constant/ConstantType.java b/api-admin/src/main/java/com/glxp/api/admin/constant/ConstantType.java new file mode 100644 index 00000000..7e012ea8 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/constant/ConstantType.java @@ -0,0 +1,23 @@ +package com.glxp.api.admin.constant; + +public interface ConstantType { + + String TYPE_PUT_PRODUCT = "ProduceWareHouseIn"; //生产入库 + String TYPE_PUT_PURCHASE = "PurchaseWareHouseIn"; //采购入库 + String TYPE_PUT_RETURN = "ReturnWareHouseIn"; //退货入库 + String TYPE_PUT_ALLOT = "AllocateWareHouseIn"; //调拨入库 + + String TYPE_OUT_SALE = "SalesWareHouseOut"; //销售出库 + String TYPE_OUT_RETURN = "ReturnWareHouseOut"; //退货出库 + String TYPE_OUT_ALLOT = "AllocateWareHouseOut"; //调拨出库 + String TYPE_OUT_DESTORY = "DestoryWareHouseOut"; //销毁出库 + String TYPE_OUT_STRAIGHT = "DirectAllocateWareHouseOut"; //直调出库 + String TYPE_OUT_REWORK = "ReworkWareHouseOut"; //返工出库 + String TYPE_OUT_CHECK = "CheckWareHouseOut"; //盘点 抽检出库 + String TYPE_CODE_REPLACE = "CodeReplace"; //码替换 + String TYPE_CODE_DESTORY = "CodeDestory"; //码注销 + String TYPE_STOCK_CHECK = "StockCheck"; //盘点 + + String TYPE_PUT = "WareHouseIn"; //出库 + String TYPE_OUT = "WareHouseOut"; //入库 +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthAdminController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthAdminController.java new file mode 100644 index 00000000..4d771c16 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthAdminController.java @@ -0,0 +1,234 @@ +package com.glxp.api.admin.controller.auth; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.req.auth.AuthAdminQueryRequest; +import com.glxp.api.admin.req.auth.AuthAdminSaveRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.admin.annotation.AuthRuleAnnotation; +import com.glxp.api.admin.entity.auth.AuthAdmin; +import com.glxp.api.admin.entity.auth.AuthRole; +import com.glxp.api.admin.entity.auth.AuthRoleAdmin; +import com.glxp.api.admin.service.auth.AuthAdminService; +import com.glxp.api.admin.service.auth.AuthRoleAdminService; +import com.glxp.api.admin.service.auth.AuthRoleService; +import com.glxp.api.admin.util.PasswordUtils; +import com.glxp.api.admin.res.auth.AuthAdminRoleResponse; +import com.glxp.api.admin.res.auth.AuthAdminResponse; +import org.springframework.beans.BeanUtils; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.validation.Valid; +import java.util.*; +import java.util.stream.Collectors; + +/** + * 管理员相关 + */ +@RestController +public class AuthAdminController { + + @Resource + private AuthAdminService authAdminService; + + @Resource + private AuthRoleService authRoleService; + + @Resource + private AuthRoleAdminService authRoleAdminService; + + /** + * 获取管理员列表 + */ + @AuthRuleAnnotation("admin/auth/admin/index") + @GetMapping("/admin/auth/admin/index") + public BaseResponse index(@Valid AuthAdminQueryRequest authAdminQueryRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + + if (authAdminQueryRequest.getRoleId() != null) { + List authRoleAdmins = authRoleAdminService.listByRoleId(authAdminQueryRequest.getRoleId()); + List ids = new ArrayList<>(); + if (authRoleAdmins != null && !authRoleAdmins.isEmpty()) { + ids = authRoleAdmins.stream().map(AuthRoleAdmin::getAdmin_id).collect(Collectors.toList()); + } + authAdminQueryRequest.setIds(ids); + } + List authAdmins = authAdminService.listAdminPage(authAdminQueryRequest); + List authAdminList = new ArrayList<>(); + for (AuthAdmin authAdmin : authAdmins) { + if (!authAdmin.getUserName().equals("admin")) { + authAdminList.add(authAdmin); + } + } + // 查询所有的权限 + List adminIds = authAdminList.stream().map(AuthAdmin::getId).collect(Collectors.toList()); + List authRoleAdminList = authRoleAdminService.listByAdminIdIn(adminIds); + + // 视图列表 + List authAdminResponseList = authAdminList.stream().map(item -> { + AuthAdminResponse authAdminResponse = new AuthAdminResponse(); + BeanUtils.copyProperties(item, authAdminResponse); + List roles = authRoleAdminList.stream() + .filter(authRoleAdmin -> authAdminResponse.getId().equals(authRoleAdmin.getAdmin_id())) + .map(AuthRoleAdmin::getRole_id) + .collect(Collectors.toList()); + authAdminResponse.setRoles(roles); + return authAdminResponse; + }).collect(Collectors.toList()); + + PageInfo authAdminPageInfo = new PageInfo<>(authAdminList); + PageSimpleResponse authAdminPageSimpleResponse = new PageSimpleResponse<>(); + authAdminPageSimpleResponse.setTotal(authAdminPageInfo.getTotal()); + authAdminPageSimpleResponse.setList(authAdminResponseList); + + return ResultVOUtils.success(authAdminPageSimpleResponse); + + } + + + /** + * 获取角色列表 + */ + @AuthRuleAnnotation("admin/auth/admin/roleList") + @GetMapping("/admin/auth/admin/roleList") + public BaseResponse roleList(@RequestParam(value = "page", defaultValue = "1") Integer page, + @RequestParam(value = "limit", defaultValue = "100") Integer limit) { + + List authRoleList = authRoleService.listAuthAdminRolePage(page, limit, null); + PageInfo pageInfo = new PageInfo<>(authRoleList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + List authAdminRoleResponses = authRoleList.stream().map(e -> { + AuthAdminRoleResponse authAdminRoleResponse = new AuthAdminRoleResponse(); + BeanUtils.copyProperties(e, authAdminRoleResponse); + return authAdminRoleResponse; + }).collect(Collectors.toList()); + pageSimpleResponse.setList(authAdminRoleResponses); + + return ResultVOUtils.success(pageSimpleResponse); + + } + + + /** + * 新增 + * + * @return + */ + @AuthRuleAnnotation("admin/auth/admin/save") + @PostMapping("/admin/auth/admin/save") + public BaseResponse save(@RequestBody @Valid AuthAdminSaveRequest authAdminSaveRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + + // 检查是否存在相同名称的管理员 + AuthAdmin byUserName = authAdminService.findByUserName(authAdminSaveRequest.getUserName()); + if (byUserName != null) { + return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "当前管理员已存在"); + } + + AuthAdmin authAdmin = new AuthAdmin(); + BeanUtils.copyProperties(authAdminSaveRequest, authAdmin); + + if (authAdmin.getPassWord() != null) { + authAdmin.setPassWord(PasswordUtils.authAdminPwd(authAdmin.getPassWord())); + } + + boolean b = authAdminService.insertAuthAdmin(authAdmin); + authAdmin = authAdminService.findByUserName(authAdmin.getUserName()); + if (!b) { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + + // 插入角色 + if (authAdminSaveRequest.getRoles() != null) { + authRoleAdminService.insertRolesAdminIdAll(authAdminSaveRequest.getRoles(), authAdmin.getId()); + } + + Map res = new HashMap<>(); + res.put("id", authAdmin.getId()); + return ResultVOUtils.success(res); + } + + /** + * 修改 + * + * @return + */ + @AuthRuleAnnotation("admin/auth/admin/edit") + @PostMapping("/admin/auth/admin/edit") + public BaseResponse edit(@RequestBody @Valid AuthAdminSaveRequest authAdminSaveRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + + if (authAdminSaveRequest.getId() == null) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "参数错误！"); + } + + // 检查是否存在除了当前管理员的其它名称的管理员 + AuthAdmin byUserName = authAdminService.findByUserName(authAdminSaveRequest.getUserName()); + if (byUserName != null && !authAdminSaveRequest.getId().equals(byUserName.getId())) { + return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "当前管理员已存在"); + } + + AuthAdmin authAdmin = new AuthAdmin(); + BeanUtils.copyProperties(authAdminSaveRequest, authAdmin); + if (authAdmin.getPassWord() != null) { + authAdmin.setPassWord(PasswordUtils.authAdminPwd(authAdmin.getPassWord())); + } + + boolean b = authAdminService.updateAuthAdmin(authAdmin); + + if (!b) { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + + // 修改角色 + if (authAdminSaveRequest.getRoles() != null) { + // 先删除之前的 + authRoleAdminService.deleteByAdminId(authAdmin.getId()); + authRoleAdminService.insertRolesAdminIdAll(authAdminSaveRequest.getRoles(), authAdmin.getId()); + } + + return ResultVOUtils.success(); + } + + /** + * 删除 + * + * @return + */ + @AuthRuleAnnotation("admin/auth/admin/delete") + @PostMapping("/admin/auth/admin/delete") + public BaseResponse delete(@RequestBody AuthAdminSaveRequest authAdminSaveRequest) { + + if (authAdminSaveRequest.getId() == null) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "参数错误！"); + } + + boolean b = authAdminService.deleteById(authAdminSaveRequest.getId()); + if (!b) { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + // 先删除之前的角色 + authRoleAdminService.deleteByAdminId(authAdminSaveRequest.getId()); + + return ResultVOUtils.success(); + } + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthPermissionRuleController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthPermissionRuleController.java new file mode 100644 index 00000000..eeb40139 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthPermissionRuleController.java @@ -0,0 +1,133 @@ +package com.glxp.api.admin.controller.auth; + +import com.glxp.api.admin.annotation.AuthRuleAnnotation; +import com.glxp.api.admin.req.auth.AuthPermissionRuleSaveRequest; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.admin.entity.auth.AuthPermissionRule; +import com.glxp.api.admin.service.auth.AuthPermissionRuleService; +import com.glxp.api.admin.util.PermissionRuleTreeUtils; +import com.glxp.api.admin.res.auth.AuthPermissionRuleMergeResponse; +import org.springframework.beans.BeanUtils; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.validation.Valid; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 权限规则相关 + */ +@RestController +public class AuthPermissionRuleController { + + @Resource + private AuthPermissionRuleService authPermissionRuleService; + + /** + * 列表 + * @return + */ + @AuthRuleAnnotation("admin/auth/permission_rule/index") + @GetMapping("/admin/auth/permission_rule/index") + public BaseResponse index() { + + + List authPermissionRuleList = authPermissionRuleService.listAll(); + List merge = PermissionRuleTreeUtils.merge(authPermissionRuleList,0L); + + Map restMap = new HashMap<>(); + restMap.put("list", merge); + return ResultVOUtils.success(restMap); + } + + /** + * 新增 + * @param authPermissionRuleSaveRequest + * @param bindingResult + * @return + */ + @AuthRuleAnnotation("admin/auth/permission_rule/save") + @PostMapping("/admin/auth/permission_rule/save") + public BaseResponse save(@RequestBody @Valid AuthPermissionRuleSaveRequest authPermissionRuleSaveRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + + if (authPermissionRuleSaveRequest.getPid() == null) { + authPermissionRuleSaveRequest.setPid(0L); // 默认设置 + } + AuthPermissionRule authPermissionRule = new AuthPermissionRule(); + BeanUtils.copyProperties(authPermissionRuleSaveRequest, authPermissionRule); + + boolean b = authPermissionRuleService.insertAuthPermissionRule(authPermissionRule); + if (!b) { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + + Map res = new HashMap<>(); + res.put("id", authPermissionRule.getId()); + return ResultVOUtils.success(res); + } + + /** + * 编辑 + * @param authPermissionRuleSaveRequest + * @param bindingResult + * @return + */ + @AuthRuleAnnotation("admin/auth/permission_rule/edit") + @PostMapping("/admin/auth/permission_rule/edit") + public BaseResponse edit(@RequestBody @Valid AuthPermissionRuleSaveRequest authPermissionRuleSaveRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + + if (authPermissionRuleSaveRequest.getId() == null) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + } + + authPermissionRuleSaveRequest.setPid(null); // 不能修改父级 pid + + AuthPermissionRule authPermissionRule = new AuthPermissionRule(); + BeanUtils.copyProperties(authPermissionRuleSaveRequest, authPermissionRule); + + boolean b = authPermissionRuleService.updateAuthPermissionRule(authPermissionRule); + if (!b) { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + + return ResultVOUtils.success(); + } + + /** + * 删除 + * @param authPermissionRuleSaveRequest + * @return + */ + @AuthRuleAnnotation("admin/auth/permission_rule/delete") + @PostMapping("/admin/auth/permission_rule/delete") + public BaseResponse delete(@RequestBody AuthPermissionRuleSaveRequest authPermissionRuleSaveRequest) { + + if (authPermissionRuleSaveRequest.getId() == null) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + } + + boolean b = authPermissionRuleService.deleteById(authPermissionRuleSaveRequest.getId()); + if (!b) { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + + return ResultVOUtils.success(); + } + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthRoleController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthRoleController.java new file mode 100644 index 00000000..19a15a47 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthRoleController.java @@ -0,0 +1,224 @@ +package com.glxp.api.admin.controller.auth; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.req.auth.AuthRoleAuthRequest; +import com.glxp.api.admin.req.auth.AuthRoleQueryRequest; +import com.glxp.api.admin.req.auth.AuthRoleSaveRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.admin.annotation.AuthRuleAnnotation; +import com.glxp.api.admin.entity.auth.AuthPermission; +import com.glxp.api.admin.entity.auth.AuthPermissionRule; +import com.glxp.api.admin.entity.auth.AuthRole; +import com.glxp.api.admin.service.auth.AuthPermissionRuleService; +import com.glxp.api.admin.service.auth.AuthPermissionService; +import com.glxp.api.admin.service.auth.AuthRoleService; +import com.glxp.api.admin.util.PermissionRuleTreeUtils; +import com.glxp.api.admin.res.auth.AuthPermissionRuleMergeResponse; +import com.glxp.api.admin.res.auth.AuthRoleResponse; +import org.springframework.beans.BeanUtils; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.validation.Valid; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * 角色相关 + */ +@RestController +public class AuthRoleController { + + @Resource + private AuthRoleService authRoleService; + + @Resource + private AuthPermissionRuleService authPermissionRuleService; + + @Resource + private AuthPermissionService authPermissionService; + + /** + * 角色列表 + */ + @AuthRuleAnnotation("admin/auth/role/index") + @GetMapping("/admin/auth/role/index") + public BaseResponse index(@Valid AuthRoleQueryRequest authRoleQueryRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + + List authRoleList = authRoleService.listAdminPage(authRoleQueryRequest); + List authRoleResponseList = authRoleList.stream().map(item -> { + AuthRoleResponse authRoleResponse = new AuthRoleResponse(); + BeanUtils.copyProperties(item, authRoleResponse); + return authRoleResponse; + }).collect(Collectors.toList()); + + PageInfo pageInfo = new PageInfo<>(authRoleList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(authRoleResponseList); + return ResultVOUtils.success(pageSimpleResponse); + } + + /** + * 获取授权列表 + * + * @param id + * @return + */ + @AuthRuleAnnotation("admin/auth/role/authList") + @GetMapping("/admin/auth/role/authList") + public BaseResponse authList(@RequestParam("id") Long id) { + + // 查询当前角色拥有的权限id + List authPermissionList = authPermissionService.listByRoleId(id); + List checkedKeys = authPermissionList.stream() + .map(AuthPermission::getPermissionRuleId) + .collect(Collectors.toList()); + + // 查询所有权限规则 + List authPermissionRuleList = authPermissionRuleService.listAll(); + List merge = PermissionRuleTreeUtils.merge(authPermissionRuleList, 0L); + + Map restMap = new HashMap<>(); + restMap.put("list", merge); + restMap.put("checkedKeys", checkedKeys); + return ResultVOUtils.success(restMap); + } + + @AuthRuleAnnotation("admin/auth/role/auth") + @PostMapping("/admin/auth/role/auth") + public BaseResponse auth(@RequestBody @Valid AuthRoleAuthRequest authRoleAuthRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + + // 先删除之前的授权 + authPermissionService.deleteByRoleId(authRoleAuthRequest.getRole_id()); + + List authPermissionList = authRoleAuthRequest.getAuth_rules().stream() + .map(aLong -> { + AuthPermission authPermission = new AuthPermission(); + authPermission.setRoleId(authRoleAuthRequest.getRole_id()); + authPermission.setPermissionRuleId(aLong); + authPermission.setType("admin"); + return authPermission; + }).collect(Collectors.toList()); + + int i = authPermissionService.insertAuthPermissionAll(authPermissionList); + + return ResultVOUtils.success(); + } + + /** + * 新增 + * + * @param authRoleSaveRequest + * @param bindingResult + * @return + */ + @AuthRuleAnnotation("admin/auth/role/save") + @PostMapping("/admin/auth/role/save") + public BaseResponse save(@RequestBody @Valid AuthRoleSaveRequest authRoleSaveRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + + AuthRole byName = authRoleService.findByName(authRoleSaveRequest.getName()); + if (byName != null) { + return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "当前角色已存在"); + } + + AuthRole authRole = new AuthRole(); + BeanUtils.copyProperties(authRoleSaveRequest, authRole); + + boolean b = authRoleService.insertAuthRole(authRole); + if (!b) { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + + Map res = new HashMap<>(); + res.put("id", authRole.getId()); + return ResultVOUtils.success(res); + } + + /** + * 编辑 + * + * @param authRoleSaveRequest + * @param bindingResult + * @return + */ + @AuthRuleAnnotation("admin/auth/role/edit") + @PostMapping("/admin/auth/role/edit") + public BaseResponse edit(@RequestBody @Valid AuthRoleSaveRequest authRoleSaveRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + + if (authRoleSaveRequest.getId() == null) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + } + + // 检查是否存在当前角色 + AuthRole byName = authRoleService.findByName(authRoleSaveRequest.getName()); + if (byName != null && !authRoleSaveRequest.getId().equals(byName.getId())) { + return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "当前角色已存在"); + } + + AuthRole authRole = new AuthRole(); + BeanUtils.copyProperties(authRoleSaveRequest, authRole); + + boolean b = authRoleService.updateAuthRole(authRole); + if (!b) { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + + return ResultVOUtils.success(); + } + + /** + * 删除 + * + * @param authRoleSaveRequest + * @return + */ + @AuthRuleAnnotation("admin/auth/role/delete") + @PostMapping("/admin/auth/role/delete") + public BaseResponse delete(@RequestBody AuthRoleSaveRequest authRoleSaveRequest) { + + if (authRoleSaveRequest.getId() == null) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + } + + boolean b = authRoleService.deleteById(authRoleSaveRequest.getId()); + if (!b) { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + + //TODO 删除角色后先前授权的缓存不会消失 + + // 再删除之前的授权 + authPermissionService.deleteByRoleId(authRoleSaveRequest.getId()); + + return ResultVOUtils.success(); + } + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/LoginController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/auth/LoginController.java new file mode 100644 index 00000000..cf9da5c3 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/auth/LoginController.java @@ -0,0 +1,152 @@ +package com.glxp.api.admin.controller.auth; + +import com.glxp.api.admin.req.auth.LoginRequest; +import com.glxp.api.admin.req.auth.UpdatePasswordRequest; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.admin.annotation.AuthRuleAnnotation; +import com.glxp.api.admin.entity.auth.AuthAdmin; +import com.glxp.api.admin.exception.JsonException; +import com.glxp.api.admin.service.auth.AuthAdminService; +import com.glxp.api.admin.service.auth.AuthLoginService; +import com.glxp.api.admin.util.PasswordUtils; +import com.glxp.api.admin.res.auth.LoginUserInfoResponse; +import com.glxp.api.admin.util.IpUtils; +import com.glxp.api.admin.util.JwtUtils; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +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.servlet.http.HttpServletRequest; +import javax.validation.Valid; +import java.util.*; + +/** + * 登录相关 + */ +@RestController +@Slf4j +public class LoginController { + + @Autowired + private AuthLoginService authLoginService; + + @Autowired + private AuthAdminService authAdminService; + + /** + * 用户登录 + * @return + */ + @PostMapping(value = "/login") + public BaseResponse index(@RequestBody @Valid LoginRequest loginRequest, + BindingResult bindingResult, + HttpServletRequest request) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + + AuthAdmin authAdmin = authAdminService.findByUserName(loginRequest.getUsername()); + if (authAdmin == null) { + throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误"); + } + + if (!PasswordUtils.authAdminPwd(loginRequest.getPassword()).equals(authAdmin.getPassWord())) { + throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误"); + } + + // 更新登录状态 + AuthAdmin authAdminUp = new AuthAdmin(); + authAdminUp.setId(authAdmin.getId()); + authAdminUp.setLastLoginTime(new Date()); + authAdminUp.setLastLoginIp(IpUtils.getIpAddr(request)); + authAdminService.updateAuthAdmin(authAdminUp); + + // 登录成功后获取权限，这里面会设置到缓存 + authLoginService.listRuleByAdminId(authAdmin.getId()); + + Map claims = new HashMap<>(); + claims.put("admin_id", authAdmin.getId()); + String token = JwtUtils.createToken(claims, 86400L); // 一天后过期 + + Map map = new HashMap<>(); + map.put("id", authAdmin.getId()); + map.put("token", token); + + return ResultVOUtils.success(map); + } + + /** + * 获取登录用户信息 + * @return + */ + @AuthRuleAnnotation("") + @GetMapping("/admin/auth/login/userInfo") + public BaseResponse userInfo(HttpServletRequest request) { + String adminId = request.getHeader("ADMIN_ID"); + Long id = Long.valueOf(adminId); + + AuthAdmin authAdmin = authAdminService.findById(id); + + List authRules = authLoginService.listRuleByAdminId(authAdmin.getId()); + + LoginUserInfoResponse loginUserInfoResponse = new LoginUserInfoResponse(); + BeanUtils.copyProperties(authAdmin, loginUserInfoResponse); + loginUserInfoResponse.setAuthRules(authRules); + + return ResultVOUtils.success(loginUserInfoResponse); + } + + /** + * 登出 + * @return + */ + @PostMapping("/admin/auth/login/out") + public BaseResponse out(){ + return ResultVOUtils.success(); + } + + /** + * 修改密码 + * @return + */ + @AuthRuleAnnotation("") // 需要登录验证,但是不需要权限验证时,value 值填空字符串 + @PostMapping("/admin/auth/login/password") + public BaseResponse password(@RequestBody @Valid UpdatePasswordRequest updatePasswordRequest, + BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL.getCode(), + bindingResult.getFieldError().getDefaultMessage()); + } + + AuthAdmin authAdmin = authAdminService.findById(updatePasswordRequest.getAdminId()); + if (authAdmin == null) { + throw new JsonException(ResultEnum.DATA_NOT); + } + String oldPwd = PasswordUtils.authAdminPwd(updatePasswordRequest.getOldPassword()); + // 旧密码不对 + if (authAdmin.getPassWord() != null + && !authAdmin.getPassWord().equals(oldPwd)) { + throw new JsonException(ResultEnum.DATA_NOT, "旧密码匹配失败"); + } + + AuthAdmin authAdminUp = new AuthAdmin(); + authAdminUp.setId(authAdmin.getId()); + String newPwd = PasswordUtils.authAdminPwd(updatePasswordRequest.getNewPassword()); + authAdminUp.setPassWord(newPwd); + + boolean b = authAdminService.updateAuthAdmin(authAdminUp); + if (b) { + return ResultVOUtils.success(); + } + + return ResultVOUtils.error(ResultEnum.DATA_CHANGE); + } + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicUnitMaintainController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicUnitMaintainController.java new file mode 100644 index 00000000..806540e6 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicUnitMaintainController.java @@ -0,0 +1,181 @@ +package com.glxp.api.admin.controller.basic; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.res.basic.ErpUnitsResponse; +import com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity; +import com.glxp.api.admin.entity.info.SystemParamConfigEntity; +import com.glxp.api.admin.httpclient.ErpBasicClient; +import com.glxp.api.admin.req.basic.BasicUnitMaintainFilterRequest; +import com.glxp.api.admin.req.basic.BasicUnitMaintainSaveRequest; +import com.glxp.api.admin.req.info.SystemParamConfigRequest; +import com.glxp.api.admin.req.inout.DeleteRequest; +import com.glxp.api.admin.req.receipt.CombineUnitRequest; +import com.glxp.api.admin.req.receipt.UnitMaintainFilterRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.res.basic.BasicUnitMaintainResponse; +import com.glxp.api.admin.service.basic.BasicUnitMaintainService; +import com.glxp.api.admin.service.info.SystemParamConfigService; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import javax.validation.Valid; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * 往来单位信息维护 + */ +@RestController +public class BasicUnitMaintainController { + + @Resource + private BasicUnitMaintainService basicUnitMaintainService; + + @Autowired + private SystemParamConfigService systemParamConfigService; + + + @GetMapping("/udiwms/basic/unit/maintain/filter") + public BaseResponse filterBasicUnitMaintain(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List basicUnitMaintainEntities; + basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest); + PageInfo pageInfo = new PageInfo<>(basicUnitMaintainEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(basicUnitMaintainEntities); + + SystemParamConfigEntity systemParamConfigEntityBUMErpId = systemParamConfigService.selectByParamKey("basic_unit_maintain_erp_id"); + SystemParamConfigEntity systemParamConfigEntityBUMThirdId = systemParamConfigService.selectByParamKey("basic_unit_maintain_third_id"); + Map rMap = new HashMap<>(); + rMap.put("BUMErpIdValue", + systemParamConfigEntityBUMErpId != null && StringUtils.isNotBlank(systemParamConfigEntityBUMErpId.getParamValue()) ? + systemParamConfigEntityBUMErpId.getParamValue() : "0"); + rMap.put("BUMThirdIdValue", + systemParamConfigEntityBUMThirdId != null && StringUtils.isNotBlank(systemParamConfigEntityBUMThirdId.getParamValue()) ? + systemParamConfigEntityBUMThirdId.getParamValue() : "0"); + rMap.put("page", pageSimpleResponse); + return ResultVOUtils.success(rMap); + } + + @PostMapping("/udiwms/basic/unit/maintain/save") + public BaseResponse save(@RequestBody @Valid BasicUnitMaintainSaveRequest basicUnitMaintainSaveRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + + BasicUnitMaintainEntity basicUnitMaintainEntity = new BasicUnitMaintainEntity(); + BeanUtils.copyProperties(basicUnitMaintainSaveRequest, basicUnitMaintainEntity); + + boolean b = basicUnitMaintainService.insert(basicUnitMaintainEntity); + if (!b) { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + + return ResultVOUtils.success(); + } + + @PostMapping("/udiwms/basic/unit/maintain/update") + public BaseResponse update(@RequestBody BasicUnitMaintainSaveRequest basicUnitMaintainSaveRequest) { + basicUnitMaintainService.updateById(basicUnitMaintainSaveRequest); + return ResultVOUtils.success("修改成功"); + } + + @GetMapping("/udiwms/unit/download") + public BaseResponse downloadBasicUnit(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List basicUnitMaintainEntities; + basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest); + + List basicUnitMaintainResponses = basicUnitMaintainEntities.stream().map(item -> + { + BasicUnitMaintainResponse basicUnitMaintainResponse = new BasicUnitMaintainResponse(); + BeanUtils.copyProperties(item, basicUnitMaintainResponse); + return basicUnitMaintainResponse; + }).collect(Collectors.toList()); + PageInfo pageInfo; + pageInfo = new PageInfo<>(basicUnitMaintainResponses); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(basicUnitMaintainResponses); + return ResultVOUtils.success(pageSimpleResponse); + } + + + @PostMapping("/udiwms/basic/unit/maintain/combine") + public BaseResponse combine(@RequestBody CombineUnitRequest combineRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List custmandocResponses = combineRequest.getCustmandocResponses(); + if (custmandocResponses != null && custmandocResponses.size() > 0) { + for (ErpUnitsResponse custmandocResponse : custmandocResponses) { + BasicUnitMaintainEntity basicUnitMaintainEntity = new BasicUnitMaintainEntity(); + basicUnitMaintainEntity.setErpId(custmandocResponse.getId()); + basicUnitMaintainEntity.setName(custmandocResponse.getName()); + basicUnitMaintainEntity.setSpell(custmandocResponse.getSpell()); + basicUnitMaintainEntity.setAddr(custmandocResponse.getAddr()); + basicUnitMaintainEntity.setCreditNo(custmandocResponse.getCreditNo()); + basicUnitMaintainEntity.setContact(custmandocResponse.getContact()); + basicUnitMaintainEntity.setMobile(custmandocResponse.getMobile()); + basicUnitMaintainService.insertBasicUnitMaintain(basicUnitMaintainEntity); + } + } + + return ResultVOUtils.success("选入成功"); + } + + + @PostMapping("/udiwms/basic/unit/maintain/delete") + public BaseResponse deleteBasicUnitMaintain(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + String id = deleteRequest.getId(); + + basicUnitMaintainService.deleteById(id); + + return ResultVOUtils.success("删除成功"); + } + + + //查询ERP往来单位 + @GetMapping("/udiwms/unitMaintain/filterErp") + public BaseResponse filterErp(UnitMaintainFilterRequest unitMaintainFilterRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + SystemParamConfigEntity systemParamConfigEntityBUMErpQuery = systemParamConfigService.selectByParamKey("basic_unit_maintain_erp_query"); + if (systemParamConfigEntityBUMErpQuery == null) + return ResultVOUtils.error(500, "往来单位接口地址未定义"); + BaseResponse> udiDlDeviceResponse = + new ErpBasicClient().getErpCrop(unitMaintainFilterRequest, systemParamConfigEntityBUMErpQuery.getParamValue()); + return udiDlDeviceResponse; + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessTypeController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessTypeController.java new file mode 100644 index 00000000..a23337c5 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessTypeController.java @@ -0,0 +1,93 @@ +package com.glxp.api.admin.controller.basic; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.constant.BussinessTypeUtils; +import com.glxp.api.admin.entity.basic.BussinessTypeEntity; +import com.glxp.api.admin.req.inout.DeleteRequest; +import com.glxp.api.admin.req.receipt.BussinessTypeFilterRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.service.basic.BussinessTypeService; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.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; +import java.util.Map; + +/** + * 业务类型维护 + */ + +@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 bussinessTypeEntities; + bussinessTypeEntities = bussinessTypeService.filterList(bussinessTypeFilterRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(bussinessTypeEntities); + PageSimpleResponse 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("添加成功"); + } + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoController.java new file mode 100644 index 00000000..7b853507 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoController.java @@ -0,0 +1,115 @@ +package com.glxp.api.admin.controller.basic; + +import com.alibaba.fastjson.JSONObject; +import com.glxp.api.admin.entity.basic.UdiInfoEntity; +import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; +import com.glxp.api.admin.entity.info.SystemParamConfigEntity; +import com.glxp.api.admin.entity.basic.UdiEntity; +import com.glxp.api.admin.httpclient.ErpBasicClient; +import com.glxp.api.admin.req.basic.FilterErpGoodsRequest; +import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; +import com.glxp.api.admin.req.info.SystemParamConfigRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.res.basic.ErpProductsResponse; +import com.glxp.api.admin.service.basic.UdiInfoService; +import com.glxp.api.admin.service.basic.UdiRelevanceService; +import com.glxp.api.admin.service.info.SystemParamConfigService; +import com.glxp.api.admin.util.FilterUdiUtils; +import com.glxp.api.admin.util.HttpClient; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +//基础信息维护 +@RestController +public class UdiInfoController { + + @Resource + UdiRelevanceService udiRelevanceService; + @Resource + UdiInfoService udiInfoService; + @Autowired + private SystemParamConfigService systemParamConfigService; + + @Value("${UDI_SERVER_URL}") + private String udiUrl; + + //获取同步库UDI信息 + @GetMapping("udiwms/udiinfo/filterUdi") + public BaseResponse filterUdi(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 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("uuid", productInfoFilterRequest.getUuid()); + + String response = HttpClient.mipsGet(udiUrl + "/udidl/device/filterUdi", paramMap); + try { + BaseResponse> udiDlDeviceResponse = (BaseResponse>) JSONObject.parseObject(response, BaseResponse.class); + return udiDlDeviceResponse; + } catch (Exception e) { + e.printStackTrace(); + return ResultVOUtils.error(500, "连接UDI数据下载服务出错！"); + } + } + + //获取本地已维护UDI信息 + @GetMapping("udiwms/udiinfo/local/filterByUuid") + public BaseResponse filterLocalByUuid(FilterUdiInfoRequest productInfoFilterRequest) { + + List udiInfoEntities = udiInfoService.filterAllUdiInfo(productInfoFilterRequest); + return ResultVOUtils.success(udiInfoEntities); + } + + //获取ERP产品信息 + @GetMapping("udiwms/udiinfo/erp/products") + public BaseResponse getErpProducts(FilterErpGoodsRequest filterErpGoodsRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("erp_products_query"); + if (systemParamConfigEntity == null) return ResultVOUtils.error(500, "ERP产品信息接口地址未定义"); + ErpBasicClient erpBasicHttpClient = new ErpBasicClient(); + BaseResponse> udiDlDeviceResponse = erpBasicHttpClient.getErpProducts(filterErpGoodsRequest, systemParamConfigEntity.getParamValue()); + if (udiDlDeviceResponse.getCode() == 20000) { + List invmandocResponses = udiDlDeviceResponse.getData().getList(); + for (ErpProductsResponse invmandocResponse : invmandocResponses) { + UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByThirdId(invmandocResponse.getCode()); + if (udiRelevanceEntity != null) { + invmandocResponse.setChecked(true); + } else { + invmandocResponse.setChecked(false); + } + + } + } + return udiDlDeviceResponse; + + } +} \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java new file mode 100644 index 00000000..4aa4d384 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java @@ -0,0 +1,228 @@ +package com.glxp.api.admin.controller.basic; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.entity.basic.UdiInfoEntity; +import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; +import com.glxp.api.admin.entity.info.SystemParamConfigEntity; +import com.glxp.api.admin.entity.inout.WarehouseEntity; +import com.glxp.api.admin.httpclient.UdiDlHttpClient; +import com.glxp.api.admin.req.basic.CombineRequest; +import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; +import com.glxp.api.admin.req.inout.DeleteRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.res.basic.UdiRelevanceResponse; +import com.glxp.api.admin.service.basic.UdiInfoService; +import com.glxp.api.admin.service.basic.UdiRelevanceService; +import com.glxp.api.admin.service.info.SystemParamConfigService; +import com.glxp.api.admin.service.inout.CodesService; +import com.glxp.api.admin.thread.BasicUpdateproductService; +import com.glxp.api.admin.util.DateUtil; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import org.springframework.beans.factory.annotation.Value; +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 UdiRelevanceController { + + @Value("${UDI_SERVER_URL}") + private String udiUrl; + @Resource + UdiRelevanceService udiRelevanceService; + @Resource + UdiInfoService udiInfoService; + @Resource + BasicUpdateproductService updateproductService; + @Resource + CodesService warehouseService; + @Resource + private SystemParamConfigService systemParamConfigService; + + //客户端器械信息下载 + @GetMapping("/udi/udirel/download") + public BaseResponse downloadProducts(FilterUdiInfoRequest filterUdiInfoRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List udiRelevanceResponses = null; + udiRelevanceResponses = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest); + + PageInfo pageInfo; + pageInfo = new PageInfo<>(udiRelevanceResponses); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(udiRelevanceResponses); + return ResultVOUtils.success(pageSimpleResponse); + } + + + //器械信息维护首页 + @GetMapping("/udi/udirel/filterUdi") + public BaseResponse filterUdiGp(FilterUdiInfoRequest filterUdiInfoRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List udiRelevanceResponses = null; + udiRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiInfoRequest); + if (udiRelevanceResponses != null && udiRelevanceResponses.size() > 0) { + for (UdiRelevanceResponse udiRelevanceResponse : udiRelevanceResponses) { + if (udiRelevanceResponse.getDiType() == 2 && udiRelevanceResponse.getIsUseDy() != 1) { + udiRelevanceResponse.setNameCode(udiRelevanceResponse.getSjcpbm()); + } + } + } + PageInfo pageInfo; + pageInfo = new PageInfo<>(udiRelevanceResponses); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(udiRelevanceResponses); + return ResultVOUtils.success(pageSimpleResponse); + } + + + //更新下载ERP存货产品 + @GetMapping("/udi/udirel/updateErp") + public BaseResponse updateErp() { + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("erp_products_query"); + String productUrl; + String onHandUrl; + if (systemParamConfigEntity == null) + return ResultVOUtils.error(500, "ERP产品信息接口地址未定义"); + else + productUrl = systemParamConfigEntity.getParamValue(); + systemParamConfigEntity = systemParamConfigService.selectByParamKey("erp_onhand_query"); + if (systemParamConfigEntity == null) + return ResultVOUtils.error(500, "ERP现存量接口地址未定义"); + else + onHandUrl = systemParamConfigEntity.getParamValue(); + updateproductService.updateProduct(productUrl, onHandUrl); + return ResultVOUtils.success("后台已开启下载更新，请稍后刷新查看！"); + } + + //多选删除 + @PostMapping("/udi/udirel/deleteAll") + public BaseResponse deleteAll(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List ids = deleteRequest.getIds(); + udiRelevanceService.deleteByIds(ids); + return ResultVOUtils.success("删除成功"); + } + + @PostMapping("/udi/udirel/deleteById") + public BaseResponse deleteById(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + String ids = deleteRequest.getId(); + UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(ids); + if (udiRelevanceEntity != null && udiRelevanceEntity.getUuid() != null) { + List udiRelevanceEntities = udiRelevanceService.selectByUuid(udiRelevanceEntity.getUuid()); + if (udiRelevanceEntities != null && !udiRelevanceEntities.isEmpty()) { + for (UdiRelevanceEntity udiRelevanceEntity1 : udiRelevanceEntities) { + List udiInfoEntities = udiInfoService.findByUuids(udiRelevanceEntity1.getUuid()); + if (udiInfoEntities != null && udiInfoEntities.size() > 0) { + for (int i = 0; i < udiInfoEntities.size(); i++) { + List warehouseEntityList = warehouseService.searchCode(udiInfoEntities.get(i).getNameCode()); + if (warehouseEntityList != null && warehouseEntityList.size() > 0) { + return ResultVOUtils.error(500, "改产品已被" + warehouseEntityList.get(0).getOrderId() + "订单关联不能删除"); + } + } + } + } + udiInfoService.deleteByUuid(udiRelevanceEntity.getUuid()); + } + } + udiRelevanceService.deleteById(ids); + return ResultVOUtils.success("删除成功"); + } + + @PostMapping("/udi/udirel/update") + public BaseResponse updateRelevanceEntity(@RequestBody UdiRelevanceEntity udiRelevanceEntity, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime()); + udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); + return ResultVOUtils.success("更新成功"); + } + + //新增或修改关联 + @PostMapping("/udi/udirel/revleance") + public BaseResponse revleanceUdi(@RequestBody CombineRequest combineRequest) { + + List keys = combineRequest.getKeys(); + if (keys != null && keys.size() > 0) { + for (String key : keys) { + FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); + filterUdiInfoRequest.setUuid(key); + List udiInfoEntities = udiInfoService.filterAllUdiInfo(filterUdiInfoRequest); + UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); + if (udiInfoEntities == null || udiInfoEntities.isEmpty()) { + udiInfoEntities = new UdiDlHttpClient(udiUrl).getUdiByUuid(key); + if (udiInfoEntities != null) { + udiInfoService.insertUdiInfos(udiInfoEntities); + } else { + return ResultVOUtils.error(500, "连接UDI数据下载服务出错！"); + } + } + if (combineRequest.getRelId() != null) { + udiRelevanceEntity.setId(combineRequest.getRelId()); + udiRelevanceEntity.setUuid(key); + udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime()); + udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); + } else { + udiRelevanceEntity.setThirdId(combineRequest.getThirdId()); + udiRelevanceEntity.setThirdName(combineRequest.getErpName()); + udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime()); + udiRelevanceEntity.setUuid(key); + udiRelevanceService.insertUdiRelevance(udiRelevanceEntity); + } + + + } + } + return ResultVOUtils.success("合并成功"); + } + + //更换关联ERP产品 + @PostMapping("/udi/udirel/modifyRel") + public BaseResponse modifyRel(@RequestBody CombineRequest combineRequest) { + + UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); + udiRelevanceEntity.setId(combineRequest.getRelId()); + udiRelevanceEntity.setThirdId(combineRequest.getThirdId()); + udiRelevanceEntity.setThirdName(combineRequest.getErpName()); + udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime()); + udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); + return ResultVOUtils.success("更新成功"); + } + + //单独选入ERP产品 + @PostMapping("/udi/udirel/addErp") + public BaseResponse addErp(@RequestBody CombineRequest combineRequest) { + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("erp_products_query"); + if (systemParamConfigEntity == null) return ResultVOUtils.error(500, "ERP产品信息接口地址未定义"); + String url = systemParamConfigEntity.getParamValue(); + updateproductService.addProduct(combineRequest.getThirdId(), combineRequest.getErpName(), url); + return ResultVOUtils.success("添加成功"); + } + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/info/CompanyController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/info/CompanyController.java new file mode 100644 index 00000000..bbd36a79 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/info/CompanyController.java @@ -0,0 +1,36 @@ +package com.glxp.api.admin.controller.info; + +import com.glxp.api.admin.entity.info.CompanyEntity; +import com.glxp.api.admin.service.info.CompanyService; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +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; + +@RestController +public class CompanyController { + + @Resource + private CompanyService companyService; + + @GetMapping("/warehouse/info/company") + public BaseResponse getCompanyInfo() { + CompanyEntity companyEntity = companyService.findCompany(); + if (companyEntity != null) { + return ResultVOUtils.success(companyEntity); + } + return ResultVOUtils.error(500, "企业信息为空"); + } + + @PostMapping("/warehouse/info/modifyCompany") + public BaseResponse modifyCompany(@RequestBody CompanyEntity companyEntity) { + + boolean b = companyService.modifyCompany(companyEntity); + + return ResultVOUtils.success("修改成功"); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/info/SetupController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/info/SetupController.java new file mode 100644 index 00000000..8975bf81 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/info/SetupController.java @@ -0,0 +1,39 @@ +package com.glxp.api.admin.controller.info; + +import com.glxp.api.admin.entity.info.SetupEntity; +import com.glxp.api.admin.req.info.FilterSetupRequest; +import com.glxp.api.admin.service.info.SetupService; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +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 SetupController { + + @Resource + private SetupService setupService; + + @GetMapping("/udi/info/setup") + public BaseResponse getCompanyInfo(FilterSetupRequest filterSetupRequest) { + filterSetupRequest.setId(1); + SetupEntity setupEntity = setupService.findSetup(filterSetupRequest); + if (setupEntity != null) { + return ResultVOUtils.success(setupEntity); + } + return ResultVOUtils.error(500, "设置信息为空"); + } + + @PostMapping("/udi/info/setup/modify") + public BaseResponse modifyCompany(@RequestBody SetupEntity setupEntity) { + setupEntity.setId(1); + setupService.modifySetup(setupEntity); + return ResultVOUtils.success("修改成功"); + } + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/info/SystemParamConfigController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/info/SystemParamConfigController.java new file mode 100644 index 00000000..4c2bb64e --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/info/SystemParamConfigController.java @@ -0,0 +1,105 @@ +package com.glxp.api.admin.controller.info; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.annotation.AuthRuleAnnotation; +import com.glxp.api.admin.entity.info.SystemParamConfigEntity; +import com.glxp.api.admin.req.info.SystemParamConfigRequest; +import com.glxp.api.admin.req.info.SystemParamConfigSaveRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.res.info.SystemParamConfigResponse; +import com.glxp.api.admin.service.info.SystemParamConfigService; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.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 javax.annotation.Resource; +import javax.validation.Valid; +import java.util.List; +import java.util.stream.Collectors; + +@RestController +public class SystemParamConfigController { + + @Resource + private SystemParamConfigService systemParamConfigService; + + @AuthRuleAnnotation("system/param/config/list") + @GetMapping("/system/param/config/list") + public BaseResponse list(@Valid SystemParamConfigRequest systemParamConfigRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + + systemParamConfigRequest.setParamStatus(1); + List systemParamConfigEntityList = systemParamConfigService.queryPage(systemParamConfigRequest); + List systemParamConfigResponseList = systemParamConfigEntityList.stream().map(item -> { + SystemParamConfigResponse systemParamConfigResponse = new SystemParamConfigResponse(); + BeanUtils.copyProperties(item, systemParamConfigResponse); + return systemParamConfigResponse; + }).collect(Collectors.toList()); + + PageInfo pageInfo = new PageInfo<>(systemParamConfigEntityList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(systemParamConfigResponseList); + return ResultVOUtils.success(pageSimpleResponse); + } + + @GetMapping("/udiwms/sys/config/selectByKey") + public BaseResponse selectByKey(@Valid SystemParamConfigRequest systemParamConfigRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey(systemParamConfigRequest.getParamKey()); + return ResultVOUtils.success(systemParamConfigEntity); + } + + @AuthRuleAnnotation("system/param/config/save") + @PostMapping("/system/param/config/save") + public BaseResponse save(@RequestBody @Valid SystemParamConfigSaveRequest systemParamConfigSaveRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + + SystemParamConfigEntity systemParamConfigEntity = new SystemParamConfigEntity(); + BeanUtils.copyProperties(systemParamConfigSaveRequest, systemParamConfigEntity); + + boolean b = systemParamConfigService.insert(systemParamConfigEntity); + if (!b) { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + + return ResultVOUtils.success(); + } + + @AuthRuleAnnotation("system/param/config/update") + @PostMapping("/system/param/config/update") + public BaseResponse update(@RequestBody SystemParamConfigSaveRequest systemParamConfigSaveRequest) { +// systemParamConfigSaveRequest.setId(1); + systemParamConfigService.updateById(systemParamConfigSaveRequest); + if (systemParamConfigSaveRequest.getParentId() == 0) { + SystemParamConfigSaveRequest systemParamConfigSaveRequest1 = new SystemParamConfigSaveRequest(); + systemParamConfigSaveRequest1.setParentId(systemParamConfigSaveRequest.getId()); + if (systemParamConfigSaveRequest.getParamValue().equals("1")) { + systemParamConfigSaveRequest1.setParamStatus(1); + } else { + systemParamConfigSaveRequest1.setParamStatus(0); + } + systemParamConfigService.updateParentId(systemParamConfigSaveRequest1); + } + return ResultVOUtils.success("修改成功"); + } + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java new file mode 100644 index 00000000..4c004f40 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java @@ -0,0 +1,260 @@ +package com.glxp.api.admin.controller.inout; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.constant.ConstantStatus; +import com.glxp.api.admin.controller.inout.utils.ContrastErpUtil; +import com.glxp.api.admin.controller.inout.utils.InoutUtils; +import com.glxp.api.admin.entity.info.SystemParamConfigEntity; +import com.glxp.api.admin.httpclient.ErpOrderClient; +import com.glxp.api.admin.entity.inout.OrderEntity; +import com.glxp.api.admin.entity.inout.WarehouseEntity; +import com.glxp.api.admin.entity.inout.ErpOrderEntity; +import com.glxp.api.admin.entity.inout.FilterErpOrderRequest; +import com.glxp.api.admin.req.inout.*; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.service.basic.UdiInfoService; +import com.glxp.api.admin.service.basic.UdiRelevanceService; +import com.glxp.api.admin.service.info.SystemParamConfigService; +import com.glxp.api.admin.service.inout.OrderDetailService; +import com.glxp.api.admin.service.inout.OrderService; +import com.glxp.api.admin.service.inout.CodesService; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import javax.validation.Valid; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +@RestController +public class OrderController { + + @Resource + private OrderService orderService; + @Resource + private CodesService warehouseService; + @Resource + private OrderDetailService myErpOrderService; + @Resource + private UdiInfoService udiInfoService; + @Resource + private UdiRelevanceService udiRelevanceService; + @Resource + private SystemParamConfigService systemParamConfigService; + + @Value("${UCLOD_SERVER_URL}") + private String ucloudUrl; + + + @GetMapping("udiwms/inout/order/error") + public BaseResponse listOrderError(OrderFilterRequest orderFilterRequest) { + orderFilterRequest.setStatus(ConstantStatus.ORDER_STATUS_FAIL); + List orderEntityList = orderService.filterList(orderFilterRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(orderEntityList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(orderEntityList); + return ResultVOUtils.success(pageSimpleResponse); + } + + @GetMapping("udiwms/inout/order/repeat") + public BaseResponse listOrderRepeat(OrderQueryRequest orderQueryRequest) { + List orderEntityList = orderService.listOrderRepeat(orderQueryRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(orderEntityList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(orderEntityList); + return ResultVOUtils.success(pageSimpleResponse); + } + + @PostMapping("udiwms/inout/order/delete") + public BaseResponse deleteOrder(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + String id = deleteRequest.getId(); + + orderService.deleteById(id); + myErpOrderService.deleteByOrderId(id); + return ResultVOUtils.success("删除成功"); + } + + @PostMapping("/udiwms/inout/order/updateUnit") + public BaseResponse updateUnit(@RequestBody @Valid OrderEntity orderEntity, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + + boolean b = orderService.updateUnit(orderEntity); + if (!b) { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + + b = warehouseService.updateUnit(orderEntity.getId(), orderEntity.getFromCorpId(), orderEntity.getFromCorp()); + if (!b) { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + return ResultVOUtils.success("添加成功"); + } + + @GetMapping("/udiwms/inout/order/filter") + public BaseResponse filterOrder(OrderFilterRequest orderFilterRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List orderEntityList; + if (orderFilterRequest.getCode() != null && !orderFilterRequest.getCode().equals("")) { + List warehouseEntityList = warehouseService.findByCode(orderFilterRequest.getCode()); + orderEntityList = orderService.filterListByCode(warehouseEntityList); + } else { + orderEntityList = orderService.filterList(orderFilterRequest); + } + PageInfo pageInfo; + pageInfo = new PageInfo<>(orderEntityList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(orderEntityList); + return ResultVOUtils.success(pageSimpleResponse); + } + + @GetMapping("/udiwms/inout/order/filterCode") + public BaseResponse filterOrderByCode(OrderFilterByCodeRequest orderFilterByCodeRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List warehouseEntityList = warehouseService.findByCode(orderFilterByCodeRequest.getCode()); + List orderEntityList = orderService.filterListByCode(warehouseEntityList); + PageInfo pageInfo; + pageInfo = new PageInfo<>(orderEntityList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(orderEntityList); + return ResultVOUtils.success(pageSimpleResponse); + } + + @PostMapping("/udiwms/inout/order/updateExportStatus") + public BaseResponse updateExportStatus(@RequestBody UpdateExportStatusRequest updateExportStatusRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + boolean b = orderService.updateExportStatus(updateExportStatusRequest.getOrderId(), updateExportStatusRequest.getExportStatus()); + if (!b) { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + return ResultVOUtils.success("更新成功"); + } + + @PostMapping("/warehouse/inout/order/mergeOrder") + public BaseResponse mergeOrder(@RequestBody OrderMergeRequest orderMergeRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + + List orderList = orderMergeRequest.getOrderList(); + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("forbidSameErp"); + if (systemParamConfigEntity == null || systemParamConfigEntity.getParamValue().equals("0")) { + List mergeList = new ArrayList<>(); + if (orderList != null && orderList.size() > 1) { + for (String orderId : orderList) { + FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest(); + filterErpOrderRequest.setOrderId(orderId); + List erpOrderEntities = myErpOrderService.filterAllMyErpOrder(filterErpOrderRequest); + if (erpOrderEntities != null && erpOrderEntities.size() > 0) { + mergeList.addAll(erpOrderEntities); + } + myErpOrderService.deleteByOrderId(orderId); + + } + String mainOrder = orderList.get(0); + for (int i = 1; i < orderList.size(); i++) { + warehouseService.updateOrderId(orderList.get(i), mainOrder); + orderService.deleteByOrderId(orderList.get(i)); + } + OrderEntity mainOrderEntity = orderService.findById(mainOrder); + List docids = getDocids(mergeList); + String docidStr = ""; + if (docids != null && docids.size() > 0) { + for (String temp : docids) { + docidStr = docidStr + "," + temp; + } + docidStr = docidStr.substring(1); + } + mainOrderEntity.setErpFk(docidStr); + orderService.updateOrder(mainOrderEntity); + List erpOrderEntities = new ErpOrderClient(ucloudUrl).getErpOrder(docids); + if (erpOrderEntities != null && erpOrderEntities.size() > 0) { + List returnOrders = new ContrastErpUtil().transErp(erpOrderEntities, udiRelevanceService, mainOrder); + myErpOrderService.insertErpOrders(returnOrders); + List warehouseEntityList = warehouseService.findByReceiptId(mainOrder); + new ContrastErpUtil().contrastErp(udiInfoService, udiRelevanceService, myErpOrderService, orderService, warehouseEntityList, systemParamConfigService); + } else { + orderService.updateContrastStatus(mainOrder, "error"); + orderService.updateRemark(mainOrder, "U8Cloud获取ERP单失败"); + return ResultVOUtils.error(500, "U8Cloud获取ERP单失败"); + } + } else { + return ResultVOUtils.error(ResultEnum.DATA_ERROR); + } + } else { + if (orderList != null && orderList.size() > 1) { + for (String orderId : orderList) { + FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest(); + filterErpOrderRequest.setOrderId(orderId); + List erpOrderEntities = myErpOrderService.filterAllMyErpOrder(filterErpOrderRequest); + if (erpOrderEntities != null && erpOrderEntities.size() > 0) { + for (ErpOrderEntity erpOrderEntity : erpOrderEntities) { + if (erpOrderEntity.getErpOrderId() != null) { + return ResultVOUtils.error(500, "已校验过订单不能合并！"); + } + } + } + myErpOrderService.deleteByOrderId(orderId); + } + String mainOrder = orderList.get(0); + for (int i = 1; i < orderList.size(); i++) { + warehouseService.updateOrderId(orderList.get(i), mainOrder); + orderService.deleteByOrderId(orderList.get(i)); + } + new Thread(() -> { + List datas = warehouseService.findByReceiptId(mainOrder); + new InoutUtils().generateConstrastDetail(udiInfoService, udiRelevanceService, myErpOrderService, datas); + }).start(); + } + } + + return ResultVOUtils.success("合并成功,后台正在数据转换，请稍后刷新重试！"); + } + + + public List getDocids(List mergeList) { + List docids = new ArrayList<>(); + Map> mapErps = mergeList.stream().collect(Collectors.groupingBy(ErpOrderEntity::getErpOrderId)); + for (String key : mapErps.keySet()) { + docids.add(key); + } + return docids; + } + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java new file mode 100644 index 00000000..71841088 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java @@ -0,0 +1,266 @@ +package com.glxp.api.admin.controller.inout; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.constant.ConstantStatus; +import com.glxp.api.admin.controller.inout.utils.ContrastErpUtil; +import com.glxp.api.admin.entity.info.SystemParamConfigEntity; +import com.glxp.api.admin.entity.inout.ErpOrderEntity; +import com.glxp.api.admin.entity.inout.FilterErpOrderRequest; +import com.glxp.api.admin.httpclient.ErpOrderClient; +import com.glxp.api.admin.res.inout.PurchaseinResponse; +import com.glxp.api.admin.entity.inout.OrderEntity; +import com.glxp.api.admin.entity.inout.WarehouseEntity; +import com.glxp.api.admin.req.inout.*; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.service.basic.UdiInfoService; +import com.glxp.api.admin.service.basic.UdiRelevanceService; +import com.glxp.api.admin.service.info.SystemParamConfigService; +import com.glxp.api.admin.service.inout.OrderDetailService; +import com.glxp.api.admin.service.inout.OrderService; +import com.glxp.api.admin.service.inout.CodesService; +import com.glxp.api.admin.thread.InvDlErpStockService; +import com.glxp.api.admin.thread.IoTransInoutService; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import org.springframework.beans.factory.annotation.Autowired; +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; +import java.util.Map; +import java.util.stream.Collectors; + +@RestController +public class OrderDetailController { + + @Resource + OrderDetailService myErpOrderService; + @Resource + UdiInfoService udiInfoService; + @Resource + CodesService warehouseService; + @Resource + OrderService orderService; + @Resource + private UdiRelevanceService udiRelevanceService; + @Resource + private InvDlErpStockService dlErpStockService; + + + @Resource + private IoTransInoutService transInoutService; + @Autowired + private SystemParamConfigService systemParamConfigService; + + @GetMapping("/udiwms/erpOrder/filter") + public BaseResponse filterErpOrder(FilterOrderRequest filterErpOrderRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("erp_order_query"); + if (systemParamConfigEntity == null) { + return ResultVOUtils.error(500, "ERP出入库单据接口未定义"); + } + return new ErpOrderClient(systemParamConfigEntity.getParamValue()).getErpOrderResponse(filterErpOrderRequest); +// + + } + + + @GetMapping("/warehouse/getMyErpOrders") + public BaseResponse getMyErpOrders(FilterErpOrderRequest filterErpOrderRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + if (filterErpOrderRequest.getDocid() == null || filterErpOrderRequest.getDocid().equals("")) { + filterErpOrderRequest.setDocid("null"); + } + List erpInfoEntityList = myErpOrderService.filterMyErpDetailOrder(filterErpOrderRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(erpInfoEntityList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(erpInfoEntityList); + return ResultVOUtils.success(pageSimpleResponse); + } + + + @PostMapping("/warehouse/deleteErpOrder") + public BaseResponse deleteErpOrder(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + boolean b = myErpOrderService.deleteById(deleteRequest.getId()); + if (b) { + return ResultVOUtils.success("删除成功"); + } else { + return ResultVOUtils.error(500, "删除失败"); + } + } + + @GetMapping(value = "/warehouse/inout/order/detail") + public BaseResponse orderDetail(FilterErpOrderRequest filterErpOrderRequest, + BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + if (filterErpOrderRequest.getOrderId() == null || filterErpOrderRequest.getOrderId().equals("")) { + filterErpOrderRequest.setOrderId("1"); + } + filterErpOrderRequest.setPage(1); + filterErpOrderRequest.setLimit(100); + List erpOrderEntities = myErpOrderService.filterMyErpOrder(filterErpOrderRequest); + return ResultVOUtils.success(erpOrderEntities); + } + + @GetMapping(value = "/warehouse/inout/order/uploadOrder") + public BaseResponse uploadOrder(FilterErpOrderRequest filterErpOrderRequest, + BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + if (filterErpOrderRequest.getOrderId() == null || filterErpOrderRequest.getOrderId().equals("")) { + return ResultVOUtils.error(500, "上传失败"); + } + + filterErpOrderRequest.setPage(1); + filterErpOrderRequest.setLimit(100); + List erpOrderEntities = myErpOrderService.filterMyErpOrder(filterErpOrderRequest); + OrderFilterRequest orderFilterRequest = new OrderFilterRequest(); + orderFilterRequest.setId(filterErpOrderRequest.getOrderId()); + OrderEntity orderEntity = orderService.findOne(orderFilterRequest); + if (erpOrderEntities != null) { + for (int i = 0; i < erpOrderEntities.size(); i++) { + if (erpOrderEntities.get(i).getErpOrderId() == null) { + return ResultVOUtils.error(500, "批次号不匹配，请检查后修改！"); + } + + if (erpOrderEntities.get(i).getErpOrderId().contains(",")) { + return ResultVOUtils.error(500, "无法修改合并单据！"); + } + + if (erpOrderEntities.get(i).getCount() > erpOrderEntities.get(i).getErpCount()) { + return ResultVOUtils.error(500, "扫码数量大于实际数量,无法修改！"); + } + } + } + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("erp_order_modify"); + if (systemParamConfigEntity == null) + return ResultVOUtils.error(500, "ERP出入库单据修改接口未定义"); + String url = systemParamConfigEntity.getParamValue(); + Map> listMap = erpOrderEntities.stream().collect(Collectors.groupingBy(ErpOrderEntity::getErpOrderId)); + BaseResponse baseResponse = new ErpOrderClient().postBill(listMap, orderEntity.getAction(), url); + if (baseResponse != null && baseResponse.getCode() == 20000) { + orderService.updateExportStatus(orderEntity.getId(), ConstantStatus.ORDER_EXPORT_ED); + return ResultVOUtils.success("修改成功"); + } else { + if (baseResponse != null) { + return ResultVOUtils.error(500, baseResponse.getMessage()); + } + return ResultVOUtils.error(500, "修改失败"); + } + } + + + @GetMapping("/warehouse/dlErpStock1") + public BaseResponse dlErpStock() { + dlErpStockService.dlErpStock(); + return ResultVOUtils.success("后台已自动更新，请稍后刷新查看！"); + } + + @PostMapping("/warehouse/selectErpOrder") + public BaseResponse selectErpOrder(@RequestBody ImportErpOrderRequest importErpOrderRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List docids = importErpOrderRequest.getPurchaseinResponses(); + String docidStr = ""; + if (docids != null && docids.size() > 0) { + for (PurchaseinResponse temp : docids) { + docidStr = docidStr + "," + temp.getVbillcode(); + } + docidStr = docidStr.substring(1); + } + List erpOrderEntities = new ArrayList<>(); + if (docids != null && docids.size() > 0) { + for (PurchaseinResponse purchaseinResponse : docids) { + for (PurchaseinResponse.SubPurchase subPurchase : purchaseinResponse.getSubPurchases()) { + ErpOrderEntity erpOrderEntity = new ErpOrderEntity(); + erpOrderEntity.setErpOrderId(purchaseinResponse.getVbillcode()); + erpOrderEntity.setCompanyid(purchaseinResponse.getProvider_code()); + erpOrderEntity.setCompanyname(purchaseinResponse.getProvider_name()); + erpOrderEntity.setCredate(purchaseinResponse.getDbilldate()); + erpOrderEntity.setGoodsid(subPurchase.getInventory_code()); + erpOrderEntity.setGoodsname(subPurchase.getInventory_name()); + erpOrderEntity.setBatchNo(subPurchase.getVbatchcode()); + erpOrderEntity.setErpCount(Math.abs(subPurchase.getDtlgoodsqty())); + erpOrderEntity.setReCount(Math.abs(subPurchase.getReCount())); + erpOrderEntity.setGoodsunit(subPurchase.getInvspec()); + erpOrderEntities.add(erpOrderEntity); + } + } + } + if (erpOrderEntities != null && erpOrderEntities.size() > 0) { + ErpOrderEntity temp = erpOrderEntities.get(0); + for (int i = 0; i < erpOrderEntities.size(); i++) { + if (!temp.getCompanyname().equals(erpOrderEntities.get(i).getCompanyname())) { + return ResultVOUtils.error(500, "选择Erp订单往来单位不一致！"); + } + } + + OrderFilterRequest orderFilterRequest = new OrderFilterRequest(); + orderFilterRequest.setId(importErpOrderRequest.getOrderId()); + OrderEntity orderEntity = orderService.findOne(orderFilterRequest); + ErpOrderEntity exitErp = new ContrastErpUtil().vailErpExit(myErpOrderService, erpOrderEntities, importErpOrderRequest.getOrderId()); + if (exitErp != null) { + String errMsg = "所选ERP单" + exitErp.getErpOrderId() + "已被其他出入库单" + exitErp.getOrderIdFk() + "绑定"; + orderEntity.setRemark(errMsg); + orderService.updateOrder(orderEntity); + return ResultVOUtils.error(500, errMsg); + } else { + orderEntity.setErpFk(docidStr); + orderService.updateOrder(orderEntity); + } + + myErpOrderService.deleteByOrderId(importErpOrderRequest.getOrderId()); + List returnOrders = new ContrastErpUtil().transErp(erpOrderEntities, udiRelevanceService, importErpOrderRequest.getOrderId()); + myErpOrderService.insertErpOrders(returnOrders); + List warehouseEntityList = warehouseService.findByReceiptId(importErpOrderRequest.getOrderId()); + new ContrastErpUtil().contrastErp(udiInfoService, udiRelevanceService, myErpOrderService, orderService, warehouseEntityList, systemParamConfigService); + + + } else { + return ResultVOUtils.error(500, "ERP订单不能为空"); + } + + return ResultVOUtils.success("导入成功"); + } + + + @PostMapping("/warehouse/repeatCheck") + public BaseResponse repeatCheck(@RequestBody FilterErpOrderRequest filterErpOrderRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + OrderFilterRequest orderFilterRequest = new OrderFilterRequest(); + orderFilterRequest.setId(filterErpOrderRequest.getOrderId()); + OrderEntity orderEntity = orderService.findOne(orderFilterRequest); + transInoutService.repeatCheck(orderEntity.getId()); + return ResultVOUtils.success("后台已开始校验，请稍后刷新重试！"); + } + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/UdiTraceController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/UdiTraceController.java new file mode 100644 index 00000000..52a0d36c --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/UdiTraceController.java @@ -0,0 +1,66 @@ +package com.glxp.api.admin.controller.inout; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.entity.inout.WarehouseEntity; +import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; +import com.glxp.api.admin.req.inout.WarehouseQueryRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.res.basic.UdiRelevanceResponse; +import com.glxp.api.admin.res.basic.UdiTraceResponse; +import com.glxp.api.admin.service.basic.UdiRelevanceService; +import com.glxp.api.admin.service.inout.CodesService; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; +import java.util.stream.Collectors; + +@RestController +public class UdiTraceController { + + @Resource + private CodesService warehouseService; + @Resource + UdiRelevanceService udiRelevanceService; + + @GetMapping("udiwarehouse/trace/filter") + public BaseResponse list(WarehouseQueryRequest warehouseQueryRequest) { + List warehouseEntityList = warehouseService.findByOrderId(warehouseQueryRequest); + if (warehouseEntityList != null && warehouseEntityList.size() > 0) { + WarehouseEntity warehouseEntity = warehouseEntityList.get(0); + String udi = warehouseEntity.getCode().substring(2, 16); + FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); + filterUdiInfoRequest.setNameCode(udi); + List udiRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiInfoRequest); + UdiRelevanceResponse udiRelevance = null; + if (udiRelevanceResponses != null && udiRelevanceResponses.size() > 0) { + udiRelevance = udiRelevanceResponses.get(0); + } + + UdiRelevanceResponse finalUdiRelevance = udiRelevance; + List udiTraceResponseList = warehouseEntityList.stream().map(item -> + { + UdiTraceResponse udiTraceResponse = new UdiTraceResponse(); + BeanUtils.copyProperties(item, udiTraceResponse); + if(finalUdiRelevance!=null){ + udiTraceResponse.setYlqxzcrbarmc(finalUdiRelevance.getYlqxzcrbarmc()); + udiTraceResponse.setCpmctymc(finalUdiRelevance.getCpmctymc()); + udiTraceResponse.setGgxh(finalUdiRelevance.getGgxh()); + } + return udiTraceResponse; + }).collect(Collectors.toList()); + PageInfo pageInfo; + pageInfo = new PageInfo<>(udiTraceResponseList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(udiTraceResponseList); + return ResultVOUtils.success(pageSimpleResponse); + }else { + return ResultVOUtils.error(500,"未找到该条码！"); + } + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java new file mode 100644 index 00000000..b9bb925a --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java @@ -0,0 +1,138 @@ +package com.glxp.api.admin.controller.inout; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.entity.inout.WarehouseEntity; +import com.glxp.api.admin.req.inout.*; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.res.inout.WarehouseResponse; +import com.glxp.api.admin.service.inout.CodesTempService; +import com.glxp.api.admin.service.inout.CodesService; +import com.glxp.api.admin.thread.IoTransInoutService; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; +import java.util.stream.Collectors; + +@RestController +public class WareHouseController { + @Resource + private CodesService warehouseService; + @Resource + private IoTransInoutService transInoutService; + @Resource + private CodesTempService codesTempService; + + + @PostMapping("/warehouse/inout/code/deleteCodes") + public BaseResponse deleteCodes(@RequestBody DeleteCodeRequest deleteCodeRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List codes = deleteCodeRequest.getCodes(); + if (codes != null && codes.size() > 0) { + codesTempService.deleteCodesTemp(codes); + } else { + return ResultVOUtils.error(ResultEnum.DATA_ERROR); + } + return ResultVOUtils.success("删除成功"); + } + + + @GetMapping("admin/warehouse/inout/findByNo") + public BaseResponse findByNo(WarehouseQueryRequest warehouseQueryRequest) { + List warehouseEntityList = warehouseService.findByNo(warehouseQueryRequest); + List warehouseResponses = warehouseEntityList.stream().map(item -> + { + WarehouseResponse warehouseResponse = new WarehouseResponse(); + BeanUtils.copyProperties(item, warehouseResponse); + return warehouseResponse; + }).collect(Collectors.toList()); + PageInfo pageInfo; + pageInfo = new PageInfo<>(warehouseEntityList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(warehouseResponses); + return ResultVOUtils.success(pageSimpleResponse); + } + + @GetMapping("admin/warehouse/inout/findByOrderId") + public BaseResponse findByOrderId(WarehouseQueryRequest warehouseQueryRequest) { + List warehouseEntityList = warehouseService.findByOrderId(warehouseQueryRequest); + List warehouseResponses = warehouseEntityList.stream().map(item -> + { + WarehouseResponse warehouseResponse = new WarehouseResponse(); + BeanUtils.copyProperties(item, warehouseResponse); + return warehouseResponse; + }).collect(Collectors.toList()); + PageInfo pageInfo; + pageInfo = new PageInfo<>(warehouseEntityList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(warehouseResponses); + return ResultVOUtils.success(pageSimpleResponse); + } + + @GetMapping("admin/warehouse/inout/findAllByOrderId") + public BaseResponse findAllByOrderId(WarehouseQueryRequest warehouseQueryRequest) { + List warehouseEntityList = warehouseService.findAllByOrderId(warehouseQueryRequest); + List warehouseResponses = warehouseEntityList.stream().map(item -> + { + WarehouseResponse warehouseResponse = new WarehouseResponse(); + BeanUtils.copyProperties(item, warehouseResponse); + return warehouseResponse; + }).collect(Collectors.toList()); + PageInfo pageInfo; + pageInfo = new PageInfo<>(warehouseEntityList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(warehouseResponses); + return ResultVOUtils.success(pageSimpleResponse); + } + + + @GetMapping("admin/warehouse/inout/findErrorByOrderId") + public BaseResponse findErrorByOrderId(WarehouseQueryRequest warehouseQueryRequest) { + List warehousetempList = codesTempService.findByOrderId(warehouseQueryRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(warehousetempList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(warehousetempList); + return ResultVOUtils.success(pageSimpleResponse); + } + + + @PostMapping("warehouse/inout/postOrders") + public BaseResponse postOrders(@RequestBody PostOrderRequest postOrderRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + try { + transInoutService.creatOrder(postOrderRequest); + } catch (Exception e) { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + + return ResultVOUtils.success("导入成功"); + } + + @PostMapping("/warehouse/inout/commit") + public BaseResponse commitOrder(@RequestBody CommitRequest commitRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + transInoutService.repeatCommit(commitRequest); + return ResultVOUtils.success("提交成功"); + } + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/ContrastErpUtil.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/ContrastErpUtil.java new file mode 100644 index 00000000..6f50d99f --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/ContrastErpUtil.java @@ -0,0 +1,260 @@ +package com.glxp.api.admin.controller.inout.utils; + +import com.glxp.api.admin.constant.ConstantStatus; +import com.glxp.api.admin.entity.basic.UdiInfoEntity; +import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; +import com.glxp.api.admin.entity.info.SystemParamConfigEntity; +import com.glxp.api.admin.entity.inout.OrderEntity; +import com.glxp.api.admin.entity.inout.WarehouseEntity; +import com.glxp.api.admin.entity.inout.ErpOrderEntity; +import com.glxp.api.admin.entity.inout.FilterErpOrderRequest; +import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; +import com.glxp.api.admin.req.inout.OrderFilterRequest; +import com.glxp.api.admin.res.basic.UdiRelevanceResponse; +import com.glxp.api.admin.service.basic.UdiInfoService; +import com.glxp.api.admin.service.basic.UdiRelevanceService; +import com.glxp.api.admin.service.info.SystemParamConfigService; +import com.glxp.api.admin.service.inout.OrderDetailService; +import com.glxp.api.admin.service.inout.OrderService; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class ContrastErpUtil { + + int erpTotalCount; + List mErpOrderEntities; + String udiUrl = ""; + + public ContrastErpUtil() { + + } + + public ContrastErpUtil(String udiUrl) { + this.udiUrl = udiUrl; + } + + public void contrastErp(UdiInfoService udiInfoService, UdiRelevanceService udiRelevanceService, + OrderDetailService myErpOrderService, + OrderService orderService, + List warehouseEntityList, SystemParamConfigService setupService) { + String orderIdFk = warehouseEntityList.get(0).getOrderId(); + FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest(); + filterErpOrderRequest.setOrderId(orderIdFk); + mErpOrderEntities = myErpOrderService.filterAllMyErpOrder(filterErpOrderRequest); + if (mErpOrderEntities != null && mErpOrderEntities.size() > 0) + for (ErpOrderEntity erpOrderEntity : mErpOrderEntities) { + erpTotalCount = erpTotalCount + erpOrderEntity.getErpCount(); + erpOrderEntity.setCount(0); + } + String errMsg = null; + String resultMsg = null; + List errorData = new ArrayList<>(); + for (WarehouseEntity warehouseEntity : warehouseEntityList) { + UdiInfoEntity udiInfoEntity = new InoutUtils(udiUrl).getUdiInfo(udiInfoService, udiRelevanceService, warehouseEntity.getCode()); + if (warehouseEntity.getCount() > 1) { + udiInfoEntity.setCount(warehouseEntity.getCount()); + } + List udiRelevanceEntities = udiRelevanceService.selectByUuid(udiInfoEntity.getUuid()); + if (udiRelevanceEntities != null && udiRelevanceEntities.size() > 0) { + UdiRelevanceEntity udiRelevanceEntity = checkGoodsId(udiRelevanceEntities); + if (udiRelevanceEntity != null) { + udiInfoEntity.setThirdId(udiRelevanceEntity.getThirdId()); + udiInfoEntity.setThirdName(udiRelevanceEntity.getThirdName()); + udiInfoEntity.setWarehouseCode(warehouseEntity.getWarehouseCode()); + errMsg = vaildErpOrder(warehouseEntityList, udiInfoEntity); + if (errMsg != null && (errMsg.equals("产品信息不匹配") || errMsg.equals("非此单产品批次号"))) { + errorData.add(warehouseEntity); + } + } else { + errMsg = "产品信息不匹配"; + errorData.add(warehouseEntity); + } + } else { + errMsg = "产品信息未维护"; + errorData.add(warehouseEntity); + } + if (resultMsg == null && errMsg != null) { + resultMsg = errMsg; + } + + } + myErpOrderService.insertErpOrders(mErpOrderEntities); + OrderFilterRequest orderFilterRequest = new OrderFilterRequest(); + orderFilterRequest.setId(orderIdFk); + OrderEntity orderEntity = orderService.findOne(orderFilterRequest); + ErpOrderEntity vailExitMsg = vailErpExit(myErpOrderService, mErpOrderEntities, orderIdFk); + SystemParamConfigEntity systemParamConfigEntity = setupService.selectByParamKey("forbidSameErp"); + if (vailExitMsg != null && systemParamConfigEntity!=null && systemParamConfigEntity.getParamValue().equals("1")) { + errMsg = "所选ERP单" + vailExitMsg.getErpOrderId() + "已被其他出入库单" + vailExitMsg.getOrderIdFk() + "绑定！"; + } + if (mErpOrderEntities != null && mErpOrderEntities.size() > 0) + for (ErpOrderEntity erpOrderEntity : mErpOrderEntities) { + if (erpOrderEntity.getErpCount() != erpOrderEntity.getCount()) { + errMsg = "所选ERP单" + erpOrderEntity.getErpOrderId() + "下" + erpOrderEntity.getGoodsname() + "数量不匹配"; + } + } + + if (errMsg != null) { + orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_FAIL); + orderEntity.setRemark(errMsg); + } else { + orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_SUCCESS); + } + orderService.updateOrder(orderEntity); + if (errorData.size() > 0) { + new InoutUtils(udiUrl).generateConstrastDetail(udiInfoService, udiRelevanceService, myErpOrderService, errorData); + } + } + + public UdiRelevanceEntity checkGoodsId(List udiRelevanceEntities) { + if (mErpOrderEntities.size() > 0) { + for (ErpOrderEntity erpOrderEntity : mErpOrderEntities) { + for (UdiRelevanceEntity udiRelevanceEntity : udiRelevanceEntities) { + if (erpOrderEntity.getGoodsid().equals(udiRelevanceEntity.getThirdId())) { + return udiRelevanceEntity; + } + } + } + } + return null; + } + + public int getSelectedCount(List warehouseEntityList) { + int total = 0; + for (WarehouseEntity warehouseEntity : warehouseEntityList) { + total = total + warehouseEntity.getCount(); + } + return total; + } + + //验证产品ID,批次号，仓位号 + public String vaildErpOrder(List warehouseEntityList, UdiInfoEntity udiInfoEntity) { + String errMsg = "产品信息不匹配"; + if (mErpOrderEntities.size() > 0) { + for (ErpOrderEntity erpOrderEntity : mErpOrderEntities) { + errMsg = isPass(erpOrderEntity, udiInfoEntity); + if (errMsg == null) { + int erpCount = erpOrderEntity.getCount() + udiInfoEntity.getCount(); + if (erpOrderEntity.getErpCount() != erpCount) { + erpOrderEntity.setCount(erpCount); + if (erpOrderEntity.getErpCount() != erpCount) + return "该" + udiInfoEntity.getBatchNo() + "批次号下" + udiInfoEntity.getCpmctymc() + "订单数目不匹配"; + } + erpOrderEntity.setCount(erpCount); + return null; + } + } + } + if (errMsg == null && getSelectedCount(warehouseEntityList) + udiInfoEntity.getCount() != erpTotalCount) { + return "订单数目匹配失败"; + } + return errMsg; + } + + public String isPass(ErpOrderEntity erpOrderEntity, UdiInfoEntity udiInfoEntity) { + String errMsg = null; + if (erpOrderEntity.getBatchNo().equals(udiInfoEntity.getBatchNo())) { + if (erpOrderEntity.getGoodsid().equals(udiInfoEntity.getThirdId())) { + if (erpOrderEntity.getWarehouseCode() != null && udiInfoEntity.getWarehouseCode() != null) { + if (erpOrderEntity.getWarehouseCode().equals(udiInfoEntity.getWarehouseCode())) { + return null; + } else + errMsg = "仓位号不匹配"; + } else + return null; + } else + errMsg = "产品信息不匹配"; + } else { + errMsg = "非此单产品批次号"; + } + return errMsg; + } + + public List transErp(List erpOrderEntities, UdiRelevanceService udiRelevanceService, String orderFk) { + List returnOrders = new ArrayList<>(); + Map filterMap = new HashMap<>(); + if (erpOrderEntities != null && erpOrderEntities.size() > 0) { + for (ErpOrderEntity erpOrderEntity : erpOrderEntities) { + + FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); + filterUdiInfoRequest.setThirdId(erpOrderEntity.getGoodsid()); + filterUdiInfoRequest.setPage(1); + filterUdiInfoRequest.setLimit(100); + List udiRelevanceResponses = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest); + + if (udiRelevanceResponses != null && udiRelevanceResponses.size() > 0) { + UdiRelevanceResponse temp = udiRelevanceResponses.get(0); + erpOrderEntity.setCoName(temp.getCpmctymc()); + erpOrderEntity.setAuthCode(temp.getZczbhhzbapzbh()); + erpOrderEntity.setPackSpec(temp.getGgxh()); + erpOrderEntity.setPackRatio(temp.getPackRatio()); + erpOrderEntity.setProductCompany(temp.getYlqxzcrbarmc()); + erpOrderEntity.setOrderIdFk(orderFk); + } + erpOrderEntity.setOrderIdFk(orderFk); + String key = erpOrderEntity.getBatchNo() + erpOrderEntity.getGoodsid() + erpOrderEntity.getWarehouseCode(); + ErpOrderEntity filterTemp = filterMap.get(key); + if (filterTemp != null) { + filterTemp.setErpCount(filterTemp.getErpCount() + erpOrderEntity.getErpCount()); + filterTemp.setErpOrderId(filterTemp.getErpOrderId() + "," + erpOrderEntity.getErpOrderId()); + } else { + filterTemp = erpOrderEntity; + } + filterMap.put(key, filterTemp); + } + for (Map.Entry entry : filterMap.entrySet()) { + returnOrders.add(entry.getValue()); + } + } + + + return returnOrders; + } + + + public List getDocids(List erpOrderEntities) { + Map filter = new HashMap<>(); + List docids = new ArrayList<>(); + for (ErpOrderEntity erpOrderEntity : erpOrderEntities) { + + if (erpOrderEntity.getErpOrderId().contains(",")) { + String[] dociArray = erpOrderEntity.getErpOrderId().split(","); + if (dociArray != null && dociArray.length > 0) { + for (int i = 0; i < dociArray.length; i++) { + filter.put(dociArray[i], dociArray[i]); + } + } + } else { + filter.put(erpOrderEntity.getErpOrderId(), erpOrderEntity.getErpOrderId()); + } + } + for (String docid : filter.keySet()) { + docids.add(docid); + } + return docids; + } + + //校验Erp单是否存在 + public ErpOrderEntity vailErpExit(OrderDetailService myErpOrderService, List erpOrderEntities, String orderId) { + if (erpOrderEntities != null && erpOrderEntities.size() > 0) { + FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest(); + filterErpOrderRequest.setOrderId(orderId); + List docids = myErpOrderService.filterAllDocidE(filterErpOrderRequest); + List bDocids = getDocids(erpOrderEntities); + if (docids != null && docids.size() > 0) { + for (ErpOrderEntity docid : docids) { + for (String temp : bDocids) { + if (docid.getErpOrderId() != null && docid.getErpOrderId().contains(temp)) { + return docid; + } + } + } + } + return null; + } + return null; + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/DataTransUtil.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/DataTransUtil.java new file mode 100644 index 00000000..8ff98596 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/DataTransUtil.java @@ -0,0 +1,39 @@ +package com.glxp.api.admin.controller.inout.utils; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + +public class DataTransUtil { + + public static String erpListToStr(List erpIdList) { + if (erpIdList != null && erpIdList.size() > 0) { + List erpIds = erpIdList.stream().distinct().collect(Collectors.toList()); + String str = ""; + for (String erpId : erpIds) { + str = "," + str; + } + return str.substring(1); + } else + return null; + } + + public static String[] strToErpArray(String erpFk) { + if (erpFk != null && erpFk.length() > 0) { + return erpFk.split(","); + } else + return null; + } + + public static List strToErpList(String erpFk) { + if (erpFk != null && erpFk.length() > 0) { + String[] erpArray = erpFk.split(","); + List erpList = new ArrayList<>(); + for (int i = 0; i < erpArray.length; i++) { + erpList.add(erpArray[i]); + } + return erpList; + } else + return null; + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/InoutUtils.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/InoutUtils.java new file mode 100644 index 00000000..2b5bb67f --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/InoutUtils.java @@ -0,0 +1,226 @@ +package com.glxp.api.admin.controller.inout.utils; + +import com.glxp.api.admin.constant.ConstantType; +import com.glxp.api.admin.entity.info.SystemParamConfigEntity; +import com.glxp.api.admin.httpclient.UdiDlHttpClient; +import com.glxp.api.admin.entity.basic.UdiInfoEntity; +import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; +import com.glxp.api.admin.entity.inout.WarehouseEntity; +import com.glxp.api.admin.entity.basic.UdiEntity; +import com.glxp.api.admin.entity.inout.ErpOrderEntity; +import com.glxp.api.admin.service.basic.UdiInfoService; +import com.glxp.api.admin.service.basic.UdiRelevanceService; +import com.glxp.api.admin.service.info.SystemParamConfigService; +import com.glxp.api.admin.service.inout.OrderDetailService; +import com.glxp.api.admin.service.inout.CodesService; +import com.glxp.api.admin.util.DateUtil; +import com.glxp.api.admin.util.FilterUdiUtils; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class InoutUtils { + String udiUrl = ""; + + public InoutUtils() { + + } + + public InoutUtils(String udiUrl) { + this.udiUrl = udiUrl; + } + + public String filterCode(CodesService warehouseService, WarehouseEntity warehouseData, SystemParamConfigService setupService) { + List warehouseEntityList = warehouseService.findByCode(warehouseData.getCode()); + if (warehouseEntityList == null || warehouseEntityList.size() == 0) { //数据库为null,可以添加 + return nullVail(warehouseData, setupService); + } + List inList = new ArrayList<>(); + List outList = new ArrayList<>(); + if (warehouseEntityList != null && warehouseEntityList.size() > 0) { + for (int i = 0; i < warehouseEntityList.size(); i++) { + WarehouseEntity temp = warehouseEntityList.get(i); + if (temp.getAction().equals(ConstantType.TYPE_CODE_DESTORY)) { //过滤已销毁的 + return getErrMsg(temp); + } + if (temp.getAction().equals(ConstantType.TYPE_STOCK_CHECK)) { //过滤已盘点 + if (warehouseData.getAction().equals(ConstantType.TYPE_STOCK_CHECK)) { + return warehouseData.getCode() + "该码已盘点"; + } + } + if (temp.getMainAction().equals(ConstantType.TYPE_OUT)) { + outList.add(temp); + } else if (temp.getMainAction().equals(ConstantType.TYPE_PUT)) { + inList.add(temp); + } + } + //如果序列号未null则不判断是否重码 + UdiEntity udiEntity = FilterUdiUtils.getUdi(warehouseData.getCode()); + if (udiEntity.getSerialNo() == null) { + return null; + } + //如果数据库存在1个出库，则可以再录入1个入库;（同理：存在4个出库，3个入库，则可以再录入1个入库） + if (outList.size() - inList.size() == 1) { + if (warehouseData.getMainAction().equals(ConstantType.TYPE_PUT)) { + return null; + } + } else if (inList.size() - outList.size() == 1) { + if (warehouseData.getMainAction().equals(ConstantType.TYPE_OUT)) { + return null; + } + } else if (inList.size() - outList.size() == 0) { + return nullVail(warehouseData, setupService); + } else { + return "订单：" + warehouseData.getOrderId() + "已存在" + warehouseData.getCode(); + } + return warehouseData.getCode() + "条码重复"; + } + + + return null; + } + + public String nullVail(WarehouseEntity warehousetemp, SystemParamConfigService configService) { + if (warehousetemp.getAction().equals(ConstantType.TYPE_PUT_RETURN)) { + SystemParamConfigEntity systemParamConfigEntity = configService.selectByParamKey("isReturnWareHouseIn"); + if (systemParamConfigEntity==null || "0".equals(systemParamConfigEntity.getParamValue())) { + return null; + } else { + return warehousetemp.getCode() + "不允许未销售出库可以退货入库"; + } + } else if (warehousetemp.getAction().equals(ConstantType.TYPE_OUT_RETURN)) { + SystemParamConfigEntity systemParamConfigEntity = configService.selectByParamKey("isReturnWareHouseOut"); + if (systemParamConfigEntity==null || "0".equals(systemParamConfigEntity.getParamValue())) { + return null; + } else { + return warehousetemp.getCode() + "不允许零库存退货出库"; + } + } else if (warehousetemp.getAction().equals(ConstantType.TYPE_OUT_SALE)) { + SystemParamConfigEntity systemParamConfigEntity = configService.selectByParamKey("isSalesWareHouseOut"); + if (systemParamConfigEntity==null || "0".equals(systemParamConfigEntity.getParamValue())) { + return null; + } else { + return warehousetemp.getCode() + "不允许零库存销售出库"; + } + } + return null; + } + + public String getErrMsg(WarehouseEntity warehousetemp) { + if (warehousetemp.getAction().equals(ConstantType.TYPE_PUT_PRODUCT)) { + return warehousetemp.getCode() + "已生产入库"; + } else if (warehousetemp.getAction().equals(ConstantType.TYPE_PUT_PURCHASE)) { + return warehousetemp.getCode() + "已采购入库"; + } else if (warehousetemp.getAction().equals(ConstantType.TYPE_PUT_RETURN)) { + return warehousetemp.getCode() + "已退货入库"; + } else if (warehousetemp.getAction().equals(ConstantType.TYPE_PUT_ALLOT)) { + return warehousetemp.getCode() + "已调拨入库"; + } else if (warehousetemp.getAction().equals(ConstantType.TYPE_OUT_SALE)) { + return warehousetemp.getCode() + "已销售出库"; + } else if (warehousetemp.getAction().equals(ConstantType.TYPE_OUT_RETURN)) { + return warehousetemp.getCode() + "已退货出库"; + } else if (warehousetemp.getAction().equals(ConstantType.TYPE_OUT_ALLOT)) { + return warehousetemp.getCode() + "已调拨出库"; + } else if (warehousetemp.getAction().equals(ConstantType.TYPE_OUT_DESTORY)) { + return warehousetemp.getCode() + "已销毁出库"; + } else if (warehousetemp.getAction().equals(ConstantType.TYPE_OUT_STRAIGHT)) { + return warehousetemp.getCode() + "已直调出库"; + } else if (warehousetemp.getAction().equals(ConstantType.TYPE_OUT_REWORK)) { + return warehousetemp.getCode() + "已返工出库"; + } else if (warehousetemp.getAction().equals(ConstantType.TYPE_OUT_CHECK)) { + return warehousetemp.getCode() + "已抽检出库"; + } else if (warehousetemp.getAction().equals(ConstantType.TYPE_CODE_DESTORY)) { + return warehousetemp.getCode() + "已销毁"; + } + return warehousetemp.getCode() + "出错"; + } + + + public UdiInfoEntity getUdiInfo(UdiInfoService udiInfoService, UdiRelevanceService udiRelevanceService, String code) { + String prefix; + prefix = FilterUdiUtils.getDiStr(code); + UdiInfoEntity udiInfoEntity = udiInfoService.findByNameCode(prefix); + if (udiInfoEntity == null) { + List froms = new UdiDlHttpClient(udiUrl).getUdiByDi(prefix); + if (froms != null && !froms.isEmpty()) { + udiInfoService.insertUdiInfos(froms); + udiInfoEntity = udiInfoService.findByNameCode(prefix); + UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); + udiRelevanceEntity.setUuid(udiInfoEntity.getUuid()); + udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime()); + udiRelevanceService.insertUdiRelevance(udiRelevanceEntity); + } else { + udiInfoEntity = new UdiInfoEntity(); + } + } + + udiInfoEntity.setCode(code); + udiInfoEntity = FilterUdiUtils.transUdi(udiInfoEntity); + return udiInfoEntity; + } + + public void generateConstrastDetail(UdiInfoService udiInfoService, UdiRelevanceService udiRelevanceService, + OrderDetailService myErpOrderService, + List warehouseEntityList) { + if (warehouseEntityList != null && warehouseEntityList.size() > 0) { + List udiInfoEntities = new ArrayList<>(); + for (WarehouseEntity warehouseEntity : warehouseEntityList) { + UdiInfoEntity udiInfoEntity = getUdiInfo(udiInfoService, udiRelevanceService, warehouseEntity.getCode()); + if (udiInfoEntity != null) { + if (warehouseEntity.getCount() != null) + udiInfoEntity.setCount(warehouseEntity.getCount()); + else { + udiInfoEntity.setCount(getActCount(udiInfoEntity)); + } + udiInfoEntities.add(udiInfoEntity); + } + } + + List returnOrderDetail = new ArrayList<>(); + Map sortMaps = new HashMap<>(); + for (UdiInfoEntity detailCodeEntity : udiInfoEntities) { + String key = detailCodeEntity.getNameCode(); + UdiInfoEntity temp = sortMaps.get(key); + if (temp != null) { + detailCodeEntity.setCount(temp.getCount() + detailCodeEntity.getCount()); + } + sortMaps.put(key, detailCodeEntity); + } + + for (Map.Entry entry : sortMaps.entrySet()) { + System.out.println("key = " + entry.getKey() + ", value = " + entry.getValue()); + returnOrderDetail.add(entry.getValue()); + } + + List erpOrderEntities = new ArrayList<>(); + for (UdiInfoEntity erpDetailCodeEntity : returnOrderDetail) { + ErpOrderEntity erpOrderEntity = new ErpOrderEntity(); + erpOrderEntity.setNameCode(erpDetailCodeEntity.getNameCode()); + erpOrderEntity.setPackRatio(erpDetailCodeEntity.getPackRatio()); + erpOrderEntity.setCoName(erpDetailCodeEntity.getCpmctymc()); + erpOrderEntity.setBatchNo(erpDetailCodeEntity.getBatchNo()); + erpOrderEntity.setCount(erpDetailCodeEntity.getCount()); + erpOrderEntity.setOrderIdFk(warehouseEntityList.get(0).getOrderId()); + erpOrderEntity.setProductCompany(erpDetailCodeEntity.getYlqxzcrbarmc()); + erpOrderEntity.setAuthCode(erpDetailCodeEntity.getZczbhhzbapzbh()); + erpOrderEntity.setPackSpec(erpDetailCodeEntity.getGgxh()); + erpOrderEntities.add(erpOrderEntity); + } + if (!erpOrderEntities.isEmpty()) + myErpOrderService.insertErpOrders(erpOrderEntities); + } + } + + public int getActCount(UdiInfoEntity udiInfoBean) { + if (udiInfoBean != null) { + if (udiInfoBean.getZxxsbzbhsydysl() > 1) { + return udiInfoBean.getZxxsbzbhsydysl() * udiInfoBean.getBhzxxsbzsl(); + } else { + return udiInfoBean.getBhzxxsbzsl(); + } + } + return 1; + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/TransInoutUtil.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/TransInoutUtil.java new file mode 100644 index 00000000..d0c51d07 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/TransInoutUtil.java @@ -0,0 +1,4 @@ +package com.glxp.api.admin.controller.inout.utils; + +public class TransInoutUtil { +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvCheckController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvCheckController.java new file mode 100644 index 00000000..c1ddacb7 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvCheckController.java @@ -0,0 +1,189 @@ +package com.glxp.api.admin.controller.inventory; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.constant.ConstantType; +import com.glxp.api.admin.entity.inout.OrderEntity; +import com.glxp.api.admin.entity.inout.StockCheckEntity; +import com.glxp.api.admin.entity.inout.ErpOrderEntity; +import com.glxp.api.admin.entity.inout.FilterErpOrderRequest; +import com.glxp.api.admin.req.inout.DeleteRequest; +import com.glxp.api.admin.req.inout.FilterStockCheckRequest; +import com.glxp.api.admin.req.inout.OrderFilterRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.service.inout.OrderDetailService; +import com.glxp.api.admin.service.inout.OrderService; +import com.glxp.api.admin.service.inventory.InvOrderCheckService; +import com.glxp.api.admin.thread.InvImportStockService; +import com.glxp.api.admin.util.DateUtil; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.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; +import java.util.Map; +import java.util.stream.Collectors; + +@RestController +public class InvCheckController { + + @Resource + private OrderService orderService; + @Resource + private InvOrderCheckService stockCheckService; + @Resource + private InvImportStockService importStockService; + @Resource + private OrderDetailService myErpOrderService; + + + @GetMapping("/udiwarehouse/stockCheck/filter") + public BaseResponse filter(FilterStockCheckRequest filterStockCheckRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List stockCheckEntities + = stockCheckService.filterStockCheck(filterStockCheckRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(stockCheckEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(stockCheckEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + + @GetMapping("/udiwarehouse/stockCheck/getDetail") + public BaseResponse getDetail(FilterStockCheckRequest filterStockCheckRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List orderIds = getOrderIds(filterStockCheckRequest.getId() + ""); + List erpOrderEntities = new ArrayList<>(); + if (orderIds.size() > 0) { + FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest(); + filterErpOrderRequest.setPage(1); + filterErpOrderRequest.setLimit(100); + filterErpOrderRequest.setOrderIds(orderIds); + erpOrderEntities = myErpOrderService.findByStockCheck(filterErpOrderRequest); + if (isRepeat(erpOrderEntities)) { + Map> groupBy = erpOrderEntities.stream().collect(Collectors.groupingBy(ErpOrderEntity::getNameCode)); + for (List combines : groupBy.values()) { + ErpOrderEntity erpOrderEntity = combines.get(0); + if (combines.size() > 1) { + for (int i = 1; i < combines.size(); i++) { + erpOrderEntity.setCount(erpOrderEntity.getCount() + combines.get(i).getCount()); + myErpOrderService.deleteByPrimiyId(combines.get(i).getId() + ""); + } + } + myErpOrderService.updateErpOrder(erpOrderEntity); + } + erpOrderEntities = myErpOrderService.findByStockCheck(filterErpOrderRequest); + } + } + + + PageInfo pageInfo; + pageInfo = new PageInfo<>(erpOrderEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(erpOrderEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + + public List getOrderIds(String checkId) { + OrderFilterRequest orderFilterRequest = new OrderFilterRequest(); + orderFilterRequest.setAction(ConstantType.TYPE_STOCK_CHECK); + orderFilterRequest.setStockCheckFk(checkId + ""); + List orderEntities = orderService.findAllOrders(orderFilterRequest); + List orderIds = new ArrayList<>(); + if (orderEntities != null) { + for (OrderEntity orderEntity : orderEntities) { + orderIds.add(orderEntity.getId()); + } + } + return orderIds; + } + + private boolean isRepeat(List erpOrderEntities) { + List stringList = erpOrderEntities.stream().map(ErpOrderEntity::getNameCode) + .collect(Collectors.toList()); + long count = stringList.stream().distinct().count(); + if (stringList.size() == count) { + return false; + } else { + return true; + } + } + + @GetMapping("/udiwarehouse/stockCheck/checkErp") + public BaseResponse checkErp(FilterStockCheckRequest filterStockCheckRequest, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + importStockService.checkStock(filterStockCheckRequest); + + return ResultVOUtils.success("后台已开启库存盘点校验，请稍后刷新查看"); + } + + + @GetMapping("/udiwarehouse/stockCheck/create") + public BaseResponse createStockCheck() { + + FilterStockCheckRequest filterStockCheckRequest = new FilterStockCheckRequest(); + filterStockCheckRequest.setStatus("正在盘点"); + List stockCheckEntities = stockCheckService.filterStockCheck(filterStockCheckRequest); + if (stockCheckEntities != null && stockCheckEntities.size() > 0) { + return ResultVOUtils.error(500, "当前有盘点单正在进行，无法创建新盘点单！"); + } + StockCheckEntity stockCheckEntity = new StockCheckEntity(); + stockCheckEntity.setActDate(DateUtil.getDateTime()); + stockCheckEntity.setAction(ConstantType.TYPE_STOCK_CHECK); + stockCheckEntity.setStatus("正在盘点"); + stockCheckService.insertStockCheck(stockCheckEntity); + return ResultVOUtils.success("创建成功"); + } + + @PostMapping("/udiwarehouse/stockCheck/finish") + public BaseResponse finishStockCheck(@RequestBody StockCheckEntity stockCheckEntity, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + stockCheckEntity.setEndTime(DateUtil.getDateTime()); + stockCheckEntity.setStatus("盘点完成"); + stockCheckService.updateStockCheck(stockCheckEntity); + return ResultVOUtils.success("更新成功"); + } + + + @PostMapping("/udiwarehouse/stockCheck/delete") + public BaseResponse deleteStockCheck(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + stockCheckService.deleteById(deleteRequest.getId()); + List orderIds = getOrderIds(deleteRequest.getId() + ""); + if (orderIds.size() > 0) { + for (String id : orderIds) { + orderService.deleteById(id); + myErpOrderService.deleteByOrderId(id); + } + } + + return ResultVOUtils.success("删除成功"); + } + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvErpOnhandController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvErpOnhandController.java new file mode 100644 index 00000000..101282cf --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvErpOnhandController.java @@ -0,0 +1,115 @@ +package com.glxp.api.admin.controller.inventory; + +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.TypeReference; +import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; +import com.glxp.api.admin.entity.basic.UdiEntity; +import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; +import com.glxp.api.admin.req.basic.UOnhandQueryRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.res.basic.UOnhandQueryResponse; +import com.glxp.api.admin.res.basic.UdiRelevanceResponse; +import com.glxp.api.admin.service.basic.UdiRelevanceService; +import com.glxp.api.admin.util.FilterUdiUtils; +import com.glxp.api.admin.util.HttpClient; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@RestController +public class InvErpOnhandController { + + @Value("${UCLOD_SERVER_URL}") + private String ucloudUrl; + @Resource + UdiRelevanceService udiRelevanceService; + + + + @GetMapping("/warehouse/ucloud/onHand") + public BaseResponse getOnhand(UOnhandQueryRequest onhandQueryRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + if (onhandQueryRequest.getUdiCode() != null) { + UdiEntity udiEntity = FilterUdiUtils.getUdi(onhandQueryRequest.getUdiCode()); + if (udiEntity != null) { + UdiRelevanceResponse udiRelevanceResponse = findByNamecode(udiEntity.getUdi()); + if (udiRelevanceResponse != null) { + String thirdId = udiRelevanceResponse.getThirdId(); + onhandQueryRequest.setInventory(thirdId); + onhandQueryRequest.setBatchcode(udiEntity.getBatchNo()); + + } else { + return ResultVOUtils.error(500, "产品信息未维护！"); + } + + } else { + return ResultVOUtils.error(500, "无效UDI码"); + + } + } else if (onhandQueryRequest.getNameCode() != null) { + UdiRelevanceResponse udiRelevanceResponse = findByNamecode(onhandQueryRequest.getNameCode()); + onhandQueryRequest.setInventory(udiRelevanceResponse.getThirdId()); + } + + Map paramMap = new HashMap<>(16); + if (onhandQueryRequest.getBatchcode() != null && !onhandQueryRequest.getBatchcode().equals("")) + paramMap.put("batchcode", onhandQueryRequest.getBatchcode()); + if (onhandQueryRequest.getWarehouse() != null && !onhandQueryRequest.getWarehouse().equals("")) + paramMap.put("warehouse", onhandQueryRequest.getWarehouse()); + if (onhandQueryRequest.getIsGroupByBatchcode() != null && !onhandQueryRequest.getIsGroupByBatchcode().equals("")) + paramMap.put("isGroupByBatchcode", onhandQueryRequest.getIsGroupByBatchcode()); + if (onhandQueryRequest.getNumcondition() != null && !onhandQueryRequest.getNumcondition().equals("")) + paramMap.put("numcondition", onhandQueryRequest.getNumcondition()); + paramMap.put("inventory", onhandQueryRequest.getInventory()); + + + String response = HttpClient.mipsGet(ucloudUrl + "/uclooud/basic/onhandQuery", paramMap); + try { + BaseResponse> onHandsResponse = + JSONObject.parseObject(response, new TypeReference>>() { + }); + List invmandocResponses = onHandsResponse.getData().getList(); + for (UOnhandQueryResponse invmandocResponse : invmandocResponses) { + UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByThirdId(invmandocResponse.getCinventory_code()); + if (udiRelevanceEntity != null) { + invmandocResponse.setChecked(true); + } else { + invmandocResponse.setChecked(false); + } + + } + return onHandsResponse; + } catch (Exception e) { + e.printStackTrace(); + return ResultVOUtils.error(500, "连接U8云下载服务出错！"); + } + } + + + public UdiRelevanceResponse findByNamecode(String udi) { + FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); + filterUdiInfoRequest.setNameCode(udi); + List udiRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiInfoRequest); + if (udiRelevanceResponses != null && udiRelevanceResponses.size() > 0) { + return udiRelevanceResponses.get(0); + } else { + return null; + } + } + + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvPrintController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvPrintController.java new file mode 100644 index 00000000..117fec95 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvPrintController.java @@ -0,0 +1,208 @@ +package com.glxp.api.admin.controller.inventory; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.entity.info.SystemParamConfigEntity; +import com.glxp.api.admin.httpclient.ErpInvClient; +import com.glxp.api.admin.req.inventory.ErpOnhandRequest; +import com.glxp.api.admin.res.inout.PurchaseinResponse; +import com.glxp.api.admin.entity.basic.ErpStockEntity; +import com.glxp.api.admin.entity.basic.StockPrintEntity; +import com.glxp.api.admin.req.basic.FilterStockprintRequest; +import com.glxp.api.admin.req.basic.UpdatePrintStatusRequest; +import com.glxp.api.admin.req.inout.DeleteRequest; +import com.glxp.api.admin.req.inout.ImportErpOrderRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.res.inventory.ErpOnHandResponse; +import com.glxp.api.admin.service.inventory.InvErpStockService; +import com.glxp.api.admin.service.inventory.InvStockPrintService; +import com.glxp.api.admin.service.info.SystemParamConfigService; +import com.glxp.api.admin.thread.InvDlErpStockService; +import com.glxp.api.admin.thread.InvImportStockService; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +@RestController +public class InvPrintController { + @Resource + InvStockPrintService stockPrintService; + @Resource + InvImportStockService importStockService; + @Resource + private InvDlErpStockService dlErpStockService; + @Resource + private InvErpStockService erpStockService; + @Resource + private SystemParamConfigService systemParamConfigService; + + @PostMapping("/udiwarehouse/stockPrint/filter") + public BaseResponse filterAll(@RequestBody FilterStockprintRequest stockprintRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List stockPrintEntities + = stockPrintService.filterStockPrint(stockprintRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(stockPrintEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(stockPrintEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @GetMapping("/udiwarehouse/stockPrint/getFilter") + public BaseResponse getFilter(FilterStockprintRequest stockprintRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List stockPrintEntities + = stockPrintService.filterStockPrint(stockprintRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(stockPrintEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(stockPrintEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + + @GetMapping("/udiwarehouse/stockPrint/filterNum") + public BaseResponse filterNum(FilterStockprintRequest stockprintRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("erp_onhand_query"); + String onHandUrl; + if (systemParamConfigEntity == null) + return ResultVOUtils.error(500, "ERP产品信息接口地址未定义"); + else onHandUrl = systemParamConfigEntity.getParamValue(); + + List stockPrintEntities + = stockPrintService.filterStockPrint(stockprintRequest); + if (stockPrintEntities != null) { + for (StockPrintEntity stockPrintEntity : stockPrintEntities) { + ErpOnhandRequest erpOnhandRequest = new ErpOnhandRequest(); + erpOnhandRequest.setInventoryCode(stockPrintEntity.getThirdId()); + List erpOnHandResponses = new ErpInvClient().getOnHand(erpOnhandRequest, onHandUrl); + if (erpOnHandResponses != null && erpOnHandResponses.size() > 0) { + for (ErpOnHandResponse onhandQueryResponse : erpOnHandResponses) { + if (onhandQueryResponse.getBatchNo().equals(stockPrintEntity.getBatchNo()) && onhandQueryResponse.getWarehouseCode().equals(stockPrintEntity.getWarehouseCode())) { + stockPrintEntity.setNnum(onhandQueryResponse.getCount() + ""); + break; + } + } + } + } + } + PageInfo pageInfo; + pageInfo = new PageInfo<>(stockPrintEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(stockPrintEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @GetMapping("/udiwarehouse/stockPrint/import") + public BaseResponse importStock() { + importStockService.updateStock(); + return ResultVOUtils.success("后台已开始自动更新，请稍后刷新查看"); + } + + @PostMapping("/udiwarehouse/stockPrint/update") + public BaseResponse updatePrintStatus(@RequestBody UpdatePrintStatusRequest updatePrintStatusRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List ids = updatePrintStatusRequest.getIds(); + if (ids != null && ids.size() > 0) { + stockPrintService.updatePrintStatus(ids); + } else { + return ResultVOUtils.error(500, "更新数据不能为空"); + } + return ResultVOUtils.success("更新成功"); + } + + + @PostMapping("/udiwarehouse/stockPrint/modify") + public BaseResponse updatePrintStatus(@RequestBody StockPrintEntity stockPrintEntity, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + if (stockPrintEntity.getProduceDate() == null) { + stockPrintEntity.setProduceDate(""); + } + + if (stockPrintEntity.getExpireDate() == null) { + stockPrintEntity.setExpireDate(""); + } + + if (stockPrintEntity.getBatchNo() == null) { + stockPrintEntity.setBatchNo(""); + } + String udiCode = "#" + stockPrintEntity.getNameCode() + "#" + stockPrintEntity.getProduceDate() + "#" + stockPrintEntity.getExpireDate() + + "#" + stockPrintEntity.getBatchNo() + "#" + "#" + stockPrintEntity.getWarehouseCode(); + stockPrintEntity.setUdiCode(udiCode); + stockPrintService.updateStockPrint(stockPrintEntity); + return ResultVOUtils.success("更新成功"); + } + + @PostMapping("/udiwarehouse/stockPrint/delete") + public BaseResponse deletePrintStatus(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + stockPrintService.deleteById(deleteRequest.getId()); + return ResultVOUtils.success("删除成功"); + } + + + @PostMapping("/warehouse/stockPrint/importErpStock") + public BaseResponse importErpStock(@RequestBody ImportErpOrderRequest importErpOrderRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List docids = importErpOrderRequest.getPurchaseinResponses(); + if (docids != null && docids.size() > 0) { + for (PurchaseinResponse purchaseinResponse : docids) { + List stockEntities = new ArrayList<>(); + for (PurchaseinResponse.SubPurchase subPurchase : purchaseinResponse.getSubPurchases()) { + ErpStockEntity erpStockEntity = new ErpStockEntity(); + erpStockEntity.setOrderId(purchaseinResponse.getVbillcode()); + erpStockEntity.setExpirationDate(subPurchase.getDvalidate()); + erpStockEntity.setCode(subPurchase.getInventory_code()); + erpStockEntity.setBatchNo(subPurchase.getVbatchcode()); + erpStockEntity.setName(subPurchase.getInventory_name()); + erpStockEntity.setCount(subPurchase.getDtlgoodsqty() + ""); + stockEntities.add(erpStockEntity); + } + erpStockService.insertErpStocks(stockEntities); + } + } + return ResultVOUtils.success("导入成功"); + } + + + @GetMapping("/warehouse/stockPrint/dlErpStock") + public BaseResponse dlErpStock() { + dlErpStockService.dlErpStock(); + return ResultVOUtils.success("后台已自动更新，请稍后刷新查看！"); + } + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/auth/AuthAdminDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/auth/AuthAdminDao.java new file mode 100644 index 00000000..e9c3471c --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/auth/AuthAdminDao.java @@ -0,0 +1,60 @@ +package com.glxp.api.admin.dao.auth; + +import com.glxp.api.admin.req.auth.AuthAdminQueryRequest; +import com.glxp.api.admin.entity.auth.AuthAdmin; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface AuthAdminDao { + + /** + * 后台业务查询列表 + * @return 列表 + */ + List listAdminPage(AuthAdminQueryRequest authAdminQueryRequest); + + /** + * 根据id查询 + * @param id 传入的id + * @return + */ + AuthAdmin findById(Long id); + + /** + * 根据id查询 password + * @param id 传入的id + * @return + */ + AuthAdmin findPwdById(Long id); + + /** + * 根据Name + * @param userName 用户名 + * @return + */ + AuthAdmin findByUserName(String userName); + + /** + * 插入 + * @param authAdmin + * @return + */ + boolean insertAuthAdmin(AuthAdmin authAdmin); + + /** + * 更新 + * @param authAdmin + * @return + */ + boolean updateAuthAdmin(AuthAdmin authAdmin); + + /** + * 删除 + * @param id + * @return + */ + boolean deleteById(Long id); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/auth/AuthPermissionDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/auth/AuthPermissionDao.java new file mode 100644 index 00000000..c80f57eb --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/auth/AuthPermissionDao.java @@ -0,0 +1,40 @@ +package com.glxp.api.admin.dao.auth; + +import com.glxp.api.admin.entity.auth.AuthPermission; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface AuthPermissionDao { + + /** + * 根据roleIds查询 + * @param roleIds 传入的id + * @return + */ + List listByRoleIdIn(List roleIds); + + /** + * 根据 roleId 查询 + * @param roleId 传入的id + * @return + */ + List listByRoleId(Long roleId); + + + /** + * 批量插入 + * @param authPermissionList + * @return + */ + int insertAuthPermissionAll(List authPermissionList); + + /** + * 根据角色id删除 + * @param roleId + * @return + */ + boolean deleteByRoleId(Long roleId); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/auth/AuthPermissionRuleDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/auth/AuthPermissionRuleDao.java new file mode 100644 index 00000000..fc68a70c --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/auth/AuthPermissionRuleDao.java @@ -0,0 +1,61 @@ +package com.glxp.api.admin.dao.auth; + +import com.glxp.api.admin.entity.auth.AuthPermissionRule; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + + +@Mapper +public interface AuthPermissionRuleDao { + + /** + * 根据ids查询 规则名称 + * @param ids 传入的ids + * @return + */ + List listByIdIn(List ids); + + /** + * 查询所有 + * @param map + * @return + */ + List listAll(); + + /** + * 根据 父级 pid 查询 + * @param pid + * @return + */ + List listByPid(Long pid); + + /** + * 根据 规则名称查询 + * @param name + * @return + */ + AuthPermissionRule findByName(String name); + + /** + * 插入 + * @param authPermissionRule + * @return + */ + boolean insertAuthPermissionRule(AuthPermissionRule authPermissionRule); + + /** + * 更新 + * @param authPermissionRule + * @return + */ + boolean updateAuthPermissionRule(AuthPermissionRule authPermissionRule); + + /** + * 删除 + * @param id + * @return + */ + boolean deleteById(Long id); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/auth/AuthRoleAdminDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/auth/AuthRoleAdminDao.java new file mode 100644 index 00000000..1ccaacfc --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/auth/AuthRoleAdminDao.java @@ -0,0 +1,47 @@ +package com.glxp.api.admin.dao.auth; + +import com.glxp.api.admin.entity.auth.AuthRoleAdmin; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + + +@Mapper +public interface AuthRoleAdminDao { + + /** + * 根据 adminId 查询 + * @param adminId 传入的 adminId + * @return + */ + List listByAdminId(Long adminId); + + /** + * 根据 多个 adminId 查询 + * @param adminIds 传入的 adminIds + * @return + */ + List listByAdminIdIn(List adminIds); + + /** + * 根据 role_id 查询 admin_id + * @param roleId 传入的 roleId + * @return + */ + List listByRoleId(Long roleId); + + /** + * 批量插入 + * @param authRoleAdminList + * @return + */ + int insertAuthRoleAdminAll(List authRoleAdminList); + + + /** + * 根据 adminId 删除 + * @param adminId + * @return + */ + boolean deleteByAdminId(Long adminId); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/auth/AuthRoleDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/auth/AuthRoleDao.java new file mode 100644 index 00000000..c97683e3 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/auth/AuthRoleDao.java @@ -0,0 +1,47 @@ +package com.glxp.api.admin.dao.auth; + +import com.glxp.api.admin.req.auth.AuthRoleQueryRequest; +import com.glxp.api.admin.entity.auth.AuthRole; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface AuthRoleDao { + + /** + * 后台管理业务查询列表 + * @return 列表 + */ + List listAdminPage(AuthRoleQueryRequest authRoleQueryRequest); + + /** + * 返回id,name 字段的列表 + * @return 列表 + */ + List listAuthAdminRolePage(Integer status); + + AuthRole findByName(String name); + + /** + * 插入 + * @param authAdmin + * @return + */ + boolean insertAuthRole(AuthRole authAdmin); + + /** + * 更新 + * @param authAdmin + * @return + */ + boolean updateAuthRole(AuthRole authAdmin); + + /** + * 删除 + * @param id + * @return + */ + boolean deleteById(Long id); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicUnitMaintainDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicUnitMaintainDao.java new file mode 100644 index 00000000..aafc1bbb --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicUnitMaintainDao.java @@ -0,0 +1,24 @@ +package com.glxp.api.admin.dao.basic; + +import com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity; +import com.glxp.api.admin.req.basic.BasicUnitMaintainFilterRequest; +import com.glxp.api.admin.req.basic.BasicUnitMaintainSaveRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface BasicUnitMaintainDao { + List filterList(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest); + + boolean insertBasicUnitMaintain(BasicUnitMaintainEntity basicUnitMaintainEntity); + + boolean insert(BasicUnitMaintainEntity basicUnitMaintainEntity); + + boolean updateById(BasicUnitMaintainSaveRequest basicUnitMaintainSaveRequest); + + boolean deleteById(@Param("id") String id); + + BasicUnitMaintainEntity selectById(@Param("id") String id); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessTypeDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessTypeDao.java new file mode 100644 index 00000000..ba50238f --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessTypeDao.java @@ -0,0 +1,22 @@ +package com.glxp.api.admin.dao.basic; + +import com.glxp.api.admin.entity.basic.BussinessTypeEntity; +import com.glxp.api.admin.req.receipt.BussinessTypeFilterRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface BussinessTypeDao { + + List filterList(BussinessTypeFilterRequest bussinessTypeFilterRequest); + + boolean insertBussinessType(BussinessTypeEntity bussinessTypeEntity); + + boolean updateBussinessType(BussinessTypeEntity bussinessTypeEntity); + + boolean deleteById(@Param("id") String id); + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiInfoDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiInfoDao.java new file mode 100644 index 00000000..f7752bbb --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiInfoDao.java @@ -0,0 +1,32 @@ +package com.glxp.api.admin.dao.basic; + +import com.glxp.api.admin.entity.basic.UdiInfoEntity; +import com.glxp.api.admin.entity.inout.Unit; +import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface UdiInfoDao { + + List filterUdiInfo(FilterUdiInfoRequest filterUdiInfoRequest); + + UdiInfoEntity findByNameCode(@Param("nameCode") String nameCode); + + UdiInfoEntity findByUuid(@Param("uuid") String uuid); + + List findByUuids(@Param("uuid") String uuid); + + boolean insertUdiInfo(UdiInfoEntity udiInfoEntity); + + boolean insertUdiInfos(@Param("udiInfoEntities") List udiInfoEntities); + + boolean updateUdiInfo(UdiInfoEntity udiInfoEntity); + + boolean deleteById(@Param("id") String id); + + boolean deleteByUuid(@Param("uuid") String uuid); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiRelevanceDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiRelevanceDao.java new file mode 100644 index 00000000..cc17c9b0 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiRelevanceDao.java @@ -0,0 +1,35 @@ +package com.glxp.api.admin.dao.basic; + +import com.glxp.api.admin.entity.basic.UdiInfoEntity; +import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; +import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; +import com.glxp.api.admin.res.basic.UdiRelevanceResponse; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface UdiRelevanceDao { + + List filterUdiRelevance(FilterUdiInfoRequest filterUdiInfoRequest); + + List filterUdiGp(FilterUdiInfoRequest filterUdiInfoRequest); + + // UdiRelevanceResponse selectUdiByUUid + List selectByUuid(@Param("uuid") String uuid); + + UdiRelevanceEntity selectById(@Param("id") String id); + + UdiRelevanceEntity selectByThirdId(@Param("thirdId")String thirdId); + + boolean insertUdiRelevance(UdiRelevanceEntity udiRelevanceEntity); + + boolean updateUdiRelevance(UdiRelevanceEntity udiRelevanceEntity); + + boolean deleteById(@Param("id") String id); + + boolean deleteByIds(@Param("ids") List id); + + boolean deleteByUuid(@Param("uuid") String uuid); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UnitMaintainDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UnitMaintainDao.java new file mode 100644 index 00000000..8d135fa8 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UnitMaintainDao.java @@ -0,0 +1,19 @@ +package com.glxp.api.admin.dao.basic; + +import com.glxp.api.admin.entity.basic.UnitMaintainEntity; +import com.glxp.api.admin.req.receipt.UnitMaintainFilterRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface UnitMaintainDao { + List filterList(UnitMaintainFilterRequest unitMaintainFilterRequest); + + boolean insertUnitMaintain(UnitMaintainEntity unitMaintainEntity); + + boolean deleteById(@Param("id") String id); + + UnitMaintainEntity selectById(@Param("id") String id); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/info/CompanyDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/info/CompanyDao.java new file mode 100644 index 00000000..ab508d44 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/info/CompanyDao.java @@ -0,0 +1,14 @@ +package com.glxp.api.admin.dao.info; + +import com.glxp.api.admin.entity.info.CompanyEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CompanyDao { + + CompanyEntity findCompany(); + + boolean modifyCompany(CompanyEntity companyEntity); + + boolean insertCompany(CompanyEntity companyEntity); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/info/ScheduledDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/info/ScheduledDao.java new file mode 100644 index 00000000..623aa499 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/info/ScheduledDao.java @@ -0,0 +1,18 @@ +package com.glxp.api.admin.dao.info; + +import com.glxp.api.admin.entity.info.ScheduledEntity; +import com.glxp.api.admin.req.udid.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); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/info/SetupDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/info/SetupDao.java new file mode 100644 index 00000000..35c7b15a --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/info/SetupDao.java @@ -0,0 +1,18 @@ +package com.glxp.api.admin.dao.info; + +import com.glxp.api.admin.entity.info.SetupEntity; +import com.glxp.api.admin.req.info.FilterSetupRequest; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface SetupDao { + + SetupEntity findSetup(FilterSetupRequest filterSetupRequest); + + boolean modifySetup(SetupEntity setupEntity); + + boolean insertSetup(SetupEntity setupEntity); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/info/SystemParamConfigDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/info/SystemParamConfigDao.java new file mode 100644 index 00000000..15b5062f --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/info/SystemParamConfigDao.java @@ -0,0 +1,27 @@ +package com.glxp.api.admin.dao.info; + +import com.glxp.api.admin.entity.info.SystemParamConfigEntity; +import com.glxp.api.admin.req.info.SystemParamConfigRequest; +import com.glxp.api.admin.req.info.SystemParamConfigSaveRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface SystemParamConfigDao { + List queryPage(SystemParamConfigRequest systemParamConfigRequest); + + SystemParamConfigEntity findSystemParamConfig(SystemParamConfigRequest systemParamConfigRequest); + + SystemParamConfigEntity selectByParamName(SystemParamConfigRequest systemParamConfigRequest); + + SystemParamConfigEntity selectByParamKey(@Param("paramKey") String paramKey); + + boolean updateById(SystemParamConfigSaveRequest systemParamConfigSaveRequest); + + boolean updateParentId(SystemParamConfigSaveRequest systemParamConfigSaveRequest); + + boolean insert(SystemParamConfigEntity systemParamConfigEntity); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/CodesDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inout/CodesDao.java new file mode 100644 index 00000000..542dd5c8 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inout/CodesDao.java @@ -0,0 +1,37 @@ +package com.glxp.api.admin.dao.inout; + +import com.glxp.api.admin.entity.inout.WarehouseEntity; +import com.glxp.api.admin.req.inout.WarehouseQueryRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface CodesDao { + + List listWarehouse(WarehouseQueryRequest warehouseQueryRequest); + + boolean insertWarehouse(WarehouseEntity warehouseEntity); + + boolean insertWarehouses(@Param("warehouseEntities") List warehouseEntities); + + List findByNo(WarehouseQueryRequest warehouseQueryRequest); + + Integer isExit(WarehouseEntity warehouseEntity); + + List findByOrderId(WarehouseQueryRequest warehouseQueryRequest); + + List findByReceiptId(@Param("orderId") String orderId); + + List findByCode(@Param("code") String code); + + List searchCode(@Param("code") String code); + + boolean updateOrderId(@Param("oldOrderId") String oldOrderId, @Param("newOrderId") String newOrderId); + + boolean updateUnit(@Param("orderId") String orderId, @Param("fromCorpID") String fromCorpID, @Param("fromCorp") String fromCorp); + + List findCodesById(@Param("orderId") String orderId); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/CodesTempDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inout/CodesTempDao.java new file mode 100644 index 00000000..92cfabd3 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inout/CodesTempDao.java @@ -0,0 +1,20 @@ +package com.glxp.api.admin.dao.inout; + +import com.glxp.api.admin.entity.inout.WarehouseEntity; +import com.glxp.api.admin.entity.inout.Warehousetemp; +import com.glxp.api.admin.req.inout.WarehouseQueryRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface CodesTempDao { + + int insertCodesTemp(@Param("codes") List warehouseEntities); + + int deleteCodesTemp(@Param("codes") List warehouseEntities); + + List findByOrderId(WarehouseQueryRequest warehouseQueryRequest); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/OrderDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inout/OrderDao.java new file mode 100644 index 00000000..4d5eee55 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inout/OrderDao.java @@ -0,0 +1,50 @@ +package com.glxp.api.admin.dao.inout; + +import com.glxp.api.admin.entity.inout.OrderEntity; +import com.glxp.api.admin.entity.inout.WarehouseEntity; +import com.glxp.api.admin.req.inout.OrderFilterRequest; +import com.glxp.api.admin.req.inout.OrderQueryRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface OrderDao { + + List listOrder(OrderQueryRequest orderQueryRequest); + + boolean insertOrder(OrderEntity orderEntity); + + boolean updateOrder(OrderEntity orderEntity); + + List listOrderError(OrderQueryRequest orderQueryRequest); + + List listOrderRepeat(OrderQueryRequest orderQueryRequest); + + boolean deleteByOrderId(@Param("orderId") String orderId); + + boolean deleteById(@Param("id") String id); + + boolean updateUnit(OrderEntity orderEntity); + + boolean updateOrderStatus(@Param("orderId") String orderId, @Param("status") Integer status); + + boolean updateExportStatus(@Param("orderId") String orderId, @Param("exportStatus") Integer exportStatus); + + boolean updateContrastStatus(@Param("orderId") String orderId, @Param("contrastStatus") String contrastStatus); + + boolean updateSignStatus(@Param("orderId") String orderId, @Param("signStatus") Integer signStatus); + + boolean updateRemark(@Param("orderId") String orderId, @Param("remark") String remark); + + List filterList(OrderFilterRequest orderFilterRequest); + + List filterNoSort(OrderFilterRequest orderFilterRequest); + + List filterListByCode(@Param("warehouseEntityList") List warehouseEntityList); + + OrderEntity findOne(OrderFilterRequest orderFilterRequest); + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/OrderDetailDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inout/OrderDetailDao.java new file mode 100644 index 00000000..9e24d68a --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inout/OrderDetailDao.java @@ -0,0 +1,43 @@ +package com.glxp.api.admin.dao.inout; + +import com.glxp.api.admin.entity.inout.ErpOrderEntity; +import com.glxp.api.admin.entity.inout.FilterErpOrderRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface OrderDetailDao { + + List filterMyErpOrder(FilterErpOrderRequest filterErpOrderRequest); + + List findByStockCheck(@Param("orderids") List orderids); + + List filterMyErpMainOrder(FilterErpOrderRequest filterErpOrderRequest); + + List filterMyErpDetailOrder(FilterErpOrderRequest filterErpOrderRequest); + + List findAllByDocids(@Param("docids") List docids); + + List filterAllDocid(FilterErpOrderRequest filterErpOrderRequest); + + List filterAllDocidE(FilterErpOrderRequest filterErpOrderRequest); + + boolean insertErpOrders(@Param("erpOrderEntities") List erpOrderEntities); + + boolean insertErpOrder(ErpOrderEntity erpOrderEntity); + + boolean updateErpOrder(ErpOrderEntity erpOrderEntity); + + boolean deleteById(@Param("id") String id); + + boolean deleteByPrimiyId(@Param("id") String id); + + + Integer isExit(@Param("docid") String docid); + + List selectAllIds(@Param("docids") List docids); + + boolean deleteByOrderId(@Param("id") String id); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvErpStockDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvErpStockDao.java new file mode 100644 index 00000000..5592a15c --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvErpStockDao.java @@ -0,0 +1,24 @@ +package com.glxp.api.admin.dao.inventory; + +import com.glxp.api.admin.entity.basic.ErpStockEntity; +import com.glxp.api.admin.req.basic.FilterStockprintRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface InvErpStockDao { + + ErpStockEntity findByCode(@Param("code") String code, @Param("batchNo") String batchNo); + + boolean insertErpStock(ErpStockEntity stockPrintEntity); + + boolean insertErpStocks(@Param("erpStockEntities") List erpStockEntities); + + boolean updateErpStock(ErpStockEntity udiInfoEntity); + + boolean deleteById(@Param("id") String id); + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvOrderCheckDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvOrderCheckDao.java new file mode 100644 index 00000000..a901517d --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvOrderCheckDao.java @@ -0,0 +1,21 @@ +package com.glxp.api.admin.dao.inventory; + +import com.glxp.api.admin.entity.basic.StockPrintEntity; +import com.glxp.api.admin.entity.inout.StockCheckEntity; +import com.glxp.api.admin.req.basic.FilterStockprintRequest; +import com.glxp.api.admin.req.inout.FilterStockCheckRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface InvOrderCheckDao { + List filterStockCheck(FilterStockCheckRequest filterStockCheckRequest); + + boolean insertStockCheck(StockCheckEntity stockCheckEntity); + + boolean updateStockCheck(StockCheckEntity stockCheckEntity); + + boolean deleteById(@Param("id") String id); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvStockPrintDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvStockPrintDao.java new file mode 100644 index 00000000..e4f50e27 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvStockPrintDao.java @@ -0,0 +1,32 @@ +package com.glxp.api.admin.dao.inventory; + +import com.glxp.api.admin.entity.basic.StockPrintEntity; +import com.glxp.api.admin.entity.basic.UdiInfoEntity; +import com.glxp.api.admin.req.basic.FilterStockprintRequest; +import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface InvStockPrintDao { + + List filterStockPrint(FilterStockprintRequest filterStockprintRequest); + + StockPrintEntity findByNameCode(@Param("nameCode") String nameCode); + + StockPrintEntity findByRlId(FilterStockprintRequest udiRlIdFk); + + boolean insertStockPrint(StockPrintEntity stockPrintEntity); + + boolean insertStockPrints(@Param("stockPrintEntities") List stockPrintEntities); + + boolean updateStockPrint(StockPrintEntity udiInfoEntity); + + boolean deleteById(@Param("id") String id); + + boolean updatePrintStatus(@Param("ids") List ids); + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/AuthAdmin.java b/api-admin/src/main/java/com/glxp/api/admin/entity/auth/AuthAdmin.java new file mode 100644 index 00000000..3513b59d --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/auth/AuthAdmin.java @@ -0,0 +1,31 @@ +package com.glxp.api.admin.entity.auth; + +import lombok.Data; + +import java.util.Date; + +@Data +public class AuthAdmin { + + // 主键 + private Long id; + // 昵称 + private String userName; + // 登录密码 + private String passWord; + + // 最后登录ip + private String lastLoginIp; + // 最后登录时间 + private Date lastLoginTime; + // 创建时间 + private Date createTime; + // 状态 + private Integer userFlag; + + private Date lastModifyTime; + private String comments; + private String employeeName; + private Integer CustomerId; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/AuthPermission.java b/api-admin/src/main/java/com/glxp/api/admin/entity/auth/AuthPermission.java new file mode 100644 index 00000000..c0ba1fe8 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/auth/AuthPermission.java @@ -0,0 +1,19 @@ +package com.glxp.api.admin.entity.auth; + +import lombok.Data; + +/** + * 权限授权表 + */ +@Data +public class AuthPermission { + + private Long id; + + private Long roleId; + + private Long permissionRuleId; + + private String type; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/AuthPermissionRule.java b/api-admin/src/main/java/com/glxp/api/admin/entity/auth/AuthPermissionRule.java new file mode 100644 index 00000000..b11708cd --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/auth/AuthPermissionRule.java @@ -0,0 +1,22 @@ +package com.glxp.api.admin.entity.auth; + +import lombok.Data; + +import java.util.Date; + +/** + * 规则表 + */ +@Data +public class AuthPermissionRule { + + private Long id; + private Long pid; + private String name; + private String title; + private Integer status; + private String condition; + private Integer listorder; + private Date createTime; + private Date updateTime; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/AuthRole.java b/api-admin/src/main/java/com/glxp/api/admin/entity/auth/AuthRole.java new file mode 100644 index 00000000..79dd7069 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/auth/AuthRole.java @@ -0,0 +1,21 @@ +package com.glxp.api.admin.entity.auth; + +import lombok.Data; + +import java.util.Date; + +/** + * 角色表 + */ +@Data +public class AuthRole { + + private Long id; + private String name; + private Long pid; + private Long status; + private String remark; + private Long listorder; + private Date createTime; + private Date updateTime; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/AuthRoleAdmin.java b/api-admin/src/main/java/com/glxp/api/admin/entity/auth/AuthRoleAdmin.java new file mode 100644 index 00000000..f0c16429 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/auth/AuthRoleAdmin.java @@ -0,0 +1,14 @@ +package com.glxp.api.admin.entity.auth; + +import lombok.Data; + +/** + * 用户角色对应表 + */ +@Data +public class AuthRoleAdmin { + private Long id; + private Long role_id; + private Long admin_id; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicUnitMaintainEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicUnitMaintainEntity.java new file mode 100644 index 00000000..3d1066ae --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicUnitMaintainEntity.java @@ -0,0 +1,20 @@ +package com.glxp.api.admin.entity.basic; + +import lombok.Data; + +@Data +public class BasicUnitMaintainEntity { + + private Integer id; + private String thirdId; + private String erpId; + private String name; + private String spell; + private String addr; + private String status; + private String type; + private String creditNo; + private String contact; + private String mobile; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BussinessTypeEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BussinessTypeEntity.java new file mode 100644 index 00000000..f7253eb0 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BussinessTypeEntity.java @@ -0,0 +1,14 @@ +package com.glxp.api.admin.entity.basic; + +import lombok.Data; + +@Data +public class BussinessTypeEntity { + private Integer id; + private String action; + private String name; + private Boolean enable; + private String remark; + private String mainAction; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/ErpStockEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/ErpStockEntity.java new file mode 100644 index 00000000..92e4a871 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/ErpStockEntity.java @@ -0,0 +1,18 @@ +package com.glxp.api.admin.entity.basic; + +import lombok.Data; + +@Data +public class ErpStockEntity { + + private String id; + private String orderId; + private String code; + private String batchNo; + private String manufacturingDate; + private String expirationDate; + private String count; + private String remark; + private String name; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/StockPrintEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/StockPrintEntity.java new file mode 100644 index 00000000..0eb942f1 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/StockPrintEntity.java @@ -0,0 +1,27 @@ +package com.glxp.api.admin.entity.basic; + +import lombok.Data; + +@Data +public class StockPrintEntity { + private int id; + private String udiRlIdFk; + private String udiCode; + private String nameCode; + private String cpmctymc; + private String batchNo; + private String produceDate; + private String expireDate; + private String serialNo; + private String codeType; + private String thirdId; + private String thirdName; + private String printStatus; + private String ggxh; + private String ylqxzcrbarmc; + private String zczbhhzbapzbh; + private String warehouseName; + private String warehouseCode; + private String nnum; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiEntity.java new file mode 100644 index 00000000..661c5ae4 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiEntity.java @@ -0,0 +1,65 @@ +package com.glxp.api.admin.entity.basic; + +/** + * @author 彭于晏 + * @date 2020/9/22. + */ +public class UdiEntity { + + private String batchNo; + private String produceDate; + private String expireDate; + private String serialNo; + private String udi; + + public String getBatchNo() { + return batchNo; + } + + public void setBatchNo(String batchNo) { + this.batchNo = batchNo; + } + + public String getProduceDate() { + return produceDate; + } + + public void setProduceDate(String produceDate) { + this.produceDate = produceDate; + } + + public String getExpireDate() { + return expireDate; + } + + public void setExpireDate(String expireDate) { + this.expireDate = expireDate; + } + + public String getSerialNo() { + return serialNo; + } + + public void setSerialNo(String serialNo) { + this.serialNo = serialNo; + } + + public String getUdi() { + return udi; + } + + public void setUdi(String udi) { + this.udi = udi; + } + + @Override + public String toString() { + return "UdiEntity{" + + "batchNo='" + batchNo + '\'' + + ", produceDate='" + produceDate + '\'' + + ", expireDate='" + expireDate + '\'' + + ", serialNo='" + serialNo + '\'' + + ", udi='" + udi + '\'' + + '}'; + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoEntity.java new file mode 100644 index 00000000..5dddda0e --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoEntity.java @@ -0,0 +1,337 @@ +package com.glxp.api.admin.entity.basic; + +import lombok.Data; + +public class UdiInfoEntity { + + private Integer id; + private String nameCode; + private String packRatio; + private String packLevel; + private Integer bhxjsl; + private Integer bhzxxsbzsl; + private Integer zxxsbzbhsydysl; + private String bhxjcpbm; + private String sjcpbm; // + private String bzcj; + private String addType; + private String deviceRecordKey; + private String cpmctymc; + private String cplb; + private String flbm; + private String ggxh; + private String qxlb; + private String tyshxydm; + private String ylqxzcrbarmc; + private String zczbhhzbapzbh; + private String ylqxzcrbarywmc; + private String sydycpbs; + private String uuid; + private int versionNumber; + private int diType; + private String thirdId; + private String thirdName; + + + //本地生成信息 + private String batchNo; + private String produceDate; + private String expireDate; + private String serialNo; + private String udi; + private String code; + private Integer count; + private String warehouseCode; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getNameCode() { + return nameCode; + } + + public void setNameCode(String nameCode) { + this.nameCode = nameCode; + } + + public String getPackRatio() { + return packRatio; + } + + public void setPackRatio(String packRatio) { + this.packRatio = packRatio; + } + + public String getPackLevel() { + return packLevel; + } + + public void setPackLevel(String packLevel) { + this.packLevel = packLevel; + } + + public Integer getBhxjsl() { + if (bhxjsl == null || bhxjsl == 0) { + return 1; + } + return bhxjsl; + } + + public void setBhxjsl(Integer bhxjsl) { + this.bhxjsl = bhxjsl; + } + + public Integer getBhzxxsbzsl() { + if (bhzxxsbzsl == null || bhzxxsbzsl == 0) { + return 1; + } + return bhzxxsbzsl; + } + + public void setBhzxxsbzsl(Integer bhzxxsbzsl) { + this.bhzxxsbzsl = bhzxxsbzsl; + } + + public Integer getZxxsbzbhsydysl() { + if (zxxsbzbhsydysl == null || zxxsbzbhsydysl == 0) { + return 1; + } + return zxxsbzbhsydysl; + } + + public void setZxxsbzbhsydysl(Integer zxxsbzbhsydysl) { + this.zxxsbzbhsydysl = zxxsbzbhsydysl; + } + + public String getBhxjcpbm() { + return bhxjcpbm; + } + + public void setBhxjcpbm(String bhxjcpbm) { + this.bhxjcpbm = bhxjcpbm; + } + + public String getSjcpbm() { + return sjcpbm; + } + + public void setSjcpbm(String sjcpbm) { + this.sjcpbm = sjcpbm; + } + + public String getBzcj() { + return bzcj; + } + + public void setBzcj(String bzcj) { + this.bzcj = bzcj; + } + + public String getAddType() { + return addType; + } + + public void setAddType(String addType) { + this.addType = addType; + } + + public String getDeviceRecordKey() { + return deviceRecordKey; + } + + public void setDeviceRecordKey(String deviceRecordKey) { + this.deviceRecordKey = deviceRecordKey; + } + + + public String getCpmctymc() { + return cpmctymc; + } + + public void setCpmctymc(String cpmctymc) { + this.cpmctymc = cpmctymc; + } + + public String getCplb() { + return cplb; + } + + public void setCplb(String cplb) { + this.cplb = cplb; + } + + public String getFlbm() { + return flbm; + } + + public void setFlbm(String flbm) { + this.flbm = flbm; + } + + public String getGgxh() { + return ggxh; + } + + public void setGgxh(String ggxh) { + this.ggxh = ggxh; + } + + public String getQxlb() { + return qxlb; + } + + public void setQxlb(String qxlb) { + this.qxlb = qxlb; + } + + public String getTyshxydm() { + return tyshxydm; + } + + public void setTyshxydm(String tyshxydm) { + this.tyshxydm = tyshxydm; + } + + public String getYlqxzcrbarmc() { + return ylqxzcrbarmc; + } + + public void setYlqxzcrbarmc(String ylqxzcrbarmc) { + this.ylqxzcrbarmc = ylqxzcrbarmc; + } + + public String getZczbhhzbapzbh() { + return zczbhhzbapzbh; + } + + public void setZczbhhzbapzbh(String zczbhhzbapzbh) { + this.zczbhhzbapzbh = zczbhhzbapzbh; + } + + public String getYlqxzcrbarywmc() { + return ylqxzcrbarywmc; + } + + public void setYlqxzcrbarywmc(String ylqxzcrbarywmc) { + this.ylqxzcrbarywmc = ylqxzcrbarywmc; + } + + public String getSydycpbs() { + return sydycpbs; + } + + public void setSydycpbs(String sydycpbs) { + this.sydycpbs = sydycpbs; + } + + public String getUuid() { + return uuid; + } + + public void setUuid(String uuid) { + this.uuid = uuid; + } + + public int getVersionNumber() { + return versionNumber; + } + + public void setVersionNumber(int versionNumber) { + this.versionNumber = versionNumber; + } + + public int getDiType() { + return diType; + } + + public void setDiType(int diType) { + this.diType = diType; + } + + public String getThirdId() { + return thirdId; + } + + public void setThirdId(String thirdId) { + this.thirdId = thirdId; + } + + public String getThirdName() { + return thirdName; + } + + public void setThirdName(String thirdName) { + this.thirdName = thirdName; + } + + public String getBatchNo() { + return batchNo; + } + + public void setBatchNo(String batchNo) { + this.batchNo = batchNo; + } + + public String getProduceDate() { + return produceDate; + } + + public void setProduceDate(String produceDate) { + this.produceDate = produceDate; + } + + public String getExpireDate() { + return expireDate; + } + + public void setExpireDate(String expireDate) { + this.expireDate = expireDate; + } + + public String getSerialNo() { + return serialNo; + } + + public void setSerialNo(String serialNo) { + this.serialNo = serialNo; + } + + public String getUdi() { + return udi; + } + + public void setUdi(String udi) { + this.udi = udi; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public Integer getCount() { + if(count ==null) + return 1; + return count; + } + + public void setCount(Integer count) { + this.count = count; + } + + public String getWarehouseCode() { + return warehouseCode; + } + + public void setWarehouseCode(String warehouseCode) { + this.warehouseCode = warehouseCode; + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiRelevanceEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiRelevanceEntity.java new file mode 100644 index 00000000..3cd47fb6 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiRelevanceEntity.java @@ -0,0 +1,15 @@ +package com.glxp.api.admin.entity.basic; + +import lombok.Data; + +@Data +public class UdiRelevanceEntity { + + private String id; + private String thirdId; + private String thirdName; + private String uuid; + private Boolean isUseDy; + private String updateTime; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UnitMaintainEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UnitMaintainEntity.java new file mode 100644 index 00000000..560de4b0 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UnitMaintainEntity.java @@ -0,0 +1,19 @@ +package com.glxp.api.admin.entity.basic; + +import lombok.Data; + +@Data +public class UnitMaintainEntity { + + private Integer id; + private String thirdId; + private String erpId; + private String name; + private String spell; + private String addr; + private String status; + private String type; + private String contact; + private String mobile; + private String creditNo; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/info/CompanyEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/info/CompanyEntity.java new file mode 100644 index 00000000..a1248b46 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/info/CompanyEntity.java @@ -0,0 +1,16 @@ +package com.glxp.api.admin.entity.info; + +import lombok.Data; + +@Data +public class CompanyEntity { + + private String name; //企业名称 + private String category; //企业类型 + private String creditCode; //统一社会信用代码 + private String addr; //住所地址 + private String productAddr; //生产地址 + private String classes; //企业类别 //企业类别：1.生产企业，2.流通企业，3。医疗机构 + private String appId; + private String appSecret; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/info/MipsServiceEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/info/MipsServiceEntity.java new file mode 100644 index 00000000..6f7a3f11 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/info/MipsServiceEntity.java @@ -0,0 +1,10 @@ +package com.glxp.api.admin.entity.info; + +import lombok.Data; + +@Data +public class MipsServiceEntity { + private String mipsName; + private String url; + private String remark; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/info/ScheduledEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/info/ScheduledEntity.java new file mode 100644 index 00000000..d1207f7a --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/info/ScheduledEntity.java @@ -0,0 +1,12 @@ +package com.glxp.api.admin.entity.info; + +import lombok.Data; + +@Data +public class ScheduledEntity { + + private int id; + private String cronName; + private String cron; + private String customerId; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/info/SetupEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/info/SetupEntity.java new file mode 100644 index 00000000..206e77eb --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/info/SetupEntity.java @@ -0,0 +1,30 @@ +package com.glxp.api.admin.entity.info; + +import lombok.Data; + +@Data +public class SetupEntity { + + private int id; + private boolean erpSaleOutModify; + private boolean erpGetSaleOut; + private boolean erpSaleOutSign; + private boolean filterSaleOutSign; + private int erpGetSaleOutDay; + + private boolean erpPruchaseModify; + private boolean erpGetPurchaseIn; + private boolean erpPruchaseSign; + private int erpGetPurchaseDay; + private boolean filterPurchaseSign; + private String remark; + private boolean forbidSameErp; + + private boolean returnWareHouseOut; + private boolean salesWareHouseOut; + private boolean returnWareHouseIn; + private boolean updateErpData; + + private boolean dlStockErp; + private Integer dlStockErpDay; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/info/SystemParamConfigEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/info/SystemParamConfigEntity.java new file mode 100644 index 00000000..243a4862 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/info/SystemParamConfigEntity.java @@ -0,0 +1,16 @@ +package com.glxp.api.admin.entity.info; + +import lombok.Data; + +@Data +public class SystemParamConfigEntity { + + private int id; + private int parentId; + private String paramName; + private String paramKey; + private String paramValue; + private int paramStatus; + private int paramType; + private String paramExplain; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/ErpDetailCodeEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/inout/ErpDetailCodeEntity.java new file mode 100644 index 00000000..fa3ee4dc --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/inout/ErpDetailCodeEntity.java @@ -0,0 +1,21 @@ +package com.glxp.api.admin.entity.inout; + +import lombok.Data; + +@Data +public class ErpDetailCodeEntity { + private String nameCode; + private String packRatio; + private String packSpec; + private String authCode; + private String coName; + private String unit; + private int bhzxxsbzsl; + private int zxxsbzbhsydysl; + private int isUseDy; + private String batchNo; + private String code; + private int count; + private String thirdProductNo; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/ErpOrderEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/inout/ErpOrderEntity.java new file mode 100644 index 00000000..24bd005d --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/inout/ErpOrderEntity.java @@ -0,0 +1,58 @@ +package com.glxp.api.admin.entity.inout; + +import lombok.Data; + +@Data +public class ErpOrderEntity { + + + /** + * companyid : 31443 + * docid : 200959 + * iodtlid : 1108752 + * inoutid : 1064084 + * credate : 2020-10-14 10:24:56.0 + * goodsunit : 瓶 + * goodsid : 26 + * lotid : 84392 + * goodsname : 川贝清肺糖浆（120ml） + * companyname : 安徽阜阳医药集团有限公司 + * lotno : 1912198 + * dtlgoodsqty : 4000 + */ + + private long id; + private String erpOrderId; + private String iodtlId; + private String inoutId; + private String companyid; + private String companyname; + private String goodsid; + private String goodsname; + private String goodsunit; + private String batchNoId; + private String batchNo; + private String credate; + private String warehouseCode; + private String productDate; + private String expireDate; + private int erpCount; + private int reCount; + + + private String nameCode; + private String productCompany; + private String coName; + private String authCode; + private String packSpec; + private String packRatio; + private int bhzxxsbzsl; + private int zxxsbzbhsydysl; + private String isDownload; + private String orderIdFk; + private String nameCodes; + private String status; + private int count; + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/FilterErpOrderRequest.java b/api-admin/src/main/java/com/glxp/api/admin/entity/inout/FilterErpOrderRequest.java new file mode 100644 index 00000000..c9699050 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/inout/FilterErpOrderRequest.java @@ -0,0 +1,23 @@ +package com.glxp.api.admin.entity.inout; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; + +import java.util.List; + +@Data +public class FilterErpOrderRequest extends ListPageRequest { + + private String docid; + private String goodsname; + private String companyname; + private String orderId; + private String orderIdFk; + private String startDate; + private String endDate; + private String billAction; + private String billcode; + private String fbillflag; + List orderIds; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/MipsDrugEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/inout/MipsDrugEntity.java new file mode 100644 index 00000000..b1c1bdf0 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/inout/MipsDrugEntity.java @@ -0,0 +1,20 @@ +package com.glxp.api.admin.entity.inout; + +import lombok.Data; + +@Data +public class MipsDrugEntity { + + private String AuthorizedNo; + private String Type; + private String Spec; + private String PackUnit; + private String ProductCode; + private String ProductName; + private String ProductType; + private String PackageSpec; + private String PkgRatio; + private String ResCode; + private String CodeVersion; + private String CodeLevel; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/OrderDetailEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/inout/OrderDetailEntity.java new file mode 100644 index 00000000..0568b66a --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/inout/OrderDetailEntity.java @@ -0,0 +1,34 @@ +package com.glxp.api.admin.entity.inout; + +import lombok.Data; + +@Data +public class OrderDetailEntity { + + private String id; + private String nameCode; + private String packRatio; + private String packLevel; + private int bhxjsl; + private int bhzxxsbzsl; + + private String bhxjcpbm; + private String bzcj; + private String thirdProductNo; + private String addType; + private String deviceRecordKey; + private String type; + private String unit; + private String coName; + private String form; + private String formSpec; + private String packSpec; + private String authCode; + private String name; + private String uuid; + private int count; + private int zxxsbzbhsydysl; + private int isUseDy; + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/OrderEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/inout/OrderEntity.java new file mode 100644 index 00000000..928e6a5c --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/inout/OrderEntity.java @@ -0,0 +1,24 @@ +package com.glxp.api.admin.entity.inout; + +import lombok.Data; + +@Data +public class OrderEntity { + + private String id; + private String corpOrderId; + private String action; + private String actDate; + private String fromCorpId; + private String actor; + private String mainAction; + private String fromCorp; + private Integer status; + private String exportStatus; + private String fromType; + private Integer contrastStatus; + private String erpFk; + private String signStatus; + private String stockCheckFk; + private String remark; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/StockCheckEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/inout/StockCheckEntity.java new file mode 100644 index 00000000..40414992 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/inout/StockCheckEntity.java @@ -0,0 +1,17 @@ +package com.glxp.api.admin.entity.inout; + +import lombok.Data; + +@Data +public class StockCheckEntity { + + private int id; + private String action; + private String actDate; + private String status; + private String remark; + private String endTime; + private String whouse; + private String houseCard; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/Unit.java b/api-admin/src/main/java/com/glxp/api/admin/entity/inout/Unit.java new file mode 100644 index 00000000..66760b94 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/inout/Unit.java @@ -0,0 +1,14 @@ +package com.glxp.api.admin.entity.inout; + +import lombok.Data; + +@Data +public class Unit { + private String unitId; + private String name; + private String spell; + private String addr; + private String status; + private String type; + private Integer id; +} \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/WarehouseEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/inout/WarehouseEntity.java new file mode 100644 index 00000000..09e4fb6b --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/inout/WarehouseEntity.java @@ -0,0 +1,24 @@ +package com.glxp.api.admin.entity.inout; + +import lombok.Data; + +@Data +public class WarehouseEntity { + private Long id; + private String action; + private String mainAction; + private String code; + private String corpOrderId; + private String actor; + private String actDate; + private String fromCorpId; + private String fromCorp; + private String orderId; + private String batchNo; + private String produceDate; + private String expireDate; + private String serialNo; + private Integer count; + private String packageLevel; + private String warehouseCode; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/Warehousetemp.java b/api-admin/src/main/java/com/glxp/api/admin/entity/inout/Warehousetemp.java new file mode 100644 index 00000000..af5a496a --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/inout/Warehousetemp.java @@ -0,0 +1,192 @@ +package com.glxp.api.admin.entity.inout; + +public class Warehousetemp { + private Long id; + + private String action; + + private String mainaction; + + private String code; + + private String corporderid; + + private String actor; + + private String actdate; + + private Integer wrongcode; + + private String uppercorporderid; + + private String fromcorpid; + + private String fromcorp; + + private String orderid; + + private String batchno; + + private String producedate; + + private String expiredate; + + private String serialno; + + private String udi; + + private Integer count; + private Integer type; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getAction() { + return action; + } + + public void setAction(String action) { + this.action = action == null ? null : action.trim(); + } + + public String getMainaction() { + return mainaction; + } + + public void setMainaction(String mainaction) { + this.mainaction = mainaction == null ? null : mainaction.trim(); + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code == null ? null : code.trim(); + } + + public String getCorporderid() { + return corporderid; + } + + public void setCorporderid(String corporderid) { + this.corporderid = corporderid == null ? null : corporderid.trim(); + } + + public String getActor() { + return actor; + } + + public void setActor(String actor) { + this.actor = actor == null ? null : actor.trim(); + } + + public String getActdate() { + return actdate; + } + + public void setActdate(String actdate) { + this.actdate = actdate == null ? null : actdate.trim(); + } + + public Integer getWrongcode() { + return wrongcode; + } + + public void setWrongcode(Integer wrongcode) { + this.wrongcode = wrongcode; + } + + public String getUppercorporderid() { + return uppercorporderid; + } + + public void setUppercorporderid(String uppercorporderid) { + this.uppercorporderid = uppercorporderid == null ? null : uppercorporderid.trim(); + } + + public String getFromcorpid() { + return fromcorpid; + } + + public void setFromcorpid(String fromcorpid) { + this.fromcorpid = fromcorpid == null ? null : fromcorpid.trim(); + } + + public String getFromcorp() { + return fromcorp; + } + + public void setFromcorp(String fromcorp) { + this.fromcorp = fromcorp == null ? null : fromcorp.trim(); + } + + public String getOrderid() { + return orderid; + } + + public void setOrderid(String orderid) { + this.orderid = orderid == null ? null : orderid.trim(); + } + + public String getBatchno() { + return batchno; + } + + public void setBatchno(String batchno) { + this.batchno = batchno == null ? null : batchno.trim(); + } + + public String getProducedate() { + return producedate; + } + + public void setProducedate(String producedate) { + this.producedate = producedate == null ? null : producedate.trim(); + } + + public String getExpiredate() { + return expiredate; + } + + public void setExpiredate(String expiredate) { + this.expiredate = expiredate == null ? null : expiredate.trim(); + } + + public String getSerialno() { + return serialno; + } + + public void setSerialno(String serialno) { + this.serialno = serialno == null ? null : serialno.trim(); + } + + public String getUdi() { + return udi; + } + + public void setUdi(String udi) { + this.udi = udi == null ? null : udi.trim(); + } + + public Integer getCount() { + return count; + } + + public void setCount(Integer count) { + this.count = count; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } +} \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/WarehousetempExample.java b/api-admin/src/main/java/com/glxp/api/admin/entity/inout/WarehousetempExample.java new file mode 100644 index 00000000..529a29cc --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/inout/WarehousetempExample.java @@ -0,0 +1,1429 @@ +package com.glxp.api.admin.entity.inout; + +import java.util.ArrayList; +import java.util.List; + +public class WarehousetempExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public WarehousetempExample() { + oredCriteria = new ArrayList<>(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList<>(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andActionIsNull() { + addCriterion("action is null"); + return (Criteria) this; + } + + public Criteria andActionIsNotNull() { + addCriterion("action is not null"); + return (Criteria) this; + } + + public Criteria andActionEqualTo(String value) { + addCriterion("action =", value, "action"); + return (Criteria) this; + } + + public Criteria andActionNotEqualTo(String value) { + addCriterion("action <>", value, "action"); + return (Criteria) this; + } + + public Criteria andActionGreaterThan(String value) { + addCriterion("action >", value, "action"); + return (Criteria) this; + } + + public Criteria andActionGreaterThanOrEqualTo(String value) { + addCriterion("action >=", value, "action"); + return (Criteria) this; + } + + public Criteria andActionLessThan(String value) { + addCriterion("action <", value, "action"); + return (Criteria) this; + } + + public Criteria andActionLessThanOrEqualTo(String value) { + addCriterion("action <=", value, "action"); + return (Criteria) this; + } + + public Criteria andActionLike(String value) { + addCriterion("action like", value, "action"); + return (Criteria) this; + } + + public Criteria andActionNotLike(String value) { + addCriterion("action not like", value, "action"); + return (Criteria) this; + } + + public Criteria andActionIn(List values) { + addCriterion("action in", values, "action"); + return (Criteria) this; + } + + public Criteria andActionNotIn(List values) { + addCriterion("action not in", values, "action"); + return (Criteria) this; + } + + public Criteria andActionBetween(String value1, String value2) { + addCriterion("action between", value1, value2, "action"); + return (Criteria) this; + } + + public Criteria andActionNotBetween(String value1, String value2) { + addCriterion("action not between", value1, value2, "action"); + return (Criteria) this; + } + + public Criteria andMainactionIsNull() { + addCriterion("mainAction is null"); + return (Criteria) this; + } + + public Criteria andMainactionIsNotNull() { + addCriterion("mainAction is not null"); + return (Criteria) this; + } + + public Criteria andMainactionEqualTo(String value) { + addCriterion("mainAction =", value, "mainaction"); + return (Criteria) this; + } + + public Criteria andMainactionNotEqualTo(String value) { + addCriterion("mainAction <>", value, "mainaction"); + return (Criteria) this; + } + + public Criteria andMainactionGreaterThan(String value) { + addCriterion("mainAction >", value, "mainaction"); + return (Criteria) this; + } + + public Criteria andMainactionGreaterThanOrEqualTo(String value) { + addCriterion("mainAction >=", value, "mainaction"); + return (Criteria) this; + } + + public Criteria andMainactionLessThan(String value) { + addCriterion("mainAction <", value, "mainaction"); + return (Criteria) this; + } + + public Criteria andMainactionLessThanOrEqualTo(String value) { + addCriterion("mainAction <=", value, "mainaction"); + return (Criteria) this; + } + + public Criteria andMainactionLike(String value) { + addCriterion("mainAction like", value, "mainaction"); + return (Criteria) this; + } + + public Criteria andMainactionNotLike(String value) { + addCriterion("mainAction not like", value, "mainaction"); + return (Criteria) this; + } + + public Criteria andMainactionIn(List values) { + addCriterion("mainAction in", values, "mainaction"); + return (Criteria) this; + } + + public Criteria andMainactionNotIn(List values) { + addCriterion("mainAction not in", values, "mainaction"); + return (Criteria) this; + } + + public Criteria andMainactionBetween(String value1, String value2) { + addCriterion("mainAction between", value1, value2, "mainaction"); + return (Criteria) this; + } + + public Criteria andMainactionNotBetween(String value1, String value2) { + addCriterion("mainAction not between", value1, value2, "mainaction"); + return (Criteria) this; + } + + public Criteria andCodeIsNull() { + addCriterion("code is null"); + return (Criteria) this; + } + + public Criteria andCodeIsNotNull() { + addCriterion("code is not null"); + return (Criteria) this; + } + + public Criteria andCodeEqualTo(String value) { + addCriterion("code =", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeNotEqualTo(String value) { + addCriterion("code <>", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeGreaterThan(String value) { + addCriterion("code >", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeGreaterThanOrEqualTo(String value) { + addCriterion("code >=", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeLessThan(String value) { + addCriterion("code <", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeLessThanOrEqualTo(String value) { + addCriterion("code <=", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeLike(String value) { + addCriterion("code like", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeNotLike(String value) { + addCriterion("code not like", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeIn(List values) { + addCriterion("code in", values, "code"); + return (Criteria) this; + } + + public Criteria andCodeNotIn(List values) { + addCriterion("code not in", values, "code"); + return (Criteria) this; + } + + public Criteria andCodeBetween(String value1, String value2) { + addCriterion("code between", value1, value2, "code"); + return (Criteria) this; + } + + public Criteria andCodeNotBetween(String value1, String value2) { + addCriterion("code not between", value1, value2, "code"); + return (Criteria) this; + } + + public Criteria andCorporderidIsNull() { + addCriterion("corpOrderId is null"); + return (Criteria) this; + } + + public Criteria andCorporderidIsNotNull() { + addCriterion("corpOrderId is not null"); + return (Criteria) this; + } + + public Criteria andCorporderidEqualTo(String value) { + addCriterion("corpOrderId =", value, "corporderid"); + return (Criteria) this; + } + + public Criteria andCorporderidNotEqualTo(String value) { + addCriterion("corpOrderId <>", value, "corporderid"); + return (Criteria) this; + } + + public Criteria andCorporderidGreaterThan(String value) { + addCriterion("corpOrderId >", value, "corporderid"); + return (Criteria) this; + } + + public Criteria andCorporderidGreaterThanOrEqualTo(String value) { + addCriterion("corpOrderId >=", value, "corporderid"); + return (Criteria) this; + } + + public Criteria andCorporderidLessThan(String value) { + addCriterion("corpOrderId <", value, "corporderid"); + return (Criteria) this; + } + + public Criteria andCorporderidLessThanOrEqualTo(String value) { + addCriterion("corpOrderId <=", value, "corporderid"); + return (Criteria) this; + } + + public Criteria andCorporderidLike(String value) { + addCriterion("corpOrderId like", value, "corporderid"); + return (Criteria) this; + } + + public Criteria andCorporderidNotLike(String value) { + addCriterion("corpOrderId not like", value, "corporderid"); + return (Criteria) this; + } + + public Criteria andCorporderidIn(List values) { + addCriterion("corpOrderId in", values, "corporderid"); + return (Criteria) this; + } + + public Criteria andCorporderidNotIn(List values) { + addCriterion("corpOrderId not in", values, "corporderid"); + return (Criteria) this; + } + + public Criteria andCorporderidBetween(String value1, String value2) { + addCriterion("corpOrderId between", value1, value2, "corporderid"); + return (Criteria) this; + } + + public Criteria andCorporderidNotBetween(String value1, String value2) { + addCriterion("corpOrderId not between", value1, value2, "corporderid"); + return (Criteria) this; + } + + public Criteria andActorIsNull() { + addCriterion("actor is null"); + return (Criteria) this; + } + + public Criteria andActorIsNotNull() { + addCriterion("actor is not null"); + return (Criteria) this; + } + + public Criteria andActorEqualTo(String value) { + addCriterion("actor =", value, "actor"); + return (Criteria) this; + } + + public Criteria andActorNotEqualTo(String value) { + addCriterion("actor <>", value, "actor"); + return (Criteria) this; + } + + public Criteria andActorGreaterThan(String value) { + addCriterion("actor >", value, "actor"); + return (Criteria) this; + } + + public Criteria andActorGreaterThanOrEqualTo(String value) { + addCriterion("actor >=", value, "actor"); + return (Criteria) this; + } + + public Criteria andActorLessThan(String value) { + addCriterion("actor <", value, "actor"); + return (Criteria) this; + } + + public Criteria andActorLessThanOrEqualTo(String value) { + addCriterion("actor <=", value, "actor"); + return (Criteria) this; + } + + public Criteria andActorLike(String value) { + addCriterion("actor like", value, "actor"); + return (Criteria) this; + } + + public Criteria andActorNotLike(String value) { + addCriterion("actor not like", value, "actor"); + return (Criteria) this; + } + + public Criteria andActorIn(List values) { + addCriterion("actor in", values, "actor"); + return (Criteria) this; + } + + public Criteria andActorNotIn(List values) { + addCriterion("actor not in", values, "actor"); + return (Criteria) this; + } + + public Criteria andActorBetween(String value1, String value2) { + addCriterion("actor between", value1, value2, "actor"); + return (Criteria) this; + } + + public Criteria andActorNotBetween(String value1, String value2) { + addCriterion("actor not between", value1, value2, "actor"); + return (Criteria) this; + } + + public Criteria andActdateIsNull() { + addCriterion("actDate is null"); + return (Criteria) this; + } + + public Criteria andActdateIsNotNull() { + addCriterion("actDate is not null"); + return (Criteria) this; + } + + public Criteria andActdateEqualTo(String value) { + addCriterion("actDate =", value, "actdate"); + return (Criteria) this; + } + + public Criteria andActdateNotEqualTo(String value) { + addCriterion("actDate <>", value, "actdate"); + return (Criteria) this; + } + + public Criteria andActdateGreaterThan(String value) { + addCriterion("actDate >", value, "actdate"); + return (Criteria) this; + } + + public Criteria andActdateGreaterThanOrEqualTo(String value) { + addCriterion("actDate >=", value, "actdate"); + return (Criteria) this; + } + + public Criteria andActdateLessThan(String value) { + addCriterion("actDate <", value, "actdate"); + return (Criteria) this; + } + + public Criteria andActdateLessThanOrEqualTo(String value) { + addCriterion("actDate <=", value, "actdate"); + return (Criteria) this; + } + + public Criteria andActdateLike(String value) { + addCriterion("actDate like", value, "actdate"); + return (Criteria) this; + } + + public Criteria andActdateNotLike(String value) { + addCriterion("actDate not like", value, "actdate"); + return (Criteria) this; + } + + public Criteria andActdateIn(List values) { + addCriterion("actDate in", values, "actdate"); + return (Criteria) this; + } + + public Criteria andActdateNotIn(List values) { + addCriterion("actDate not in", values, "actdate"); + return (Criteria) this; + } + + public Criteria andActdateBetween(String value1, String value2) { + addCriterion("actDate between", value1, value2, "actdate"); + return (Criteria) this; + } + + public Criteria andActdateNotBetween(String value1, String value2) { + addCriterion("actDate not between", value1, value2, "actdate"); + return (Criteria) this; + } + + public Criteria andWrongcodeIsNull() { + addCriterion("wrongCode is null"); + return (Criteria) this; + } + + public Criteria andWrongcodeIsNotNull() { + addCriterion("wrongCode is not null"); + return (Criteria) this; + } + + public Criteria andWrongcodeEqualTo(Integer value) { + addCriterion("wrongCode =", value, "wrongcode"); + return (Criteria) this; + } + + public Criteria andWrongcodeNotEqualTo(Integer value) { + addCriterion("wrongCode <>", value, "wrongcode"); + return (Criteria) this; + } + + public Criteria andWrongcodeGreaterThan(Integer value) { + addCriterion("wrongCode >", value, "wrongcode"); + return (Criteria) this; + } + + public Criteria andWrongcodeGreaterThanOrEqualTo(Integer value) { + addCriterion("wrongCode >=", value, "wrongcode"); + return (Criteria) this; + } + + public Criteria andWrongcodeLessThan(Integer value) { + addCriterion("wrongCode <", value, "wrongcode"); + return (Criteria) this; + } + + public Criteria andWrongcodeLessThanOrEqualTo(Integer value) { + addCriterion("wrongCode <=", value, "wrongcode"); + return (Criteria) this; + } + + public Criteria andWrongcodeIn(List values) { + addCriterion("wrongCode in", values, "wrongcode"); + return (Criteria) this; + } + + public Criteria andWrongcodeNotIn(List values) { + addCriterion("wrongCode not in", values, "wrongcode"); + return (Criteria) this; + } + + public Criteria andWrongcodeBetween(Integer value1, Integer value2) { + addCriterion("wrongCode between", value1, value2, "wrongcode"); + return (Criteria) this; + } + + public Criteria andWrongcodeNotBetween(Integer value1, Integer value2) { + addCriterion("wrongCode not between", value1, value2, "wrongcode"); + return (Criteria) this; + } + + public Criteria andUppercorporderidIsNull() { + addCriterion("upperCorpOrderId is null"); + return (Criteria) this; + } + + public Criteria andUppercorporderidIsNotNull() { + addCriterion("upperCorpOrderId is not null"); + return (Criteria) this; + } + + public Criteria andUppercorporderidEqualTo(String value) { + addCriterion("upperCorpOrderId =", value, "uppercorporderid"); + return (Criteria) this; + } + + public Criteria andUppercorporderidNotEqualTo(String value) { + addCriterion("upperCorpOrderId <>", value, "uppercorporderid"); + return (Criteria) this; + } + + public Criteria andUppercorporderidGreaterThan(String value) { + addCriterion("upperCorpOrderId >", value, "uppercorporderid"); + return (Criteria) this; + } + + public Criteria andUppercorporderidGreaterThanOrEqualTo(String value) { + addCriterion("upperCorpOrderId >=", value, "uppercorporderid"); + return (Criteria) this; + } + + public Criteria andUppercorporderidLessThan(String value) { + addCriterion("upperCorpOrderId <", value, "uppercorporderid"); + return (Criteria) this; + } + + public Criteria andUppercorporderidLessThanOrEqualTo(String value) { + addCriterion("upperCorpOrderId <=", value, "uppercorporderid"); + return (Criteria) this; + } + + public Criteria andUppercorporderidLike(String value) { + addCriterion("upperCorpOrderId like", value, "uppercorporderid"); + return (Criteria) this; + } + + public Criteria andUppercorporderidNotLike(String value) { + addCriterion("upperCorpOrderId not like", value, "uppercorporderid"); + return (Criteria) this; + } + + public Criteria andUppercorporderidIn(List values) { + addCriterion("upperCorpOrderId in", values, "uppercorporderid"); + return (Criteria) this; + } + + public Criteria andUppercorporderidNotIn(List values) { + addCriterion("upperCorpOrderId not in", values, "uppercorporderid"); + return (Criteria) this; + } + + public Criteria andUppercorporderidBetween(String value1, String value2) { + addCriterion("upperCorpOrderId between", value1, value2, "uppercorporderid"); + return (Criteria) this; + } + + public Criteria andUppercorporderidNotBetween(String value1, String value2) { + addCriterion("upperCorpOrderId not between", value1, value2, "uppercorporderid"); + return (Criteria) this; + } + + public Criteria andFromcorpidIsNull() { + addCriterion("fromCorpID is null"); + return (Criteria) this; + } + + public Criteria andFromcorpidIsNotNull() { + addCriterion("fromCorpID is not null"); + return (Criteria) this; + } + + public Criteria andFromcorpidEqualTo(String value) { + addCriterion("fromCorpID =", value, "fromcorpid"); + return (Criteria) this; + } + + public Criteria andFromcorpidNotEqualTo(String value) { + addCriterion("fromCorpID <>", value, "fromcorpid"); + return (Criteria) this; + } + + public Criteria andFromcorpidGreaterThan(String value) { + addCriterion("fromCorpID >", value, "fromcorpid"); + return (Criteria) this; + } + + public Criteria andFromcorpidGreaterThanOrEqualTo(String value) { + addCriterion("fromCorpID >=", value, "fromcorpid"); + return (Criteria) this; + } + + public Criteria andFromcorpidLessThan(String value) { + addCriterion("fromCorpID <", value, "fromcorpid"); + return (Criteria) this; + } + + public Criteria andFromcorpidLessThanOrEqualTo(String value) { + addCriterion("fromCorpID <=", value, "fromcorpid"); + return (Criteria) this; + } + + public Criteria andFromcorpidLike(String value) { + addCriterion("fromCorpID like", value, "fromcorpid"); + return (Criteria) this; + } + + public Criteria andFromcorpidNotLike(String value) { + addCriterion("fromCorpID not like", value, "fromcorpid"); + return (Criteria) this; + } + + public Criteria andFromcorpidIn(List values) { + addCriterion("fromCorpID in", values, "fromcorpid"); + return (Criteria) this; + } + + public Criteria andFromcorpidNotIn(List values) { + addCriterion("fromCorpID not in", values, "fromcorpid"); + return (Criteria) this; + } + + public Criteria andFromcorpidBetween(String value1, String value2) { + addCriterion("fromCorpID between", value1, value2, "fromcorpid"); + return (Criteria) this; + } + + public Criteria andFromcorpidNotBetween(String value1, String value2) { + addCriterion("fromCorpID not between", value1, value2, "fromcorpid"); + return (Criteria) this; + } + + public Criteria andFromcorpIsNull() { + addCriterion("fromCorp is null"); + return (Criteria) this; + } + + public Criteria andFromcorpIsNotNull() { + addCriterion("fromCorp is not null"); + return (Criteria) this; + } + + public Criteria andFromcorpEqualTo(String value) { + addCriterion("fromCorp =", value, "fromcorp"); + return (Criteria) this; + } + + public Criteria andFromcorpNotEqualTo(String value) { + addCriterion("fromCorp <>", value, "fromcorp"); + return (Criteria) this; + } + + public Criteria andFromcorpGreaterThan(String value) { + addCriterion("fromCorp >", value, "fromcorp"); + return (Criteria) this; + } + + public Criteria andFromcorpGreaterThanOrEqualTo(String value) { + addCriterion("fromCorp >=", value, "fromcorp"); + return (Criteria) this; + } + + public Criteria andFromcorpLessThan(String value) { + addCriterion("fromCorp <", value, "fromcorp"); + return (Criteria) this; + } + + public Criteria andFromcorpLessThanOrEqualTo(String value) { + addCriterion("fromCorp <=", value, "fromcorp"); + return (Criteria) this; + } + + public Criteria andFromcorpLike(String value) { + addCriterion("fromCorp like", value, "fromcorp"); + return (Criteria) this; + } + + public Criteria andFromcorpNotLike(String value) { + addCriterion("fromCorp not like", value, "fromcorp"); + return (Criteria) this; + } + + public Criteria andFromcorpIn(List values) { + addCriterion("fromCorp in", values, "fromcorp"); + return (Criteria) this; + } + + public Criteria andFromcorpNotIn(List values) { + addCriterion("fromCorp not in", values, "fromcorp"); + return (Criteria) this; + } + + public Criteria andFromcorpBetween(String value1, String value2) { + addCriterion("fromCorp between", value1, value2, "fromcorp"); + return (Criteria) this; + } + + public Criteria andFromcorpNotBetween(String value1, String value2) { + addCriterion("fromCorp not between", value1, value2, "fromcorp"); + return (Criteria) this; + } + + public Criteria andOrderidIsNull() { + addCriterion("orderId is null"); + return (Criteria) this; + } + + public Criteria andOrderidIsNotNull() { + addCriterion("orderId is not null"); + return (Criteria) this; + } + + public Criteria andOrderidEqualTo(String value) { + addCriterion("orderId =", value, "orderid"); + return (Criteria) this; + } + + public Criteria andOrderidNotEqualTo(String value) { + addCriterion("orderId <>", value, "orderid"); + return (Criteria) this; + } + + public Criteria andOrderidGreaterThan(String value) { + addCriterion("orderId >", value, "orderid"); + return (Criteria) this; + } + + public Criteria andOrderidGreaterThanOrEqualTo(String value) { + addCriterion("orderId >=", value, "orderid"); + return (Criteria) this; + } + + public Criteria andOrderidLessThan(String value) { + addCriterion("orderId <", value, "orderid"); + return (Criteria) this; + } + + public Criteria andOrderidLessThanOrEqualTo(String value) { + addCriterion("orderId <=", value, "orderid"); + return (Criteria) this; + } + + public Criteria andOrderidLike(String value) { + addCriterion("orderId like", value, "orderid"); + return (Criteria) this; + } + + public Criteria andOrderidNotLike(String value) { + addCriterion("orderId not like", value, "orderid"); + return (Criteria) this; + } + + public Criteria andOrderidIn(List values) { + addCriterion("orderId in", values, "orderid"); + return (Criteria) this; + } + + public Criteria andOrderidNotIn(List values) { + addCriterion("orderId not in", values, "orderid"); + return (Criteria) this; + } + + public Criteria andOrderidBetween(String value1, String value2) { + addCriterion("orderId between", value1, value2, "orderid"); + return (Criteria) this; + } + + public Criteria andOrderidNotBetween(String value1, String value2) { + addCriterion("orderId not between", value1, value2, "orderid"); + return (Criteria) this; + } + + public Criteria andBatchnoIsNull() { + addCriterion("batchNo is null"); + return (Criteria) this; + } + + public Criteria andBatchnoIsNotNull() { + addCriterion("batchNo is not null"); + return (Criteria) this; + } + + public Criteria andBatchnoEqualTo(String value) { + addCriterion("batchNo =", value, "batchno"); + return (Criteria) this; + } + + public Criteria andBatchnoNotEqualTo(String value) { + addCriterion("batchNo <>", value, "batchno"); + return (Criteria) this; + } + + public Criteria andBatchnoGreaterThan(String value) { + addCriterion("batchNo >", value, "batchno"); + return (Criteria) this; + } + + public Criteria andBatchnoGreaterThanOrEqualTo(String value) { + addCriterion("batchNo >=", value, "batchno"); + return (Criteria) this; + } + + public Criteria andBatchnoLessThan(String value) { + addCriterion("batchNo <", value, "batchno"); + return (Criteria) this; + } + + public Criteria andBatchnoLessThanOrEqualTo(String value) { + addCriterion("batchNo <=", value, "batchno"); + return (Criteria) this; + } + + public Criteria andBatchnoLike(String value) { + addCriterion("batchNo like", value, "batchno"); + return (Criteria) this; + } + + public Criteria andBatchnoNotLike(String value) { + addCriterion("batchNo not like", value, "batchno"); + return (Criteria) this; + } + + public Criteria andBatchnoIn(List values) { + addCriterion("batchNo in", values, "batchno"); + return (Criteria) this; + } + + public Criteria andBatchnoNotIn(List values) { + addCriterion("batchNo not in", values, "batchno"); + return (Criteria) this; + } + + public Criteria andBatchnoBetween(String value1, String value2) { + addCriterion("batchNo between", value1, value2, "batchno"); + return (Criteria) this; + } + + public Criteria andBatchnoNotBetween(String value1, String value2) { + addCriterion("batchNo not between", value1, value2, "batchno"); + return (Criteria) this; + } + + public Criteria andProducedateIsNull() { + addCriterion("produceDate is null"); + return (Criteria) this; + } + + public Criteria andProducedateIsNotNull() { + addCriterion("produceDate is not null"); + return (Criteria) this; + } + + public Criteria andProducedateEqualTo(String value) { + addCriterion("produceDate =", value, "producedate"); + return (Criteria) this; + } + + public Criteria andProducedateNotEqualTo(String value) { + addCriterion("produceDate <>", value, "producedate"); + return (Criteria) this; + } + + public Criteria andProducedateGreaterThan(String value) { + addCriterion("produceDate >", value, "producedate"); + return (Criteria) this; + } + + public Criteria andProducedateGreaterThanOrEqualTo(String value) { + addCriterion("produceDate >=", value, "producedate"); + return (Criteria) this; + } + + public Criteria andProducedateLessThan(String value) { + addCriterion("produceDate <", value, "producedate"); + return (Criteria) this; + } + + public Criteria andProducedateLessThanOrEqualTo(String value) { + addCriterion("produceDate <=", value, "producedate"); + return (Criteria) this; + } + + public Criteria andProducedateLike(String value) { + addCriterion("produceDate like", value, "producedate"); + return (Criteria) this; + } + + public Criteria andProducedateNotLike(String value) { + addCriterion("produceDate not like", value, "producedate"); + return (Criteria) this; + } + + public Criteria andProducedateIn(List values) { + addCriterion("produceDate in", values, "producedate"); + return (Criteria) this; + } + + public Criteria andProducedateNotIn(List values) { + addCriterion("produceDate not in", values, "producedate"); + return (Criteria) this; + } + + public Criteria andProducedateBetween(String value1, String value2) { + addCriterion("produceDate between", value1, value2, "producedate"); + return (Criteria) this; + } + + public Criteria andProducedateNotBetween(String value1, String value2) { + addCriterion("produceDate not between", value1, value2, "producedate"); + return (Criteria) this; + } + + public Criteria andExpiredateIsNull() { + addCriterion("expireDate is null"); + return (Criteria) this; + } + + public Criteria andExpiredateIsNotNull() { + addCriterion("expireDate is not null"); + return (Criteria) this; + } + + public Criteria andExpiredateEqualTo(String value) { + addCriterion("expireDate =", value, "expiredate"); + return (Criteria) this; + } + + public Criteria andExpiredateNotEqualTo(String value) { + addCriterion("expireDate <>", value, "expiredate"); + return (Criteria) this; + } + + public Criteria andExpiredateGreaterThan(String value) { + addCriterion("expireDate >", value, "expiredate"); + return (Criteria) this; + } + + public Criteria andExpiredateGreaterThanOrEqualTo(String value) { + addCriterion("expireDate >=", value, "expiredate"); + return (Criteria) this; + } + + public Criteria andExpiredateLessThan(String value) { + addCriterion("expireDate <", value, "expiredate"); + return (Criteria) this; + } + + public Criteria andExpiredateLessThanOrEqualTo(String value) { + addCriterion("expireDate <=", value, "expiredate"); + return (Criteria) this; + } + + public Criteria andExpiredateLike(String value) { + addCriterion("expireDate like", value, "expiredate"); + return (Criteria) this; + } + + public Criteria andExpiredateNotLike(String value) { + addCriterion("expireDate not like", value, "expiredate"); + return (Criteria) this; + } + + public Criteria andExpiredateIn(List values) { + addCriterion("expireDate in", values, "expiredate"); + return (Criteria) this; + } + + public Criteria andExpiredateNotIn(List values) { + addCriterion("expireDate not in", values, "expiredate"); + return (Criteria) this; + } + + public Criteria andExpiredateBetween(String value1, String value2) { + addCriterion("expireDate between", value1, value2, "expiredate"); + return (Criteria) this; + } + + public Criteria andExpiredateNotBetween(String value1, String value2) { + addCriterion("expireDate not between", value1, value2, "expiredate"); + return (Criteria) this; + } + + public Criteria andSerialnoIsNull() { + addCriterion("serialNo is null"); + return (Criteria) this; + } + + public Criteria andSerialnoIsNotNull() { + addCriterion("serialNo is not null"); + return (Criteria) this; + } + + public Criteria andSerialnoEqualTo(String value) { + addCriterion("serialNo =", value, "serialno"); + return (Criteria) this; + } + + public Criteria andSerialnoNotEqualTo(String value) { + addCriterion("serialNo <>", value, "serialno"); + return (Criteria) this; + } + + public Criteria andSerialnoGreaterThan(String value) { + addCriterion("serialNo >", value, "serialno"); + return (Criteria) this; + } + + public Criteria andSerialnoGreaterThanOrEqualTo(String value) { + addCriterion("serialNo >=", value, "serialno"); + return (Criteria) this; + } + + public Criteria andSerialnoLessThan(String value) { + addCriterion("serialNo <", value, "serialno"); + return (Criteria) this; + } + + public Criteria andSerialnoLessThanOrEqualTo(String value) { + addCriterion("serialNo <=", value, "serialno"); + return (Criteria) this; + } + + public Criteria andSerialnoLike(String value) { + addCriterion("serialNo like", value, "serialno"); + return (Criteria) this; + } + + public Criteria andSerialnoNotLike(String value) { + addCriterion("serialNo not like", value, "serialno"); + return (Criteria) this; + } + + public Criteria andSerialnoIn(List values) { + addCriterion("serialNo in", values, "serialno"); + return (Criteria) this; + } + + public Criteria andSerialnoNotIn(List values) { + addCriterion("serialNo not in", values, "serialno"); + return (Criteria) this; + } + + public Criteria andSerialnoBetween(String value1, String value2) { + addCriterion("serialNo between", value1, value2, "serialno"); + return (Criteria) this; + } + + public Criteria andSerialnoNotBetween(String value1, String value2) { + addCriterion("serialNo not between", value1, value2, "serialno"); + return (Criteria) this; + } + + public Criteria andUdiIsNull() { + addCriterion("udi is null"); + return (Criteria) this; + } + + public Criteria andUdiIsNotNull() { + addCriterion("udi is not null"); + return (Criteria) this; + } + + public Criteria andUdiEqualTo(String value) { + addCriterion("udi =", value, "udi"); + return (Criteria) this; + } + + public Criteria andUdiNotEqualTo(String value) { + addCriterion("udi <>", value, "udi"); + return (Criteria) this; + } + + public Criteria andUdiGreaterThan(String value) { + addCriterion("udi >", value, "udi"); + return (Criteria) this; + } + + public Criteria andUdiGreaterThanOrEqualTo(String value) { + addCriterion("udi >=", value, "udi"); + return (Criteria) this; + } + + public Criteria andUdiLessThan(String value) { + addCriterion("udi <", value, "udi"); + return (Criteria) this; + } + + public Criteria andUdiLessThanOrEqualTo(String value) { + addCriterion("udi <=", value, "udi"); + return (Criteria) this; + } + + public Criteria andUdiLike(String value) { + addCriterion("udi like", value, "udi"); + return (Criteria) this; + } + + public Criteria andUdiNotLike(String value) { + addCriterion("udi not like", value, "udi"); + return (Criteria) this; + } + + public Criteria andUdiIn(List values) { + addCriterion("udi in", values, "udi"); + return (Criteria) this; + } + + public Criteria andUdiNotIn(List values) { + addCriterion("udi not in", values, "udi"); + return (Criteria) this; + } + + public Criteria andUdiBetween(String value1, String value2) { + addCriterion("udi between", value1, value2, "udi"); + return (Criteria) this; + } + + public Criteria andUdiNotBetween(String value1, String value2) { + addCriterion("udi not between", value1, value2, "udi"); + return (Criteria) this; + } + + public Criteria andCountIsNull() { + addCriterion("count is null"); + return (Criteria) this; + } + + public Criteria andCountIsNotNull() { + addCriterion("count is not null"); + return (Criteria) this; + } + + public Criteria andCountEqualTo(Integer value) { + addCriterion("count =", value, "count"); + return (Criteria) this; + } + + public Criteria andCountNotEqualTo(Integer value) { + addCriterion("count <>", value, "count"); + return (Criteria) this; + } + + public Criteria andCountGreaterThan(Integer value) { + addCriterion("count >", value, "count"); + return (Criteria) this; + } + + public Criteria andCountGreaterThanOrEqualTo(Integer value) { + addCriterion("count >=", value, "count"); + return (Criteria) this; + } + + public Criteria andCountLessThan(Integer value) { + addCriterion("count <", value, "count"); + return (Criteria) this; + } + + public Criteria andCountLessThanOrEqualTo(Integer value) { + addCriterion("count <=", value, "count"); + return (Criteria) this; + } + + public Criteria andCountIn(List values) { + addCriterion("count in", values, "count"); + return (Criteria) this; + } + + public Criteria andCountNotIn(List values) { + addCriterion("count not in", values, "count"); + return (Criteria) this; + } + + public Criteria andCountBetween(Integer value1, Integer value2) { + addCriterion("count between", value1, value2, "count"); + return (Criteria) this; + } + + public Criteria andCountNotBetween(Integer value1, Integer value2) { + addCriterion("count not between", value1, value2, "count"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/api/admin/exception/JsonException.java b/api-admin/src/main/java/com/glxp/api/admin/exception/JsonException.java new file mode 100644 index 00000000..ef76551a --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/exception/JsonException.java @@ -0,0 +1,28 @@ +package com.glxp.api.admin.exception; + +import com.glxp.api.common.enums.ResultEnum; +import lombok.Getter; + +/** + * 错误处理类 + */ +@Getter +public class JsonException extends RuntimeException{ + + private Integer code; + + public JsonException(ResultEnum resultEnum) { + super(resultEnum.getMessage()); + this.code = resultEnum.getCode(); + } + + public JsonException(ResultEnum resultEnum, String message) { + super(message); + this.code = resultEnum.getCode(); + } + + public JsonException(Integer code, String message) { + super(message); + this.code = code; + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/handler/GlobalExceptionHandler.java b/api-admin/src/main/java/com/glxp/api/admin/handler/GlobalExceptionHandler.java new file mode 100644 index 00000000..b2dffc8a --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/handler/GlobalExceptionHandler.java @@ -0,0 +1,33 @@ +package com.glxp.api.admin.handler; + +import com.glxp.api.admin.exception.JsonException; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; + +/** + * 错误回调 + */ +@RestControllerAdvice +@Slf4j +public class GlobalExceptionHandler { + + // 拦截API异常 + @ExceptionHandler(value = JsonException.class) + public BaseResponse handlerJsonException(JsonException e) { + // 返回对应的错误信息 + return ResultVOUtils.error(e.getCode(), e.getMessage()); + } + + // 拦截API异常 + @ExceptionHandler(value = RuntimeException.class) + public BaseResponse handlerRuntimeException(RuntimeException e) { + log.error(e.getMessage()); + // 返回对应的错误信息 + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpBasicClient.java b/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpBasicClient.java new file mode 100644 index 00000000..4b177e49 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpBasicClient.java @@ -0,0 +1,61 @@ +package com.glxp.api.admin.httpclient; + +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.TypeReference; +import com.glxp.api.admin.res.basic.ErpProductsResponse; +import com.glxp.api.admin.res.basic.ErpUnitsResponse; +import com.glxp.api.admin.req.basic.FilterErpGoodsRequest; +import com.glxp.api.admin.req.receipt.UnitMaintainFilterRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.util.HttpClient; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; + +import java.util.HashMap; +import java.util.Map; + +/** + * 获取ERP基础数据 + */ +public class ErpBasicClient { + + + //获取往来单位 + public BaseResponse> getErpCrop(UnitMaintainFilterRequest unitMaintainFilterRequest, String url) { + Map paramMap = new HashMap<>(16); + paramMap.put("unitId", unitMaintainFilterRequest.getUnitId()); + paramMap.put("name", unitMaintainFilterRequest.getName()); + paramMap.put("page", unitMaintainFilterRequest.getPage()); + paramMap.put("limit", unitMaintainFilterRequest.getLimit()); + String response = HttpClient.mipsGet(url, paramMap); + try { + BaseResponse> udiDlDeviceResponse = (BaseResponse>) JSONObject.parseObject(response, BaseResponse.class); + return udiDlDeviceResponse; + } catch (Exception e) { + e.printStackTrace(); + return ResultVOUtils.error(500, "连接ERP服务出错！"); + } + } + + //获取产品信息 + public BaseResponse> getErpProducts(FilterErpGoodsRequest filterErpGoodsRequest, String url) { + Map paramMap = new HashMap<>(16); + paramMap.put("code", filterErpGoodsRequest.getCode()); + paramMap.put("name", filterErpGoodsRequest.getName()); + paramMap.put("limit", filterErpGoodsRequest.getLimit()); + paramMap.put("page", filterErpGoodsRequest.getPage()); + + String response = HttpClient.mipsGet(url, paramMap); + try { + BaseResponse> udiDlDeviceResponse = + JSONObject.parseObject(response, new TypeReference>>() { + }); + return udiDlDeviceResponse; + } catch (Exception e) { + e.printStackTrace(); + return ResultVOUtils.error(500, "连接ERP服务出错！"); + } + } + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpInvClient.java b/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpInvClient.java new file mode 100644 index 00000000..f74ba52b --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpInvClient.java @@ -0,0 +1,39 @@ +package com.glxp.api.admin.httpclient; + +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.TypeReference; +import com.glxp.api.admin.req.inventory.ErpOnhandRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.res.inventory.ErpOnHandResponse; +import com.glxp.api.admin.util.HttpClient; +import com.glxp.api.common.res.BaseResponse; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class ErpInvClient { + + + public List getOnHand(ErpOnhandRequest onhandRequest, String url) { + + Map paramMap = new HashMap<>(16); + if (onhandRequest.getBatchNo() != null && !onhandRequest.getBatchNo().equals("")) + paramMap.put("batchNo", onhandRequest.getBatchNo()); + if (onhandRequest.getWarehouseCode() != null && !onhandRequest.getWarehouseCode().equals("")) + paramMap.put("warehouseCode", onhandRequest.getWarehouseCode()); + if (onhandRequest.getInventoryCode() != null && !onhandRequest.getInventoryCode().equals("")) + paramMap.put("inventoryCode", onhandRequest.getInventoryCode()); + String response = HttpClient.mipsGet(url, paramMap); + try { + BaseResponse> onHandsResponse = + JSONObject.parseObject(response, new TypeReference>>() { + }); + List erpOnHandResponses = onHandsResponse.getData().getList(); + return erpOnHandResponses; + } catch (Exception e) { + e.printStackTrace(); + } + return null; + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpOrderClient.java b/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpOrderClient.java new file mode 100644 index 00000000..b7dbf827 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpOrderClient.java @@ -0,0 +1,144 @@ +package com.glxp.api.admin.httpclient; + +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.TypeReference; +import com.glxp.api.admin.entity.inout.ErpOrderEntity; +import com.glxp.api.admin.req.inout.ERPPostBillRequest; +import com.glxp.api.admin.req.inout.FilterOrderRequest; +import com.glxp.api.admin.req.inout.USignRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.res.inout.ErpOrderResponse; +import com.glxp.api.admin.util.DateUtil; +import com.glxp.api.admin.util.HttpClient; +import com.glxp.api.common.res.BaseResponse; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 获取ERP出入库单据 + */ +public class ErpOrderClient { + private String url; + + public ErpOrderClient() { + + } + + public ErpOrderClient(String url) { + this.url = url; + } + + public List getErpOrder(List billCodes) { + List erpOrderEntities = new ArrayList<>(); + if (billCodes != null && billCodes.size() > 0) { + for (int i = 0; i < billCodes.size(); i++) { + ErpOrderEntity erpOrderEntity = getErpOrder(billCodes.get(i)); + if (erpOrderEntity != null) { + erpOrderEntities.add(erpOrderEntity); + } + } + } + return erpOrderEntities; + } + + public BaseResponse> getErpOrderResponse(FilterOrderRequest filterOrderRequest) { + Map paramMap = new HashMap<>(16); + paramMap.put("billNo", filterOrderRequest.getBillNo()); + paramMap.put("page", filterOrderRequest.getPage()); + paramMap.put("limit", filterOrderRequest.getLimit()); + paramMap.put("billAction", filterOrderRequest.getBillAction()); + if (filterOrderRequest.getStartDate() == null || filterOrderRequest.getEndDate() == null) { + Map date = DateUtil.getDayTRange(); + if (filterOrderRequest.getBillNo() != null) { + date = DateUtil.getYearTRange(); + } + filterOrderRequest.setStartDate((String) date.get("startDate")); + filterOrderRequest.setEndDate((String) date.get("endDate")); + } + paramMap.put("startDate", filterOrderRequest.getStartDate()); + paramMap.put("endDate", filterOrderRequest.getEndDate()); + + String response = ""; + response = HttpClient.mipsGet(url, paramMap); + try { + BaseResponse> responseBaseResponse = + JSONObject.parseObject(response, new TypeReference>>() { + }); + return responseBaseResponse; + + } catch ( + Exception e) { + e.printStackTrace(); + } + return null; + } + + public List getErpOrder(FilterOrderRequest filterOrderRequest) { + + try { + BaseResponse> responseBaseResponse = getErpOrderResponse(filterOrderRequest); + List purchaseinResponseList = responseBaseResponse.getData().getList(); + if (purchaseinResponseList != null && purchaseinResponseList.size() > 0) { + List erpOrderEntities = new ArrayList<>(); + for (ErpOrderResponse erpOrderResponse : purchaseinResponseList) { + for (ErpOrderResponse.SubErpOrder subPurchase : erpOrderResponse.getSubErpOrders()) { + ErpOrderEntity erpOrderEntity = new ErpOrderEntity(); + erpOrderEntity.setErpOrderId(erpOrderResponse.getBillNo()); + erpOrderEntity.setCompanyid(erpOrderResponse.getCorpId()); + erpOrderEntity.setCompanyname(erpOrderResponse.getCorpName()); + erpOrderEntity.setCredate(erpOrderResponse.getBilldate()); + erpOrderEntity.setGoodsid(subPurchase.getProductId()); + erpOrderEntity.setGoodsname(subPurchase.getProductName()); + erpOrderEntity.setBatchNo(subPurchase.getBatchNo()); + erpOrderEntity.setProductDate(subPurchase.getProductDate()); + erpOrderEntity.setExpireDate(subPurchase.getExpireDate()); + erpOrderEntity.setErpCount(Math.abs(subPurchase.getCount())); + erpOrderEntity.setReCount(Math.abs(subPurchase.getReCount())); + erpOrderEntity.setGoodsunit(subPurchase.getSpec()); + erpOrderEntities.add(erpOrderEntity); + } + } + return erpOrderEntities; + } + } catch ( + Exception e) { + e.printStackTrace(); + } + return null; + } + + public ErpOrderEntity getErpOrder(String billCode) { + FilterOrderRequest filterOrderRequest = new FilterOrderRequest(); + filterOrderRequest.setPage(1); + filterOrderRequest.setLimit(1); + filterOrderRequest.setBillNo(billCode); + List erpOrderEntities = getErpOrder(filterOrderRequest); + if (erpOrderEntities != null && erpOrderEntities.size() > 0) { + return erpOrderEntities.get(0); + } + return null; + } + + public BaseResponse postBill(Map> postMap, String billAction, String uploadUrl) { + ERPPostBillRequest erpPostBillRequest = new ERPPostBillRequest(); + erpPostBillRequest.setPostMap(postMap); + erpPostBillRequest.setBillAction(billAction); + String response = HttpClient.uCloudPost(uploadUrl, erpPostBillRequest); + BaseResponse baseResponse = + JSONObject.parseObject(response, new TypeReference() { + }); + return baseResponse; + } + + public BaseResponse signBill(USignRequest signRequest, String url) { + String response = HttpClient.uCloudPost(url, signRequest); + BaseResponse baseResponse = + JSONObject.parseObject(response, new TypeReference() { + }); + return baseResponse; + } + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/httpclient/UdiDlHttpClient.java b/api-admin/src/main/java/com/glxp/api/admin/httpclient/UdiDlHttpClient.java new file mode 100644 index 00000000..8bb3f8b2 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/httpclient/UdiDlHttpClient.java @@ -0,0 +1,59 @@ +package com.glxp.api.admin.httpclient; + +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.TypeReference; +import com.glxp.api.admin.entity.basic.UdiInfoEntity; +import com.glxp.api.admin.util.HttpClient; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * 获取国家UDI同步库信息 + */ +public class UdiDlHttpClient { + String udiUrl; + + public UdiDlHttpClient(String udiUrl) { + this.udiUrl = udiUrl; + } + + public List getUdiByUuid(String uuid) { + Map paramMap = new HashMap<>(16); + paramMap.put("page", 1); + paramMap.put("limit", 100); + paramMap.put("uuid", uuid); + String response = HttpClient.mipsGet(udiUrl + "/udidl/device/filterByUuid", paramMap); + try { + BaseResponse> udiDlDeviceResponse = (BaseResponse>) JSONObject.parseObject(response, BaseResponse.class); + List udiInfoEntities = udiDlDeviceResponse.getData(); + return udiInfoEntities; + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + public List getUdiByDi(String key) { + Map paramMap = new HashMap<>(16); + paramMap.put("page", 1); + paramMap.put("limit", 100); + paramMap.put("nameCode", key); + String response = HttpClient.mipsGet(udiUrl + "/udidl/device/filterByNameCode", paramMap); + try { + BaseResponse> udiDlDeviceResponse = + JSONObject.parseObject(response, new TypeReference>>() { + + }); + List udiInfoEntities = udiDlDeviceResponse.getData(); + return udiInfoEntities; + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/ListPageRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/ListPageRequest.java new file mode 100644 index 00000000..fc9e7e5d --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/ListPageRequest.java @@ -0,0 +1,23 @@ +package com.glxp.api.admin.req; + +import lombok.Data; + +import javax.validation.constraints.Max; +import javax.validation.constraints.Min; + +/** + * 分页的表单 + */ +@Data +public class ListPageRequest { + + + @Min(message = "分页参数错误", value = 1) + private Integer page; + + + @Min(value = 1, message = "分页参数不能小于1") + @Max(value = 500, message = "分页参数不能大于50") + private Integer limit; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthAdminQueryRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthAdminQueryRequest.java new file mode 100644 index 00000000..0d85a331 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthAdminQueryRequest.java @@ -0,0 +1,21 @@ +package com.glxp.api.admin.req.auth; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.List; + +@EqualsAndHashCode(callSuper = true) +@Data +public class AuthAdminQueryRequest extends ListPageRequest { + + private String userName; + + private Integer userFlag; + + private Long roleId; + + private List ids; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthAdminSaveRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthAdminSaveRequest.java new file mode 100644 index 00000000..58c217bf --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthAdminSaveRequest.java @@ -0,0 +1,38 @@ +package com.glxp.api.admin.req.auth; + +import lombok.Data; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * 管理员的提交保存表单 + */ +@Data +public class AuthAdminSaveRequest { + // id + private Long id; + // 昵称 + @NotEmpty(message = "请输入用户名") + private String userName; + // 登录密码 + private String passWord; + // 状态 + @NotNull(message = "请选择状态") + private Integer userFlag; + private String employeeName; + + + // 最后登录ip + private String lastLoginIp; + // 最后登录时间 + private String lastLoginTime; + // 创建时间 + private String createTime; + + private String lastModifyTime; + private String comments; + // 角色ids + private List roles; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthPermissionRuleSaveRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthPermissionRuleSaveRequest.java new file mode 100644 index 00000000..5b066045 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthPermissionRuleSaveRequest.java @@ -0,0 +1,24 @@ +package com.glxp.api.admin.req.auth; + +import lombok.Data; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; + +/** + * 权限规则的提交保存表单 + */ +@Data +public class AuthPermissionRuleSaveRequest { + private Long id; + private Long pid; + @NotEmpty(message = "请输入规则名称") + private String name; + @NotEmpty(message = "请输入规则标题") + private String title; + @NotNull(message = "请选择状态") + private Integer status; + private String condition; + private Integer listorder; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthRoleAuthRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthRoleAuthRequest.java new file mode 100644 index 00000000..1eaa3c2b --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthRoleAuthRequest.java @@ -0,0 +1,18 @@ +package com.glxp.api.admin.req.auth; + +import lombok.Data; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * 角色的授权提交表单 + */ +@Data +public class AuthRoleAuthRequest { + @NotNull(message = "请选择角色") + private Long role_id; + @NotEmpty(message = "请选择授权的权限规则") + private List auth_rules; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthRoleQueryRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthRoleQueryRequest.java new file mode 100644 index 00000000..b3011b40 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthRoleQueryRequest.java @@ -0,0 +1,16 @@ +package com.glxp.api.admin.req.auth; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 角色的查询表单 + */ +@EqualsAndHashCode(callSuper = true) +@Data +public class AuthRoleQueryRequest extends ListPageRequest { + private String name; + private Integer status; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthRoleSaveRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthRoleSaveRequest.java new file mode 100644 index 00000000..5c84e302 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthRoleSaveRequest.java @@ -0,0 +1,16 @@ +package com.glxp.api.admin.req.auth; + +import lombok.Data; + +/** + * 角色的提交保存表单 + */ +@Data +public class AuthRoleSaveRequest { + private Long id; + private String name; + private Long pid; + private Long status; + private String remark; + private Long listorder; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/auth/LoginRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/auth/LoginRequest.java new file mode 100644 index 00000000..476f6be8 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/auth/LoginRequest.java @@ -0,0 +1,19 @@ +package com.glxp.api.admin.req.auth; + +import lombok.Data; + +import javax.validation.constraints.NotEmpty; + +/** + * 登录验证 + */ +@Data +public class LoginRequest { + + @NotEmpty(message = "用户名不能为空") + private String username; + + @NotEmpty(message = "密码不能为空") + private String password; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/auth/UpdatePasswordRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/auth/UpdatePasswordRequest.java new file mode 100644 index 00000000..58b613a8 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/auth/UpdatePasswordRequest.java @@ -0,0 +1,23 @@ +package com.glxp.api.admin.req.auth; + +import lombok.Data; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; + +/** + * 修改密码的表单 + */ +@Data +public class UpdatePasswordRequest { + + @NotNull(message = "参数错误！") + private Long adminId; + + @NotEmpty(message = "请输入旧密码") + private String oldPassword; + + @NotEmpty(message = "请输入新密码") + private String newPassword; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicUnitMaintainFilterRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicUnitMaintainFilterRequest.java new file mode 100644 index 00000000..f262d77b --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicUnitMaintainFilterRequest.java @@ -0,0 +1,11 @@ +package com.glxp.api.admin.req.basic; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class BasicUnitMaintainFilterRequest extends ListPageRequest { + + private String key; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicUnitMaintainSaveRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicUnitMaintainSaveRequest.java new file mode 100644 index 00000000..6f498d52 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicUnitMaintainSaveRequest.java @@ -0,0 +1,19 @@ +package com.glxp.api.admin.req.basic; + +import lombok.Data; + +@Data +public class BasicUnitMaintainSaveRequest { + + private int id; + private String thirdId; + private String erpId; + private String name; + private String spell; + private String addr; + private String status; + private String type; + private String creditNo; + private String contact; + private String mobile; +} \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/CombineRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/CombineRequest.java new file mode 100644 index 00000000..5a6db6e8 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/CombineRequest.java @@ -0,0 +1,15 @@ +package com.glxp.api.admin.req.basic; + +import lombok.Data; + +import java.util.List; + +@Data +public class CombineRequest { + + List keys; + private String thirdId; + private String erpName; + private String relId; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterErpGoodsRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterErpGoodsRequest.java new file mode 100644 index 00000000..417dccfb --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterErpGoodsRequest.java @@ -0,0 +1,12 @@ +package com.glxp.api.admin.req.basic; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class FilterErpGoodsRequest extends ListPageRequest { + + private String name; + private String code; +} + diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterStockprintRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterStockprintRequest.java new file mode 100644 index 00000000..59e854cd --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterStockprintRequest.java @@ -0,0 +1,17 @@ +package com.glxp.api.admin.req.basic; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class FilterStockprintRequest extends ListPageRequest { + private String nameCode; + private String printStatus; + private String udiCode; + private String cpmctymc; + private String thirdName; + private String thirdId; + private String batchNo; + private String udiRlIdFk; + private String warehouseCode; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterUdiInfoRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterUdiInfoRequest.java new file mode 100644 index 00000000..78ebdb6f --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterUdiInfoRequest.java @@ -0,0 +1,16 @@ +package com.glxp.api.admin.req.basic; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class FilterUdiInfoRequest extends ListPageRequest { + + private String ylqxzcrbarmc; + private String cpmctymc; + private String nameCode; + private String uuid; + private String ggxh; + private String thirdId; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/UOnhandQueryRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/UOnhandQueryRequest.java new file mode 100644 index 00000000..9fa8be25 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/UOnhandQueryRequest.java @@ -0,0 +1,21 @@ +package com.glxp.api.admin.req.basic; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +@Data +public class UOnhandQueryRequest extends ListPageRequest { + + private String batchcode; //批次号 + private String inventory; //存货 + private String warehouse; //仓库 + private String isGroupByBatchcode; // 按批次号展开 + private String numcondition; //只查询数量大于0传>，只查询数量小于0传<，只查询数量等于0传=，只查询数量不等于0传<>，其他符号不识别，u8c3.1版本 + + private String udiCode; + private String nameCode; + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/UpdatePrintStatusRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/UpdatePrintStatusRequest.java new file mode 100644 index 00000000..839f1585 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/UpdatePrintStatusRequest.java @@ -0,0 +1,12 @@ +package com.glxp.api.admin.req.basic; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +public class UpdatePrintStatusRequest implements Serializable { + + List ids; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/info/FilterSetupRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/info/FilterSetupRequest.java new file mode 100644 index 00000000..a03c7ed3 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/info/FilterSetupRequest.java @@ -0,0 +1,12 @@ +package com.glxp.api.admin.req.info; + +import lombok.Data; + +@Data +public class FilterSetupRequest { + + private int id; + private String erpSign; + private String erpSaleOutModify; + private String erpPruchaseModify; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/info/SystemParamConfigRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/info/SystemParamConfigRequest.java new file mode 100644 index 00000000..823ce843 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/info/SystemParamConfigRequest.java @@ -0,0 +1,19 @@ +package com.glxp.api.admin.req.info; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@EqualsAndHashCode(callSuper = true) +@Data +public class SystemParamConfigRequest extends ListPageRequest { + + private int id; + private int parentId; + private String paramName; + private String paramKey; + private String paramValue; + private int paramStatus; + private int paramType; + private String paramExplain; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/info/SystemParamConfigSaveRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/info/SystemParamConfigSaveRequest.java new file mode 100644 index 00000000..8d55c999 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/info/SystemParamConfigSaveRequest.java @@ -0,0 +1,16 @@ +package com.glxp.api.admin.req.info; + +import lombok.Data; + +@Data +public class SystemParamConfigSaveRequest { + + private int id; + private int parentId; + private String paramName; + private String paramKey; + private String paramValue; + private int paramStatus; + private int paramType; + private String paramExplain; +} \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/CommitRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inout/CommitRequest.java new file mode 100644 index 00000000..51c29642 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/inout/CommitRequest.java @@ -0,0 +1,9 @@ +package com.glxp.api.admin.req.inout; + +import lombok.Data; + +@Data +public class CommitRequest { + + private String orderId; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/DeleteCodeRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inout/DeleteCodeRequest.java new file mode 100644 index 00000000..848146f9 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/inout/DeleteCodeRequest.java @@ -0,0 +1,10 @@ +package com.glxp.api.admin.req.inout; + +import lombok.Data; + +import java.util.List; +@Data +public class DeleteCodeRequest { + List codes; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/DeleteRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inout/DeleteRequest.java new file mode 100644 index 00000000..fb8be3b0 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/inout/DeleteRequest.java @@ -0,0 +1,12 @@ +package com.glxp.api.admin.req.inout; + +import lombok.Data; + +import java.util.List; + +@Data +public class DeleteRequest { + + String id; + List ids; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/ERPPostBillRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inout/ERPPostBillRequest.java new file mode 100644 index 00000000..349cd02e --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/inout/ERPPostBillRequest.java @@ -0,0 +1,14 @@ +package com.glxp.api.admin.req.inout; + +import com.glxp.api.admin.entity.inout.ErpOrderEntity; +import lombok.Data; + +import java.util.List; +import java.util.Map; + +@Data +public class ERPPostBillRequest { + + private String billAction; + private Map> postMap; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/FilterOrderRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inout/FilterOrderRequest.java new file mode 100644 index 00000000..259dbcd7 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/inout/FilterOrderRequest.java @@ -0,0 +1,16 @@ +package com.glxp.api.admin.req.inout; + +import lombok.Data; + +@Data +public class FilterOrderRequest { + + private String startDate; //起始日期 + private String endDate; //结束日期 + private String billNo; //单据号 + private String billFlag; //单据状态,0.未签字，1.已签字 + private String billAction; + private Integer limit; + private Integer page; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/FilterStockCheckRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inout/FilterStockCheckRequest.java new file mode 100644 index 00000000..796b9d4b --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/inout/FilterStockCheckRequest.java @@ -0,0 +1,16 @@ +package com.glxp.api.admin.req.inout; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class FilterStockCheckRequest extends ListPageRequest { + + private Long id; + private String action; + private String actDate; + private String endTime; + private String whouse; + private String houseCard; + private String status; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/ImportErpOrderRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inout/ImportErpOrderRequest.java new file mode 100644 index 00000000..7251d6ac --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/inout/ImportErpOrderRequest.java @@ -0,0 +1,17 @@ +package com.glxp.api.admin.req.inout; + +import com.glxp.api.admin.res.inout.PurchaseinResponse; +import lombok.Data; + +import java.util.List; + +@Data +public class ImportErpOrderRequest { + + List docids; + List purchaseinResponses; + List ids; + private String orderId; + private boolean isFilter; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderFilterByCodeRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderFilterByCodeRequest.java new file mode 100644 index 00000000..8f98b0d5 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderFilterByCodeRequest.java @@ -0,0 +1,10 @@ +package com.glxp.api.admin.req.inout; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class OrderFilterByCodeRequest extends ListPageRequest { + + private String code; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderFilterRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderFilterRequest.java new file mode 100644 index 00000000..5b9f8494 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderFilterRequest.java @@ -0,0 +1,22 @@ +package com.glxp.api.admin.req.inout; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class OrderFilterRequest extends ListPageRequest { + + private String id; + private String action; + private String mainAction; + private String code; + private Integer exportStatus; + private Integer status; + private String corpOrderId; + private Integer contrastStatus; + private Integer signStatus; + private String startTime; + private String endTime; + private String stockCheckFk; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderMergeRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderMergeRequest.java new file mode 100644 index 00000000..810961d3 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderMergeRequest.java @@ -0,0 +1,11 @@ +package com.glxp.api.admin.req.inout; + +import lombok.Data; + +import java.util.List; + +@Data +public class OrderMergeRequest { + + List orderList; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderQueryRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderQueryRequest.java new file mode 100644 index 00000000..0fef589c --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderQueryRequest.java @@ -0,0 +1,9 @@ +package com.glxp.api.admin.req.inout; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class OrderQueryRequest extends ListPageRequest { + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/PostOrderRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inout/PostOrderRequest.java new file mode 100644 index 00000000..39ab54b8 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/inout/PostOrderRequest.java @@ -0,0 +1,69 @@ +package com.glxp.api.admin.req.inout; + +import com.glxp.api.admin.entity.inout.WarehouseEntity; +import lombok.Data; + +import java.util.List; + +@Data +public class PostOrderRequest { + List postOrders; + + public List getPostOrder() { + return postOrders; + } + + public void setPostOrder(List postOrder) { + this.postOrders = postOrder; + } + + public static class PostOrder { + public List erpOrders; + List codes; + private String billType; + private String orderId; + + public String getStockIdFk() { + return stockIdFk; + } + + public void setStockIdFk(String stockIdFk) { + this.stockIdFk = stockIdFk; + } + + private String stockIdFk; + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getBillType() { + return billType; + } + + public void setBillType(String billType) { + this.billType = billType; + } + + public List getErpOrders() { + return erpOrders; + } + + public void setErpOrders(List erpOrders) { + this.erpOrders = erpOrders; + } + + public List getCodes() { + return codes; + } + + public void setCodes(List codes) { + this.codes = codes; + } + } + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/USignRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inout/USignRequest.java new file mode 100644 index 00000000..89403b1c --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/inout/USignRequest.java @@ -0,0 +1,11 @@ +package com.glxp.api.admin.req.inout; + +import lombok.Data; + +import javax.validation.constraints.NotNull; + +@Data +public class USignRequest { + @NotNull(message = "单据号不能为空") + private String billcode; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/UpdateExportStatusRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inout/UpdateExportStatusRequest.java new file mode 100644 index 00000000..02799f41 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/inout/UpdateExportStatusRequest.java @@ -0,0 +1,11 @@ +package com.glxp.api.admin.req.inout; + +import lombok.Data; + +@Data +public class UpdateExportStatusRequest { + + private String orderId; + private Integer exportStatus; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/WarehouseQueryRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inout/WarehouseQueryRequest.java new file mode 100644 index 00000000..1e1ba049 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/inout/WarehouseQueryRequest.java @@ -0,0 +1,14 @@ +package com.glxp.api.admin.req.inout; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class WarehouseQueryRequest extends ListPageRequest { + + private String corpOrderId; + private String code; + private String udi; + private String batchNo; + private String orderId; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/WarehouseSaveRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inout/WarehouseSaveRequest.java new file mode 100644 index 00000000..04e50a5c --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/inout/WarehouseSaveRequest.java @@ -0,0 +1,19 @@ +package com.glxp.api.admin.req.inout; + +import lombok.Data; + +@Data +public class WarehouseSaveRequest { + + private String action; + private String mainAction; + private String code; + private String corpOrderId; + private String actor; + private String actDate; + private long wrongCode; + private String upperCorpOrderId; + private String fromCorpId; + private long id; + private String fromCorp; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/ErpOnhandRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/ErpOnhandRequest.java new file mode 100644 index 00000000..86b5c44d --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/ErpOnhandRequest.java @@ -0,0 +1,14 @@ +package com.glxp.api.admin.req.inventory; + +import lombok.Data; + +import java.util.List; + +@Data +public class ErpOnhandRequest { + + private String batchNo; + private String warehouseCode; + private String inventoryCode; + private List inventoryCodes; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/receipt/AddReceiptRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/receipt/AddReceiptRequest.java new file mode 100644 index 00000000..69f8f06e --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/receipt/AddReceiptRequest.java @@ -0,0 +1,107 @@ +package com.glxp.api.admin.req.receipt; + +import lombok.Data; + +import java.util.List; + +@Data +public class AddReceiptRequest { + + + private List receipts; + + + public static class ReceiptRequest{ + private String id; + private String action; + private String corpOrderId; + private String actDate; + private String fromCorpId; + private String actor; + private String mainAction; + private String fromCorp; + private String status; + private String remark; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getAction() { + return action; + } + + public void setAction(String action) { + this.action = action; + } + + public String getCorpOrderId() { + return corpOrderId; + } + + public void setCorpOrderId(String corpOrderId) { + this.corpOrderId = corpOrderId; + } + + public String getActDate() { + return actDate; + } + + public void setActDate(String actDate) { + this.actDate = actDate; + } + + public String getFromCorpId() { + return fromCorpId; + } + + public void setFromCorpId(String fromCorpId) { + this.fromCorpId = fromCorpId; + } + + public String getActor() { + return actor; + } + + public void setActor(String actor) { + this.actor = actor; + } + + public String getMainAction() { + return mainAction; + } + + public void setMainAction(String mainAction) { + this.mainAction = mainAction; + } + + public String getFromCorp() { + return fromCorp; + } + + public void setFromCorp(String fromCorp) { + this.fromCorp = fromCorp; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + } + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/receipt/BussinessTypeFilterRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/receipt/BussinessTypeFilterRequest.java new file mode 100644 index 00000000..52a6f35e --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/receipt/BussinessTypeFilterRequest.java @@ -0,0 +1,13 @@ +package com.glxp.api.admin.req.receipt; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class BussinessTypeFilterRequest extends ListPageRequest { + + private String action; + private String name; + private String mainAction; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/receipt/ClearStockRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/receipt/ClearStockRequest.java new file mode 100644 index 00000000..e4ae405e --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/receipt/ClearStockRequest.java @@ -0,0 +1,8 @@ +package com.glxp.api.admin.req.receipt; + +import lombok.Data; + +@Data +public class ClearStockRequest { + String orderId; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/receipt/CodeDetailRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/receipt/CodeDetailRequest.java new file mode 100644 index 00000000..89e90d89 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/receipt/CodeDetailRequest.java @@ -0,0 +1,9 @@ +package com.glxp.api.admin.req.receipt; + +import lombok.Data; + +@Data +public class CodeDetailRequest { + + String code; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/receipt/CombineUnitRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/receipt/CombineUnitRequest.java new file mode 100644 index 00000000..3111ad44 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/receipt/CombineUnitRequest.java @@ -0,0 +1,14 @@ +package com.glxp.api.admin.req.receipt; + +import com.glxp.api.admin.res.basic.ErpUnitsResponse; +import lombok.Data; + +import java.util.List; + +@Data +public class CombineUnitRequest { + + List keys; + private String thirdId; + List custmandocResponses; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/receipt/ManuorderFilterRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/receipt/ManuorderFilterRequest.java new file mode 100644 index 00000000..357723f1 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/receipt/ManuorderFilterRequest.java @@ -0,0 +1,14 @@ +package com.glxp.api.admin.req.receipt; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class ManuorderFilterRequest extends ListPageRequest { + + private String BatchNo; + private String startTime; + private String endTime; + private String coName; + private String mipsUrl; +} \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/receipt/ProductFilterRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/receipt/ProductFilterRequest.java new file mode 100644 index 00000000..aed1c668 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/receipt/ProductFilterRequest.java @@ -0,0 +1,16 @@ +package com.glxp.api.admin.req.receipt; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class ProductFilterRequest extends ListPageRequest { + + private String closeFlag; + private String batchNo; + private String orderNo; + private String startTime; + private String endTime; + private String coName; + private String dlstaus; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/receipt/ProductInfoFilterRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/receipt/ProductInfoFilterRequest.java new file mode 100644 index 00000000..3e96346f --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/receipt/ProductInfoFilterRequest.java @@ -0,0 +1,15 @@ +package com.glxp.api.admin.req.receipt; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class ProductInfoFilterRequest extends ListPageRequest { + + private String unit; + private String coName; + private String nameCode; + private int addType; + private String thirdProductNo; + private String deviceRecordKey; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/receipt/ReceiptDetailRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/receipt/ReceiptDetailRequest.java new file mode 100644 index 00000000..fa9aa340 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/receipt/ReceiptDetailRequest.java @@ -0,0 +1,10 @@ +package com.glxp.api.admin.req.receipt; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class ReceiptDetailRequest extends ListPageRequest { + + private String receiptId; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/receipt/ReceiptFilterRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/receipt/ReceiptFilterRequest.java new file mode 100644 index 00000000..429b0774 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/receipt/ReceiptFilterRequest.java @@ -0,0 +1,13 @@ +package com.glxp.api.admin.req.receipt; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class ReceiptFilterRequest extends ListPageRequest { + + private String id; + private String action; + private String mainAction; + private String status; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/receipt/U8Request.java b/api-admin/src/main/java/com/glxp/api/admin/req/receipt/U8Request.java new file mode 100644 index 00000000..ca243e3e --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/receipt/U8Request.java @@ -0,0 +1,139 @@ +package com.glxp.api.admin.req.receipt; + +public class U8Request { + + + /** + * forinvname : a + * invbarcode : a + * invclcode : a + * invcode : a + * invmnecode : a + * invname : a + * invshortname : a + * isprimarybarcode : a + * issecondarybarcode : a + * page_now : 1 + * page_size : 10 + * system : + * unitcode : 1001 + */ + + private String forinvname; + private String invbarcode; + private String invclcode; + private String invcode; + private String invmnecode; + private String invname; + private String invshortname; + private String isprimarybarcode; + private String issecondarybarcode; + private String page_now; + private String page_size; + private String system; + private String unitcode; + + public String getForinvname() { + return forinvname; + } + + public void setForinvname(String forinvname) { + this.forinvname = forinvname; + } + + public String getInvbarcode() { + return invbarcode; + } + + public void setInvbarcode(String invbarcode) { + this.invbarcode = invbarcode; + } + + public String getInvclcode() { + return invclcode; + } + + public void setInvclcode(String invclcode) { + this.invclcode = invclcode; + } + + public String getInvcode() { + return invcode; + } + + public void setInvcode(String invcode) { + this.invcode = invcode; + } + + public String getInvmnecode() { + return invmnecode; + } + + public void setInvmnecode(String invmnecode) { + this.invmnecode = invmnecode; + } + + public String getInvname() { + return invname; + } + + public void setInvname(String invname) { + this.invname = invname; + } + + public String getInvshortname() { + return invshortname; + } + + public void setInvshortname(String invshortname) { + this.invshortname = invshortname; + } + + public String getIsprimarybarcode() { + return isprimarybarcode; + } + + public void setIsprimarybarcode(String isprimarybarcode) { + this.isprimarybarcode = isprimarybarcode; + } + + public String getIssecondarybarcode() { + return issecondarybarcode; + } + + public void setIssecondarybarcode(String issecondarybarcode) { + this.issecondarybarcode = issecondarybarcode; + } + + public String getPage_now() { + return page_now; + } + + public void setPage_now(String page_now) { + this.page_now = page_now; + } + + public String getPage_size() { + return page_size; + } + + public void setPage_size(String page_size) { + this.page_size = page_size; + } + + public String getSystem() { + return system; + } + + public void setSystem(String system) { + this.system = system; + } + + public String getUnitcode() { + return unitcode; + } + + public void setUnitcode(String unitcode) { + this.unitcode = unitcode; + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/receipt/UnitMaintainFilterRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/receipt/UnitMaintainFilterRequest.java new file mode 100644 index 00000000..0b6d4e9d --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/receipt/UnitMaintainFilterRequest.java @@ -0,0 +1,12 @@ +package com.glxp.api.admin.req.receipt; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class UnitMaintainFilterRequest extends ListPageRequest { + + private String key; + private String unitId; + private String name; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/udid/ScheduledRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/udid/ScheduledRequest.java new file mode 100644 index 00000000..8f69633b --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/udid/ScheduledRequest.java @@ -0,0 +1,9 @@ +package com.glxp.api.admin.req.udid; + +import lombok.Data; + +@Data +public class ScheduledRequest { + private String cronName; + private String customerId; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/PageSimpleResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/PageSimpleResponse.java new file mode 100644 index 00000000..d4e06df9 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/res/PageSimpleResponse.java @@ -0,0 +1,16 @@ +package com.glxp.api.admin.res; + +import lombok.Data; + +import java.util.List; + +/** + * 简单的分页返回对象 + */ +@Data +public class PageSimpleResponse { + // 总数 + private Long total; + // 列表 + private List list; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/auth/AuthAdminResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/auth/AuthAdminResponse.java new file mode 100644 index 00000000..6e5e1598 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/res/auth/AuthAdminResponse.java @@ -0,0 +1,41 @@ +package com.glxp.api.admin.res.auth; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonInclude; +import lombok.Data; + +import java.util.Date; +import java.util.List; + +/** + * 后台管理的 管理员管理页面的 VO + */ +@Data +@JsonInclude(JsonInclude.Include.NON_NULL) +public class AuthAdminResponse { + + // 主键 + private Long id; + // 昵称 + private String userName; + // 登录密码 + private String passWord; + + // 最后登录ip + private String lastLoginIp; + // 最后登录时间 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date lastLoginTime; + // 创建时间 + private Date createTime; + // 状态 + private Integer userFlag; + + private Date lastModifyTime; + private String comments; + private String employeeName; + private Integer CustomerId; + // 角色ids + private List roles; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/auth/AuthAdminRoleResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/auth/AuthAdminRoleResponse.java new file mode 100644 index 00000000..c150b638 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/res/auth/AuthAdminRoleResponse.java @@ -0,0 +1,15 @@ +package com.glxp.api.admin.res.auth; + +import lombok.Data; + +/** + * 管理员页面的赛选的角色列表 + */ +@Data +public class AuthAdminRoleResponse { + + private Long id; + + private String name; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/auth/AuthPermissionRuleMergeResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/auth/AuthPermissionRuleMergeResponse.java new file mode 100644 index 00000000..ed762873 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/res/auth/AuthPermissionRuleMergeResponse.java @@ -0,0 +1,24 @@ +package com.glxp.api.admin.res.auth; + +import lombok.Data; + +import java.util.List; + +/** + * 权限列表整合为多维数组的视图 + */ +@Data +public class AuthPermissionRuleMergeResponse { + + private Long id; + private Long pid; + private String name; + private String title; + private Long status; + private String condition; + private Long listorder; + + // 一次性加载所有权限规则生成 tree 树形节点时需要 + private List children; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/auth/AuthRoleResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/auth/AuthRoleResponse.java new file mode 100644 index 00000000..2caba0ab --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/res/auth/AuthRoleResponse.java @@ -0,0 +1,18 @@ +package com.glxp.api.admin.res.auth; + +import lombok.Data; + +/** + * 角色视图 + */ +@Data +public class AuthRoleResponse { + + private Long id; + private String name; + private Long pid; + private Long status; + private String remark; + private Long listorder; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/auth/LoginUserInfoResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/auth/LoginUserInfoResponse.java new file mode 100644 index 00000000..ce5bfc8a --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/res/auth/LoginUserInfoResponse.java @@ -0,0 +1,18 @@ +package com.glxp.api.admin.res.auth; + +import lombok.Data; + +import java.util.List; + +/** + * 登录用户的信息视图 + */ +@Data +public class LoginUserInfoResponse { + + private Long id; + private String userName; + private String avatar; + // 权限列表 + private List authRules; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/BasicUnitMaintainResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/basic/BasicUnitMaintainResponse.java new file mode 100644 index 00000000..60af0511 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/res/basic/BasicUnitMaintainResponse.java @@ -0,0 +1,20 @@ +package com.glxp.api.admin.res.basic; + +import lombok.Data; + +@Data +public class BasicUnitMaintainResponse { + + private Integer id; + private String thirdId; + private String erpId; + private String name; + private String spell; + private String addr; + private String status; + private String type; + private String creditNo; + private String contact; + private String mobile; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/ErpProductsResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/basic/ErpProductsResponse.java new file mode 100644 index 00000000..cd10bdfe --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/res/basic/ErpProductsResponse.java @@ -0,0 +1,19 @@ +package com.glxp.api.admin.res.basic; + +import lombok.Data; + +@Data +public class ErpProductsResponse { + + private String code; //产品编码 + private String name; + private String measname; //计量单位 + private String spec; //规格型号 + private String registerNo; //注册证号 + private String manufactory; //生产厂家 + + + //辅助字段 + private boolean isChecked; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/ErpUnitsResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/basic/ErpUnitsResponse.java new file mode 100644 index 00000000..eee9aa07 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/res/basic/ErpUnitsResponse.java @@ -0,0 +1,15 @@ +package com.glxp.api.admin.res.basic; + +import lombok.Data; + +@Data +public class ErpUnitsResponse { + + private String id; + private String name; + private String spell; + private String addr; + private String creditNo; + private String contact; + private String mobile; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/UOnhandQueryResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/basic/UOnhandQueryResponse.java new file mode 100644 index 00000000..5144a805 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/res/basic/UOnhandQueryResponse.java @@ -0,0 +1,175 @@ +package com.glxp.api.admin.res.basic; + +public class UOnhandQueryResponse { + + + /** + * pk_corp : 1013 + * corp_code : 1110 + * corp_name : 福建片仔癀诊断技术有限公司（测试） + * ccalbodyid : 1013F8100000000002DN + * ccalbody_code : 1110 + * ccalbody_name : 福建片仔癀诊断技术有限公司 + * cinventoryid : 1013F8100000000007LU + * cinventory_code : 1100023 + * cinventory_name : KJ0001 试剂瓶 贝克曼 + * invspec : 80/30/10ml + * nnum : 777 + * nastnum : 0 + */ + + private String pk_corp; + private String corp_code; + private String corp_name; + private String ccalbodyid; + private String ccalbody_code; + private String ccalbody_name; + private String cinventoryid; + private String cinventory_code; + private String cinventory_name; + private String invspec; + private int nnum; + private int nastnum; + private String vbatchcode; + private String cwarehouse_name; + private String invtype; + private String cwarehouse_code; + + public boolean isChecked() { + return isChecked; + } + + public void setChecked(boolean checked) { + isChecked = checked; + } + + private boolean isChecked; + + public String getPk_corp() { + return pk_corp; + } + + public void setPk_corp(String pk_corp) { + this.pk_corp = pk_corp; + } + + public String getCorp_code() { + return corp_code; + } + + public void setCorp_code(String corp_code) { + this.corp_code = corp_code; + } + + public String getCorp_name() { + return corp_name; + } + + public void setCorp_name(String corp_name) { + this.corp_name = corp_name; + } + + public String getCcalbodyid() { + return ccalbodyid; + } + + public void setCcalbodyid(String ccalbodyid) { + this.ccalbodyid = ccalbodyid; + } + + public String getCcalbody_code() { + return ccalbody_code; + } + + public void setCcalbody_code(String ccalbody_code) { + this.ccalbody_code = ccalbody_code; + } + + public String getCcalbody_name() { + return ccalbody_name; + } + + public void setCcalbody_name(String ccalbody_name) { + this.ccalbody_name = ccalbody_name; + } + + public String getCinventoryid() { + return cinventoryid; + } + + public void setCinventoryid(String cinventoryid) { + this.cinventoryid = cinventoryid; + } + + public String getCinventory_code() { + return cinventory_code; + } + + public void setCinventory_code(String cinventory_code) { + this.cinventory_code = cinventory_code; + } + + public String getCinventory_name() { + return cinventory_name; + } + + public void setCinventory_name(String cinventory_name) { + this.cinventory_name = cinventory_name; + } + + public String getInvspec() { + return invspec; + } + + public void setInvspec(String invspec) { + this.invspec = invspec; + } + + public int getNnum() { + return nnum; + } + + public void setNnum(int nnum) { + this.nnum = nnum; + } + + public int getNastnum() { + return nastnum; + } + + public void setNastnum(int nastnum) { + this.nastnum = nastnum; + } + + public String getVbatchcode() { + return vbatchcode; + } + + public void setVbatchcode(String vbatchcode) { + this.vbatchcode = vbatchcode; + } + + public String getCwarehouse_name() { + return cwarehouse_name; + } + + public void setCwarehouse_name(String cwarehouse_name) { + this.cwarehouse_name = cwarehouse_name; + } + + public String getInvtype() { + return invtype; + } + + public void setInvtype(String invtype) { + this.invtype = invtype; + } + + public String getCwarehouse_code() { + return cwarehouse_code; + } + + public void setCwarehouse_code(String cwarehouse_code) { + this.cwarehouse_code = cwarehouse_code; + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRelevanceResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRelevanceResponse.java new file mode 100644 index 00000000..8b98173b --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRelevanceResponse.java @@ -0,0 +1,39 @@ +package com.glxp.api.admin.res.basic; + +import lombok.Data; + +@Data +public class UdiRelevanceResponse { + + private int id; + private String thirdId; + private String thirdName; + private String uuid; + private String nameCode; + private String packLevel; + private String packRatio; + private Integer bhxjsl; + private Integer bhzxxsbzsl; + private Integer zxxsbzbhsydysl; + private String bhxjcpbm; + private String sjcpbm; // + private String bzcj; + private String addType; + private String deviceRecordKey; + private int isUseDy; + private String cpmctymc; + private String cplb; + private String flbm; + private String ggxh; + private String qxlb; + private String tyshxydm; + private String ylqxzcrbarmc; + private String zczbhhzbapzbh; + private String ylqxzcrbarywmc; + private String sydycpbs; + private int versionNumber; + private int diType; + private String batchNo; + private String warehouseName; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiTraceResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiTraceResponse.java new file mode 100644 index 00000000..15b316c9 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiTraceResponse.java @@ -0,0 +1,20 @@ +package com.glxp.api.admin.res.basic; + +import lombok.Data; + +@Data +public class UdiTraceResponse { + + private String orderId; + private String actDate; + private String mainAction; + private String action; + private String fromCorp; + private Integer count; + private String cpmctymc; + private String ylqxzcrbarmc; + private String ggxh; + private String batchNo; + private String produceDate; + private String expireDate; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/info/SystemParamConfigResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/info/SystemParamConfigResponse.java new file mode 100644 index 00000000..a152578f --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/res/info/SystemParamConfigResponse.java @@ -0,0 +1,16 @@ +package com.glxp.api.admin.res.info; + +import lombok.Data; + +@Data +public class SystemParamConfigResponse { + + private int id; + private int parentId; + private String paramName; + private String paramKey; + private String paramValue; + private int paramStatus; + private int paramType; + private String paramExplain; +} \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inout/ErpOrderResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/inout/ErpOrderResponse.java new file mode 100644 index 00000000..14c73b35 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/res/inout/ErpOrderResponse.java @@ -0,0 +1,146 @@ +package com.glxp.api.admin.res.inout; + +import java.util.List; + +public class ErpOrderResponse { + + private String billNo; + private String billdate; + private String corpId; + private String corpName; + private String billType; + private boolean signFlag; + private List subErpOrders; + + public String getBillNo() { + return billNo; + } + + public void setBillNo(String billNo) { + this.billNo = billNo; + } + + public String getBilldate() { + return billdate; + } + + public void setBilldate(String billdate) { + this.billdate = billdate; + } + + public String getCorpId() { + return corpId; + } + + public void setCorpId(String corpId) { + this.corpId = corpId; + } + + public String getCorpName() { + return corpName; + } + + public void setCorpName(String corpName) { + this.corpName = corpName; + } + + public String getBillType() { + return billType; + } + + public void setBillType(String billType) { + this.billType = billType; + } + + public boolean isSignFlag() { + return signFlag; + } + + public void setSignFlag(boolean signFlag) { + this.signFlag = signFlag; + } + + public List getSubErpOrders() { + return subErpOrders; + } + + public void setSubErpOrders(List subErpOrders) { + this.subErpOrders = subErpOrders; + } + + public static class SubErpOrder { + private String productId; + private String productName; + private String spec; + private String batchNo; + private String expireDate; + private String productDate; + private int count; //账面数量 + private int reCount; //实际数量 + + public String getProductId() { + return productId; + } + + public void setProductId(String productId) { + this.productId = productId; + } + + public String getProductName() { + return productName; + } + + public void setProductName(String productName) { + this.productName = productName; + } + + public String getSpec() { + return spec; + } + + public void setSpec(String spec) { + this.spec = spec; + } + + public String getBatchNo() { + return batchNo; + } + + public void setBatchNo(String batchNo) { + this.batchNo = batchNo; + } + + public String getExpireDate() { + return expireDate; + } + + public void setExpireDate(String expireDate) { + this.expireDate = expireDate; + } + + public String getProductDate() { + return productDate; + } + + public void setProductDate(String productDate) { + this.productDate = productDate; + } + + public int getCount() { + return count; + } + + public void setCount(int count) { + this.count = count; + } + + public int getReCount() { + return reCount; + } + + public void setReCount(int reCount) { + this.reCount = reCount; + } + } + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inout/InvmandocResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/inout/InvmandocResponse.java new file mode 100644 index 00000000..34bd8d5d --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/res/inout/InvmandocResponse.java @@ -0,0 +1,16 @@ +package com.glxp.api.admin.res.inout; + +import lombok.Data; + +@Data +public class InvmandocResponse { + + private String invcode; + private String invname; + private String measname; + private String invspec; + private boolean isChecked; + private String invtype; + private String prodarea; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inout/PurchaseinResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/inout/PurchaseinResponse.java new file mode 100644 index 00000000..9ca32c1c --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/res/inout/PurchaseinResponse.java @@ -0,0 +1,164 @@ +package com.glxp.api.admin.res.inout; + +import java.util.List; + +public class PurchaseinResponse { + + private String vbillcode; + private String dbilldate; + private String provider_code; + private String provider_name; + private String billType; + private boolean freplenishflag; + private List subPurchases; + + public boolean isFreplenishflag() { + return freplenishflag; + } + + public void setFreplenishflag(boolean freplenishflag) { + this.freplenishflag = freplenishflag; + } + + public String getVbillcode() { + return vbillcode; + } + + public void setVbillcode(String vbillcode) { + this.vbillcode = vbillcode; + } + + public String getDbilldate() { + return dbilldate; + } + + public void setDbilldate(String dbilldate) { + this.dbilldate = dbilldate; + } + + public String getProvider_code() { + return provider_code; + } + + public void setProvider_code(String provider_code) { + this.provider_code = provider_code; + } + + public String getProvider_name() { + return provider_name; + } + + public void setProvider_name(String provider_name) { + this.provider_name = provider_name; + } + + public List getSubPurchases() { + return subPurchases; + } + + public void setSubPurchases(List subPurchases) { + this.subPurchases = subPurchases; + } + + public String getBillType() { + return billType; + } + + public void setBillType(String billType) { + this.billType = billType; + } + + public static class SubPurchase { + private String inventory_code; + private String inventory_name; + private String invspec; + private String vbatchcode; + private int nshouldinnum; + private int ninnum; + private int noutnum; + private int reCount; + private int dtlgoodsqty; + private String dvalidate; + + public int getReCount() { + return reCount; + } + + public void setReCount(int reCount) { + this.reCount = reCount; + } + + public int getDtlgoodsqty() { + return dtlgoodsqty; + } + + public void setDtlgoodsqty(int dtlgoodsqty) { + this.dtlgoodsqty = dtlgoodsqty; + } + + public String getInventory_code() { + return inventory_code; + } + + public void setInventory_code(String inventory_code) { + this.inventory_code = inventory_code; + } + + public String getInventory_name() { + return inventory_name; + } + + public void setInventory_name(String inventory_name) { + this.inventory_name = inventory_name; + } + + public String getInvspec() { + return invspec; + } + + public void setInvspec(String invspec) { + this.invspec = invspec; + } + + public String getVbatchcode() { + return vbatchcode; + } + + public void setVbatchcode(String vbatchcode) { + this.vbatchcode = vbatchcode; + } + + public int getNshouldinnum() { + return nshouldinnum; + } + + public void setNshouldinnum(int nshouldinnum) { + this.nshouldinnum = nshouldinnum; + } + + public int getNinnum() { + return ninnum; + } + + public void setNinnum(int ninnum) { + this.ninnum = ninnum; + } + + public int getNoutnum() { + return noutnum; + } + + public void setNoutnum(int noutnum) { + this.noutnum = noutnum; + } + + public String getDvalidate() { + return dvalidate; + } + + public void setDvalidate(String dvalidate) { + this.dvalidate = dvalidate; + } + } + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inout/WarehouseResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/inout/WarehouseResponse.java new file mode 100644 index 00000000..2154f0a8 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/res/inout/WarehouseResponse.java @@ -0,0 +1,19 @@ +package com.glxp.api.admin.res.inout; + +import lombok.Data; + +@Data +public class WarehouseResponse { + private String action; + private String mainAction; + private String code; + private String corpOrderId; + private String actor; + private String actDate; + private long wrongCode; + private String upperCorpOrderId; + private String fromCorpId; + private long id; + private String fromCorp; + private Integer count; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/ErpOnHandResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/inventory/ErpOnHandResponse.java new file mode 100644 index 00000000..1325057d --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/res/inventory/ErpOnHandResponse.java @@ -0,0 +1,16 @@ +package com.glxp.api.admin.res.inventory; + +import lombok.Data; + +@Data +public class ErpOnHandResponse { + + private String inventoryCode; + private String inventoryName; + private String spec; + private int count; + private String batchNo; + private String warehouseName; + private String warehouseCode; + private String registerCertNo; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/AuthAdminService.java b/api-admin/src/main/java/com/glxp/api/admin/service/auth/AuthAdminService.java new file mode 100644 index 00000000..6d0c6c71 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/auth/AuthAdminService.java @@ -0,0 +1,27 @@ +package com.glxp.api.admin.service.auth; + + +import com.glxp.api.admin.req.auth.AuthAdminQueryRequest; +import com.glxp.api.admin.entity.auth.AuthAdmin; + +import java.util.List; + +public interface AuthAdminService { + + List listAdminPage(AuthAdminQueryRequest authAdminQueryRequest); + + AuthAdmin findByUserName(String userName); + + + AuthAdmin findById(Long id); + + + AuthAdmin findPwdById(Long id); + + boolean insertAuthAdmin(AuthAdmin authAdmin); + + boolean updateAuthAdmin(AuthAdmin authAdmin); + + boolean deleteById(Long id); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/AuthLoginService.java b/api-admin/src/main/java/com/glxp/api/admin/service/auth/AuthLoginService.java new file mode 100644 index 00000000..cf7f4fbf --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/auth/AuthLoginService.java @@ -0,0 +1,9 @@ +package com.glxp.api.admin.service.auth; + +import java.util.List; + +public interface AuthLoginService { + + List listRuleByAdminId(Long adminId); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/AuthPermissionRuleService.java b/api-admin/src/main/java/com/glxp/api/admin/service/auth/AuthPermissionRuleService.java new file mode 100644 index 00000000..17e8ee05 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/auth/AuthPermissionRuleService.java @@ -0,0 +1,25 @@ +package com.glxp.api.admin.service.auth; + + +import com.glxp.api.admin.entity.auth.AuthPermissionRule; + +import java.util.List; + +public interface AuthPermissionRuleService { + + + List listByIdIn(List ids); + + + List listByPid(Long pid); + + List listAll(); + + boolean insertAuthPermissionRule(AuthPermissionRule authPermissionRule); + + boolean updateAuthPermissionRule(AuthPermissionRule authPermissionRule); + + boolean deleteById(Long id); + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/AuthPermissionService.java b/api-admin/src/main/java/com/glxp/api/admin/service/auth/AuthPermissionService.java new file mode 100644 index 00000000..627fd058 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/auth/AuthPermissionService.java @@ -0,0 +1,19 @@ +package com.glxp.api.admin.service.auth; + + +import com.glxp.api.admin.entity.auth.AuthPermission; + +import java.util.List; + +public interface AuthPermissionService { + + + List listByRoleIdIn(List roleIds); + + List listByRoleId(Long roleId); + + int insertAuthPermissionAll(List authPermissionList); + + boolean deleteByRoleId(Long roleId); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/AuthRoleAdminService.java b/api-admin/src/main/java/com/glxp/api/admin/service/auth/AuthRoleAdminService.java new file mode 100644 index 00000000..24d67180 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/auth/AuthRoleAdminService.java @@ -0,0 +1,22 @@ +package com.glxp.api.admin.service.auth; + + +import com.glxp.api.admin.entity.auth.AuthRoleAdmin; + +import java.util.List; + +public interface AuthRoleAdminService { + + List listByAdminId(Long adminId); + + List listByAdminIdIn(List adminIds); + + List listByRoleId(Long roleId); + + int insertAuthRoleAdminAll(List authRoleAdminList); + + int insertRolesAdminIdAll(List roles, Long adminId); + + boolean deleteByAdminId(Long adminId); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/AuthRoleService.java b/api-admin/src/main/java/com/glxp/api/admin/service/auth/AuthRoleService.java new file mode 100644 index 00000000..283fe20f --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/auth/AuthRoleService.java @@ -0,0 +1,23 @@ +package com.glxp.api.admin.service.auth; + + +import com.glxp.api.admin.req.auth.AuthRoleQueryRequest; +import com.glxp.api.admin.entity.auth.AuthRole; + +import java.util.List; + +public interface AuthRoleService { + + List listAdminPage(AuthRoleQueryRequest authRoleQueryRequest); + + List listAuthAdminRolePage(Integer page, Integer limit, Integer status); + + AuthRole findByName(String name); + + boolean insertAuthRole(AuthRole authRole); + + boolean updateAuthRole(AuthRole authRole); + + boolean deleteById(Long id); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/AuthAdminServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/AuthAdminServiceImpl.java new file mode 100644 index 00000000..7835c01a --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/AuthAdminServiceImpl.java @@ -0,0 +1,110 @@ +package com.glxp.api.admin.service.auth.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.auth.AuthAdminDao; +import com.glxp.api.admin.exception.JsonException; +import com.glxp.api.admin.req.auth.AuthAdminQueryRequest; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.admin.entity.auth.AuthAdmin; +import com.glxp.api.admin.service.auth.AuthAdminService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.Date; +import java.util.List; + +@Service +public class AuthAdminServiceImpl implements AuthAdminService { + + @Resource + private AuthAdminDao authAdminDao; + + @Override + public List listAdminPage(AuthAdminQueryRequest authAdminQueryRequest) { + if (authAdminQueryRequest == null) { + return Collections.emptyList(); + } + int offset = (authAdminQueryRequest.getPage() - 1) * authAdminQueryRequest.getLimit(); + PageHelper.offsetPage(offset, authAdminQueryRequest.getLimit()); + return authAdminDao.listAdminPage(authAdminQueryRequest); + } + + @Override + public AuthAdmin findByUserName(String userName) { + return authAdminDao.findByUserName(userName); + } + + /** + * 根据id 获取需要的info + * @param id + * @return + */ + @Override + public AuthAdmin findById(Long id) { + return authAdminDao.findById(id); + } + + /** + * 根据 id 获取密码字段 + * @param id + * @return + */ + @Override + public AuthAdmin findPwdById(Long id) { + return authAdminDao.findPwdById(id); + } + + /** + * 新增 + * @param authAdmin + * @return + */ + @Override + public boolean insertAuthAdmin(AuthAdmin authAdmin) { + + if (authAdmin.getUserName() != null) { + AuthAdmin byUserName = authAdminDao.findByUserName(authAdmin.getUserName()); + if (byUserName != null) { + throw new JsonException(ResultEnum.DATA_REPEAT, "当前管理员已存在"); + } + } + authAdmin.setCreateTime(new Date()); + return authAdminDao.insertAuthAdmin(authAdmin); + } + + /** + * 更新 + * @param authAdmin + * @return + */ + @Override + public boolean updateAuthAdmin(AuthAdmin authAdmin) { + + if (authAdmin.getId() == null) { + return false; + } + // 当用户名不为空时，检查是否存在 + if (authAdmin.getUserName() != null) { + AuthAdmin byUserName = authAdminDao.findByUserName(authAdmin.getUserName()); + // 判断是否存在，剔除自己 + if (byUserName != null && !authAdmin.getId().equals(byUserName.getId())) { + throw new JsonException(ResultEnum.DATA_REPEAT, "当前管理员已存在"); + } + } + + return authAdminDao.updateAuthAdmin(authAdmin); + } + + /** + * 根据id删除 + * @param id + * @return + */ + @Override + public boolean deleteById(Long id) { + return authAdminDao.deleteById(id); + } + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/AuthLoginServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/AuthLoginServiceImpl.java new file mode 100644 index 00000000..97111954 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/AuthLoginServiceImpl.java @@ -0,0 +1,81 @@ +package com.glxp.api.admin.service.auth.impl; + +import com.glxp.api.admin.entity.auth.AuthPermission; +import com.glxp.api.admin.entity.auth.AuthPermissionRule; +import com.glxp.api.admin.entity.auth.AuthRoleAdmin; +import com.glxp.api.admin.service.auth.AuthLoginService; +import com.glxp.api.admin.service.auth.AuthPermissionRuleService; +import com.glxp.api.admin.service.auth.AuthPermissionService; +import com.glxp.api.admin.service.auth.AuthRoleAdminService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + +@Service +@Slf4j +public class AuthLoginServiceImpl implements AuthLoginService { + + @Resource + private AuthRoleAdminService authRoleAdminService; + + @Resource + private AuthPermissionService authPermissionService; + + @Resource + private AuthPermissionRuleService authPermissionRuleService; + + + /** + * 根据 管理员id 获取权限 + * @param adminId + * @return + */ + @Override + public List listRuleByAdminId(Long adminId) { + + List authRules = new ArrayList<>(); + // 超级管理员 + if (adminId.equals(1L)) { + authRules.add("admin"); + return authRules; + } + + // 如果存在，先从缓存中获取权限 +// String aarKey = String.format(CacheConstant.ADMIN_AUTH_RULES, adminId); +// if (CacheUtils.hasKey(aarKey)) { +// return new ArrayList<>(CacheUtils.sGetMembers(aarKey)); +// } +// log.info("开始获取数据库中的用户的权限规则列表"); + + // 获取角色ids + List authRoleAdmins = authRoleAdminService.listByAdminId(adminId); + + List roleIds = authRoleAdmins.stream().map(AuthRoleAdmin::getRole_id).collect(Collectors.toList()); + + // 角色授权列表 + List authPermissions = authPermissionService.listByRoleIdIn(roleIds); + List permissionRuleIds = authPermissions.stream().map(AuthPermission::getPermissionRuleId).collect(Collectors.toList()); + + // 获取授权的规则 + List authPermissionRules = authPermissionRuleService.listByIdIn(permissionRuleIds); + + // 获取权限列表 + authRules = authPermissionRules.stream().map(AuthPermissionRule::getName).collect(Collectors.toList()); + + // 如果为空，则添加一个空值 + if (authRules.isEmpty()) { + authRules.add(""); + } + +// String[] strings = authRules.toArray(new String[0]); +// CacheUtils.sAdd(aarKey, strings); +// CacheUtils.expire(aarKey, 7200L); // 两小时后过期 + + return authRules; + } + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/AuthPermissionRuleServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/AuthPermissionRuleServiceImpl.java new file mode 100644 index 00000000..5557a732 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/AuthPermissionRuleServiceImpl.java @@ -0,0 +1,110 @@ +package com.glxp.api.admin.service.auth.impl; + +import com.glxp.api.admin.dao.auth.AuthPermissionRuleDao; +import com.glxp.api.admin.exception.JsonException; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.admin.entity.auth.AuthPermissionRule; +import com.glxp.api.admin.service.auth.AuthPermissionRuleService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.Date; +import java.util.List; + +/** + * + */ +@Service +public class AuthPermissionRuleServiceImpl implements AuthPermissionRuleService { + + @Resource + private AuthPermissionRuleDao authPermissionRuleDao; + + /** + * 根据多个id查询 + * + * @param ids + * @return + */ + @Override + public List listByIdIn(List ids) { + if (ids.isEmpty()) { + return Collections.emptyList(); + } + return authPermissionRuleDao.listByIdIn(ids); + } + + /** + * 根据父级 pid 查询 + * + * @param pid + * @return + */ + @Override + public List listByPid(Long pid) { + return authPermissionRuleDao.listByPid(pid); + } + + /** + * 查询所有 + * @return + */ + @Override + public List listAll() { + return authPermissionRuleDao.listAll(); + } + + /** + * 插入 + * @param authPermissionRule + * @return + */ + @Override + public boolean insertAuthPermissionRule(AuthPermissionRule authPermissionRule) { + + // 查询是否存在 + AuthPermissionRule byName = authPermissionRuleDao.findByName(authPermissionRule.getName()); + if (byName != null) { + throw new JsonException(ResultEnum.DATA_REPEAT, "当前权限规则已存在"); + } + + authPermissionRule.setCreateTime(new Date()); + authPermissionRule.setUpdateTime(new Date()); + if (authPermissionRule.getListorder() == null) { + authPermissionRule.setListorder(999); + } + return authPermissionRuleDao.insertAuthPermissionRule(authPermissionRule); + } + + /** + * 更新 + * @param authPermissionRule + * @return + */ + @Override + public boolean updateAuthPermissionRule(AuthPermissionRule authPermissionRule) { + + if (authPermissionRule.getName() != null) { + // 查询是否存在 + AuthPermissionRule byName = authPermissionRuleDao.findByName(authPermissionRule.getName()); + if (byName != null && !authPermissionRule.getId().equals(byName.getId())) { + throw new JsonException(ResultEnum.DATA_REPEAT, "当前权限规则已存在"); + } + } + + authPermissionRule.setUpdateTime(new Date()); + return authPermissionRuleDao.updateAuthPermissionRule(authPermissionRule); + } + + /** + * 删除 + * + * @param id + * @return + */ + @Override + public boolean deleteById(Long id) { + return authPermissionRuleDao.deleteById(id); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/AuthPermissionServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/AuthPermissionServiceImpl.java new file mode 100644 index 00000000..7bf61079 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/AuthPermissionServiceImpl.java @@ -0,0 +1,60 @@ +package com.glxp.api.admin.service.auth.impl; + +import com.glxp.api.admin.dao.auth.AuthPermissionDao; +import com.glxp.api.admin.entity.auth.AuthPermission; +import com.glxp.api.admin.service.auth.AuthPermissionService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class AuthPermissionServiceImpl implements AuthPermissionService { + + @Resource + private AuthPermissionDao authPermissionDao; + + /** + * 根据 多个角色id 查询 + * @param roleIds + * @return + */ + @Override + public List listByRoleIdIn(List roleIds) { + if (roleIds.isEmpty()) { + return Collections.emptyList(); + } + return authPermissionDao.listByRoleIdIn(roleIds); + } + + /** + * 根据某个角色id 查询 + * @param roleId + * @return + */ + @Override + public List listByRoleId(Long roleId) { + return authPermissionDao.listByRoleId(roleId); + } + + /** + * 批量插入 + * @param authPermissionList + * @return + */ + @Override + public int insertAuthPermissionAll(List authPermissionList) { + return authPermissionDao.insertAuthPermissionAll(authPermissionList); + } + + /** + * 根据角色id删除 + * @param roleId + * @return + */ + @Override + public boolean deleteByRoleId(Long roleId) { + return authPermissionDao.deleteByRoleId(roleId); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/AuthRoleAdminServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/AuthRoleAdminServiceImpl.java new file mode 100644 index 00000000..d6a52d49 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/AuthRoleAdminServiceImpl.java @@ -0,0 +1,103 @@ +package com.glxp.api.admin.service.auth.impl; + +import com.glxp.api.admin.dao.auth.AuthRoleAdminDao; +import com.glxp.api.admin.entity.auth.AuthRoleAdmin; +import com.glxp.api.admin.service.auth.AuthRoleAdminService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; + +@Service +public class AuthRoleAdminServiceImpl implements AuthRoleAdminService { + + @Resource + private AuthRoleAdminDao authRoleAdminDao; + + /** + * 根据 adminid 获取角色id + * @param adminId + * @return + */ + @Override + public List listByAdminId(Long adminId) { + return authRoleAdminDao.listByAdminId(adminId); + } + + /** + * 根据多个 adminId 查询角色列表 + * @param adminIds + * @return + */ + @Override + public List listByAdminIdIn(List adminIds) { + if (adminIds.isEmpty()) { + return Collections.emptyList(); + } + return authRoleAdminDao.listByAdminIdIn(adminIds); + } + + /** + * 根据 roleId 获取 管理员id + * @param roleId + * @return + */ + @Override + public List listByRoleId(Long roleId) { + return authRoleAdminDao.listByRoleId(roleId); + } + + /** + * 批量插入 + * @param authRoleAdminList + * @return + */ + @Override + public int insertAuthRoleAdminAll(List authRoleAdminList) { + + if (authRoleAdminList == null || authRoleAdminList.isEmpty()) { + return 0; + } + + return authRoleAdminDao.insertAuthRoleAdminAll(authRoleAdminList); + } + + /** + * 根据 角色ids 和 管理员 adminId 批量插入 + * @param roles + * @param adminId + * @return + */ + @Override + public int insertRolesAdminIdAll(List roles, Long adminId) { + + List authRoleAdminList = roles.stream().map(aLong -> { + AuthRoleAdmin authRoleAdmin = new AuthRoleAdmin(); + authRoleAdmin.setRole_id(aLong); + authRoleAdmin.setAdmin_id(adminId); + return authRoleAdmin; + }).collect(Collectors.toList()); + if (!authRoleAdminList.isEmpty()) { + return insertAuthRoleAdminAll(authRoleAdminList); + } + + return 0; + } + + /** + * 根据 adminId 删除对应的权限 + * @param adminId + * @return + */ + @Override + public boolean deleteByAdminId(Long adminId) { + +// // 删除之前缓存权限规则 +// String aarKey = String.format(CacheConstant.ADMIN_AUTH_RULES, adminId); +// CacheUtils.delete(aarKey); + + return authRoleAdminDao.deleteByAdminId(adminId); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/AuthRoleServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/AuthRoleServiceImpl.java new file mode 100644 index 00000000..6591b156 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/AuthRoleServiceImpl.java @@ -0,0 +1,93 @@ +package com.glxp.api.admin.service.auth.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.auth.AuthRoleDao; +import com.glxp.api.admin.req.auth.AuthRoleQueryRequest; +import com.glxp.api.admin.entity.auth.AuthRole; +import com.glxp.api.admin.service.auth.AuthRoleService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Date; +import java.util.List; + +@Service +public class AuthRoleServiceImpl implements AuthRoleService { + + @Resource + private AuthRoleDao authRoleDao; + + /** + * 查询列表 + * @return + */ + @Override + public List listAdminPage(AuthRoleQueryRequest authRoleQueryRequest) { + int offset = (authRoleQueryRequest.getPage() - 1) * authRoleQueryRequest.getLimit(); + PageHelper.offsetPage(offset, authRoleQueryRequest.getLimit()); + List list = authRoleDao.listAdminPage(authRoleQueryRequest); + return list; + } + + /** + * 查询管理员页面的列表 + * @param page + * @param limit + * @param status + * @return + */ + @Override + public List listAuthAdminRolePage(Integer page, Integer limit, Integer status) { + page = page != null && page > 0 ? page : 1; + limit = limit != null && limit > 0 && limit < 100 ? limit : 100; + int offset = (page - 1) * limit; + PageHelper.offsetPage(offset, limit); + List list = authRoleDao.listAuthAdminRolePage(status); + return list; + } + + /** + * 根据名称查询 + * @param name + * @return + */ + @Override + public AuthRole findByName(String name) { + return authRoleDao.findByName(name); + } + + /** + * 插入 + * @param authRole + * @return + */ + @Override + public boolean insertAuthRole(AuthRole authRole) { + + authRole.setCreateTime(new Date()); + authRole.setUpdateTime(new Date()); + + return authRoleDao.insertAuthRole(authRole); + } + + /** + * 修改 + * @param authRole + * @return + */ + @Override + public boolean updateAuthRole(AuthRole authRole) { + authRole.setUpdateTime(new Date()); + return authRoleDao.updateAuthRole(authRole); + } + + /** + * 删除 + * @param id + * @return + */ + @Override + public boolean deleteById(Long id) { + return authRoleDao.deleteById(id); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicUnitMaintainService.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicUnitMaintainService.java new file mode 100644 index 00000000..fc4699b0 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicUnitMaintainService.java @@ -0,0 +1,23 @@ +package com.glxp.api.admin.service.basic; + + +import com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity; +import com.glxp.api.admin.req.basic.BasicUnitMaintainFilterRequest; +import com.glxp.api.admin.req.basic.BasicUnitMaintainSaveRequest; + +import java.util.List; + +public interface BasicUnitMaintainService { + + List filterList(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest); + + boolean insertBasicUnitMaintain(BasicUnitMaintainEntity basicUnitMaintainEntity); + + boolean insert(BasicUnitMaintainEntity basicUnitMaintainEntity); + + boolean updateById(BasicUnitMaintainSaveRequest basicUnitMaintainSaveRequest); + + boolean deleteById(String id); + + BasicUnitMaintainEntity selectById(String id); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessTypeService.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessTypeService.java new file mode 100644 index 00000000..efe57269 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessTypeService.java @@ -0,0 +1,21 @@ +package com.glxp.api.admin.service.basic; + +import com.glxp.api.admin.entity.basic.BussinessTypeEntity; +import com.glxp.api.admin.req.receipt.BussinessTypeFilterRequest; + +import java.util.List; + +public interface BussinessTypeService { + + List filterList(BussinessTypeFilterRequest bussinessTypeFilterRequest); + + BussinessTypeEntity findBTByAction(String action); + + BussinessTypeEntity findBTByName(String action); + + boolean insertBussinessType(BussinessTypeEntity bussinessTypeEntity); + + boolean updateBussinessType(BussinessTypeEntity bussinessTypeEntity); + + boolean deleteById(String id); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiInfoService.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiInfoService.java new file mode 100644 index 00000000..1f8a77ba --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiInfoService.java @@ -0,0 +1,31 @@ +package com.glxp.api.admin.service.basic; + +import com.glxp.api.admin.entity.basic.UdiInfoEntity; +import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface UdiInfoService { + + List filterUdiInfo(FilterUdiInfoRequest filterUdiInfoRequest); + + List filterAllUdiInfo(FilterUdiInfoRequest filterUdiInfoRequest); + + UdiInfoEntity findByNameCode(String nameCode); + + UdiInfoEntity findByUuid(String uuid); + + List findByUuids(String uuid); + + boolean insertUdiInfo(UdiInfoEntity udiInfoEntity); + + boolean insertUdiInfos(List udiInfoEntities); + + boolean updateUdiInfo(UdiInfoEntity udiInfoEntity); + + boolean deleteById(String id); + + boolean deleteByUuid(String uuid); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiRelevanceService.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiRelevanceService.java new file mode 100644 index 00000000..08e577de --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiRelevanceService.java @@ -0,0 +1,32 @@ +package com.glxp.api.admin.service.basic; + +import com.glxp.api.admin.entity.basic.UdiInfoEntity; +import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; +import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; +import com.glxp.api.admin.res.basic.UdiRelevanceResponse; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface UdiRelevanceService { + + List filterUdiRelevance(FilterUdiInfoRequest filterUdiInfoRequest); + + List filterUdiGp(FilterUdiInfoRequest filterUdiInfoRequest); + + List selectByUuid(String uuid); + + UdiRelevanceEntity selectById( String id); + UdiRelevanceEntity selectByThirdId(String thirdId); + + boolean insertUdiRelevance(UdiRelevanceEntity udiRelevanceEntity); + + boolean updateUdiRelevance(UdiRelevanceEntity udiRelevanceEntity); + + boolean deleteById(String id); + + boolean deleteByIds(List id); + + boolean deleteByUuid(String uuid); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/UnitMaintainService.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/UnitMaintainService.java new file mode 100644 index 00000000..9a2da3dc --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/UnitMaintainService.java @@ -0,0 +1,17 @@ +package com.glxp.api.admin.service.basic; + +import com.glxp.api.admin.entity.basic.UnitMaintainEntity; +import com.glxp.api.admin.req.receipt.UnitMaintainFilterRequest; + +import java.util.List; + +public interface UnitMaintainService { + + List filterList(UnitMaintainFilterRequest unitMaintainFilterRequest); + + boolean insertUnitMaintain(UnitMaintainEntity unitMaintainEntity); + + boolean deleteById(String id); + + UnitMaintainEntity selectById(String id); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicUnitMaintainServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicUnitMaintainServiceImpl.java new file mode 100644 index 00000000..ea8679e9 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicUnitMaintainServiceImpl.java @@ -0,0 +1,57 @@ +package com.glxp.api.admin.service.basic.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.basic.BasicUnitMaintainDao; +import com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity; +import com.glxp.api.admin.req.basic.BasicUnitMaintainFilterRequest; +import com.glxp.api.admin.req.basic.BasicUnitMaintainSaveRequest; +import com.glxp.api.admin.service.basic.BasicUnitMaintainService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class BasicUnitMaintainServiceImpl implements BasicUnitMaintainService { + + @Resource + BasicUnitMaintainDao basicUnitMaintainDao; + + @Override + public List filterList(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest) { + if (basicUnitMaintainFilterRequest == null) { + return Collections.emptyList(); + } + int offset = (basicUnitMaintainFilterRequest.getPage() - 1) * basicUnitMaintainFilterRequest.getLimit(); + PageHelper.offsetPage(offset, basicUnitMaintainFilterRequest.getLimit()); + List data = basicUnitMaintainDao.filterList(basicUnitMaintainFilterRequest); + return data; + } + + @Override + public boolean insertBasicUnitMaintain(BasicUnitMaintainEntity basicUnitMaintainEntity) { + return basicUnitMaintainDao.insertBasicUnitMaintain(basicUnitMaintainEntity); + } + + @Override + public boolean insert(BasicUnitMaintainEntity basicUnitMaintainEntity) { + return basicUnitMaintainDao.insert(basicUnitMaintainEntity); + } + + @Override + public boolean updateById(BasicUnitMaintainSaveRequest basicUnitMaintainSaveRequest) { + + return basicUnitMaintainDao.updateById(basicUnitMaintainSaveRequest); + } + + @Override + public boolean deleteById(String id) { + return basicUnitMaintainDao.deleteById(id); + } + + @Override + public BasicUnitMaintainEntity selectById(String id) { + return basicUnitMaintainDao.selectById(id); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessTypeServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessTypeServiceImpl.java new file mode 100644 index 00000000..a6a277fb --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessTypeServiceImpl.java @@ -0,0 +1,67 @@ +package com.glxp.api.admin.service.basic.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.basic.BussinessTypeDao; +import com.glxp.api.admin.entity.basic.BussinessTypeEntity; +import com.glxp.api.admin.req.receipt.BussinessTypeFilterRequest; +import com.glxp.api.admin.service.basic.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 filterList(BussinessTypeFilterRequest bussinessTypeFilterRequest) { + if (bussinessTypeFilterRequest == null) { + return Collections.emptyList(); + } + int offset = (bussinessTypeFilterRequest.getPage() - 1) * bussinessTypeFilterRequest.getLimit(); + PageHelper.offsetPage(offset, bussinessTypeFilterRequest.getLimit()); + List data = bussinessTypeDao.filterList(bussinessTypeFilterRequest); + return data; + } + + @Override + public BussinessTypeEntity findBTByAction(String action) { + BussinessTypeFilterRequest bussinessTypeFilterRequest = new BussinessTypeFilterRequest(); + bussinessTypeFilterRequest.setAction(action); + List 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 data = bussinessTypeDao.filterList(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); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiInfoServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiInfoServiceImpl.java new file mode 100644 index 00000000..67e217f3 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiInfoServiceImpl.java @@ -0,0 +1,81 @@ +package com.glxp.api.admin.service.basic.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.basic.UdiInfoDao; +import com.glxp.api.admin.entity.basic.UdiInfoEntity; +import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; +import com.glxp.api.admin.service.basic.UdiInfoService; +import com.glxp.api.admin.util.FilterUdiUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class UdiInfoServiceImpl implements UdiInfoService { + + @Resource + UdiInfoDao udiInfoDao; + + @Override + public List filterUdiInfo(FilterUdiInfoRequest filterUdiInfoRequest) { + if (filterUdiInfoRequest == null) { + return Collections.emptyList(); + } + int offset = (filterUdiInfoRequest.getPage() - 1) * filterUdiInfoRequest.getLimit(); + PageHelper.offsetPage(offset, filterUdiInfoRequest.getLimit()); + List data = udiInfoDao.filterUdiInfo(filterUdiInfoRequest); + return data; + } + + @Override + public List filterAllUdiInfo(FilterUdiInfoRequest filterUdiInfoRequest) { + if (filterUdiInfoRequest == null) { + return Collections.emptyList(); + } + List data = udiInfoDao.filterUdiInfo(filterUdiInfoRequest); + return data; + } + + @Override + public UdiInfoEntity findByNameCode(String nameCode) { + String prefix = FilterUdiUtils.getDiStr(nameCode); + return udiInfoDao.findByNameCode(prefix); + } + + @Override + public UdiInfoEntity findByUuid(String uuid) { + return udiInfoDao.findByUuid(uuid); + } + + @Override + public List findByUuids(String uuid) { + return udiInfoDao.findByUuids(uuid); + } + + @Override + public boolean insertUdiInfo(UdiInfoEntity udiInfoEntity) { + return udiInfoDao.insertUdiInfo(udiInfoEntity); + } + + @Override + public boolean insertUdiInfos(List udiInfoEntities) { + return udiInfoDao.insertUdiInfos(udiInfoEntities); + } + + @Override + public boolean updateUdiInfo(UdiInfoEntity udiInfoEntity) { + return udiInfoDao.updateUdiInfo(udiInfoEntity); + } + + @Override + public boolean deleteById(String id) { + return udiInfoDao.deleteById(id); + } + + @Override + public boolean deleteByUuid(String uuid) { + return udiInfoDao.deleteByUuid(uuid); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiRelevanceServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiRelevanceServiceImpl.java new file mode 100644 index 00000000..a5c76ece --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiRelevanceServiceImpl.java @@ -0,0 +1,85 @@ +package com.glxp.api.admin.service.basic.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.basic.UdiRelevanceDao; +import com.glxp.api.admin.entity.basic.UdiInfoEntity; +import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; +import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; +import com.glxp.api.admin.res.basic.UdiRelevanceResponse; +import com.glxp.api.admin.service.basic.UdiRelevanceService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class UdiRelevanceServiceImpl implements UdiRelevanceService { + @Resource + UdiRelevanceDao udiRelevanceDao; + + @Override + public List filterUdiRelevance(FilterUdiInfoRequest filterUdiInfoRequest) { + if (filterUdiInfoRequest == null) { + return Collections.emptyList(); + } + int offset = (filterUdiInfoRequest.getPage() - 1) * filterUdiInfoRequest.getLimit(); + PageHelper.offsetPage(offset, filterUdiInfoRequest.getLimit()); + List data = udiRelevanceDao.filterUdiRelevance(filterUdiInfoRequest); + return data; + } + + @Override + public List filterUdiGp(FilterUdiInfoRequest filterUdiInfoRequest) { + if (filterUdiInfoRequest == null) { + return Collections.emptyList(); + } + if (filterUdiInfoRequest.getPage() != null) { + int offset = (filterUdiInfoRequest.getPage() - 1) * filterUdiInfoRequest.getLimit(); + PageHelper.offsetPage(offset, filterUdiInfoRequest.getLimit()); + } + + List data = udiRelevanceDao.filterUdiGp(filterUdiInfoRequest); + return data; + } + + @Override + public List selectByUuid(String uuid) { + return udiRelevanceDao.selectByUuid(uuid); + } + + @Override + public UdiRelevanceEntity selectById(String id) { + return udiRelevanceDao.selectById(id); + } + + @Override + public UdiRelevanceEntity selectByThirdId(String thirdId) { + return udiRelevanceDao.selectByThirdId(thirdId); + } + + @Override + public boolean insertUdiRelevance(UdiRelevanceEntity udiRelevanceEntity) { + return udiRelevanceDao.insertUdiRelevance(udiRelevanceEntity); + } + + @Override + public boolean updateUdiRelevance(UdiRelevanceEntity udiRelevanceEntity) { + return udiRelevanceDao.updateUdiRelevance(udiRelevanceEntity); + } + + @Override + public boolean deleteById(String id) { + return udiRelevanceDao.deleteById(id); + } + + @Override + public boolean deleteByIds(List ids) { + return udiRelevanceDao.deleteByIds(ids); + } + + @Override + public boolean deleteByUuid(String uuid) { + return udiRelevanceDao.deleteByUuid(uuid); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UnitMaintainServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UnitMaintainServiceImpl.java new file mode 100644 index 00000000..e7e1c04a --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UnitMaintainServiceImpl.java @@ -0,0 +1,45 @@ +package com.glxp.api.admin.service.basic.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.basic.UnitMaintainDao; +import com.glxp.api.admin.entity.basic.UnitMaintainEntity; +import com.glxp.api.admin.req.receipt.UnitMaintainFilterRequest; +import com.glxp.api.admin.service.basic.UnitMaintainService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class UnitMaintainServiceImpl implements UnitMaintainService { + + @Resource + UnitMaintainDao unitMaintainDao; + + @Override + public List filterList(UnitMaintainFilterRequest unitMaintainFilterRequest) { + if (unitMaintainFilterRequest == null) { + return Collections.emptyList(); + } + int offset = (unitMaintainFilterRequest.getPage() - 1) * unitMaintainFilterRequest.getLimit(); + PageHelper.offsetPage(offset, unitMaintainFilterRequest.getLimit()); + List data = unitMaintainDao.filterList(unitMaintainFilterRequest); + return data; + } + + @Override + public boolean insertUnitMaintain(UnitMaintainEntity unitMaintainEntity) { + return unitMaintainDao.insertUnitMaintain(unitMaintainEntity); + } + + @Override + public boolean deleteById(String id) { + return unitMaintainDao.deleteById(id); + } + + @Override + public UnitMaintainEntity selectById(String id) { + return unitMaintainDao.selectById(id); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/info/CompanyService.java b/api-admin/src/main/java/com/glxp/api/admin/service/info/CompanyService.java new file mode 100644 index 00000000..8ee903e1 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/info/CompanyService.java @@ -0,0 +1,11 @@ +package com.glxp.api.admin.service.info; + +import com.glxp.api.admin.entity.info.CompanyEntity; + +public interface CompanyService { + + CompanyEntity findCompany(); + + boolean modifyCompany(CompanyEntity companyEntity); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/info/SetupService.java b/api-admin/src/main/java/com/glxp/api/admin/service/info/SetupService.java new file mode 100644 index 00000000..94175d66 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/info/SetupService.java @@ -0,0 +1,19 @@ +package com.glxp.api.admin.service.info; + +import com.glxp.api.admin.entity.info.SetupEntity; +import com.glxp.api.admin.req.info.FilterSetupRequest; +import lombok.Data; + +import java.util.List; + + +public interface SetupService { + + SetupEntity selectSetup(); + + SetupEntity findSetup(FilterSetupRequest filterSetupRequest); + + boolean modifySetup(SetupEntity setupEntity); + + boolean insertSetup(SetupEntity setupEntity); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/info/SystemParamConfigService.java b/api-admin/src/main/java/com/glxp/api/admin/service/info/SystemParamConfigService.java new file mode 100644 index 00000000..868c3361 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/info/SystemParamConfigService.java @@ -0,0 +1,28 @@ +package com.glxp.api.admin.service.info; + + +import com.glxp.api.admin.entity.info.SystemParamConfigEntity; +import com.glxp.api.admin.req.info.SystemParamConfigRequest; +import com.glxp.api.admin.req.info.SystemParamConfigSaveRequest; + +import java.util.List; + + +public interface SystemParamConfigService { + + List queryPage(SystemParamConfigRequest SystemParamConfigRequest); + + SystemParamConfigEntity selectSystemParamConfig(); + + SystemParamConfigEntity findSystemParamConfig(SystemParamConfigRequest SystemParamConfigRequest); + + SystemParamConfigEntity selectByParamName(SystemParamConfigRequest systemParamConfigRequest); + + SystemParamConfigEntity selectByParamKey(String key); + + boolean updateById(SystemParamConfigSaveRequest systemParamConfigSaveRequest); + + boolean updateParentId(SystemParamConfigSaveRequest systemParamConfigSaveRequest); + + boolean insert(SystemParamConfigEntity systemParamConfigEntity); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/CompanyServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/CompanyServiceImpl.java new file mode 100644 index 00000000..8da2e9a3 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/CompanyServiceImpl.java @@ -0,0 +1,29 @@ +package com.glxp.api.admin.service.info.impl; + +import com.glxp.api.admin.dao.info.CompanyDao; +import com.glxp.api.admin.entity.info.CompanyEntity; +import com.glxp.api.admin.service.info.CompanyService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +@Service +public class CompanyServiceImpl implements CompanyService { + + @Resource + CompanyDao companyDao; + + @Override + public CompanyEntity findCompany() { + return companyDao.findCompany(); + } + + @Override + public boolean modifyCompany(CompanyEntity companyEntity) { + + if (findCompany() == null) { + return companyDao.insertCompany(companyEntity); + } else + return companyDao.modifyCompany(companyEntity); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SetupServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SetupServiceImpl.java new file mode 100644 index 00000000..a1044c57 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SetupServiceImpl.java @@ -0,0 +1,40 @@ +package com.glxp.api.admin.service.info.impl; + +import com.glxp.api.admin.dao.info.SetupDao; +import com.glxp.api.admin.entity.info.SetupEntity; +import com.glxp.api.admin.req.info.FilterSetupRequest; +import com.glxp.api.admin.service.info.SetupService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +@Service +public class SetupServiceImpl implements SetupService { + @Resource + SetupDao setupDao; + + + @Override + public SetupEntity selectSetup() { + FilterSetupRequest filterSetupRequest = new FilterSetupRequest(); + filterSetupRequest.setId(1); + return setupDao.findSetup(filterSetupRequest); + } + + @Override + public SetupEntity findSetup(FilterSetupRequest filterSetupRequest) { + return setupDao.findSetup(filterSetupRequest); + } + + @Override + public boolean modifySetup(SetupEntity setupEntity) { + + return setupDao.modifySetup(setupEntity); + } + + @Override + public boolean insertSetup(SetupEntity setupEntity) { + return setupDao.insertSetup(setupEntity); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SystemParamConfigServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SystemParamConfigServiceImpl.java new file mode 100644 index 00000000..9cfab419 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SystemParamConfigServiceImpl.java @@ -0,0 +1,65 @@ +package com.glxp.api.admin.service.info.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.info.SystemParamConfigDao; +import com.glxp.api.admin.entity.info.SystemParamConfigEntity; +import com.glxp.api.admin.req.info.SystemParamConfigRequest; +import com.glxp.api.admin.req.info.SystemParamConfigSaveRequest; +import com.glxp.api.admin.service.info.SystemParamConfigService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +@Service +public class SystemParamConfigServiceImpl implements SystemParamConfigService { + @Resource + SystemParamConfigDao systemParamConfigDao; + + @Override + public List queryPage(SystemParamConfigRequest SystemParamConfigRequest) { + int offset = (SystemParamConfigRequest.getPage() - 1) * SystemParamConfigRequest.getLimit(); + PageHelper.offsetPage(offset, SystemParamConfigRequest.getLimit()); + List list = systemParamConfigDao.queryPage(SystemParamConfigRequest); + return list; + } + + @Override + public SystemParamConfigEntity selectSystemParamConfig() { + SystemParamConfigRequest systemParamConfigRequest = new SystemParamConfigRequest(); + systemParamConfigRequest.setId(1); + return systemParamConfigDao.findSystemParamConfig(systemParamConfigRequest); + } + + @Override + public SystemParamConfigEntity findSystemParamConfig(SystemParamConfigRequest systemParamConfigRequest) { + return systemParamConfigDao.findSystemParamConfig(systemParamConfigRequest); + } + + @Override + public SystemParamConfigEntity selectByParamName(SystemParamConfigRequest systemParamConfigRequest) { + return systemParamConfigDao.selectByParamName(systemParamConfigRequest); + } + + @Override + public SystemParamConfigEntity selectByParamKey(String key) { + return systemParamConfigDao.selectByParamKey(key); + } + + @Override + public boolean updateById(SystemParamConfigSaveRequest systemParamConfigSaveRequest) { + + return systemParamConfigDao.updateById(systemParamConfigSaveRequest); + } + + @Override + public boolean updateParentId(SystemParamConfigSaveRequest systemParamConfigSaveRequest) { + + return systemParamConfigDao.updateParentId(systemParamConfigSaveRequest); + } + + @Override + public boolean insert(SystemParamConfigEntity systemParamConfigEntity) { + return systemParamConfigDao.insert(systemParamConfigEntity); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/CodesService.java b/api-admin/src/main/java/com/glxp/api/admin/service/inout/CodesService.java new file mode 100644 index 00000000..579b8c59 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inout/CodesService.java @@ -0,0 +1,37 @@ +package com.glxp.api.admin.service.inout; + +import com.glxp.api.admin.entity.inout.WarehouseEntity; +import com.glxp.api.admin.entity.inout.Warehousetemp; +import com.glxp.api.admin.req.inout.CommitRequest; +import com.glxp.api.admin.req.inout.WarehouseQueryRequest; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface CodesService { + List listWarehouse(WarehouseQueryRequest warehouseQueryRequest); + + boolean insertWarehouse(WarehouseEntity warehouseEntity); + + boolean insertWarehouses(List warehouseEntities); + + + List findByNo(WarehouseQueryRequest warehouseQueryRequest); + + boolean isExits(WarehouseEntity warehouseEntity); + + List findByOrderId(WarehouseQueryRequest warehouseQueryRequest); + + + List findAllByOrderId(WarehouseQueryRequest warehouseQueryRequest); + + List findByReceiptId(String orderId); + + List findByCode(String code); + + boolean updateOrderId(String oldOrderId, String newOrderId); + + List searchCode(String code); + + boolean updateUnit(String orderId, String fromCorpID, String fromCorp); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/CodesTempService.java b/api-admin/src/main/java/com/glxp/api/admin/service/inout/CodesTempService.java new file mode 100644 index 00000000..c1be67f1 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inout/CodesTempService.java @@ -0,0 +1,16 @@ +package com.glxp.api.admin.service.inout; + +import com.glxp.api.admin.entity.inout.WarehouseEntity; +import com.glxp.api.admin.req.inout.WarehouseQueryRequest; + +import java.util.List; + +public interface CodesTempService { + + int insertCodesTemp(List warehouseEntities); + + int deleteCodesTemp(List warehouseEntities); + + List findByOrderId(WarehouseQueryRequest warehouseQueryRequest); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/OrderDetailService.java b/api-admin/src/main/java/com/glxp/api/admin/service/inout/OrderDetailService.java new file mode 100644 index 00000000..d9c779d3 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inout/OrderDetailService.java @@ -0,0 +1,39 @@ +package com.glxp.api.admin.service.inout; + +import com.glxp.api.admin.entity.inout.ErpOrderEntity; +import com.glxp.api.admin.entity.inout.FilterErpOrderRequest; + +import java.util.List; + +public interface OrderDetailService { + + List filterAllMyErpOrder(FilterErpOrderRequest filterErpOrderRequest); + + List findByStockCheck(FilterErpOrderRequest filterErpOrderRequest); + + List filterMyErpOrder(FilterErpOrderRequest filterErpOrderRequest); + + List filterMyErpMainOrder(FilterErpOrderRequest filterErpOrderRequest); + + List filterMyErpDetailOrder(FilterErpOrderRequest filterErpOrderRequest); + + List findAllByDocids(List docids); + + List filterAllDocid(FilterErpOrderRequest filterErpOrderRequest); + + List filterAllDocidE(FilterErpOrderRequest filterErpOrderRequest); + + boolean insertErpOrders(List erpOrderEntities); + + boolean insertErpOrder(ErpOrderEntity erpOrderEntity); + + boolean updateErpOrder(ErpOrderEntity erpOrderEntity); + + List selectAllIds(List docids); + + boolean deleteById(String id); + + boolean deleteByPrimiyId( String id); + + boolean deleteByOrderId(String id); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/OrderService.java b/api-admin/src/main/java/com/glxp/api/admin/service/inout/OrderService.java new file mode 100644 index 00000000..35e73e06 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inout/OrderService.java @@ -0,0 +1,48 @@ +package com.glxp.api.admin.service.inout; + +import com.glxp.api.admin.entity.inout.OrderEntity; +import com.glxp.api.admin.entity.inout.WarehouseEntity; +import com.glxp.api.admin.req.inout.OrderFilterRequest; +import com.glxp.api.admin.req.inout.OrderQueryRequest; + +import java.util.List; + +public interface OrderService { + + List listOrders(OrderQueryRequest orderQueryRequest); + + boolean insertOrder(OrderEntity orderEntity); + + boolean updateOrder(OrderEntity orderEntity); + + + List listOrderRepeat(OrderQueryRequest orderQueryRequest); + + boolean deleteByOrderId(String orderId); + + boolean deleteById(String id); + + boolean updateUnit(OrderEntity orderEntity); + + boolean updateOrderStatus(String orderId, Integer status); + + boolean updateExportStatus(String orderId, Integer exportStatus); + + boolean updateSignStatus(String orderId, Integer signStatus); + + boolean updateContrastStatus(String orderId, String contrastStatus); + + boolean updateRemark(String orderId, String remark); + + List findAllOrders(OrderFilterRequest orderFilterRequest); + + List filterList(OrderFilterRequest orderFilterRequest); + + OrderEntity findOne(OrderFilterRequest orderFilterRequest); + + OrderEntity findById(String orderId); + + List findCodesById(String orderId); + + List filterListByCode(List warehouseEntityList); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/CodesServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/CodesServiceImpl.java new file mode 100644 index 00000000..d60fc713 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/CodesServiceImpl.java @@ -0,0 +1,112 @@ +package com.glxp.api.admin.service.inout.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.inout.CodesDao; +import com.glxp.api.admin.entity.inout.WarehouseEntity; +import com.glxp.api.admin.req.inout.WarehouseQueryRequest; +import com.glxp.api.admin.service.inout.CodesService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class CodesServiceImpl implements CodesService { + + @Resource + CodesDao warehouseDao; + + @Override + public List listWarehouse(WarehouseQueryRequest warehouseQueryRequest) { + if (warehouseQueryRequest == null) { + return Collections.emptyList(); + } + int offset = (warehouseQueryRequest.getPage() - 1) * warehouseQueryRequest.getLimit(); + PageHelper.offsetPage(offset, warehouseQueryRequest.getLimit()); + return warehouseDao.listWarehouse(warehouseQueryRequest); + } + + + @Override + public boolean insertWarehouse(WarehouseEntity warehouseEntity) { + return warehouseDao.insertWarehouse(warehouseEntity); + } + + @Override + public boolean insertWarehouses(List warehouseEntities) { + return warehouseDao.insertWarehouses(warehouseEntities); + } + + + @Override + public List findByNo(WarehouseQueryRequest warehouseQueryRequest) { + if (warehouseQueryRequest == null) { + return Collections.emptyList(); + } + int offset = (warehouseQueryRequest.getPage() - 1) * warehouseQueryRequest.getLimit(); + PageHelper.offsetPage(offset, warehouseQueryRequest.getLimit()); + return warehouseDao.findByNo(warehouseQueryRequest); + } + + @Override + public boolean isExits(WarehouseEntity warehouseEntity) { + + int result = warehouseDao.isExit(warehouseEntity); + if (result == 1) + return true; + else + return false; + } + + @Override + public List findByOrderId(WarehouseQueryRequest warehouseQueryRequest) { + if (warehouseQueryRequest == null) { + return Collections.emptyList(); + } + if (warehouseQueryRequest.getPage() != null) { + int offset = (warehouseQueryRequest.getPage() - 1) * warehouseQueryRequest.getLimit(); + PageHelper.offsetPage(offset, warehouseQueryRequest.getLimit()); + } + + return warehouseDao.findByOrderId(warehouseQueryRequest); + } + + @Override + public List findAllByOrderId(WarehouseQueryRequest warehouseQueryRequest) { + if (warehouseQueryRequest == null) { + return Collections.emptyList(); + } + return warehouseDao.findByOrderId(warehouseQueryRequest); + } + + @Override + public List findByReceiptId(String orderId) { + return warehouseDao.findByReceiptId(orderId); + } + + + @Override + public List findByCode(String code) { + + return warehouseDao.findByCode(code); + } + + @Override + public boolean updateOrderId(String oldOrderId, String newOrderId) { + + + return warehouseDao.updateOrderId(oldOrderId, newOrderId); + } + + @Override + public List searchCode(String code) { + return warehouseDao.searchCode(code); + } + + + @Override + public boolean updateUnit(String orderId, String fromCorpID, String fromCorp) { + return warehouseDao.updateUnit(orderId, fromCorpID, fromCorp); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/CodesTempServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/CodesTempServiceImpl.java new file mode 100644 index 00000000..80cbf090 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/CodesTempServiceImpl.java @@ -0,0 +1,43 @@ +package com.glxp.api.admin.service.inout.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.inout.CodesDao; +import com.glxp.api.admin.dao.inout.CodesTempDao; +import com.glxp.api.admin.entity.inout.WarehouseEntity; +import com.glxp.api.admin.req.inout.WarehouseQueryRequest; +import com.glxp.api.admin.service.inout.CodesTempService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class CodesTempServiceImpl implements CodesTempService { + + + @Resource + CodesTempDao codesTempDao; + + @Override + public int insertCodesTemp(List warehouseEntities) { + return codesTempDao.insertCodesTemp(warehouseEntities); + } + + @Override + public int deleteCodesTemp(List ids) { + return codesTempDao.deleteCodesTemp(ids); + } + + @Override + public List findByOrderId(WarehouseQueryRequest warehouseQueryRequest) { + if (warehouseQueryRequest == null) { + return Collections.emptyList(); + } + if (warehouseQueryRequest.getPage() != null) { + int offset = (warehouseQueryRequest.getPage() - 1) * warehouseQueryRequest.getLimit(); + PageHelper.offsetPage(offset, warehouseQueryRequest.getLimit()); + } + return codesTempDao.findByOrderId(warehouseQueryRequest); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderDetailServiceImpl.java new file mode 100644 index 00000000..952d2c29 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderDetailServiceImpl.java @@ -0,0 +1,125 @@ +package com.glxp.api.admin.service.inout.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.inout.OrderDetailDao; +import com.glxp.api.admin.entity.inout.ErpOrderEntity; +import com.glxp.api.admin.entity.inout.FilterErpOrderRequest; +import com.glxp.api.admin.service.inout.OrderDetailService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class OrderDetailServiceImpl implements OrderDetailService { + + @Resource + OrderDetailDao myErpOrderDao; + + @Override + public List filterAllMyErpOrder(FilterErpOrderRequest filterErpOrderRequest) { + if (filterErpOrderRequest == null) { + return Collections.emptyList(); + } + + return myErpOrderDao.filterMyErpOrder(filterErpOrderRequest); + } + + @Override + public List findByStockCheck(FilterErpOrderRequest filterErpOrderRequest) { + + if (filterErpOrderRequest == null) { + return Collections.emptyList(); + } + int offset = (filterErpOrderRequest.getPage() - 1) * filterErpOrderRequest.getLimit(); + PageHelper.offsetPage(offset, filterErpOrderRequest.getLimit()); + return myErpOrderDao.findByStockCheck(filterErpOrderRequest.getOrderIds()); + } + + @Override + public List filterMyErpOrder(FilterErpOrderRequest filterErpOrderRequest) { + if (filterErpOrderRequest == null) { + return Collections.emptyList(); + } + if (filterErpOrderRequest.getPage() != null) { + int offset = (filterErpOrderRequest.getPage() - 1) * filterErpOrderRequest.getLimit(); + PageHelper.offsetPage(offset, filterErpOrderRequest.getLimit()); + } + return myErpOrderDao.filterMyErpOrder(filterErpOrderRequest); + } + + @Override + public List filterMyErpMainOrder(FilterErpOrderRequest filterErpOrderRequest) { + if (filterErpOrderRequest == null) { + return Collections.emptyList(); + } + int offset = (filterErpOrderRequest.getPage() - 1) * filterErpOrderRequest.getLimit(); + PageHelper.offsetPage(offset, filterErpOrderRequest.getLimit()); + return myErpOrderDao.filterMyErpMainOrder(filterErpOrderRequest); + } + + @Override + public List filterMyErpDetailOrder(FilterErpOrderRequest filterErpOrderRequest) { + if (filterErpOrderRequest == null) { + return Collections.emptyList(); + } + if (filterErpOrderRequest.getPage() != null && filterErpOrderRequest.getLimit() != null) { + int offset = (filterErpOrderRequest.getPage() - 1) * filterErpOrderRequest.getLimit(); + PageHelper.offsetPage(offset, filterErpOrderRequest.getLimit()); + } + + return myErpOrderDao.filterMyErpDetailOrder(filterErpOrderRequest); + } + + @Override + public List findAllByDocids(List docids) { + return myErpOrderDao.findAllByDocids(docids); + } + + @Override + public List filterAllDocid(FilterErpOrderRequest filterErpOrderRequest) { + return myErpOrderDao.filterAllDocid(filterErpOrderRequest); + } + + @Override + public List filterAllDocidE(FilterErpOrderRequest filterErpOrderRequest) { + return myErpOrderDao.filterAllDocidE(filterErpOrderRequest); + } + + @Override + public boolean insertErpOrders(List erpOrderEntities) { + return myErpOrderDao.insertErpOrders(erpOrderEntities); + } + + @Override + public boolean insertErpOrder(ErpOrderEntity erpOrderEntity) { + return myErpOrderDao.insertErpOrder(erpOrderEntity); + } + + @Override + public boolean updateErpOrder(ErpOrderEntity erpOrderEntity) { + return myErpOrderDao.updateErpOrder(erpOrderEntity); + } + + @Override + public List selectAllIds(List docids) { + return myErpOrderDao.selectAllIds(docids); + } + + @Override + public boolean deleteById(String id) { + return myErpOrderDao.deleteById(id); + } + + @Override + public boolean deleteByPrimiyId(String id) { + return myErpOrderDao.deleteByPrimiyId(id); + } + + @Override + public boolean deleteByOrderId(String id) { + return myErpOrderDao.deleteByOrderId(id); + } + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java new file mode 100644 index 00000000..778be379 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java @@ -0,0 +1,138 @@ +package com.glxp.api.admin.service.inout.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.inout.OrderDao; +import com.glxp.api.admin.dao.inout.CodesDao; +import com.glxp.api.admin.entity.inout.OrderEntity; +import com.glxp.api.admin.entity.inout.WarehouseEntity; +import com.glxp.api.admin.req.inout.OrderFilterRequest; +import com.glxp.api.admin.req.inout.OrderQueryRequest; +import com.glxp.api.admin.service.inout.OrderService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class OrderServiceImpl implements OrderService { + + @Resource + OrderDao orderDao; + @Resource + CodesDao warehouseDao; + + @Override + public List listOrders(OrderQueryRequest orderQueryRequest) { + if (orderQueryRequest == null) { + return Collections.emptyList(); + } + int offset = (orderQueryRequest.getPage() - 1) * orderQueryRequest.getLimit(); + PageHelper.offsetPage(offset, orderQueryRequest.getLimit()); + return orderDao.listOrder(orderQueryRequest); + } + + + @Override + public boolean insertOrder(OrderEntity orderEntity) { + return orderDao.insertOrder(orderEntity); + } + + @Override + public boolean updateOrder(OrderEntity orderEntity) { + return orderDao.updateOrder(orderEntity); + } + + + @Override + public List listOrderRepeat(OrderQueryRequest orderQueryRequest) { + if (orderQueryRequest == null) { + return Collections.emptyList(); + } + int offset = (orderQueryRequest.getPage() - 1) * orderQueryRequest.getLimit(); + PageHelper.offsetPage(offset, orderQueryRequest.getLimit()); + return orderDao.listOrderRepeat(orderQueryRequest); + } + + @Override + public boolean deleteByOrderId(String orderId) { + return orderDao.deleteByOrderId(orderId); + } + + @Override + public boolean deleteById(String id) { + return orderDao.deleteById(id); + } + + @Override + public boolean updateUnit(OrderEntity orderEntity) { + return orderDao.updateUnit(orderEntity); + } + + @Override + public boolean updateOrderStatus(String orderId, Integer status) { + return orderDao.updateOrderStatus(orderId, status); + } + + @Override + public boolean updateExportStatus(String orderId, Integer exportStatus) { + return orderDao.updateExportStatus(orderId, exportStatus); + } + + @Override + public boolean updateSignStatus(String orderId, Integer signStatus) { + return orderDao.updateSignStatus(orderId, signStatus); + } + + @Override + public boolean updateContrastStatus(String orderId, String contrastStatus) { + return orderDao.updateContrastStatus(orderId, contrastStatus); + } + + @Override + public boolean updateRemark(String orderId, String remark) { + return orderDao.updateRemark(orderId, remark); + } + + @Override + public List findAllOrders(OrderFilterRequest orderFilterRequest) { + return orderDao.filterNoSort(orderFilterRequest); + } + + @Override + public List filterList(OrderFilterRequest orderFilterRequest) { + if (orderFilterRequest == null) { + return Collections.emptyList(); + } + int offset = (orderFilterRequest.getPage() - 1) * orderFilterRequest.getLimit(); + PageHelper.offsetPage(offset, orderFilterRequest.getLimit()); + return orderDao.filterList(orderFilterRequest); + } + + @Override + public OrderEntity findOne(OrderFilterRequest orderFilterRequest) { + return orderDao.findOne(orderFilterRequest); + } + + @Override + public OrderEntity findById(String orderId) { + OrderFilterRequest orderFilterRequest = new OrderFilterRequest(); + orderFilterRequest.setId(orderId); + return orderDao.findOne(orderFilterRequest); + } + + @Override + public List findCodesById(String orderId) { + return warehouseDao.findCodesById(orderId); + } + + @Override + public List filterListByCode(List warehouseEntityList) { + if (warehouseEntityList == null) { + return Collections.emptyList(); + } + return orderDao.filterListByCode(warehouseEntityList); + } + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvErpStockService.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvErpStockService.java new file mode 100644 index 00000000..ba79febd --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvErpStockService.java @@ -0,0 +1,21 @@ +package com.glxp.api.admin.service.inventory; + +import com.glxp.api.admin.entity.basic.ErpStockEntity; +import com.glxp.api.admin.req.basic.FilterStockprintRequest; + +import java.util.List; + +public interface InvErpStockService { + + + ErpStockEntity findByCode(String nameCode,String batchNo); + + boolean insertErpStock(ErpStockEntity stockPrintEntity); + + boolean insertErpStocks(List stockPrintEntities); + + boolean updateErpStock(ErpStockEntity udiInfoEntity); + + boolean deleteById(String id); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvOrderCheckService.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvOrderCheckService.java new file mode 100644 index 00000000..6b63680f --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvOrderCheckService.java @@ -0,0 +1,19 @@ +package com.glxp.api.admin.service.inventory; + +import com.glxp.api.admin.entity.inout.StockCheckEntity; +import com.glxp.api.admin.req.basic.FilterStockprintRequest; +import com.glxp.api.admin.req.inout.FilterStockCheckRequest; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface InvOrderCheckService { + List filterStockCheck(FilterStockCheckRequest filterStockCheckRequest); + + boolean insertStockCheck(StockCheckEntity stockCheckEntity); + + boolean updateStockCheck(StockCheckEntity stockCheckEntity); + + boolean deleteById(String id); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvStockPrintService.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvStockPrintService.java new file mode 100644 index 00000000..29d33614 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvStockPrintService.java @@ -0,0 +1,25 @@ +package com.glxp.api.admin.service.inventory; + +import com.glxp.api.admin.entity.basic.StockPrintEntity; +import com.glxp.api.admin.req.basic.FilterStockprintRequest; +import java.util.List; + +public interface InvStockPrintService { + + List filterStockPrint(FilterStockprintRequest filterStockprintRequest); + + StockPrintEntity findByNameCode(String nameCode); + + StockPrintEntity findByRlId(FilterStockprintRequest filterStockprintRequest); + + boolean insertStockPrint(StockPrintEntity stockPrintEntity); + + boolean insertStockPrints(List stockPrintEntities); + + boolean updateStockPrint(StockPrintEntity udiInfoEntity); + + boolean deleteById(String id); + + boolean updatePrintStatus(List ids); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvErpStockServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvErpStockServiceImpl.java new file mode 100644 index 00000000..9830b05b --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvErpStockServiceImpl.java @@ -0,0 +1,41 @@ +package com.glxp.api.admin.service.inventory.impl; + +import com.glxp.api.admin.dao.inventory.InvErpStockDao; +import com.glxp.api.admin.entity.basic.ErpStockEntity; +import com.glxp.api.admin.service.inventory.InvErpStockService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +@Service +public class InvErpStockServiceImpl implements InvErpStockService { + + @Resource + InvErpStockDao erpStockDao; + + @Override + public ErpStockEntity findByCode(String nameCode, String batchNo) { + return erpStockDao.findByCode(nameCode, batchNo); + } + + @Override + public boolean insertErpStock(ErpStockEntity erpStockEntity) { + return erpStockDao.insertErpStock(erpStockEntity); + } + + @Override + public boolean insertErpStocks(List erpStockEntities) { + return erpStockDao.insertErpStocks(erpStockEntities); + } + + @Override + public boolean updateErpStock(ErpStockEntity erpStockEntity) { + return erpStockDao.updateErpStock(erpStockEntity); + } + + @Override + public boolean deleteById(String id) { + return erpStockDao.deleteById(id); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvOrderCheckServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvOrderCheckServiceImpl.java new file mode 100644 index 00000000..c24db6a5 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvOrderCheckServiceImpl.java @@ -0,0 +1,49 @@ +package com.glxp.api.admin.service.inventory.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.inventory.InvOrderCheckDao; +import com.glxp.api.admin.entity.inout.StockCheckEntity; +import com.glxp.api.admin.req.inout.FilterStockCheckRequest; +import com.glxp.api.admin.service.inventory.InvOrderCheckService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class InvOrderCheckServiceImpl implements InvOrderCheckService { + + @Resource + InvOrderCheckDao stockCheckDao; + + + @Override + public List filterStockCheck(FilterStockCheckRequest filterStockCheckRequest) { + if (filterStockCheckRequest == null) { + return Collections.emptyList(); + } + if(filterStockCheckRequest.getPage()!=null){ + int offset = (filterStockCheckRequest.getPage() - 1) * filterStockCheckRequest.getLimit(); + PageHelper.offsetPage(offset, filterStockCheckRequest.getLimit()); + } + + List data = stockCheckDao.filterStockCheck(filterStockCheckRequest); + return data; + } + + @Override + public boolean insertStockCheck(StockCheckEntity stockCheckEntity) { + return stockCheckDao.insertStockCheck(stockCheckEntity); + } + + @Override + public boolean updateStockCheck(StockCheckEntity stockCheckEntity) { + return stockCheckDao.updateStockCheck(stockCheckEntity); + } + + @Override + public boolean deleteById(String id) { + return stockCheckDao.deleteById(id); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvStockPrintServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvStockPrintServiceImpl.java new file mode 100644 index 00000000..8a057d9b --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvStockPrintServiceImpl.java @@ -0,0 +1,67 @@ +package com.glxp.api.admin.service.inventory.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.inventory.InvStockPrintDao; +import com.glxp.api.admin.entity.basic.StockPrintEntity; +import com.glxp.api.admin.req.basic.FilterStockprintRequest; +import com.glxp.api.admin.service.inventory.InvStockPrintService; +import com.glxp.api.admin.util.FilterUdiUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class InvStockPrintServiceImpl implements InvStockPrintService { + + @Resource + InvStockPrintDao stockPrintDao; + + @Override + public List filterStockPrint(FilterStockprintRequest filterStockprintRequest) { + if (filterStockprintRequest == null) { + return Collections.emptyList(); + } + int offset = (filterStockprintRequest.getPage() - 1) * filterStockprintRequest.getLimit(); + PageHelper.offsetPage(offset, filterStockprintRequest.getLimit()); + List data = stockPrintDao.filterStockPrint(filterStockprintRequest); + return data; + } + + @Override + public StockPrintEntity findByNameCode(String nameCode) { + String prefix = FilterUdiUtils.getDiStr(nameCode); + return stockPrintDao.findByNameCode(prefix); + } + + @Override + public StockPrintEntity findByRlId(FilterStockprintRequest udiRlIdFk) { + return stockPrintDao.findByRlId(udiRlIdFk); + } + + @Override + public boolean insertStockPrint(StockPrintEntity stockPrintEntity) { + return stockPrintDao.insertStockPrint(stockPrintEntity); + } + + @Override + public boolean insertStockPrints(List stockPrintEntities) { + return stockPrintDao.insertStockPrints(stockPrintEntities); + } + + @Override + public boolean updateStockPrint(StockPrintEntity stockPrintEntity) { + return stockPrintDao.updateStockPrint(stockPrintEntity); + } + + @Override + public boolean deleteById(String id) { + return stockPrintDao.deleteById(id); + } + + @Override + public boolean updatePrintStatus(List ids) { + return stockPrintDao.updatePrintStatus(ids); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateErpDataTask.java b/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateErpDataTask.java new file mode 100644 index 00000000..6d6f05b0 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateErpDataTask.java @@ -0,0 +1,62 @@ +package com.glxp.api.admin.thread; + +import com.glxp.api.admin.dao.info.ScheduledDao; +import com.glxp.api.admin.entity.info.ScheduledEntity; +import com.glxp.api.admin.entity.info.SetupEntity; +import com.glxp.api.admin.entity.info.SystemParamConfigEntity; +import com.glxp.api.admin.req.udid.ScheduledRequest; +import com.glxp.api.admin.service.info.SetupService; +import com.glxp.api.admin.service.info.SystemParamConfigService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +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; + +@Component +@EnableScheduling +public class BasicUpdateErpDataTask implements SchedulingConfigurer { + + final Logger logger = LoggerFactory.getLogger(IoModifyErpTask.class); + + @Resource + private BasicUpdateproductService updateproductService; + @Resource + protected ScheduledDao scheduledDao; + @Resource + SystemParamConfigService systemParamConfigService; + + @Override + public void configureTasks(ScheduledTaskRegistrar scheduledTaskRegistrar) { + scheduledTaskRegistrar.addTriggerTask(() -> process(), + triggerContext -> { + ScheduledRequest scheduledRequest = new ScheduledRequest(); + scheduledRequest.setCronName("updateErpData"); + 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("定时更新下载ERP产品信息"); + SystemParamConfigEntity isUpdate = systemParamConfigService.selectByParamKey("updateErpData"); + if (isUpdate != null && "1".equals(isUpdate.getParamValue())) { + SystemParamConfigEntity product = systemParamConfigService.selectByParamKey("erp_products_query"); + SystemParamConfigEntity onHand = systemParamConfigService.selectByParamKey("erp_onhand_query"); + if (product != null && onHand != null) + updateproductService.updateProduct(product.getParamValue(), onHand.getParamValue()); + } else { + logger.info("暂未设置，不更新"); + } + + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateproductService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateproductService.java new file mode 100644 index 00000000..1ca2388d --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateproductService.java @@ -0,0 +1,155 @@ +package com.glxp.api.admin.thread; + +import com.glxp.api.admin.entity.basic.UdiInfoEntity; +import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; +import com.glxp.api.admin.httpclient.ErpBasicClient; +import com.glxp.api.admin.httpclient.ErpInvClient; +import com.glxp.api.admin.req.basic.FilterErpGoodsRequest; +import com.glxp.api.admin.req.inventory.ErpOnhandRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.res.basic.ErpProductsResponse; +import com.glxp.api.admin.res.inventory.ErpOnHandResponse; +import com.glxp.api.admin.service.basic.UdiInfoService; +import com.glxp.api.admin.service.basic.UdiRelevanceService; +import com.glxp.api.admin.util.CustomUtil; +import com.glxp.api.admin.util.DateUtil; +import com.glxp.api.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.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +@Service +public class BasicUpdateproductService { + @Resource + UdiRelevanceService udiRelevanceService; + @Resource + UdiInfoService udiInfoService; + + + @Async + public void updateProduct(String productUrl, String onHandUrl) { + int page = 1; + int limit = 100; + while (page != -1) { + page = getInvmandoc(null, page, limit, productUrl, onHandUrl); + } + } + + public void addProduct(String code, String name, String url) { + List inventoryCodes = new ArrayList<>(); + inventoryCodes.add(code); + if (inventoryCodes.size() > 0) { + UdiRelevanceEntity udiRelevanceEntity1 = new UdiRelevanceEntity(); + udiRelevanceEntity1.setThirdId(code); + udiRelevanceEntity1.setThirdName(name); + udiRelevanceEntity1.setUpdateTime(DateUtil.getDateTime()); + + FilterErpGoodsRequest filterErpGoodsRequest = new FilterErpGoodsRequest(); + filterErpGoodsRequest.setCode(code); + filterErpGoodsRequest.setPage(1); + filterErpGoodsRequest.setLimit(1); + BaseResponse> erpProducts = new ErpBasicClient().getErpProducts(filterErpGoodsRequest, url); + List erpProductsResponses = erpProducts.getData().getList(); + if (erpProductsResponses != null & erpProductsResponses.size() > 0) { + ErpProductsResponse erpProductsResponse = erpProductsResponses.get(0); + UdiInfoEntity udiInfoEntity = new UdiInfoEntity(); + udiInfoEntity.setNameCode(erpProductsResponse.getCode()); + udiInfoEntity.setCpmctymc(erpProductsResponse.getName()); + udiInfoEntity.setGgxh(erpProductsResponse.getSpec()); + udiInfoEntity.setZczbhhzbapzbh(erpProductsResponse.getRegisterNo()); + udiInfoEntity.setYlqxzcrbarmc(erpProductsResponse.getManufactory()); + udiInfoEntity.setUuid(CustomUtil.getUUId()); + udiInfoService.insertUdiInfo(udiInfoEntity); + udiRelevanceEntity1.setUuid(udiInfoEntity.getUuid()); + udiRelevanceEntity1.setThirdId(udiInfoEntity.getNameCode()); + udiRelevanceEntity1.setThirdName(udiInfoEntity.getCpmctymc()); + udiRelevanceEntity1.setUpdateTime(DateUtil.getDateTime()); + + } + udiRelevanceService.insertUdiRelevance(udiRelevanceEntity1); + } + + + } + + + public int getInvmandoc(String invcode, int page, int limit, String productUrl, String onHandUrl) { + + FilterErpGoodsRequest filterErpGoodsRequest = new FilterErpGoodsRequest(); + + filterErpGoodsRequest.setPage(page); + filterErpGoodsRequest.setLimit(limit); + if (invcode != null) { + filterErpGoodsRequest.setCode(invcode); + } + BaseResponse> erpProducts = new ErpBasicClient().getErpProducts(filterErpGoodsRequest, productUrl); + List invmandocResponses = erpProducts.getData().getList(); + if (invmandocResponses != null && invmandocResponses.size() > 0) { + List inventoryCodes = new ArrayList<>(); + if (invcode != null) { + inventoryCodes.add(invcode); + } else { + for (ErpProductsResponse invmandocResponse : invmandocResponses) { + UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByThirdId(invmandocResponse.getCode()); + if (udiRelevanceEntity == null) { + inventoryCodes.add(invmandocResponse.getCode()); + } + } + } + + if (inventoryCodes.size() > 0) { + + ErpOnhandRequest erpOnhandRequest = new ErpOnhandRequest(); + erpOnhandRequest.setInventoryCodes(inventoryCodes); + List erpOnHandResponses = new ErpInvClient().getOnHand(erpOnhandRequest, onHandUrl); + if (erpOnHandResponses != null) { + Map> map = erpOnHandResponses.stream().collect(Collectors.groupingBy(ErpOnHandResponse::getInventoryCode)); + for (List onHandResponses : map.values()) { + if (onHandResponses != null && onHandResponses.size() > 0) { + ErpOnHandResponse onhandQueryResponse = onHandResponses.get(0); + if (onhandQueryResponse.getCount() > 0) { + UdiInfoEntity udiInfoEntity = new UdiInfoEntity(); + udiInfoEntity.setNameCode(onhandQueryResponse.getInventoryCode()); + udiInfoEntity.setCpmctymc(onhandQueryResponse.getInventoryName()); + udiInfoEntity.setGgxh(onhandQueryResponse.getSpec()); + udiInfoEntity.setUuid(CustomUtil.getUUId()); + udiInfoEntity.setYlqxzcrbarmc(invmandocResponses.get(0).getManufactory()); + udiInfoEntity.setZczbhhzbapzbh(invmandocResponses.get(0).getRegisterNo()); + udiInfoService.insertUdiInfo(udiInfoEntity); + UdiRelevanceEntity udiRelevanceEntity1 = new UdiRelevanceEntity(); + udiRelevanceEntity1.setUuid(udiInfoEntity.getUuid()); + udiRelevanceEntity1.setThirdId(onhandQueryResponse.getInventoryCode()); + udiRelevanceEntity1.setThirdName(onhandQueryResponse.getInventoryName()); + udiRelevanceEntity1.setUpdateTime(DateUtil.getDateTime()); + udiRelevanceService.insertUdiRelevance(udiRelevanceEntity1); + } + +// } + + } + } + } else { + UdiRelevanceEntity udiRelevanceEntity1 = new UdiRelevanceEntity(); + udiRelevanceEntity1.setThirdId(invcode); + udiRelevanceEntity1.setThirdName(invmandocResponses.get(0).getName()); + udiRelevanceEntity1.setUpdateTime(DateUtil.getDateTime()); + udiRelevanceService.insertUdiRelevance(udiRelevanceEntity1); + } + } + page++; + if (page * limit < erpProducts.getData().getTotal()) { + return page; + } + } else { + return -1; + } + + return -1; + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/InvDlErpStockService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/InvDlErpStockService.java new file mode 100644 index 00000000..84b1d5cf --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/InvDlErpStockService.java @@ -0,0 +1,108 @@ +package com.glxp.api.admin.thread; + +import com.glxp.api.admin.entity.info.SystemParamConfigEntity; +import com.glxp.api.admin.entity.inout.ErpOrderEntity; +import com.glxp.api.admin.httpclient.ErpOrderClient; +import com.glxp.api.admin.req.inout.FilterOrderRequest; +import com.glxp.api.admin.entity.basic.ErpStockEntity; +import com.glxp.api.admin.entity.basic.UdiInfoEntity; +import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; +import com.glxp.api.admin.entity.info.SetupEntity; +import com.glxp.api.admin.entity.inout.WarehouseEntity; +import com.glxp.api.admin.req.inout.WarehouseQueryRequest; +import com.glxp.api.admin.service.info.SystemParamConfigService; +import com.glxp.api.admin.service.inventory.InvErpStockService; +import com.glxp.api.admin.service.basic.UdiInfoService; +import com.glxp.api.admin.service.basic.UdiRelevanceService; +import com.glxp.api.admin.service.info.SetupService; +import com.glxp.api.admin.service.inout.CodesService; +import com.glxp.api.admin.util.DateUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +@Service +public class InvDlErpStockService { + @Resource + SetupService setupService; + @Resource + InvErpStockService erpStockService; + @Resource + UdiRelevanceService udiRelevanceService; + @Resource + UdiInfoService udiInfoService; + @Resource + CodesService warehouseService; + @Resource + SystemParamConfigService systemParamConfigService; + final Logger logger = LoggerFactory.getLogger(InvDlErpStockService.class); + + /** + * 下载ERP采购入库单所有产品信息到ERP库存表 + */ + @Async + public void dlErpStock() { + SetupEntity setupEntity = setupService.selectSetup(); + Integer day = setupEntity.getDlStockErpDay(); + Map date = DateUtil.getDayRange(day); + Integer page = 1; + Integer limit = 20; + + while (true) { + + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("erp_order_query"); + if (systemParamConfigEntity == null) { + logger.error("ERP出入库单据接口未定义"); + return; + } + FilterOrderRequest filterOrderRequest = new FilterOrderRequest(); + filterOrderRequest.setPage(page); + filterOrderRequest.setLimit(limit); + filterOrderRequest.setStartDate((String)date.get("startDate")); + filterOrderRequest.setEndDate((String)date.get("endDate")); + filterOrderRequest.setBillAction("PurchaseWareHouseIn"); + List erpOrderEntities = new ErpOrderClient(systemParamConfigEntity.getParamValue()).getErpOrder(filterOrderRequest); + List erpStockEntities = new ArrayList<>(); + if (erpOrderEntities != null && erpOrderEntities.size() > 0) { + page++; + for (ErpOrderEntity erpOrderEntity : erpOrderEntities) { + //ERP数据更新 + ErpStockEntity erpStockEntity = new ErpStockEntity(); + erpStockEntity.setOrderId(erpOrderEntity.getErpOrderId()); + erpStockEntity.setCode(erpOrderEntity.getGoodsid()); + erpStockEntity.setBatchNo(erpOrderEntity.getBatchNo()); + erpStockEntity.setExpirationDate(erpOrderEntity.getExpireDate()); + erpStockEntity.setName(erpOrderEntity.getGoodsname()); + erpStockEntity.setCount(erpOrderEntity.getCount() + ""); + + //本地数据更新 + UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByThirdId(erpStockEntity.getCode()); + if (udiRelevanceEntity != null) { + UdiInfoEntity udiInfoEntity = udiInfoService.findByUuid(udiRelevanceEntity.getUuid()); + WarehouseQueryRequest warehouseQueryRequest = new WarehouseQueryRequest(); + warehouseQueryRequest.setUdi(udiInfoEntity.getNameCode()); + warehouseQueryRequest.setBatchNo(erpStockEntity.getBatchNo()); + List warehouseEntities = warehouseService.findByOrderId(warehouseQueryRequest); + if (warehouseEntities != null && warehouseEntities.size() > 0) { + erpStockEntity.setManufacturingDate(warehouseEntities.get(0).getProduceDate()); + erpStockEntity.setExpirationDate(warehouseEntities.get(0).getExpireDate()); + } + } + erpStockEntities.add(erpStockEntity); + erpStockService.insertErpStocks(erpStockEntities); + } + } else { + break; + } + } + + } + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/InvDlErpStockTask.java b/api-admin/src/main/java/com/glxp/api/admin/thread/InvDlErpStockTask.java new file mode 100644 index 00000000..2d87eded --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/InvDlErpStockTask.java @@ -0,0 +1,45 @@ +package com.glxp.api.admin.thread; + +import com.glxp.api.admin.dao.info.ScheduledDao; +import com.glxp.api.admin.entity.info.ScheduledEntity; +import com.glxp.api.admin.req.udid.ScheduledRequest; +import com.glxp.api.admin.service.info.SetupService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +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; + +@Component +@EnableScheduling +public class InvDlErpStockTask implements SchedulingConfigurer { + @Resource + protected ScheduledDao scheduledDao; + @Resource + InvDlErpStockService dlErpStockService; + final Logger logger = LoggerFactory.getLogger(IoModifyErpTask.class); + + @Override + public void configureTasks(ScheduledTaskRegistrar scheduledTaskRegistrar) { + scheduledTaskRegistrar.addTriggerTask(() -> process(), + triggerContext -> { + ScheduledRequest scheduledRequest = new ScheduledRequest(); + scheduledRequest.setCronName("dlStockEr"); + 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("定时下载ERP采购订单到入库存"); + dlErpStockService.dlErpStock(); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/InvImportStockService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/InvImportStockService.java new file mode 100644 index 00000000..a3257adc --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/InvImportStockService.java @@ -0,0 +1,332 @@ +package com.glxp.api.admin.thread; + +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.TypeReference; +import com.glxp.api.admin.constant.ConstantType; +import com.glxp.api.admin.entity.basic.ErpStockEntity; +import com.glxp.api.admin.entity.basic.StockPrintEntity; +import com.glxp.api.admin.entity.basic.UdiInfoEntity; +import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; +import com.glxp.api.admin.entity.inout.OrderEntity; +import com.glxp.api.admin.entity.inout.ErpOrderEntity; +import com.glxp.api.admin.entity.inout.FilterErpOrderRequest; +import com.glxp.api.admin.req.basic.FilterStockprintRequest; +import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; +import com.glxp.api.admin.req.inout.FilterStockCheckRequest; +import com.glxp.api.admin.req.inout.OrderFilterRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.res.basic.UOnhandQueryResponse; +import com.glxp.api.admin.res.basic.UdiRelevanceResponse; +import com.glxp.api.admin.service.inventory.InvErpStockService; +import com.glxp.api.admin.service.inventory.InvStockPrintService; +import com.glxp.api.admin.service.basic.UdiInfoService; +import com.glxp.api.admin.service.basic.UdiRelevanceService; +import com.glxp.api.admin.service.inout.OrderDetailService; +import com.glxp.api.admin.service.inout.OrderService; +import com.glxp.api.admin.util.HttpClient; +import com.glxp.api.common.res.BaseResponse; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +@Service +public class InvImportStockService { + + @Value("${UCLOD_SERVER_URL}") + private String ucloudUrl; + @Resource + private OrderService orderService; + @Resource + InvStockPrintService stockPrintService; + @Resource + UdiRelevanceService udiRelevanceService; + @Resource + private OrderDetailService myErpOrderService; + @Resource + private UdiInfoService productInfoService; + @Resource + private InvErpStockService erpStockService; + + @Async + public void updateStock() { + + int page = 1; + int limit = 1000; + FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); + while (true) { + filterUdiInfoRequest.setPage(page); + filterUdiInfoRequest.setLimit(limit); + List udiRelevanceResponses = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest); + if (udiRelevanceResponses != null && udiRelevanceResponses.size() > 0) { + List stockPrintEntities = new ArrayList<>(); + for (UdiRelevanceResponse udiRelevanceResponse : udiRelevanceResponses) { + + Map paramMap = new HashMap<>(16); + paramMap.put("inventory", udiRelevanceResponse.getThirdId()); + String response = HttpClient.mipsGet(ucloudUrl + "/uclooud/basic/onhandQuery", paramMap); + try { + BaseResponse> onHandsResponse = + JSONObject.parseObject(response, new TypeReference>>() { + }); + List uOnhandQueryResponses = onHandsResponse.getData().getList(); + if (uOnhandQueryResponses != null && uOnhandQueryResponses.size() > 0) { + + for (UOnhandQueryResponse onhandQueryResponse : uOnhandQueryResponses) { + StockPrintEntity stockPrintEntity = new StockPrintEntity(); + stockPrintEntity.setBatchNo(onhandQueryResponse.getVbatchcode()); + stockPrintEntity.setNnum(onhandQueryResponse.getNnum() + ""); + stockPrintEntity.setWarehouseName(onhandQueryResponse.getCwarehouse_name()); + stockPrintEntity.setWarehouseCode(onhandQueryResponse.getCwarehouse_code()); + ErpStockEntity erpStockEntity = erpStockService.findByCode(udiRelevanceResponse.getThirdId(), stockPrintEntity.getBatchNo()); + if (erpStockEntity != null) { + stockPrintEntity.setExpireDate(erpStockEntity.getExpirationDate()); + stockPrintEntity.setProduceDate(erpStockEntity.getManufacturingDate()); + } + setCommonparams(stockPrintEntity, udiRelevanceResponse, stockPrintEntities); + } + + } else { + StockPrintEntity stockPrintEntity = new StockPrintEntity(); + setCommonparams(stockPrintEntity, udiRelevanceResponse, stockPrintEntities); + } + } catch (Exception e) { + e.printStackTrace(); + StockPrintEntity stockPrintEntity = new StockPrintEntity(); + setCommonparams(stockPrintEntity, udiRelevanceResponse, stockPrintEntities); + } + + + } + stockPrintService.insertStockPrints(stockPrintEntities); + if (udiRelevanceResponses.size() < limit) { + break; + } else { + page++; + } + } else { + break; + } + } + } + + @Async + public void updateByCode(String code) { + UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByThirdId(code); + UdiRelevanceResponse udiRelevanceResponse = new UdiRelevanceResponse(); + BeanUtils.copyProperties(udiRelevanceEntity, udiRelevanceResponse); + List stockPrintEntities = new ArrayList<>(); + Map paramMap = new HashMap<>(16); + paramMap.put("inventory", code); + String response = HttpClient.mipsGet(ucloudUrl + "/uclooud/basic/onhandQuery", paramMap); + try { + BaseResponse> onHandsResponse = + JSONObject.parseObject(response, new TypeReference>>() { + }); + List uOnhandQueryResponses = onHandsResponse.getData().getList(); + if (uOnhandQueryResponses != null && uOnhandQueryResponses.size() > 0) { + + for (UOnhandQueryResponse onhandQueryResponse : uOnhandQueryResponses) { + StockPrintEntity stockPrintEntity = new StockPrintEntity(); + stockPrintEntity.setBatchNo(onhandQueryResponse.getVbatchcode()); + stockPrintEntity.setNnum(onhandQueryResponse.getNnum() + ""); + stockPrintEntity.setWarehouseName(onhandQueryResponse.getCwarehouse_name()); + stockPrintEntity.setWarehouseCode(onhandQueryResponse.getCwarehouse_code()); + ErpStockEntity erpStockEntity = erpStockService.findByCode(udiRelevanceResponse.getThirdId(), stockPrintEntity.getBatchNo()); + if (erpStockEntity != null) { + stockPrintEntity.setExpireDate(erpStockEntity.getExpirationDate()); + stockPrintEntity.setProduceDate(erpStockEntity.getManufacturingDate()); + } + setCommonparams(stockPrintEntity, udiRelevanceResponse, stockPrintEntities); + } + + } else { + StockPrintEntity stockPrintEntity = new StockPrintEntity(); + setCommonparams(stockPrintEntity, udiRelevanceResponse, stockPrintEntities); + } + } catch (Exception e) { + e.printStackTrace(); + StockPrintEntity stockPrintEntity = new StockPrintEntity(); + setCommonparams(stockPrintEntity, udiRelevanceResponse, stockPrintEntities); + } + } + + public void setCommonparams(StockPrintEntity stockPrintEntity, UdiRelevanceResponse udiRelevanceResponse, List stockPrintEntities) { + + + stockPrintEntity.setCpmctymc(udiRelevanceResponse.getCpmctymc()); + stockPrintEntity.setThirdName(udiRelevanceResponse.getThirdName()); + stockPrintEntity.setGgxh(udiRelevanceResponse.getGgxh()); + stockPrintEntity.setNameCode(udiRelevanceResponse.getNameCode()); + stockPrintEntity.setThirdId(udiRelevanceResponse.getThirdId()); + stockPrintEntity.setUdiRlIdFk(udiRelevanceResponse.getId() + ""); + stockPrintEntity.setYlqxzcrbarmc(udiRelevanceResponse.getYlqxzcrbarmc()); + stockPrintEntity.setZczbhhzbapzbh(udiRelevanceResponse.getZczbhhzbapzbh()); + + stockPrintEntity.setCodeType("3"); +// if (udiRelevanceResponse.getTyshxydm() != null && !udiRelevanceResponse.getTyshxydm().equals("")) { +// +// if (udiRelevanceResponse.getNameCode().contains("MA")) { +// stockPrintEntity.setCodeType("2"); +// +// udiCode = udiRelevanceResponse.getNameCode(); +// if (udiRelevanceResponse.getBatchNo() != null && !udiRelevanceResponse.getBatchNo().equals("null")) +// udiCode = udiCode + ".L" + udiRelevanceResponse.getBatchNo(); +// } else { +// stockPrintEntity.setCodeType("1"); +// udiCode = "01" + udiRelevanceResponse.getNameCode(); +// +// if (udiRelevanceResponse.getBatchNo() != null && !udiRelevanceResponse.getBatchNo().equals("null")) +// udiCode = udiCode + "10" + udiRelevanceResponse.getBatchNo(); +// } +// } else { +// +// } + stockPrintEntity.setUdiCode(generateUdiCode(stockPrintEntity)); + FilterStockprintRequest filterStockprintRequest = new FilterStockprintRequest(); + filterStockprintRequest.setUdiRlIdFk(stockPrintEntity.getUdiRlIdFk() + ""); + filterStockprintRequest.setBatchNo(stockPrintEntity.getBatchNo()); + filterStockprintRequest.setWarehouseCode(stockPrintEntity.getWarehouseCode()); + StockPrintEntity temp = stockPrintService.findByRlId(filterStockprintRequest); + if (temp != null) { + + //如果生产日期与失效日期都有则更新 + if (stockPrintEntity.getProduceDate() != null && !stockPrintEntity.getProduceDate().equals("") && stockPrintEntity.getExpireDate() != null && !stockPrintEntity.getExpireDate().equals("")) { + temp.setProduceDate(stockPrintEntity.getProduceDate()); + temp.setExpireDate(stockPrintEntity.getExpireDate()); + } + if (temp.getProduceDate() == null) { + temp.setProduceDate(stockPrintEntity.getProduceDate()); + } + if (temp.getExpireDate() == null) { + temp.setExpireDate(stockPrintEntity.getExpireDate()); + } + temp.setUdiCode(generateUdiCode(temp)); + stockPrintEntity = temp; + } + if (udiRelevanceResponse.getTyshxydm() != null && !udiRelevanceResponse.getTyshxydm().equals("")) { + if (udiRelevanceResponse.getDiType() == 1) { + stockPrintEntity.setNameCode(udiRelevanceResponse.getNameCode()); + stockPrintEntities.add(stockPrintEntity); + } + } else + stockPrintEntities.add(stockPrintEntity); + } + + + public String generateUdiCode(StockPrintEntity stockPrintEntity) { + String udiCode = ""; + if (stockPrintEntity.getProduceDate() == null) { + stockPrintEntity.setProduceDate(""); + } + + if (stockPrintEntity.getExpireDate() == null) { + stockPrintEntity.setExpireDate(""); + } + + if (stockPrintEntity.getBatchNo() == null) { + stockPrintEntity.setBatchNo(""); + } + if (stockPrintEntity.getWarehouseCode() == null) { + stockPrintEntity.setWarehouseCode(""); + } + //货位码类型 + udiCode = "#" + stockPrintEntity.getNameCode() + "#" + stockPrintEntity.getProduceDate() + "#" + stockPrintEntity.getExpireDate() + + "#" + stockPrintEntity.getBatchNo() + "#" + "#" + stockPrintEntity.getWarehouseCode(); + return udiCode; + } + + @Async + public void checkStock(FilterStockCheckRequest filterStockCheckRequest) { + List erpOrderEntitie = getErpOrders(filterStockCheckRequest.getId() + ""); + if (erpOrderEntitie != null && erpOrderEntitie.size() > 0) { + for (ErpOrderEntity erpOrderEntity : erpOrderEntitie) { + //获取UUID + FilterUdiInfoRequest productFilterRequest = new FilterUdiInfoRequest(); + productFilterRequest.setNameCode(erpOrderEntity.getNameCode()); + List productInfoEntities = productInfoService.filterAllUdiInfo(productFilterRequest); + Map> groupBy = productInfoEntities.stream().collect(Collectors.groupingBy(UdiInfoEntity::getUuid)); + List uuids = new ArrayList<>(); + for (String uuid : groupBy.keySet()) { + uuids.add(uuid); + } + if (uuids.size() == 1) { + List udiRelevanceEntities = udiRelevanceService.selectByUuid(uuids.get(0)); + if (udiRelevanceEntities != null && udiRelevanceEntities.size() == 1) { + Map paramMap = new HashMap<>(16); + paramMap.put("inventory", udiRelevanceEntities.get(0).getThirdId()); + String response = HttpClient.mipsGet(ucloudUrl + "/uclooud/basic/onhandQuery", paramMap); + try { + BaseResponse> onHandsResponse = + JSONObject.parseObject(response, new TypeReference>>() { + }); + List uOnhandQueryResponses = onHandsResponse.getData().getList(); + if (uOnhandQueryResponses != null && uOnhandQueryResponses.size() > 0) { + for (int i = 0; i < uOnhandQueryResponses.size(); i++) { + if (uOnhandQueryResponses.get(i).getVbatchcode().equals(erpOrderEntity.getBatchNo()) + ) { + if (erpOrderEntity.getWarehouseCode() != null && uOnhandQueryResponses.get(i).getCwarehouse_code().equals(erpOrderEntity.getWarehouseCode())) + erpOrderEntity.setReCount(uOnhandQueryResponses.get(i).getNnum()); + else { + erpOrderEntity.setReCount(uOnhandQueryResponses.get(i).getNnum()); + } + myErpOrderService.updateErpOrder(erpOrderEntity); + } + } + + } + } catch (Exception e) { + e.printStackTrace(); + } + } + } + + } + } + } + + private List getErpOrders(String id) { + List orderIds = getOrderIds(id + ""); + List erpOrderEntities = new ArrayList<>(); + if (orderIds.size() > 0) { + FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest(); + filterErpOrderRequest.setPage(1); + filterErpOrderRequest.setLimit(10000); + filterErpOrderRequest.setOrderIds(orderIds); + erpOrderEntities = myErpOrderService.findByStockCheck(filterErpOrderRequest); + } + return erpOrderEntities; + } + + public List getOrderIds(String checkId) { + OrderFilterRequest orderFilterRequest = new OrderFilterRequest(); + orderFilterRequest.setAction(ConstantType.TYPE_STOCK_CHECK); + orderFilterRequest.setStockCheckFk(checkId + ""); + List orderEntities = orderService.findAllOrders(orderFilterRequest); + List orderIds = new ArrayList<>(); + if (orderEntities != null) { + for (OrderEntity orderEntity : orderEntities) { + orderIds.add(orderEntity.getId()); + } + } + return orderIds; + } + + private boolean isRepeat(List erpOrderEntities) { + List stringList = erpOrderEntities.stream().map(ErpOrderEntity::getNameCode) + .collect(Collectors.toList()); + long count = stringList.stream().distinct().count(); + if (stringList.size() == count) { + return false; + } else { + return true; + } + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/InvUpdateStock1Task.java b/api-admin/src/main/java/com/glxp/api/admin/thread/InvUpdateStock1Task.java new file mode 100644 index 00000000..83e37f3e --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/InvUpdateStock1Task.java @@ -0,0 +1,50 @@ +package com.glxp.api.admin.thread; + +import com.glxp.api.admin.dao.info.ScheduledDao; +import com.glxp.api.admin.entity.info.ScheduledEntity; +import com.glxp.api.admin.req.udid.ScheduledRequest; +import com.glxp.api.admin.service.info.SetupService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +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; + +@Component +@EnableScheduling +public class InvUpdateStock1Task implements SchedulingConfigurer { + + final Logger logger = LoggerFactory.getLogger(IoModifyErpTask.class); + + @Resource + private InvImportStockService importStockService; + @Resource + protected ScheduledDao scheduledDao; + @Resource + SetupService setupService; + + @Override + public void configureTasks(ScheduledTaskRegistrar scheduledTaskRegistrar) { + scheduledTaskRegistrar.addTriggerTask(() -> process(), + triggerContext -> { + ScheduledRequest scheduledRequest = new ScheduledRequest(); + scheduledRequest.setCronName("updateStock1"); + 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("定时更新下载电子货位卡"); + importStockService.updateStock(); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/InvUpdateStock2Task.java b/api-admin/src/main/java/com/glxp/api/admin/thread/InvUpdateStock2Task.java new file mode 100644 index 00000000..90ddf5d7 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/InvUpdateStock2Task.java @@ -0,0 +1,51 @@ +package com.glxp.api.admin.thread; + +import com.glxp.api.admin.dao.info.ScheduledDao; +import com.glxp.api.admin.entity.info.ScheduledEntity; +import com.glxp.api.admin.req.udid.ScheduledRequest; +import com.glxp.api.admin.service.info.SetupService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +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; + +@Component +@EnableScheduling +public class InvUpdateStock2Task implements SchedulingConfigurer { + + final Logger logger = LoggerFactory.getLogger(IoModifyErpTask.class); + + @Resource + private InvImportStockService importStockService; + @Resource + protected ScheduledDao scheduledDao; + @Resource + SetupService setupService; + + @Override + public void configureTasks(ScheduledTaskRegistrar scheduledTaskRegistrar) { + scheduledTaskRegistrar.addTriggerTask(() -> process(), + triggerContext -> { + ScheduledRequest scheduledRequest = new ScheduledRequest(); + scheduledRequest.setCronName("updateStock2"); + 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("定时更新下载电子货位卡"); + importStockService.updateStock(); + } +} + diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/IoModifyErpTask.java b/api-admin/src/main/java/com/glxp/api/admin/thread/IoModifyErpTask.java new file mode 100644 index 00000000..b753e024 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/IoModifyErpTask.java @@ -0,0 +1,176 @@ +package com.glxp.api.admin.thread; + +import com.glxp.api.admin.constant.ConstantStatus; +import com.glxp.api.admin.constant.ConstantType; +import com.glxp.api.admin.entity.info.SystemParamConfigEntity; +import com.glxp.api.admin.httpclient.ErpOrderClient; +import com.glxp.api.admin.dao.info.ScheduledDao; +import com.glxp.api.admin.entity.info.ScheduledEntity; +import com.glxp.api.admin.entity.info.SetupEntity; +import com.glxp.api.admin.entity.inout.OrderEntity; +import com.glxp.api.admin.entity.inout.ErpOrderEntity; +import com.glxp.api.admin.entity.inout.FilterErpOrderRequest; +import com.glxp.api.admin.req.inout.OrderFilterRequest; +import com.glxp.api.admin.req.inout.USignRequest; +import com.glxp.api.admin.req.udid.ScheduledRequest; +import com.glxp.api.admin.service.info.SetupService; +import com.glxp.api.admin.service.info.SystemParamConfigService; +import com.glxp.api.admin.service.inout.OrderDetailService; +import com.glxp.api.admin.service.inout.OrderService; +import com.glxp.api.common.res.BaseResponse; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +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.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * 定时上传到ali接口 + */ + +@Component +@EnableScheduling +public class IoModifyErpTask implements SchedulingConfigurer { + + final Logger logger = LoggerFactory.getLogger(IoModifyErpTask.class); + + @Resource + protected ScheduledDao scheduledDao; + @Resource + SetupService setupService; + @Resource + private OrderService orderService; + @Resource + OrderDetailService myErpOrderService; + @Resource + private SystemParamConfigService systemParamConfigService; + + @Override + public void configureTasks(ScheduledTaskRegistrar scheduledTaskRegistrar) { + scheduledTaskRegistrar.addTriggerTask(() -> process(), + triggerContext -> { + ScheduledRequest scheduledRequest = new ScheduledRequest(); + scheduledRequest.setCronName("modifyErp"); + 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("定时修改ERP单，定时签字"); + modifyErp(); + } + + public void modifyErp() { + SetupEntity setupEntity = setupService.selectSetup(); + if (setupEntity.isErpPruchaseModify() || setupEntity.isErpSaleOutModify()) { + OrderFilterRequest orderFilterRequest = new OrderFilterRequest(); + orderFilterRequest.setExportStatus(ConstantStatus.ORDER_EXPORT_UN); + orderFilterRequest.setContrastStatus(ConstantStatus.ORDER_CHECK_SUCCESS); + List orderEntities = orderService.findAllOrders(orderFilterRequest); + if (orderEntities != null && orderEntities.size() > 0) { + for (OrderEntity orderEntity : orderEntities) { + FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest(); + filterErpOrderRequest.setPage(1); + filterErpOrderRequest.setLimit(100); + filterErpOrderRequest.setOrderId(orderEntity.getId()); + List erpOrderEntities = myErpOrderService.filterMyErpOrder(filterErpOrderRequest); + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("erp_order_modify"); + + if (systemParamConfigEntity != null) { + String url = systemParamConfigEntity.getParamValue(); + if (erpOrderEntities != null && !erpOrderEntities.isEmpty()) { + Map> listMap = erpOrderEntities.stream().collect(Collectors.groupingBy(ErpOrderEntity::getErpOrderId)); + if (orderEntity.getMainAction().equals(ConstantType.TYPE_OUT)) { + if (setupEntity.isErpSaleOutModify()) { + BaseResponse baseResponse = new ErpOrderClient().postBill(listMap, orderEntity.getAction(), url); + if (baseResponse != null && baseResponse.getCode() == 20000) { + orderService.updateExportStatus(orderEntity.getId(), ConstantStatus.ORDER_EXPORT_ED); + } + } + } else { + if (setupEntity.isErpPruchaseModify()) { + BaseResponse baseResponse = new ErpOrderClient().postBill(listMap, orderEntity.getAction(), url); + if (baseResponse != null && baseResponse.getCode() == 20000) { + orderService.updateExportStatus(orderEntity.getId(), ConstantStatus.ORDER_EXPORT_ED); + } + } + } + } + } else { + logger.error("ERP单据修改接口地址未定义"); + } + + } + } + + + OrderFilterRequest signFilterRequest = new OrderFilterRequest(); + signFilterRequest.setSignStatus(ConstantStatus.ORDER_SIGN_UN); + signFilterRequest.setContrastStatus(ConstantStatus.ORDER_CHECK_SUCCESS); + List signsOrderEntities = orderService.findAllOrders(signFilterRequest); + if (signsOrderEntities != null && signsOrderEntities.size() > 0) { + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("erp_order_sign"); + if(systemParamConfigEntity!=null){ + String url = systemParamConfigEntity.getParamValue(); + for (OrderEntity orderEntity : signsOrderEntities) { + FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest(); + filterErpOrderRequest.setOrderId(orderEntity.getId()); + List erpOrderEntities = myErpOrderService.filterMyErpOrder(filterErpOrderRequest); + if (erpOrderEntities != null && !erpOrderEntities.isEmpty()) { + Map> listMap = erpOrderEntities.stream().collect(Collectors.groupingBy(ErpOrderEntity::getErpOrderId)); + if (orderEntity.getMainAction().equals(ConstantType.TYPE_OUT)) { + if (setupEntity.isErpSaleOutSign()) { + if (listMap != null && listMap.size() > 0) { + for (String key : listMap.keySet()) { + USignRequest signRequest = new USignRequest(); + signRequest.setBillcode(key); + signRequest.setBillcode(orderEntity.getAction()); + BaseResponse baseResponse = new ErpOrderClient().signBill(signRequest, url); + if (baseResponse != null && baseResponse.getCode() == 20000) { + orderService.updateSignStatus(orderEntity.getId(), ConstantStatus.ORDER_SIGN_ED); + } + } + } + } + } else { + if (setupEntity.isErpPruchaseSign()) { + if (listMap != null && listMap.size() > 0) { + for (String key : listMap.keySet()) { + USignRequest signRequest = new USignRequest(); + signRequest.setBillcode(key); + signRequest.setBillcode(orderEntity.getAction()); + BaseResponse baseResponse = new ErpOrderClient().signBill(signRequest, url); + if (baseResponse != null && baseResponse.getCode() == 20000) { + orderService.updateSignStatus(orderEntity.getId(), ConstantStatus.ORDER_SIGN_ED); + } + } + } + } + } + } + } + }else { + logger.error("ERP单据签字接口地址未定义"); + } + + } + } + + + } + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java new file mode 100644 index 00000000..366cdfa0 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java @@ -0,0 +1,238 @@ +package com.glxp.api.admin.thread; + +import com.glxp.api.admin.constant.ConstantStatus; +import com.glxp.api.admin.controller.inout.utils.DataTransUtil; +import com.glxp.api.admin.entity.info.SystemParamConfigEntity; +import com.glxp.api.admin.httpclient.ErpOrderClient; +import com.glxp.api.admin.controller.inout.utils.ContrastErpUtil; +import com.glxp.api.admin.controller.inout.utils.InoutUtils; +import com.glxp.api.admin.entity.inout.OrderEntity; +import com.glxp.api.admin.entity.inout.WarehouseEntity; +import com.glxp.api.admin.entity.inout.ErpOrderEntity; +import com.glxp.api.admin.req.inout.CommitRequest; +import com.glxp.api.admin.req.inout.OrderFilterRequest; +import com.glxp.api.admin.req.inout.PostOrderRequest; +import com.glxp.api.admin.req.inout.WarehouseQueryRequest; +import com.glxp.api.admin.service.basic.UdiInfoService; +import com.glxp.api.admin.service.basic.UdiRelevanceService; +import com.glxp.api.admin.service.info.SystemParamConfigService; +import com.glxp.api.admin.service.inout.CodesTempService; +import com.glxp.api.admin.service.inout.OrderDetailService; +import com.glxp.api.admin.service.inout.OrderService; +import com.glxp.api.admin.service.inout.CodesService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +@Service +public class IoTransInoutService { + + private static final Logger logger = LoggerFactory.getLogger(IoTransInoutService.class); + @Resource + private CodesService warehouseService; + @Resource + private OrderService orderService; + @Resource + private OrderDetailService myErpOrderService; + @Resource + UdiRelevanceService udiRelevanceService; + @Resource + private UdiInfoService udiInfoService; + @Value("${UDI_SERVER_URL}") + private String udiUrl; + + + @Resource + private CodesTempService codesTempService; + @Autowired + private SystemParamConfigService systemParamConfigService; + + //生成订单，插入零时表 + @Async + public void creatOrder(PostOrderRequest postOrderRequest) { + List postOrders = postOrderRequest.getPostOrder(); + if (postOrders != null && postOrders.size() > 0) { + for (int i = 0; i < postOrders.size(); i++) { + PostOrderRequest.PostOrder postOrder = postOrders.get(i); + List warehouseEntityList = postOrder.getCodes(); + if (warehouseEntityList != null && warehouseEntityList.size() > 0) { + WarehouseEntity warehouseEntity = warehouseEntityList.get(0); + String orderId = System.currentTimeMillis() + i + ""; + OrderEntity orderSaveRequest = new OrderEntity(); + orderSaveRequest.setId(orderId); + if (warehouseEntity.getActDate() != null) { + orderSaveRequest.setActDate(warehouseEntity.getActDate()); + } + orderSaveRequest.setAction(warehouseEntity.getAction()); + orderSaveRequest.setActor(warehouseEntity.getActor()); + orderSaveRequest.setCorpOrderId(warehouseEntity.getCorpOrderId()); + orderSaveRequest.setFromCorpId(warehouseEntity.getFromCorpId()); + orderSaveRequest.setMainAction(warehouseEntity.getMainAction()); + orderSaveRequest.setFromCorp(warehouseEntity.getFromCorp()); + orderSaveRequest.setFromType("手持终端"); + orderSaveRequest.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); + orderSaveRequest.setExportStatus("未上传"); + orderSaveRequest.setStockCheckFk(postOrder.getStockIdFk()); + orderSaveRequest.setSignStatus("0"); + List docidsList = postOrder.getErpOrders(); + String docidStr = ""; + if (docidsList != null) { + for (String key : docidsList) { + docidStr = docidStr + "," + key; + } + if (docidStr.length() > 1) { + docidStr = docidStr.substring(1); + orderSaveRequest.setErpFk(docidStr); + } + } + orderService.insertOrder(orderSaveRequest); + for (int index = 0; index < warehouseEntityList.size(); index++) { + warehouseEntityList.get(index).setOrderId(orderId); + } + codesTempService.insertCodesTemp(warehouseEntityList); + } + } + } + } + + //查找等待处理单据，转入正式表 + @Async + public void transInout() { + OrderFilterRequest orderFilterRequest = new OrderFilterRequest(); + orderFilterRequest.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); + List orderEntities = orderService.findAllOrders(orderFilterRequest); + for (int i = 0; i < orderEntities.size(); i++) { + OrderEntity orderEntity = orderEntities.get(i); + orderEntity = orderService.findById(orderEntity.getId()); + if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_PROCESS) { + transInout(orderEntity); + } + + } + } + + public void transInout(OrderEntity orderEntity) { + + WarehouseQueryRequest warehouseQueryRequest = new WarehouseQueryRequest(); + warehouseQueryRequest.setOrderId(orderEntity.getId()); + List filterList = codesTempService.findByOrderId(warehouseQueryRequest); + List insertList = new ArrayList<>(); + + for (int j = 0; j < filterList.size(); j++) { + WarehouseEntity warehouseEntity = filterList.get(j); + String result = new InoutUtils().filterCode(warehouseService, warehouseEntity, systemParamConfigService); + if (result == null) { + insertList.add(warehouseEntity); + } else { + orderService.updateOrderStatus(warehouseEntity.getOrderId(), ConstantStatus.ORDER_STATUS_FAIL); + orderService.updateRemark(orderEntity.getId(), result); + insertList.clear(); + return; + } + } + + if (insertList.size() > 0) { + warehouseService.insertWarehouses(insertList); + WarehouseQueryRequest tempQuery = new WarehouseQueryRequest(); + tempQuery.setOrderId(orderEntity.getId()); + List temps = codesTempService.findByOrderId(tempQuery); + if (orderEntity.getErpFk() != null) { + orderService.updateOrderStatus(orderEntity.getId(), ConstantStatus.ORDER_STATUS_CHECK); + } else { + //因为只需用到条码，所以不需要重新读取 + new InoutUtils(udiUrl).generateConstrastDetail(udiInfoService, udiRelevanceService, myErpOrderService, insertList); + orderService.updateOrderStatus(orderEntity.getId(), ConstantStatus.ORDER_STATUS_SUCCESS); + } + + List ids = new ArrayList<>(); + for (WarehouseEntity w : temps) { + ids.add(w.getId()); + } + codesTempService.deleteCodesTemp(ids); + insertList.clear(); + } + } + + //校验ERP单 + @Async + public void checkOrder() { + + OrderFilterRequest orderFilterRequest = new OrderFilterRequest(); + orderFilterRequest.setStatus(ConstantStatus.ORDER_STATUS_CHECK); + List orderEntities = orderService.findAllOrders(orderFilterRequest); + for (int i = 0; i < orderEntities.size(); i++) { + OrderEntity orderEntity = orderEntities.get(i); + checkOrder(orderEntity); + } + } + + public void checkOrder(OrderEntity orderEntity) { + orderEntity = orderService.findById(orderEntity.getId()); + List erpIds = DataTransUtil.strToErpList(orderEntity.getErpFk()); + List transData = warehouseService.findByReceiptId(orderEntity.getId()); + if (erpIds != null && erpIds.size() > 0) { + SystemParamConfigEntity systemParamConfigEntityBUMErpQuery = systemParamConfigService.selectByParamKey("erp_order_query"); + if (systemParamConfigEntityBUMErpQuery == null) { + orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_FAIL); + orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS); + orderEntity.setRemark("获取ERP出入库单据接口地址未定义"); + orderService.updateOrder(orderEntity); + } else { + String erpOrderUrl = systemParamConfigEntityBUMErpQuery.getParamValue(); + List cloudErps = new ErpOrderClient(erpOrderUrl).getErpOrder(erpIds); + if (cloudErps != null && cloudErps.size() > 0) { + List returnOrders = new ContrastErpUtil().transErp(cloudErps, udiRelevanceService, orderEntity.getId()); + ErpOrderEntity temp = returnOrders.get(0); + for (int i = 0; i < returnOrders.size(); i++) { + if (!temp.getCompanyname().equals(returnOrders.get(i).getCompanyname())) { + orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_FAIL); + orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS); + orderEntity.setRemark("选择Erp订单往来单位不一致"); + orderService.updateOrder(orderEntity); + return; + } + } + myErpOrderService.insertErpOrders(returnOrders); + new ContrastErpUtil(udiUrl).contrastErp(udiInfoService, udiRelevanceService, myErpOrderService, orderService, transData, systemParamConfigService); + } else { + orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_FAIL); + orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS); + orderEntity.setRemark("获取ERP出入库单据失败"); + orderService.updateOrder(orderEntity); + new InoutUtils(udiUrl).generateConstrastDetail(udiInfoService, udiRelevanceService, myErpOrderService, transData); + } + } + + } else { + orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_FAIL); + orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS); + orderEntity.setRemark("未选入ERP单据进行校验，请手动选择"); + orderService.updateOrder(orderEntity); + } + } + + //重码校验错误重新提交 + @Async + public void repeatCommit(CommitRequest commitRequest) { + OrderEntity orderEntity = orderService.findById(commitRequest.getOrderId()); + if (orderEntity != null) { + transInout(orderEntity); + } + } + + //重新校验 + @Async + public void repeatCheck(String orderId) { + OrderEntity orderEntity = orderService.findById(orderId); + checkOrder(orderEntity); + } + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutTask.java b/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutTask.java new file mode 100644 index 00000000..b0077bd0 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutTask.java @@ -0,0 +1,45 @@ +package com.glxp.api.admin.thread; + +import com.glxp.api.admin.dao.info.ScheduledDao; +import com.glxp.api.admin.entity.info.ScheduledEntity; +import com.glxp.api.admin.req.udid.ScheduledRequest; +import com.glxp.api.admin.service.info.SetupService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +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; + +@Component +@EnableScheduling +public class IoTransInoutTask implements SchedulingConfigurer { + + final Logger logger = LoggerFactory.getLogger(IoTransInoutTask.class); + @Resource + protected ScheduledDao scheduledDao; + @Resource + SetupService setupService; + + @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() { + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/TaskExecutorConfig.java b/api-admin/src/main/java/com/glxp/api/admin/thread/TaskExecutorConfig.java new file mode 100644 index 00000000..6b0729e1 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/TaskExecutorConfig.java @@ -0,0 +1,57 @@ +package com.glxp.api.admin.thread; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler; +import org.springframework.context.annotation.Configuration; +import org.springframework.scheduling.annotation.AsyncConfigurer; +import org.springframework.scheduling.annotation.EnableAsync; +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; + +import java.lang.reflect.Method; +import java.util.concurrent.Executor; + +@EnableAsync +@Configuration +public class TaskExecutorConfig implements AsyncConfigurer { + + private static final Logger log = LoggerFactory.getLogger(TaskExecutorConfig.class); + + + @Override + public Executor getAsyncExecutor() { + ThreadPoolTaskExecutor threadPool = new ThreadPoolTaskExecutor(); + threadPool.setCorePoolSize(5);//当前线程数 + threadPool.setMaxPoolSize(120);// 最大线程数 + threadPool.setQueueCapacity(5);//线程池所使用的缓冲队列 + threadPool.setWaitForTasksToCompleteOnShutdown(true);//等待任务在关机时完成--表明等待所有线程执行完 + threadPool.setAwaitTerminationSeconds(60 * 15);// 等待时间 （默认为0，此时立即停止），并没等待xx秒后强制停止 + threadPool.setThreadNamePrefix("MyAsync-");// 线程名称前缀 + threadPool.initialize(); // 初始化 + return threadPool; + } + + public AsyncUncaughtExceptionHandler getAsyncUncaughtExceptionHandler() { + + return new MyAsyncExceptionHandler(); + } + + /** + * 自定义异常处理类 + * + * @author hry + */ + class MyAsyncExceptionHandler implements AsyncUncaughtExceptionHandler { + + //手动处理捕获的异常 + @Override + public void handleUncaughtException(Throwable throwable, Method method, Object... obj) { + log.info("Exception message - " + throwable.getMessage()); + log.info("Method name - " + method.getName()); + for (Object param : obj) { + log.info("Parameter value - " + param); + } + } + + } +} \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/CacheUtils.java b/api-admin/src/main/java/com/glxp/api/admin/util/CacheUtils.java new file mode 100644 index 00000000..8c1c0f44 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/util/CacheUtils.java @@ -0,0 +1,129 @@ +package com.glxp.api.admin.util; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.RedisTemplate; + +import java.util.Collection; +import java.util.Set; +import java.util.concurrent.TimeUnit; + +/** + * 缓存操作类 + */ +//@Component +public class CacheUtils { + @Autowired + private RedisTemplate redisTemplate; + + // 维护一个本类的静态变量 + private static CacheUtils cacheUtils; + +// @PostConstruct + public void init() { + cacheUtils = this; + cacheUtils.redisTemplate = this.redisTemplate; + } + + /** + * 将参数中的字符串值设置为键的值，不设置过期时间 + * @param key + * @param value 必须要实现 Serializable 接口 + */ + public static void set(String key, String value) { + cacheUtils.redisTemplate.opsForValue().set(key, value); + } + + /** + * 将参数中的字符串值设置为键的值，设置过期时间 + * @param key + * @param value 必须要实现 Serializable 接口 + * @param timeout + */ + public static void set(String key, String value, Long timeout) { + cacheUtils.redisTemplate.opsForValue().set(key, value, timeout, TimeUnit.SECONDS); + } + + /** + * 获取与指定键相关的值 + * @param key + * @return + */ + public static Object get(String key) { + return cacheUtils.redisTemplate.opsForValue().get(key); + } + + /** + * 设置某个键的过期时间 + * @param key 键值 + * @param ttl 过期秒数 + */ + public static boolean expire(String key, Long ttl) { + return cacheUtils.redisTemplate.expire(key, ttl, TimeUnit.SECONDS); + } + + /** + * 判断某个键是否存在 + * @param key 键值 + */ + public static boolean hasKey(String key) { + return cacheUtils.redisTemplate.hasKey(key); + } + + /** + * 向集合添加元素 + * @param key + * @param value + * @return 返回值为设置成功的value数 + */ + public static Long sAdd(String key, String... value) { + return cacheUtils.redisTemplate.opsForSet().add(key, value); + } + + /** + * 获取集合中的某个元素 + * @param key + * @return 返回值为redis中键值为key的value的Set集合 + */ + public static Set sGetMembers(String key) { + return cacheUtils.redisTemplate.opsForSet().members(key); + } + + /** + * 将给定分数的指定成员添加到键中存储的排序集合中 + * @param key + * @param value + * @param score + * @return + */ + public static Boolean zAdd(String key, String value, double score) { + return cacheUtils.redisTemplate.opsForZSet().add(key, value, score); + } + + /** + * 返回指定排序集中给定成员的分数 + * @param key + * @param value + * @return + */ + public static Double zScore(String key, String value) { + return cacheUtils.redisTemplate.opsForZSet().score(key, value); + } + + /** + * 删除指定的键 + * @param key + * @return + */ + public static Boolean delete(String key) { + return cacheUtils.redisTemplate.delete(key); + } + + /** + * 删除多个键 + * @param keys + * @return + */ + public static Long delete(Collection keys) { + return cacheUtils.redisTemplate.delete(keys); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/CheckUtils.java b/api-admin/src/main/java/com/glxp/api/admin/util/CheckUtils.java new file mode 100644 index 00000000..3620c1ff --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/util/CheckUtils.java @@ -0,0 +1,34 @@ +package com.glxp.api.admin.util; + +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +public class CheckUtils { + + + public static Boolean checkCode(List list) { + + Set set = new HashSet(list); + boolean result = list.size() == set.size() ? true : false; + + return result; + } + + + public static String getRepeatIdCard(List list) { + StringBuffer buffer = new StringBuffer(); + buffer.append("重复值是:"); + String temp = ""; + for (int i = 0; i < list.size() - 1; i++) { + temp = list.get(i); + for (int j = i + 1; j < list.size(); j++) { + if (temp.equals(list.get(j))) { + System.out.println("第" + (i + 1) + "个跟第" + (j + 1) + "个重复，值是：" + temp); + buffer.append(temp + ","); + } + } + } + return buffer.toString(); + } +} \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/CustomUtil.java b/api-admin/src/main/java/com/glxp/api/admin/util/CustomUtil.java new file mode 100644 index 00000000..b93dfe6f --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/util/CustomUtil.java @@ -0,0 +1,11 @@ +package com.glxp.api.admin.util; + +import java.util.UUID; + +public class CustomUtil { + + public static String getUUId() { + UUID uuid = UUID.randomUUID(); + return uuid.toString().replace("-", ""); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/DateUtil.java b/api-admin/src/main/java/com/glxp/api/admin/util/DateUtil.java new file mode 100644 index 00000000..f5d7cf40 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/util/DateUtil.java @@ -0,0 +1,481 @@ +package com.glxp.api.admin.util; + +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.DateUtils; +import org.apache.commons.lang3.time.FastDateFormat; + +import java.lang.management.ManagementFactory; +import java.text.DateFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.*; + +public class DateUtil extends org.apache.commons.lang3.time.DateUtils { + + private static String[] parsePatterns = { + "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM-dd HH", "yyyy-MM", + "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM/dd HH", "yyyy/MM", + "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM.dd HH", "yyyy.MM", + "yyyy年MM月dd日", "yyyy年MM月dd日 HH时mm分ss秒", "yyyy年MM月dd日 HH时mm分", "yyyy年MM月dd日 HH时", "yyyy年MM月", + "yyyy"}; + + /** + * 得到日期字符串 ，转换格式（yyyy-MM-dd） + */ + public static String formatDate(Date date) { + return formatDate(date, "yyyy-MM-dd"); + } + + /** + * 得到日期字符串 默认格式（yyyy-MM-dd） pattern可以为："yyyy-MM-dd" "HH:mm:ss" "E" + */ + public static String formatDate(long dateTime, String pattern) { + return formatDate(new Date(dateTime), pattern); + } + + /** + * 得到日期字符串 默认格式（yyyy-MM-dd） pattern可以为："yyyy-MM-dd" "HH:mm:ss" "E" + */ + public static String formatDate(Date date, String pattern) { + String formatDate = null; + if (date != null) { +// if (StringUtils.isNotBlank(pattern)) { +// formatDate = DateFormatUtils.format(date, pattern); +// } else { +// formatDate = DateFormatUtils.format(date, "yyyy-MM-dd"); +// } + if (StringUtils.isBlank(pattern)) { + pattern = "yyyy-MM-dd"; + } + formatDate = FastDateFormat.getInstance(pattern).format(date); + } + return formatDate; + } + + /** + * 得到日期时间字符串，转换格式（yyyy-MM-dd HH:mm:ss） + */ + public static String formatDateTime(Date date) { + Date currentTime = new Date(); + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + String dateString = formatter.format(currentTime); + return dateString; + } + + /** + * 得到当前日期字符串 格式（yyyy-MM-dd） + */ + public static String getDate() { + return getDate("yyyy-MM-dd"); + } + + /** + * 得到当前日期字符串 格式（yyyy-MM-dd） pattern可以为："yyyy-MM-dd" "HH:mm:ss" "E" + */ + public static String getDate(String pattern) { +// return DateFormatUtils.format(new Date(), pattern); + return FastDateFormat.getInstance(pattern).format(new Date()); + } + + /** + * 得到当前日期前后多少天，月，年的日期字符串 + * + * @param pattern 格式（yyyy-MM-dd） pattern可以为："yyyy-MM-dd" "HH:mm:ss" "E" + * @param amont 数量，前为负数，后为正数 + * @param type 类型，可参考Calendar的常量(如：Calendar.HOUR、Calendar.MINUTE、Calendar.SECOND) + * @return + */ + public static String getDate(String pattern, int amont, int type) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(new Date()); + calendar.add(type, amont); +// return DateFormatUtils.format(calendar.getTime(), pattern); + return FastDateFormat.getInstance(pattern).format(calendar.getTime()); + } + + /** + * 得到当前时间字符串 格式（HH:mm:ss） + */ + public static String getTime() { + return formatDate(new Date(), "HH:mm:ss"); + } + + /** + * 得到当前日期和时间字符串 格式（yyyy-MM-dd HH:mm:ss） + */ + public static String getDateTime() { + return formatDate(new Date(), "yyyy-MM-dd HH:mm:ss"); + } + + /** + * 得到当前年份字符串 格式（yyyy） + */ + public static String getYear() { + return formatDate(new Date(), "yyyy"); + } + + /** + * 得到当前月份字符串 格式（MM） + */ + public static String getMonth() { + return formatDate(new Date(), "MM"); + } + + /** + * 得到当天字符串 格式（dd） + */ + public static String getDay() { + return formatDate(new Date(), "dd"); + } + + /** + * 得到当前星期字符串 格式（E）星期几 + */ + public static String getWeek() { + return formatDate(new Date(), "E"); + } + + /** + * 日期型字符串转化为日期 格式 see to DateUtils#parsePatterns + */ + public static Date parseDate(Object str) { + if (str == null) { + return null; + } + try { + return parseDate(str.toString(), parsePatterns); + } catch (ParseException e) { + return null; + } + } + + + /** + * 获取过去的天数 + * + * @param date + * @return + */ + public static long pastDays(Date date) { + long t = System.currentTimeMillis() - date.getTime(); + return t / (24 * 60 * 60 * 1000); + } + + + /** + * 获取过去的小时 + * + * @param date + * @return + */ + public static long pastHour(Date date) { + long t = System.currentTimeMillis() - date.getTime(); + return t / (60 * 60 * 1000); + } + + /** + * 获取过去的分钟 + * + * @param date + * @return + */ + public static long pastMinutes(Date date) { + long t = System.currentTimeMillis() - date.getTime(); + return t / (60 * 1000); + } + + /** + * 获取过去的秒 + * + * @param date + * @return + */ + public static long pastSecnod(Date date) { + long t = System.currentTimeMillis() - date.getTime(); + return t / (1000); + } + + /** + * 获取两个日期之间的天数 + * + * @param before + * @param after + * @return + */ + public static double getDistanceOfTwoDate(Date before, Date after) { + long beforeTime = before.getTime(); + long afterTime = after.getTime(); + return (afterTime - beforeTime) / (1000 * 60 * 60 * 24); + } + + /** + * 获取某月有几天 + * + * @param date 日期 + * @return 天数 + */ + public static int getMonthHasDays(Date date) { +// String yyyyMM = new SimpleDateFormat("yyyyMM").format(date); + String yyyyMM = FastDateFormat.getInstance("yyyyMM").format(date); + String year = yyyyMM.substring(0, 4); + String month = yyyyMM.substring(4, 6); + String day31 = ",01,03,05,07,08,10,12,"; + String day30 = "04,06,09,11"; + int day = 0; + if (day31.contains(month)) { + day = 31; + } else if (day30.contains(month)) { + day = 30; + } else { + int y = Integer.parseInt(year); + if ((y % 4 == 0 && (y % 100 != 0)) || y % 400 == 0) { + day = 29; + } else { + day = 28; + } + } + return day; + } + + /** + * 获取日期是当年的第几周 + * + * @param date + * @return + */ + public static int getWeekOfYear(Date date) { + Calendar cal = Calendar.getInstance(); + cal.setTime(date); + return cal.get(Calendar.WEEK_OF_YEAR); + } + + /** + * 获取一天的开始时间（如：2015-11-3 00:00:00.000） + * + * @param date 日期 + * @return + */ + public static Date getOfDayFirst(Date date) { + if (date == null) { + return null; + } + Calendar calendar = Calendar.getInstance(); + calendar.setTime(date); + calendar.set(Calendar.HOUR, 0); + calendar.set(Calendar.MINUTE, 0); + calendar.set(Calendar.SECOND, 0); + calendar.set(Calendar.MILLISECOND, 0); + return calendar.getTime(); + } + + /** + * 获取一天的最后时间（如：2015-11-3 23:59:59.999） + * + * @param date 日期 + * @return + */ + public static Date getOfDayLast(Date date) { + if (date == null) { + return null; + } + Calendar calendar = Calendar.getInstance(); + calendar.setTime(date); + calendar.set(Calendar.HOUR, 23); + calendar.set(Calendar.MINUTE, 59); + calendar.set(Calendar.SECOND, 59); + calendar.set(Calendar.MILLISECOND, 999); + return calendar.getTime(); + } + + /** + * 获取服务器启动时间 + * + * @param + * @return + */ + public static Date getServerStartDate() { + long time = ManagementFactory.getRuntimeMXBean().getStartTime(); + return new Date(time); + } + + + /** + * 解析日期范围字符串为日期对象 + * + * @param dateString 2018-01-01 ~ 2018-01-31 + * @return new Date[]{2018-01-01, 2018-01-31} + */ + public static Date[] parseDateBetweenString(String dateString) { + Date beginDate = null; + Date endDate = null; + if (StringUtils.isNotBlank(dateString)) { + String[] ss = StringUtils.split(dateString, "~"); + if (ss != null && ss.length == 2) { + String begin = StringUtils.trim(ss[0]); + String end = StringUtils.trim(ss[1]); + if (StringUtils.isNoneBlank(begin, end)) { + try { + beginDate = DateUtils.parseDate(begin); + endDate = DateUtils.parseDate(end); + } catch (ParseException e) { + e.printStackTrace(); + } + + } + } + } + return new Date[]{beginDate, endDate}; + } + + public static final int SECONDS_IN_DAY = 60 * 60 * 24; + public static final long MILLIS_IN_DAY = 1000L * SECONDS_IN_DAY; + + public static boolean isSameDayOfMillis(final long ms1, final long ms2) { + final long interval = ms1 - ms2; + return interval < MILLIS_IN_DAY + && interval > -1L * MILLIS_IN_DAY + && toDay(ms1) == toDay(ms2); + } + + private static long toDay(long millis) { + return (millis + TimeZone.getDefault().getOffset(millis)) / MILLIS_IN_DAY; + } + + /** + * 给时间加上几个小时 + * + * @param date 时间 + * @param hour 需要加的时间 + * @return + */ + public static String addDateMinut(Date date, int hour) { + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Calendar cal = Calendar.getInstance(); + cal.setTime(date); + cal.add(Calendar.HOUR, hour);// 24小时制 + date = cal.getTime(); + cal = null; + return format.format(date); + } + + /** + * 给时间加上几个小时 + * + * @param date 时间 + * @param hour 需要加的时间 + * @return DATE + */ + public static Date addDate(Date date, int hour) { + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Calendar cal = Calendar.getInstance(); + cal.setTime(date); + cal.add(Calendar.HOUR, hour);// 24小时制 + date = cal.getTime(); + cal = null; + return date; + } + + /** + * 日期比较 + * + * @param date1 日期参数1 + * @param date2 日期参数2 + * @return 1 date1>date2;-1 date1 dt2.getTime()) { + return 1; + } else if (dt1.getTime() < dt2.getTime()) { + return -1; + } else { + return 0; + } + } catch (Exception exception) { + exception.printStackTrace(); + } + return 0; + } + + /** + * 获取昨天开始时间和结束时间 + * @return + */ + public static Map getYesterdayRange() { + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); + Map condition=new HashMap(); + Calendar calendar = Calendar.getInstance(); + calendar.set(Calendar.MILLISECOND,0); + calendar.set(Calendar.SECOND,0); + calendar.set(Calendar.MINUTE,0); + calendar.set(Calendar.HOUR_OF_DAY,0); + condition.put("endDate",df.format(calendar.getTime())); + calendar.set(Calendar.HOUR_OF_DAY,-24); + condition.put("startDate",df.format(calendar.getTime())); + return condition; + } + + /** + * 获得近一周的开始时间和结束时间 + * @return + */ + public static Map getDaySevenRange(){ + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); + Map condition=new HashMap(); + Calendar calendar = Calendar.getInstance(); + calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH), 0, 0, 0); + calendar.set(Calendar.HOUR_OF_DAY,24); + condition.put("endDate",df.format(calendar.getTime())); + calendar.set(Calendar.HOUR_OF_DAY,-168); + condition.put("startDate",df.format(calendar.getTime())); + return condition; + } + + /** + * 获得近一月的开始时间和结束时间 + * @return + */ + public static Map getDayTRange(){ + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); + Map condition=new HashMap(); + Calendar calendar = Calendar.getInstance(); + calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH), 0, 0, 0); + calendar.set(Calendar.HOUR_OF_DAY,24); + condition.put("endDate",df.format(calendar.getTime())); + calendar.set(Calendar.HOUR_OF_DAY,-720); + condition.put("startDate",df.format(calendar.getTime())); + return condition; + } + + /** + * 获得近一年的开始时间和结束时间 + * @return + */ + public static Map getYearTRange(){ + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); + Map condition=new HashMap(); + Calendar calendar = Calendar.getInstance(); + calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH), 0, 0, 0); + calendar.set(Calendar.HOUR_OF_DAY,24); + condition.put("endDate",df.format(calendar.getTime())); + calendar.set(Calendar.HOUR_OF_DAY,-8640); + condition.put("startDate",df.format(calendar.getTime())); + return condition; + } + + + public static Map getDayRange(int day){ + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); + Map condition=new HashMap(); + Calendar calendar = Calendar.getInstance(); + calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH), 0, 0, 0); + calendar.set(Calendar.HOUR_OF_DAY,24); + condition.put("endDate",df.format(calendar.getTime())); + calendar.set(Calendar.HOUR_OF_DAY,-(24*day)); + condition.put("startDate",df.format(calendar.getTime())); + return condition; + } +} \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/FastJsonUtils.java b/api-admin/src/main/java/com/glxp/api/admin/util/FastJsonUtils.java new file mode 100644 index 00000000..f5889f2b --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/util/FastJsonUtils.java @@ -0,0 +1,55 @@ +package com.glxp.api.admin.util; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.TypeReference; + +import java.util.List; +import java.util.Map; + +/** + * @author 彭于晏 + * @date 2020/8/11. + */ +public class FastJsonUtils { + + + /** + * 功能描述：把JSON数据转换成指定的java对象 + * @param jsonData JSON数据 + * @param clazz 指定的java对象 + * @return 指定的java对象 + */ + public static T getJsonToBean(String jsonData, Class clazz) { + return JSON.parseObject(jsonData, clazz); + } + + /** + * 功能描述：把java对象转换成JSON数据 + * @param object java对象 + * @return JSON数据 + */ + public static String getBeanToJson(Object object) { + return JSON.toJSONString(object); + } + + /** + * 功能描述：把JSON数据转换成指定的java对象列表 + * @param jsonData JSON数据 + * @param clazz 指定的java对象 + * @return List + */ + public static List getJsonToList(String jsonData, Class clazz) { + return JSON.parseArray(jsonData, clazz); + } + + /** + * 功能描述：把JSON数据转换成较为复杂的List> + * @param jsonData JSON数据 + * @return List> + */ + public static List> getJsonToListMap(String jsonData) { + return JSON.parseObject(jsonData, new TypeReference>>() { + }); + } + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/FilterUdiUtils.java b/api-admin/src/main/java/com/glxp/api/admin/util/FilterUdiUtils.java new file mode 100644 index 00000000..49d2f4d1 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/util/FilterUdiUtils.java @@ -0,0 +1,256 @@ +package com.glxp.api.admin.util; + + +import com.glxp.api.admin.entity.basic.UdiInfoEntity; +import com.glxp.api.admin.entity.basic.UdiEntity; + +/** + * @author 彭于晏 + * @date 2020/9/22. + */ +public class FilterUdiUtils { + private static final String TAG = "FilterUdiUtils"; + + public static UdiEntity getUdi(String data) { + if (data != null && data.length() > 2) { + if (data.substring(0, 2).equals("MA")) { + return getZGCUdi(data); + } else if (data.substring(0, 2).equals("01")) { + return getGS1Udi(data); + } else if (data.substring(0, 1).equals("#")) { + return getGLXPUdi(data); + } + } + return null; + } + + public static UdiEntity getGS1Udi(String data) { + String batchNo = ""; + String produceDate = ""; + String expireDate = ""; + String serialNo = null; + String udi = ""; + UdiEntity udiEntity = null; + if (data.length() >= 16) { + udi = data.substring(2, 16); + if (data.length() >= 18 && data.substring(16, 18).equals("10")) { + if (data.contains("\u001D")) { + String[] splits = data.split("\u001D"); + String front = splits[0]; + batchNo = front.substring(18, front.length()); + String last = splits[1]; + boolean b = last.length() >= 18 && last.substring(16, 18).equals("21"); + if ((last != null && last.length() >= 2) && last.substring(0, 2).equals("11")) { + produceDate = last.substring(2, 8); + if (last.length() >= 10 && last.substring(8, 10).equals("17")) { + expireDate = last.substring(10, 16); + if (b) { + serialNo = last.substring(18, last.length()); + } else { + serialNo = null; + } + } + } else if ((last != null && last.length() >= 2) && last.substring(0, 2).equals("17")) { + expireDate = last.substring(2, 8); + if (last.length() >= 10 && last.substring(8, 10).equals("11")) { + produceDate = last.substring(10, 16); + if (b) { + serialNo = last.substring(18, last.length()); + } else { + serialNo = null; + } + } + } else if ((last != null && last.length() >= 2) && last.substring(0, 2).equals("21")) { + serialNo = last.substring(2, last.length()); + } + } else { + batchNo = data.substring(18); + } + + + } else if (data.length() >= 18 && data.substring(16, 18).equals("11")) { + produceDate = data.substring(18, 24); + if (data.length() >= 26 && data.substring(24, 26).equals("17")) { + expireDate = data.substring(26, 32); + if (data.length() >= 34 && data.substring(32, 34).equals("10")) { + if (data.contains("\u001D")) { + String[] splits = data.split("\u001D"); + batchNo = splits[0].substring(34, splits[0].length()); + serialNo = splits[1].substring(2); + } else { + batchNo = data.substring(34, data.length()); + } + + } + } else if (data.length() >= 26 && data.substring(24, 26).equals("10")) { + if (data.contains("\u001D")) { + String[] splits = data.split("\u001D"); + batchNo = splits[0].substring(26, splits[0].length()); + String last = splits[1]; + if (last.substring(0, 2).equals("17")) { + expireDate = last.substring(2, 8); + if (last.length() >= 10) { + serialNo = last.substring(10, last.length()); + } + } else if (last.substring(0, 2).equals("21")) { + serialNo = last.substring(2, last.length()); + } + } else { + batchNo = data.substring(26, data.length()); + } + + } else if (data.length() >= 26 && data.substring(24, 26).equals("21")) { + + serialNo = data.substring(26); + } + } else if (data.length() >= 18 && data.substring(16, 18).equals("17")) { + expireDate = data.substring(18, 24); + if (data.length() >= 26 && data.substring(24, 26).equals("11")) { + produceDate = data.substring(26, 32); + if (data.length() >= 34 && data.substring(32, 34).equals("10")) { + if (data.contains("\u001D")) { + String[] splits = data.split("\u001D"); + batchNo = splits[0].substring(34, splits[0].length()); + serialNo = splits[1].substring(2); + } else { + batchNo = data.substring(34, data.length()); + } + + } + } else if (data.length() >= 26 && data.substring(24, 26).equals("10")) { + if (data.contains("\u001D")) { + String[] splits = data.split("\u001D"); + batchNo = splits[0].substring(26); + String last = splits[1]; + if (last.substring(0, 2).equals("11")) { + produceDate = last.substring(2, 8); + if (last.length() > 8 && last.substring(8, 10).equals("21")) { + serialNo = last.substring(10); + } + } else if (last.substring(0, 2).equals("21")) { + serialNo = last.substring(2); + } + } else { + batchNo = data.substring(26, data.length()); + } + } else if (data.length() >= 26 && data.substring(24, 26).equals("21")) { + + serialNo = data.substring(26); + } + + } else if (data.length() >= 18 && data.substring(16, 18).equals("21")) { + serialNo = data.substring(18); + } + udiEntity = new UdiEntity(); + udiEntity.setUdi(udi); + udiEntity.setBatchNo(batchNo); + udiEntity.setExpireDate(expireDate); + udiEntity.setProduceDate(produceDate); + udiEntity.setSerialNo(serialNo); + } + return udiEntity; + } + + public static UdiEntity getZGCUdi(String data) { + String batchNo = ""; + String produceDate = ""; + String expireDate = ""; + String serialNo = null; + String udi = data; + String[] spilts = data.split("[.]"); + if (spilts != null && spilts.length >= 5) { + for (int i = 0; i < 5; i++) { + udi = udi + "." + spilts[i]; + } + udi = udi.substring(1); + for (int i = 0; i < spilts.length; i++) { + String tempStr = spilts[i]; + if (tempStr != null && tempStr.length() > 1 && tempStr.substring(0, 1).equals("P")) { + produceDate = tempStr.substring(1); + } else if (tempStr != null && tempStr.length() > 1 && tempStr.substring(0, 1).equals("L")) { + batchNo = tempStr.substring(1); + } else if (tempStr != null && tempStr.length() > 1 && tempStr.substring(0, 1).equals("E")) { + expireDate = tempStr.substring(1); + } else if (tempStr != null && tempStr.length() > 1 && tempStr.substring(0, 1).equals("S")) { + serialNo = tempStr.substring(1); + } + } + } + + UdiEntity udiEntity = new UdiEntity(); + udiEntity.setBatchNo(batchNo); + udiEntity.setExpireDate(expireDate); + udiEntity.setProduceDate(produceDate); + udiEntity.setUdi(udi); + udiEntity.setSerialNo(serialNo); + return udiEntity; + + } + + public static UdiEntity getGLXPUdi(String data) { + String batchNo = ""; + String produceDate = ""; + String expireDate = ""; + String serialNo = null; + String udi = ""; + String[] spilts = data.split("#"); + if (spilts != null && spilts.length >= 5) { + udi = spilts[1]; + produceDate = spilts[2]; + expireDate = spilts[3]; + batchNo = spilts[4]; + if (spilts.length > 6) { + serialNo = spilts[5]; + if (serialNo != null && serialNo.equals("")) { + serialNo = null; + } + } + + } + UdiEntity udiEntity = new UdiEntity(); + udiEntity.setBatchNo(batchNo); + udiEntity.setExpireDate(expireDate); + udiEntity.setProduceDate(produceDate); + udiEntity.setUdi(udi); + udiEntity.setSerialNo(serialNo); + return udiEntity; + } + + public static String getDiStr(String data) { + String prefix = ""; + if (data != null && data.length() > 2) { + if (data.substring(0, 2).equals("MA")) { + String[] spilts = data.split("[.]"); + if (spilts != null && spilts.length >= 5) { + for (int i = 0; i < 5; i++) { + prefix = prefix + "." + spilts[i]; + } + prefix = prefix.substring(1); + } + } else if (data.substring(0, 2).equals("01") && data.length() >= 16) { + prefix = data.substring(2, 16); + } else if (data.substring(0, 1).equals("#")) { + String[] spilts = data.split("#"); + if (spilts != null && spilts.length >= 1) + prefix = spilts[1]; + } + } + if (prefix.equals("")) + return data; + return prefix; + } + + + public static UdiInfoEntity transUdi(UdiInfoEntity data) { + UdiEntity udiEntity = getUdi(data.getCode()); + if (udiEntity != null) { + data.setBatchNo(udiEntity.getBatchNo()); + data.setProduceDate(udiEntity.getProduceDate()); + data.setExpireDate(udiEntity.getExpireDate()); + data.setSerialNo(udiEntity.getSerialNo()); + data.setUdi(udiEntity.getUdi()); + } + return data; + } + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/HttpClient.java b/api-admin/src/main/java/com/glxp/api/admin/util/HttpClient.java new file mode 100644 index 00000000..46172c28 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/util/HttpClient.java @@ -0,0 +1,100 @@ +package com.glxp.api.admin.util; + +import com.alibaba.fastjson.JSONObject; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; +import org.springframework.web.client.RestTemplate; + +import java.util.Iterator; +import java.util.Map; + +public class HttpClient { + private static final Logger logger = LoggerFactory.getLogger(HttpClient.class); + + public static String post(String url, Object object) { + RestTemplate restTemplate = new RestTemplate(); + String json = JSONObject.toJSON(object).toString(); + logger.info(url+"\n"+json); + MultiValueMap postParameters = new LinkedMultiValueMap<>(); + postParameters.add("params", json); + HttpHeaders headers = new HttpHeaders(); + headers.add("Content-Type", "application/x-www-form-urlencoded"); + HttpEntity> httpEntity = new HttpEntity<>(postParameters, headers); + String response = restTemplate.postForObject(UdidConfig.apiUrl + url, httpEntity, String.class); + System.out.println(response); + + return response; + } + + public static String postU8(String url, Object object) { + RestTemplate restTemplate = new RestTemplate(); + String json = JSONObject.toJSON(object).toString(); +// MultiValueMap postParameters = new LinkedMultiValueMap<>(); +// postParameters.add("params", json); + logger.info(url+"\n"+json); + HttpHeaders headers = new HttpHeaders(); + headers.add("Content-Type", "application/json"); + headers.add("system", "1"); + headers.add("apicode", "1b723931cca84aee8ced6b607fc7dabb"); + HttpEntity httpEntity = new HttpEntity<>(json, headers); + String response = restTemplate.postForObject(url, httpEntity, String.class); + System.out.println(response); + return response; + } + + public static String uCloudPost(String url, Object object) { + RestTemplate restTemplate = new RestTemplate(); + String json = JSONObject.toJSON(object).toString(); +// MultiValueMap postParameters = new LinkedMultiValueMap<>(); +// postParameters.add("params", json); + logger.info(url+"\n"+json); + HttpHeaders headers = new HttpHeaders(); + headers.add("Content-Type", "application/json"); + HttpEntity httpEntity = new HttpEntity<>(json, headers); + logger.info(httpEntity.toString()); + String response = restTemplate.postForObject(url, httpEntity, String.class); + System.out.println(response); + return response; + } + + + public static String mipsGet(String url) { + RestTemplate restTemplate = new RestTemplate(); + String accessTokenRequestUrl = url;//"http://127.0.0.1:9997/mips/druginfo/list"; + String response = restTemplate.getForObject(accessTokenRequestUrl, String.class); + return response; + } + + public static String mipsGet(String url, Map params) { + StringBuffer stringBuffer = new StringBuffer(url); + if (params instanceof Map) { + Iterator iterator = ((Map) params).entrySet().iterator(); + if (iterator.hasNext()) { + stringBuffer.append("?"); + Object element; + while (iterator.hasNext()) { + element = iterator.next(); + Map.Entry entry = (Map.Entry) element; + //过滤value为null，value为null时进行拼接字符串会变成 "null"字符串 + if (entry.getValue() != null) { + stringBuffer.append(element).append("&"); + } + url = stringBuffer.substring(0, stringBuffer.length() - 1); + } + } + } else { + throw new RuntimeException("url请求:" + url + "请求参数有误不是map类型"); + } + RestTemplate restTemplate = new RestTemplate(); + String accessTokenRequestUrl = url;//"http://127.0.0.1:9997/mips/druginfo/list"; + logger.info(accessTokenRequestUrl); + String response = restTemplate.getForObject(accessTokenRequestUrl, String.class); + return response; + } + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/IpUtils.java b/api-admin/src/main/java/com/glxp/api/admin/util/IpUtils.java new file mode 100644 index 00000000..3b4599f7 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/util/IpUtils.java @@ -0,0 +1,57 @@ +package com.glxp.api.admin.util; + +import org.springframework.scheduling.annotation.Async; + +import javax.servlet.http.HttpServletRequest; +import java.net.InetAddress; + +public class IpUtils { + + /** + * 获取客户端IP地址 + * + * @param request + * @return + */ + public static String getIpAddr(HttpServletRequest request) { + String ip = request.getHeader("x-forwarded-for"); + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { + ip = request.getHeader("Proxy-Client-IP"); + } + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { + ip = request.getHeader("WL-Proxy-Client-IP"); + } + if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) { + ip = request.getRemoteAddr(); + if (ip.equals("127.0.0.1")) { + //根据网卡取本机配置的IP + InetAddress inet = null; + try { + inet = InetAddress.getLocalHost(); + ip = inet.getHostAddress(); + } catch (Exception e) { + e.printStackTrace(); + } + } + } + // 多个代理的情况，第一个IP为客户端真实IP,多个IP按照','分割 + if (ip != null && ip.length() > 15) { + if (ip.indexOf(",") > 0) { + ip = ip.substring(0, ip.indexOf(",")); + } + } + return ip; + } + + @Async + public void asyncOrder() { + System.out.println("执行异步任务: "); + System.out.println("线程名称：" + Thread.currentThread().getName() + " be ready to read data!"); + try { + Thread.sleep(1000 * 5); + System.out.println("---------------------》》》无返回值延迟3秒："); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/JwtUtils.java b/api-admin/src/main/java/com/glxp/api/admin/util/JwtUtils.java new file mode 100644 index 00000000..7d6aa624 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/util/JwtUtils.java @@ -0,0 +1,104 @@ +package com.glxp.api.admin.util; + +import io.jsonwebtoken.*; + +import javax.crypto.SecretKey; +import javax.crypto.spec.SecretKeySpec; +import java.security.Key; +import java.util.Base64; +import java.util.Date; +import java.util.Map; + +/** + * jwt + */ +public class JwtUtils { + + /** + * 生成 token + * + * @param claims 自定义的 map + * @param ttl 过期时间 + * @return + */ + public static String createToken(Map claims, Long ttl) { + Key key = generateKey(); + SignatureAlgorithm signatureAlgorithm = SignatureAlgorithm.HS256; + Long nowMillis = System.currentTimeMillis(); //生成JWT的时间 + JwtBuilder builder = Jwts.builder() + .setHeaderParam("typ", "JWT") //设置header + .setHeaderParam("alg", "HS256") + .setClaims(claims) //设置payload的键值对 + // .setIssuedAt(now) //设置iat + // .setIssuer("vue-api") + .signWith(signatureAlgorithm, key); //签名，需要算法和key + if (ttl != null && ttl >= 0) { + Long expMillis = nowMillis + ttl * 1000; + Date exp = new Date(expMillis); + builder.setExpiration(exp); //设置过期时间 + } + + String token = builder.compact(); + + return token; + } + + public static String createJWT(String id, long ttlMillis) { + SignatureAlgorithm signatureAlgorithm = SignatureAlgorithm.HS256; + long nowMillis = System.currentTimeMillis(); + Date now = new Date(nowMillis); + SecretKey secretKey = generateKey(); + JwtBuilder builder = Jwts.builder().setId(id) // 主题 + .setIssuer("user") // 签发者 + .setIssuedAt(now) // 签发时间 + .signWith(signatureAlgorithm, secretKey); // 签名算法以及密匙 + if (ttlMillis >= 0) { + long expMillis = nowMillis + ttlMillis; + Date expDate = new Date(expMillis); + builder.setExpiration(expDate); // 过期时间 + } + return builder.compact(); + } + + /** + * 生成 token ，没有过期时间 + * + * @param claims 自定义的 map + * @return + */ + public static String createToken(Map claims) { + return createToken(claims, null); + } + + /** + * 解密 jwt + * @param jwt 创建的 jwt 字符串 + * @return + */ + public static Claims parse(String jwt) { + + if (jwt == null) { + return null; + } + + try { + return Jwts.parser() + .setSigningKey(generateKey()) //此处的key要与之前创建的key一致 + .parseClaimsJws(jwt) + .getBody(); + }catch (ExpiredJwtException e){ + return null; + } + } + + /** + * 获取 key + * + * @return + */ + private static SecretKey generateKey() { + String stringKey = "udicapi"; + byte[] encodedKey = Base64.getDecoder().decode(stringKey); + return new SecretKeySpec(encodedKey, 0, encodedKey.length, "AES"); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/Md5Utils.java b/api-admin/src/main/java/com/glxp/api/admin/util/Md5Utils.java new file mode 100644 index 00000000..c28c0897 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/util/Md5Utils.java @@ -0,0 +1,23 @@ +package com.glxp.api.admin.util; + +import java.math.BigInteger; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; + +public class Md5Utils { + + public static String stringToMD5(String plainText) { + byte[] secretBytes = null; + try { + secretBytes = MessageDigest.getInstance("md5").digest( + plainText.getBytes()); + } catch (NoSuchAlgorithmException e) { + throw new RuntimeException("没有这个md5算法！"); + } + String md5code = new BigInteger(1, secretBytes).toString(16); + for (int i = 0; i < 32 - md5code.length(); i++) { + md5code = "0" + md5code; + } + return md5code; + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/PasswordUtils.java b/api-admin/src/main/java/com/glxp/api/admin/util/PasswordUtils.java new file mode 100644 index 00000000..1700b7af --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/util/PasswordUtils.java @@ -0,0 +1,13 @@ +package com.glxp.api.admin.util; + +/** + * 密码相关的工具类 + */ +public class PasswordUtils { + + public static String authAdminPwd(String pwd) { +// return DigestUtils.md5DigestAsHex(DigestUtils.md5DigestAsHex(pwd.getBytes()).getBytes()).toLowerCase(); + return pwd; + } + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/PermissionRuleTreeUtils.java b/api-admin/src/main/java/com/glxp/api/admin/util/PermissionRuleTreeUtils.java new file mode 100644 index 00000000..bab16019 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/util/PermissionRuleTreeUtils.java @@ -0,0 +1,36 @@ +package com.glxp.api.admin.util; + +import com.glxp.api.admin.entity.auth.AuthPermissionRule; +import com.glxp.api.admin.res.auth.AuthPermissionRuleMergeResponse; +import org.springframework.beans.BeanUtils; + +import java.util.ArrayList; +import java.util.List; + +/** + * 权限规则生成树形节点工具类 + */ +public class PermissionRuleTreeUtils { + + /** + * 多维数组 + */ + public static List merge(List authPermissionRuleList, + Long pid) { + + List authPermissionRuleMergeResponseList = new ArrayList<>(); + for (AuthPermissionRule v : authPermissionRuleList) { + AuthPermissionRuleMergeResponse authPermissionRuleMergeResponse = new AuthPermissionRuleMergeResponse(); + BeanUtils.copyProperties(v, authPermissionRuleMergeResponse); + if (pid.equals(v.getPid())) { + authPermissionRuleMergeResponse.setChildren(merge(authPermissionRuleList, v.getId())); + authPermissionRuleMergeResponseList.add(authPermissionRuleMergeResponse); + } + } + + return authPermissionRuleMergeResponseList; + } + + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/PublicFileUtils.java b/api-admin/src/main/java/com/glxp/api/admin/util/PublicFileUtils.java new file mode 100644 index 00000000..c735f36f --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/util/PublicFileUtils.java @@ -0,0 +1,23 @@ +package com.glxp.api.admin.util; + +import com.glxp.api.admin.config.PublicFileUrlConfig; + +/** + * 公共文件管理工具 + */ +public class PublicFileUtils { + + public static String createUploadUrl(String filePath) { + + if (filePath == null || filePath.isEmpty()) { + return ""; + } + + if (filePath.indexOf("http") == 0 || filePath.indexOf("/") == 0) { + return filePath; + } + + return PublicFileUrlConfig.getDomain() + "/" + filePath; + } + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/TreeUtils.java b/api-admin/src/main/java/com/glxp/api/admin/util/TreeUtils.java new file mode 100644 index 00000000..30fdf087 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/util/TreeUtils.java @@ -0,0 +1,12 @@ +package com.glxp.api.admin.util; + +/** + * 树形结构工具类 + */ +public class TreeUtils { + + public static void Merge() { + + } + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/UdidConfig.java b/api-admin/src/main/java/com/glxp/api/admin/util/UdidConfig.java new file mode 100644 index 00000000..ff36bc0c --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/util/UdidConfig.java @@ -0,0 +1,12 @@ +package com.glxp.api.admin.util; + +public class UdidConfig { + + public static final String betaUrl = "https://udid.nmpa.gov.cn/api/beta/v1/"; + + public static final String apiUrl = "https://udid.nmpa.gov.cn/api/v1/"; + + public static final String AppId = "371ced236e844272ad14bbe9051fd25a"; + public static final String AppSecret = "592e7a00a7304f52a86a82e7fac9d2c0"; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/serializer/Date2LongSerializer.java b/api-admin/src/main/java/com/glxp/api/admin/util/serializer/Date2LongSerializer.java new file mode 100644 index 00000000..bc2ed5e6 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/util/serializer/Date2LongSerializer.java @@ -0,0 +1,21 @@ +package com.glxp.api.admin.util.serializer; + +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.JsonSerializer; +import com.fasterxml.jackson.databind.SerializerProvider; + +import java.io.IOException; +import java.util.Date; + +/** + * 毫秒转成秒 + * 只需要在需要序列化的属性上面加上这个注解 | @JsonSerialize(using = Date2LongSerializer.class) + */ +public class Date2LongSerializer extends JsonSerializer { + + @Override + public void serialize(Date date, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException, JsonProcessingException { + jsonGenerator.writeNumber(date.getTime() / 1000); + } +} diff --git a/api-admin/src/main/resources/application-dev.properties b/api-admin/src/main/resources/application-dev.properties new file mode 100644 index 00000000..6e77cf8a --- /dev/null +++ b/api-admin/src/main/resources/application-dev.properties @@ -0,0 +1,26 @@ +# 本地环境 +server.port=9991 +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udiwms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true +spring.datasource.username=root +spring.datasource.password=123456 +#spring.datasource.password=mysql80 +server.servlet.context-path= + +logging.level.com.glxp.api.admin.dao=debug +logging.level.com.glxp.api.admin.erp.second=debug + +#logback配置 + +logging.path=output/logs +# 不指定的情况下默认生成在项目根目录，按照配置生成所需的日志名称 +logging.file=D:/udi.log +#UDI数据下载 +UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server +#UDI_SERVER_URL=http://139.9.178.73:8080/UDI_DL_Server +#UCLOD服务 +#UCLOD_SERVER_URL=http://127.0.0.1:9997 +UCLOD_SERVER_URL=http://127.0.0.1:8080/UDIC_UCLOUD_SERVER + + + diff --git a/api-admin/src/main/resources/application.properties b/api-admin/src/main/resources/application.properties new file mode 100644 index 00000000..e487e916 --- /dev/null +++ b/api-admin/src/main/resources/application.properties @@ -0,0 +1,8 @@ +spring.profiles.active=dev + +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver + +mybatis.config-location=classpath:mybatis/mybatis-config.xml +mybatis.mapper-locations=classpath:mybatis/mapper/*/*.xml + +spring.jmx.enabled=false \ No newline at end of file diff --git a/api-admin/src/main/resources/logback-spring.xml b/api-admin/src/main/resources/logback-spring.xml new file mode 100644 index 00000000..daa05617 --- /dev/null +++ b/api-admin/src/main/resources/logback-spring.xml @@ -0,0 +1,145 @@ + + + logback + + + + + + %d{HH:mm:ss.SSS} %contextName [%thread] %-5level %logger{36} - %msg%n + + + + + + + + + + ${log.path}/web_debug.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + + ${log.path}/web-debug-%d{yyyy-MM-dd}.%i.log + + 40MB + + + 15 + + + + debug + ACCEPT + DENY + + + + + + + ${log.path}/web_info.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + + ${log.path}/web-info-%d{yyyy-MM-dd}.%i.log + + 40MB + + + 15 + + + + info + ACCEPT + DENY + + + + + + + ${log.path}/web_warn.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + ${log.path}/web-warn-%d{yyyy-MM-dd}.%i.log + + 40MB + + + 15 + + + + warn + ACCEPT + DENY + + + + + + + ${log.path}/web_error.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + ${log.path}/web-error-%d{yyyy-MM-dd}.%i.log + + 40MB + + + 15 + + + + ERROR + ACCEPT + DENY + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/configuration.xml b/api-admin/src/main/resources/mybatis/configuration.xml new file mode 100644 index 00000000..771e01b3 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/configuration.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/db.properties b/api-admin/src/main/resources/mybatis/db.properties new file mode 100644 index 00000000..8caaaaff --- /dev/null +++ b/api-admin/src/main/resources/mybatis/db.properties @@ -0,0 +1,5 @@ +jdbc.jar.path=D:/Program Files/maven/maven-repository/mysql/mysql-connector-java/8.0.21/mysql-connector-java-8.0.21.jar +jdbc.driver=com.mysql.cj.jdbc.Driver +jdbc.url=jdbc:mysql://127.0.0.1:3306/warehouse?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false +jdbc.username=root +jdbc.password=123456 \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml b/api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml new file mode 100644 index 00000000..38549386 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + INSERT INTO auth_user(userName,passWord,lastLoginIp,lastLoginTime,createTime,userFlag,employeeName) + values + (#{userName}, + + + #{passWord}, + + + '', + + + + + + + #{lastLoginIp}, + + + '', + + + + + #{lastLoginTime}, + + + '0001-01-01 00:00:00', + + + #{createTime}, + #{userFlag,jdbcType=INTEGER}, + #{employeeName}) + + + + UPDATE auth_user + + userName=#{userName}, + passWord=#{passWord}, + lastLoginIp=#{lastLoginIp}, + lastLoginTime=#{lastLoginTime}, + userFlag=#{userFlag}, + employeeName=#{employeeName} + + WHERE id=#{id} + + + + delete from auth_user where id = #{id} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/AuthPermissionDao.xml b/api-admin/src/main/resources/mybatis/mapper/auth/AuthPermissionDao.xml new file mode 100644 index 00000000..199cd862 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/auth/AuthPermissionDao.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + INSERT INTO auth_permission + (roleId, permissionRuleId,`type`) + VALUES + + + (#{item.roleId}, #{item.permissionRuleId}, #{item.type}) + + + + + + + delete from auth_permission where roleId = #{roleId} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/AuthPermissionRuleDao.xml b/api-admin/src/main/resources/mybatis/mapper/auth/AuthPermissionRuleDao.xml new file mode 100644 index 00000000..192b5680 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/auth/AuthPermissionRuleDao.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + INSERT INTO auth_permission_rule(pid,`name`,`title`,`status`,`condition`,`listorder`,create_time,update_time) + values + (#{pid}, + #{name}, + #{title}, + #{status}, + + + #{condition}, + + + '', + + + #{listorder}, + #{createTime}, + #{updateTime}) + + + + UPDATE auth_permission_rule + + pid=#{pid}, + `name`=#{name}, + title=#{title}, + `status`=#{status}, + `condition`=#{condition}, + `listorder`=#{listorder}, + update_time=#{updateTime}, + + WHERE id=#{id} + + + + delete from auth_permission_rule where id = #{id} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/AuthRoleAdminDao.xml b/api-admin/src/main/resources/mybatis/mapper/auth/AuthRoleAdminDao.xml new file mode 100644 index 00000000..91f75dcc --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/auth/AuthRoleAdminDao.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + INSERT INTO auth_role_admin + (role_id, admin_id) + VALUES + + + (#{item.role_id}, #{item.admin_id}) + + + + + + delete from auth_role_admin where admin_id = #{adminId} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/AuthRoleDao.xml b/api-admin/src/main/resources/mybatis/mapper/auth/AuthRoleDao.xml new file mode 100644 index 00000000..ca9ed9cb --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/auth/AuthRoleDao.xml @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + INSERT INTO auth_role(`name`,pid,`status`,`remark`,`listorder`,create_time,update_time) + values + ( + #{name}, + + + #{pid}, + + + 0, + + + #{status}, + + + #{remark}, + + + '', + + + + + #{listorder}, + + + 999, + + + #{createTime}, + #{updateTime} + ) + + + + UPDATE auth_role + + `name`=#{name}, + pid=#{pid}, + `status`=#{status}, + remark=#{remark}, + `listorder`=#{listorder}, + update_time=#{updateTime}, + + WHERE id=#{id} + + + + delete from auth_role where id = #{id} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml new file mode 100644 index 00000000..7e52c3a6 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml @@ -0,0 +1,85 @@ + + + + + + + + + + INSERT INTO basic_corp + (thirdId,erpId,name,spell, + addr,status,type,creditNo,contact,mobile) + values + ( + #{thirdId}, + #{erpId}, + #{name}, + #{spell}, + #{addr}, + #{status}, + #{type}, + #{creditNo}, + #{contact}, + #{mobile} + ) + + + + insert INTO basic_corp( + thirdId,erpId,name,spell,addr, + status,type,creditNo,contact,mobile + ) values + ( + #{thirdId}, + #{erpId}, + #{name}, + #{spell}, + #{addr}, + #{status}, + #{type}, + #{creditNo}, + #{contact}, + #{mobile} + ) + + + + UPDATE basic_corp + + thirdId=#{thirdId}, + erpId=#{erpId}, + name=#{name}, + spell=#{spell}, + addr=#{addr}, + status=#{status}, + type=#{type}, + creditNo=#{creditNo}, + contact=#{contact}, + mobile=#{mobile}, + + WHERE id=#{id} + + + + DELETE FROM basic_corp WHERE id = #{id} + + + + + diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml new file mode 100644 index 00000000..7e9ec433 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml @@ -0,0 +1,56 @@ + + + + + + + + + + INSERT INTO basic_bussiness_type + (action,name,enable,remark,mainAction) + values + ( + #{action}, + #{name}, + #{enable}, + #{remark}, + #{mainAction} + ) + + + + UPDATE basic_bussiness_type SET + action = #{action}, + name = #{name}, + enable = #{enable}, + remark = #{remark} + mainAction = #{mainAction} + WHERE id = #{id} + + + + DELETE FROM basic_bussiness_type WHERE id = #{id} + + + + + diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml new file mode 100644 index 00000000..18e30a35 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml @@ -0,0 +1,154 @@ + + + + + + + + + + + + + + replace INTO basic_products + ( + nameCode,packRatio,packLevel,bhxjsl, + bhzxxsbzsl,zxxsbzbhsydysl,bhxjcpbm,bzcj,addType,deviceRecordKey, + cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm,ylqxzcrbarmc,zczbhhzbapzbh,ylqxzcrbarywmc,uuid,sjcpbm,versionNumber + ,diType + ) + values + ( + #{nameCode}, + #{packRatio}, + #{packLevel}, + #{bhxjsl}, + #{bhzxxsbzsl}, + #{zxxsbzbhsydysl}, + #{bhxjcpbm}, + #{bzcj}, + #{addType}, + #{deviceRecordKey}, + #{cpmctymc}, + #{cplb}, + #{flbm}, + #{ggxh}, + #{qxlb}, + #{tyshxydm}, + #{ylqxzcrbarmc}, + #{zczbhhzbapzbh}, + #{ylqxzcrbarywmc}, + #{uuid}, + #{sjcpbm}, + #{versionNumber}, + #{diType} + ) + + + + replace INTO basic_products + ( + nameCode,packRatio,packLevel,bhxjsl, + bhzxxsbzsl,zxxsbzbhsydysl,bhxjcpbm,bzcj,addType,deviceRecordKey, + cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm,ylqxzcrbarmc,zczbhhzbapzbh,ylqxzcrbarywmc,uuid,sjcpbm,versionNumber + ,diType + ) + values + + + ( + #{item.nameCode}, + #{item.packRatio}, + #{item.packLevel}, + #{item.bhxjsl}, + #{item.bhzxxsbzsl}, + #{item.zxxsbzbhsydysl}, + #{item.bhxjcpbm}, + #{item.bzcj}, + #{item.addType}, + #{item.deviceRecordKey}, + #{item.cpmctymc}, + #{item.cplb}, + #{item.flbm}, + #{item.ggxh}, + #{item.qxlb}, + #{item.tyshxydm}, + #{item.ylqxzcrbarmc}, + #{item.zczbhhzbapzbh}, + #{item.ylqxzcrbarywmc}, + #{item.uuid}, + #{item.sjcpbm}, + #{item.versionNumber}, + #{item.diType} + ) + + + + + DELETE FROM basic_products WHERE id = #{id} + + + + DELETE FROM basic_products WHERE uuid = #{uuid} + + + + UPDATE basic_products + + packRatio=#{packRatio}, + packLevel=#{packLevel}, + bhxjsl=#{bhxjsl}, + bhzxxsbzsl=#{bhzxxsbzsl}, + zxxsbzbhsydysl=#{zxxsbzbhsydysl}, + bhxjcpbm=#{bhxjcpbm}, + bzcj=#{bzcj}, + addType=#{addType}, + deviceRecordKey=#{deviceRecordKey}, + cpmctymc=#{cpmctymc}, + cplb=#{cplb}, + flbm=#{flbm}, + ggxh=#{ggxh}, + qxlb=#{qxlb}, + tyshxydm=#{tyshxydm}, + ylqxzcrbarmc=#{ylqxzcrbarmc}, + ylqxzcrbarywmc=#{ylqxzcrbarywmc}, + uuid=#{uuid}, + sjcpbm=#{sjcpbm}, + versionNumber=#{versionNumber}, + diType=#{diType}, + + WHERE nameCode = #{nameCode} + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml new file mode 100644 index 00000000..cbf199b0 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -0,0 +1,141 @@ + + + + + + + + + + + + + + + + + + + replace INTO basic_udirel + ( + thirdId,thirdName,uuid,isUseDy,updateTime,batchNo,warehouseName + ) + values + ( + #{thirdId}, + #{thirdName}, + #{uuid}, + #{isUseDy}, + #{updateTime}, + #{batchNo}, + #{warehouseName} + ) + + + + + DELETE FROM basic_udirel WHERE id = #{id} + + + DELETE FROM basic_udirel WHERE id in + + #{item} + + + + DELETE FROM basic_udirel WHERE uuid = #{uuid} + + + + UPDATE basic_udirel + + thirdId=#{thirdId}, + thirdName=#{thirdName}, + uuid=#{uuid}, + isUseDy=#{isUseDy}, + updateTime=#{updateTime}, + batchNo=#{batchNo}, + warehouseName=#{warehouseName}, + + WHERE id = #{id} + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UnitMaintainDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/UnitMaintainDao.xml new file mode 100644 index 00000000..36ab4d15 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/basic/UnitMaintainDao.xml @@ -0,0 +1,49 @@ + + + + + + + + + + INSERT INTO basic_corp + (thirdId,erpId,name,spell, + addr,status,type,contact,mobile,creditNo) + values + ( + #{thirdId}, + #{erpId}, + #{name}, + #{spell}, + #{addr}, + #{status}, + #{type}, + #{contact}, + #{mobile}, + #{creditNo} + ) + + + + DELETE FROM basic_corp WHERE id = #{id} + + + + + diff --git a/api-admin/src/main/resources/mybatis/mapper/info/CompanyDao.xml b/api-admin/src/main/resources/mybatis/mapper/info/CompanyDao.xml new file mode 100644 index 00000000..cb0ba302 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/info/CompanyDao.xml @@ -0,0 +1,37 @@ + + + + + + + + + + UPDATE company SET + name = #{name}, + category = #{category}, + creditCode = #{creditCode}, + addr = #{addr}, + productAddr = #{productAddr}, + classes = #{classes}, + appId = #{appId}, + appSecret = #{appSecret} + + + + INSERT INTO company(name,category,creditCode,addr,productAddr,classes,appId,appSecret) values + ( #{name}, + #{category}, + #{creditCode}, + #{addr}, + #{productAddr}, + #{classes}, + #{appId}, + #{appSecret}) + + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/info/ScheduleDao.xml b/api-admin/src/main/resources/mybatis/mapper/info/ScheduleDao.xml new file mode 100644 index 00000000..951ad044 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/info/ScheduleDao.xml @@ -0,0 +1,40 @@ + + + + + + + + insert INTO scheduled + (cronName,cron,customerId) + values + ( + #{cronName}, + #{cron}, + #{customerId} + ) + + + + + delete from scheduled where id = #{id} + + + + + + + diff --git a/api-admin/src/main/resources/mybatis/mapper/info/SetupDao.xml b/api-admin/src/main/resources/mybatis/mapper/info/SetupDao.xml new file mode 100644 index 00000000..49fbdb3e --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/info/SetupDao.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + UPDATE system_config + + erpSaleOutModify=#{erpSaleOutModify}, + erpGetSaleOut=#{erpGetSaleOut}, + erpSaleOutSign=#{erpSaleOutSign}, + filterSaleOutSign=#{filterSaleOutSign}, + erpGetSaleOutDay=#{erpGetSaleOutDay}, + + erpPruchaseModify=#{erpPruchaseModify}, + erpGetPurchaseIn=#{erpGetPurchaseIn}, + erpPruchaseSign=#{erpPruchaseSign}, + erpGetPurchaseDay=#{erpGetPurchaseDay}, + filterPurchaseSign=#{filterPurchaseSign}, + remark=#{remark}, + forbidSameErp=#{forbidSameErp}, + returnWareHouseOut=#{returnWareHouseOut}, + salesWareHouseOut=#{salesWareHouseOut}, + returnWareHouseIn=#{returnWareHouseIn}, + updateErpData=#{updateErpData}, + dlStockErp=#{dlStockErp}, + dlStockErpDay=#{dlStockErpDay}, + + WHERE id=#{id} + + + + + + insert INTO system_config(erpSaleOutModify, + erpGetSaleOut,erpSaleOutSign,filterSaleOutSign,erpGetSaleOutDay,erpPruchaseModify, + erpGetPurchaseIn,erpPruchaseSign, + erpGetPurchaseDay,filterPurchaseSign,remark,forbidSameErp, + returnWareHouseOut,salesWareHouseOut,returnWareHouseIn,updateErpData,dlStockErp,dlStockErpDay + ) values + ( + #{erpSaleOutModify},#{erpGetSaleOut}, #{erpSaleOutSign}, + #{filterSaleOutSign}, #{erpGetSaleOutDay},#{erpPruchaseModify}, #{erpGetPurchaseIn}, + #{erpPruchaseSign}, + #{erpGetPurchaseDay}, #{filterPurchaseSign}, + #{remark},#{forbidSameErp} + ,#{returnWareHouseOut},#{salesWareHouseOut},#{returnWareHouseIn},#{updateErpData},#{dlStockErp},#{dlStockErpDay}) + + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/info/SystemParamConfigDao.xml b/api-admin/src/main/resources/mybatis/mapper/info/SystemParamConfigDao.xml new file mode 100644 index 00000000..0b8fd2c6 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/info/SystemParamConfigDao.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + UPDATE system_param_config + + paramName=#{paramName}, + paramKey=#{paramKey}, + paramValue=#{paramValue}, + paramStatus=#{paramStatus}, + paramType=#{paramType}, + paramExplain=#{paramExplain}, + + WHERE id=#{id} + + + + UPDATE system_param_config + + paramStatus=#{paramStatus}, + + WHERE parentId=#{parentId} + + + + insert INTO system_param_config(paramName, + paramKey,paramValue,paramStatus,paramType,paramExplain + ) values + ( + #{paramName}, + #{paramKey}, + #{paramValue}, + #{paramStatus}, + #{paramType}, + #{paramExplain} + ) + + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/CodesDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/CodesDao.xml new file mode 100644 index 00000000..b8d2405a --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/inout/CodesDao.xml @@ -0,0 +1,115 @@ + + + + + + + + + + + + INSERT INTO io_codes(action,mainAction,code,corpOrderId,actor,actDate,wrongCode,upperCorpOrderId,fromCorpId,fromCorp,type) + values( + #{action}, + #{mainAction}, + #{code}, + #{corpOrderId}, + #{actor}, + #{actDate}, + #{wrongCode}, + #{upperCorpOrderId}, + #{fromCorpId}, + #{fromCorp},#{orderId},#{type}) + + + + INSERT INTO io_codes + (action, + mainAction, + code, + corpOrderId, + actor, + actDate, + wrongCode, + upperCorpOrderId, + fromCorpId,fromCorp,orderId,batchNo,produceDate,expireDate,serialNo,udi,count,type) + VALUES + + ( + #{item.action}, + #{item.mainAction}, + #{item.code}, + #{item.corpOrderId}, + #{item.actor}, + #{item.actDate}, + #{item.wrongCode}, + #{item.upperCorpOrderId}, + #{item.fromCorpId}, + #{ + item.fromCorp + },#{item.orderId},#{item.batchNo} + ,#{item.produceDate} + ,#{item.expireDate} + ,#{item.serialNo} + ,#{item.udi} + ,#{item.count} + ,#{item.type}) + + + + + + + + + + + UPDATE io_codes SET orderId = #{newOrderId} where orderId = #{oldOrderId} + + + + + UPDATE io_codes SET fromCorpID = #{fromCorpID}, fromCorp = #{fromCorp} + WHERE orderId = #{orderId} + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/CodesTempDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/CodesTempDao.xml new file mode 100644 index 00000000..9802f3d4 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/inout/CodesTempDao.xml @@ -0,0 +1,46 @@ + + + + + + + + INSERT INTO io_codes_temp + (action, mainAction,code, corpOrderId, actor,actDate, + fromCorpID, fromCorp, orderId,batchNo,produceDate,expireDate,serialNo,udi,count) + VALUES + + ( + #{item.action}, + #{item.mainAction}, + #{item.code}, + #{item.corpOrderId}, + #{item.actor}, + #{item.actDate}, + #{item.fromCorpID}, + #{item.fromCorp}, + #{item.orderId} + ,#{item.batchNo} + ,#{item.produceDate} + ,#{item.expireDate} + ,#{item.serialNo} + ,#{item.udi} + ,#{item.count} + ) + + + + + + DELETE FROM io_codes_temp WHERE id IN + + #{item} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml new file mode 100644 index 00000000..9affeb6c --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml @@ -0,0 +1,210 @@ + + + + + + + + + + + + + insert INTO io_order(id,action,corpOrderId,actDate,fromCorpId,actor,mainAction, + fromCorp,status,remark,exportStatus,fromType,contrastStatus,signStatus,erpFk,stockCheckFk) + values( + #{id}, + #{action}, + #{corpOrderId}, + #{actDate}, + #{fromCorpId}, + #{actor}, + #{mainAction}, + #{fromCorp}, + #{status}, + #{remark}, + #{exportStatus}, + #{fromType}, + #{contrastStatus}, + #{signStatus}, + #{erpFk}, + #{stockCheckFk}) + + + UPDATE io_order + + action=#{action}, + corpOrderId=#{corpOrderId}, + actDate=#{actDate}, + fromCorpId=#{fromCorpId}, + actor=#{actor}, + mainAction=#{mainAction}, + fromCorp=#{fromCorp}, + status=#{status}, + remark=#{remark}, + exportStatus=#{exportStatus}, + fromType=#{fromType}, + contrastStatus=#{contrastStatus}, + erpFk=#{erpFk}, + signStatus=#{signStatus} + stockCheckFk=#{stockCheckFk} + + WHERE id = #{id} + + + + + DELETE FROM io_order WHERE id = #{orderId} + + + + DELETE FROM io_order WHERE id = #{id} + + + + UPDATE io_order SET fromCorpId = #{fromCorpId},fromCorp = #{fromCorp} where id = #{id} + + + + UPDATE io_order SET `status` = #{status} where id = #{orderId} + + + UPDATE io_order SET `exportStatus` = #{exportStatus} where id = #{orderId} + + + UPDATE io_order SET `contrastStatus` = #{contrastStatus} where id = #{orderId} + + + UPDATE io_order SET `signStatus` = #{signStatus} where id = #{orderId} + + + UPDATE io_order SET `remark` = #{remark} where id = #{orderId} + + + + + + + + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDetail.xml b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDetail.xml new file mode 100644 index 00000000..9d33e0b0 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDetail.xml @@ -0,0 +1,183 @@ + + + + + + + + + + + + + + + + + + + + + + + + replace INTO io_order_detail(id, + companyid,erpOrderId,iodtlId,inoutId,goodsunit,goodsid, + batchNoId,goodsname,companyname, + batchNo,erpCount,credate,nameCode,productCompany, + coName,authCode,packSpec,packRatio,bhzxxsbzsl, + zxxsbzbhsydysl,orderIdFk,count,reCount) + values( + #{id}, + #{companyid}, + #{erpOrderId}, + #{iodtlId}, + #{inoutId}, + #{goodsunit}, + #{goodsid}, + #{batchNoId}, + #{goodsname}, + #{companyname}, + #{batchNo}, + #{erpCount}, + #{credate}, + #{nameCode},#{productCompany},#{coName},#{authCode},#{packSpec},#{packRatio}, + #{bhzxxsbzsl},#{zxxsbzbhsydysl},#{orderIdFk},#{count},#{reCount} + ) + + + + replace INTO io_order_detail(id, + companyid,erpOrderId,iodtlId,inoutId,goodsunit,goodsid,batchNoId,goodsname,companyname, + batchNo,erpCount,credate,nameCode,productCompany, + coName,authCode,packSpec,packRatio,bhzxxsbzsl,zxxsbzbhsydysl,orderIdFk,count,reCount) + values + + + ( + #{item.id}, + #{item.companyid}, + #{item.erpOrderId}, + #{item.iodtlId}, + #{item.inoutId}, + #{item.goodsunit}, + #{item.goodsid}, + #{item.batchNoId}, + #{item.goodsname}, + #{item.companyname}, + #{item.batchNo}, + #{item.erpCount}, #{item.credate}, + #{item.nameCode}, #{item.productCompany}, #{item.coName}, #{item.authCode}, #{item.packSpec}, + #{item.packRatio}, #{item.bhzxxsbzsl}, + #{item.zxxsbzbhsydysl}, #{item.orderIdFk}, #{item.count},#{item.reCount}) + + + + + UPDATE io_order_detail + + count=#{count}, + reCount=#{reCount}, + + WHERE id = #{id} + + + DELETE FROM io_order_detail WHERE docid = #{id} + + + + DELETE FROM io_order_detail WHERE id = #{id} + + + + DELETE FROM io_order_detail WHERE orderIdFk = #{id} + + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvErpStockDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvErpStockDao.xml new file mode 100644 index 00000000..0c07cb75 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvErpStockDao.xml @@ -0,0 +1,71 @@ + + + + + + + + + replace INTO erpstock + ( + orderId,code,batchNo,manufacturingDate,expirationDate,count,remark,name + ) + values + ( + #{orderId}, + #{code}, + #{batchNo}, + #{manufacturingDate}, + #{count}, + #{remark}, + #{name} + ) + + + + replace INTO erpstock + ( + orderId,code,batchNo,manufacturingDate,expirationDate,count,remark,name + ) + values + + + ( + #{item.orderId}, + #{item.code}, + #{item.batchNo}, + #{item.manufacturingDate}, + #{item.expirationDate}, + #{item.count}, + #{item.remark}, + #{item.name} + ) + + + + + DELETE FROM erpstock WHERE id = #{id} + + + + UPDATE erpstock + + orderId=#{orderId}, + code=#{code}, + batchNo=#{batchNo}, + manufacturingDate=#{manufacturingDate}, + expirationDate=#{expirationDate}, + count=#{count}, + remark=#{remark}, + name=#{name}, + + WHERE id = #{id} + + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvOrderCheckDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvOrderCheckDao.xml new file mode 100644 index 00000000..fb6ad438 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvOrderCheckDao.xml @@ -0,0 +1,66 @@ + + + + + + + + + + insert INTO stockcheck + ( + action,actDate,status,remark,endTime,whouse,houseCard + ) + values + ( + #{action}, + #{actDate}, + #{status}, + #{remark},#{endTime},#{whouse},#{houseCard} + ) + + + + + DELETE FROM stockcheck WHERE id = #{id} + + + + UPDATE stockcheck + + action=#{action}, + actDate=#{actDate}, + status=#{status}, + remark=#{remark}, + endTime=#{endTime}, + whouse=#{whouse}, + houseCard=#{houseCard}, + + WHERE id = #{id} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvStockPrintDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvStockPrintDao.xml new file mode 100644 index 00000000..baddf9a6 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvStockPrintDao.xml @@ -0,0 +1,142 @@ + + + + + + + + + + + + replace INTO stockprint + ( + udiCode,udiRlIdFk,nameCode,cpmctymc,batchNo, + produceDate,expireDate,serialNo,codeType,thirdId,thirdName, + ggxh,ylqxzcrbarmc,zczbhhzbapzbh,warehouseName,warehouseCode + ) + values + ( + #{udiCode}, + #{udiRlIdFk}, + #{nameCode}, + #{cpmctymc}, + #{batchNo}, + #{produceDate}, + #{expireDate}, + #{serialNo}, + #{codeType}, + #{thirdId}, + #{thirdName}, + #{ggxh}, + #{ylqxzcrbarmc}, + #{zczbhhzbapzbh}, + #{warehouseName}, + #{warehouseCode} + ) + + + + replace INTO stockprint + ( + udiCode,udiRlIdFk,nameCode,cpmctymc,batchNo, + produceDate,expireDate,serialNo,codeType,thirdId,thirdName, + ggxh,ylqxzcrbarmc,zczbhhzbapzbh,warehouseName,warehouseCode + ) + values + + + ( + #{item.udiCode}, + #{item.udiRlIdFk}, + #{item.nameCode}, + #{item.cpmctymc}, + #{item.batchNo}, + #{item.produceDate}, + #{item.expireDate}, + #{item.serialNo}, + #{item.codeType}, + #{item.thirdId}, + #{item.thirdName}, + #{item.ggxh}, + #{item.ylqxzcrbarmc}, + #{item.zczbhhzbapzbh}, + #{item.warehouseName}, + #{item.warehouseCode} + ) + + + + + DELETE FROM stockprint WHERE id = #{id} + + + + UPDATE stockprint + + udiCode=#{udiCode}, + udiRlIdFk=#{udiRlIdFk}, + nameCode=#{nameCode}, + cpmctymc=#{cpmctymc}, + batchNo=#{batchNo}, + produceDate=#{produceDate}, + expireDate=#{expireDate}, + serialNo=#{serialNo}, + codeType=#{codeType}, + thirdId=#{thirdId}, + thirdName=#{thirdName}, + printStatus=#{printStatus}, + ggxh=#{ggxh}, + ylqxzcrbarmc=#{ylqxzcrbarmc}, + zczbhhzbapzbh=#{zczbhhzbapzbh}, + warehouseName=#{warehouseName}, + warehouseCode=#{warehouseCode}, + + + WHERE id = #{id} + + + + + update stockprint + set printStatus = 1 + WHERE id in + + #{item} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mybatis-config.xml b/api-admin/src/main/resources/mybatis/mybatis-config.xml new file mode 100644 index 00000000..a72d9782 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mybatis-config.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/static/.gitignore b/api-admin/src/main/resources/static/.gitignore new file mode 100644 index 00000000..c96a04f0 --- /dev/null +++ b/api-admin/src/main/resources/static/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore \ No newline at end of file diff --git a/api-admin/src/main/resources/templates/.gitignore b/api-admin/src/main/resources/templates/.gitignore new file mode 100644 index 00000000..c96a04f0 --- /dev/null +++ b/api-admin/src/main/resources/templates/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore \ No newline at end of file diff --git a/api-admin/src/test/java/com/glxp/api/BaseApiAdminApplicationTest.java b/api-admin/src/test/java/com/glxp/api/BaseApiAdminApplicationTest.java new file mode 100644 index 00000000..fa474fb7 --- /dev/null +++ b/api-admin/src/test/java/com/glxp/api/BaseApiAdminApplicationTest.java @@ -0,0 +1,10 @@ +package com.glxp.api; + +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class BaseApiAdminApplicationTest { +} diff --git a/api-admin/src/test/java/com/glxp/api/admin/service/auth/impl/AuthAdminServiceImplTest.java b/api-admin/src/test/java/com/glxp/api/admin/service/auth/impl/AuthAdminServiceImplTest.java new file mode 100644 index 00000000..3ba92ba3 --- /dev/null +++ b/api-admin/src/test/java/com/glxp/api/admin/service/auth/impl/AuthAdminServiceImplTest.java @@ -0,0 +1,70 @@ +package com.glxp.api.admin.service.auth.impl; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.req.auth.AuthAdminQueryRequest; +import com.glxp.api.BaseApiAdminApplicationTest; +import com.glxp.api.admin.entity.auth.AuthAdmin; +import com.glxp.api.admin.service.auth.AuthAdminService; +import org.junit.Test; + +import javax.annotation.Resource; + +import java.util.*; + +import static org.junit.Assert.*; + +public class AuthAdminServiceImplTest extends BaseApiAdminApplicationTest { + + @Resource + private AuthAdminService authAdminService; + + @Test + public void listAdminPage() { + + Integer page = 1; + Integer limit = 20; + Integer status = 1; + String username = "api"; + Long roleId = 1L; + + AuthAdminQueryRequest authAdminQueryForm = new AuthAdminQueryRequest(); + authAdminQueryForm.setPage(page); + authAdminQueryForm.setLimit(limit); + authAdminQueryForm.setUserFlag(status); + authAdminQueryForm.setUserName(username); + + List authAdminList = authAdminService.listAdminPage(authAdminQueryForm); + PageInfo authAdminPageInfo = new PageInfo<>(authAdminList); + System.out.println(authAdminPageInfo.getList()); + assertTrue(authAdminPageInfo.getList().size() > 0); + } + + @Test + public void findByUserName() { + } + + @Test + public void findById() { + } + + @Test + public void findPwdById() { + } + + @Test + public void insertAuthAdmin() { + + AuthAdmin authAdmin = new AuthAdmin(); + authAdmin.setUserName("sssfff4"); + authAdmin.setCreateTime(new Date()); + authAdmin.setUserFlag(1); + + boolean b = authAdminService.insertAuthAdmin(authAdmin); + assertTrue(b); + } + + @Test + public void updateAuthAdmin() { + } + +} \ No newline at end of file diff --git a/api-admin/src/test/java/com/glxp/api/admin/service/auth/impl/AuthLoginServiceImplTest.java b/api-admin/src/test/java/com/glxp/api/admin/service/auth/impl/AuthLoginServiceImplTest.java new file mode 100644 index 00000000..b37c4b9b --- /dev/null +++ b/api-admin/src/test/java/com/glxp/api/admin/service/auth/impl/AuthLoginServiceImplTest.java @@ -0,0 +1,26 @@ +package com.glxp.api.admin.service.auth.impl; + +import com.glxp.api.BaseApiAdminApplicationTest; +import com.glxp.api.admin.service.auth.AuthLoginService; +import org.junit.Test; + +import javax.annotation.Resource; + + +import java.util.List; + +public class AuthLoginServiceImplTest extends BaseApiAdminApplicationTest { + + @Resource + private AuthLoginService authLoginService; + + @Test + public void listRuleByAdminId() { + + Long adminId = 2L; + + List strings = authLoginService.listRuleByAdminId(adminId); + + + } +} \ No newline at end of file diff --git a/api-admin/src/test/java/com/glxp/api/admin/service/auth/impl/AuthPermissionRuleServiceImplTest.java b/api-admin/src/test/java/com/glxp/api/admin/service/auth/impl/AuthPermissionRuleServiceImplTest.java new file mode 100644 index 00000000..5da51dd2 --- /dev/null +++ b/api-admin/src/test/java/com/glxp/api/admin/service/auth/impl/AuthPermissionRuleServiceImplTest.java @@ -0,0 +1,37 @@ +package com.glxp.api.admin.service.auth.impl; + +import com.glxp.api.BaseApiAdminApplicationTest; +import com.glxp.api.admin.entity.auth.AuthPermissionRule; +import com.glxp.api.admin.service.auth.AuthPermissionRuleService; +import org.junit.Test; + +import javax.annotation.Resource; + +import java.util.List; + +import static org.junit.Assert.*; + +public class AuthPermissionRuleServiceImplTest extends BaseApiAdminApplicationTest { + + @Resource + private AuthPermissionRuleService authPermissionRuleService; + + @Test + public void listByIdIn() { + } + + @Test + public void listByPid() { + List authPermissionRuleList = authPermissionRuleService.listByPid(0L); + + assertTrue(authPermissionRuleList.size() > 0); + } + + @Test + public void listAll() { + + List authPermissionRuleList = authPermissionRuleService.listAll(); + + assertTrue(authPermissionRuleList.size() > 0); + } +} \ No newline at end of file diff --git a/api-admin/src/test/java/com/glxp/api/admin/service/auth/impl/AuthRoleAdminServiceImplTest.java b/api-admin/src/test/java/com/glxp/api/admin/service/auth/impl/AuthRoleAdminServiceImplTest.java new file mode 100644 index 00000000..bc395516 --- /dev/null +++ b/api-admin/src/test/java/com/glxp/api/admin/service/auth/impl/AuthRoleAdminServiceImplTest.java @@ -0,0 +1,46 @@ +package com.glxp.api.admin.service.auth.impl; + +import com.glxp.api.BaseApiAdminApplicationTest; +import com.glxp.api.admin.entity.auth.AuthRoleAdmin; +import com.glxp.api.admin.service.auth.AuthRoleAdminService; +import org.junit.Test; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +import static org.junit.Assert.*; + +public class AuthRoleAdminServiceImplTest extends BaseApiAdminApplicationTest { + + @Resource + private AuthRoleAdminService authRoleAdminService; + + @Test + public void listByAdminId() { + } + + @Test + public void listByRoleId() { + } + + @Test + public void insertAuthRoleAdminAll() { + + List authRoleAdminList = new ArrayList<>(); + + long len = 3; + for (long i = 1; i <= len; i++) { + AuthRoleAdmin authRoleAdmin = new AuthRoleAdmin(); + if (i % 2 == 0) { + authRoleAdmin.setRole_id(i); + } + authRoleAdmin.setAdmin_id(i + 1); + authRoleAdminList.add(authRoleAdmin); + } + int i = authRoleAdminService.insertAuthRoleAdminAll(authRoleAdminList); + + System.out.println(i); + assertEquals(1, i); + } +} \ No newline at end of file diff --git a/api-admin/src/test/java/com/glxp/api/admin/service/auth/impl/AuthRoleServiceImplTest.java b/api-admin/src/test/java/com/glxp/api/admin/service/auth/impl/AuthRoleServiceImplTest.java new file mode 100644 index 00000000..774797cd --- /dev/null +++ b/api-admin/src/test/java/com/glxp/api/admin/service/auth/impl/AuthRoleServiceImplTest.java @@ -0,0 +1,32 @@ +package com.glxp.api.admin.service.auth.impl; + +import com.glxp.api.BaseApiAdminApplicationTest; +import com.glxp.api.admin.entity.auth.AuthRole; +import com.glxp.api.admin.service.auth.AuthRoleService; +import org.junit.Test; + +import javax.annotation.Resource; + +import java.util.List; + +import static org.junit.Assert.*; + +public class AuthRoleServiceImplTest extends BaseApiAdminApplicationTest { + + @Resource + private AuthRoleService authRoleService; + + @Test + public void listAdminPage() { + } + + @Test + public void listAuthAdminRolePage() { + + Integer page = 1; + Integer limit = 20; + + List authRoleList = authRoleService.listAuthAdminRolePage(page, limit, null); + assertTrue(authRoleList.size() > 0); + } +} \ No newline at end of file diff --git a/api-admin/src/test/java/com/glxp/api/admin/service/auth/impl/MmpaTest.java b/api-admin/src/test/java/com/glxp/api/admin/service/auth/impl/MmpaTest.java new file mode 100644 index 00000000..b065eebf --- /dev/null +++ b/api-admin/src/test/java/com/glxp/api/admin/service/auth/impl/MmpaTest.java @@ -0,0 +1,24 @@ +package com.glxp.api.admin.service.auth.impl; + +import com.alibaba.fastjson.JSONObject; +import com.glxp.api.BaseApiAdminApplicationTest; +import org.junit.Test; +import org.springframework.http.ResponseEntity; +import org.springframework.web.client.RestTemplate; + +import javax.annotation.Resource; + +public class MmpaTest extends BaseApiAdminApplicationTest { + RestTemplate restTemplate = new RestTemplate(); + + @Test + public void testConnect() { + ResponseEntity response = restTemplate.postForEntity("https://udid.nmpa.gov.cn/api/beta/v1/connection/erp", "", String.class); + System.out.println(response.getBody()); + } + + + + + +} diff --git a/api-admin/src/test/java/com/glxp/api/admin/util/DlDeviceTest.java b/api-admin/src/test/java/com/glxp/api/admin/util/DlDeviceTest.java new file mode 100644 index 00000000..0e5df2ab --- /dev/null +++ b/api-admin/src/test/java/com/glxp/api/admin/util/DlDeviceTest.java @@ -0,0 +1,34 @@ +package com.glxp.api.admin.util; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.glxp.api.admin.httpclient.UdiDlHttpClient; +import com.glxp.api.admin.entity.basic.UdiInfoEntity; +import com.glxp.api.admin.entity.udid.*; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class DlDeviceTest { + + private static final Logger log = LoggerFactory.getLogger(JwtUtilsTest.class); + + + @Test + public void testDonwload() { +// downDevice(); + } + + + @Test + public void getDi(){ + List udiInfoEntityList = new UdiDlHttpClient("http://127.0.0.1:9994").getUdiByDi("08714729834663"); + log.info("rrr"); + } + +} diff --git a/api-admin/src/test/java/com/glxp/api/admin/util/JwtUtilsTest.java b/api-admin/src/test/java/com/glxp/api/admin/util/JwtUtilsTest.java new file mode 100644 index 00000000..1b8660b3 --- /dev/null +++ b/api-admin/src/test/java/com/glxp/api/admin/util/JwtUtilsTest.java @@ -0,0 +1,65 @@ +package com.glxp.api.admin.util; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.TypeReference; +import com.glxp.api.BaseApiAdminApplicationTest; +import io.jsonwebtoken.Claims; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.Map; + +import static org.junit.Assert.assertNotNull; + +public class JwtUtilsTest extends BaseApiAdminApplicationTest { + + private static final Logger log = LoggerFactory.getLogger(JwtUtilsTest.class); + + @Test + public void createToken() { + Map claims = new HashMap<>(); + claims.put("admin_id", 12222222); + String token = JwtUtils.createToken(claims, 86400L); + System.out.println(token); + System.out.println(token.length()); + assertNotNull(token); + } + + @Test + public void createToken1() { + Map claims = new HashMap<>(); + String token = JwtUtils.createToken(claims); + System.out.println(token); + assertNotNull(token); + } + + @Test + public void parse() { + Map claims = new HashMap<>(); + claims.put("admin_id", 1); + String token = JwtUtils.createToken(claims, 1000L); + System.out.println(token); + System.out.println(token.length()); + Claims claim = JwtUtils.parse(token); + System.out.println(claim); + assertNotNull(claim); + System.out.println(claim.get("admin_id")); + } + + + + + + + + @Test + public void tetsArray(){ + String data = "121212"; + String[] datas = data.split(","); + System.out.println(datas[0]); + } +} diff --git a/api-admin/src/test/java/com/glxp/api/admin/util/NormalTest.java b/api-admin/src/test/java/com/glxp/api/admin/util/NormalTest.java new file mode 100644 index 00000000..a8bfcf47 --- /dev/null +++ b/api-admin/src/test/java/com/glxp/api/admin/util/NormalTest.java @@ -0,0 +1,24 @@ +package com.glxp.api.admin.util; + +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.HashMap; +import java.util.Map; + +import static org.junit.Assert.assertNotNull; + +public class NormalTest { + private static final Logger log = LoggerFactory.getLogger(NormalTest.class); + + @Test + public void testMA() { + String data = "MA.156.M0.100334.0FPN95-06E6"; + log.info(FilterUdiUtils.getDiStr(data)); + + + String data2 = "#32543535#5454#45#5453#"; + log.info(FilterUdiUtils.getUdi(data2).toString()); + } +} diff --git a/api-admin/src/test/java/com/glxp/api/admin/util/PermissionRuleTreeUtilsTest.java b/api-admin/src/test/java/com/glxp/api/admin/util/PermissionRuleTreeUtilsTest.java new file mode 100644 index 00000000..7b8809de --- /dev/null +++ b/api-admin/src/test/java/com/glxp/api/admin/util/PermissionRuleTreeUtilsTest.java @@ -0,0 +1,26 @@ +package com.glxp.api.admin.util; + +import com.glxp.api.BaseApiAdminApplicationTest; +import com.glxp.api.admin.entity.auth.AuthPermissionRule; +import com.glxp.api.admin.service.auth.AuthPermissionRuleService; +import com.glxp.api.admin.res.auth.AuthPermissionRuleMergeResponse; +import org.junit.Test; + +import javax.annotation.Resource; + +import java.util.List; + +public class PermissionRuleTreeUtilsTest extends BaseApiAdminApplicationTest { + + @Resource + private AuthPermissionRuleService authPermissionRuleService; + + @Test + public void merge() { + + List authPermissionRules = authPermissionRuleService.listAll(); + List merge = PermissionRuleTreeUtils.merge(authPermissionRules,0L); + System.out.println(merge); + + } +} \ No newline at end of file diff --git a/api-admin/target/classes/META-INF/api-admin.kotlin_module b/api-admin/target/classes/META-INF/api-admin.kotlin_module new file mode 100644 index 00000000..8fb60192 Binary files /dev/null and b/api-admin/target/classes/META-INF/api-admin.kotlin_module differ diff --git a/api-admin/target/classes/META-INF/spring-configuration-metadata.json b/api-admin/target/classes/META-INF/spring-configuration-metadata.json new file mode 100644 index 00000000..c5335ca9 --- /dev/null +++ b/api-admin/target/classes/META-INF/spring-configuration-metadata.json @@ -0,0 +1,38 @@ +{ + "groups": [ + { + "name": "cors", + "type": "com.glxp.api.admin.config.CorsConfig", + "sourceType": "com.glxp.api.admin.config.CorsConfig" + }, + { + "name": "public-file", + "type": "com.glxp.api.admin.config.PublicFileUrlConfig", + "sourceType": "com.glxp.api.admin.config.PublicFileUrlConfig" + }, + { + "name": "spring.datasource", + "type": "javax.sql.DataSource", + "sourceType": "com.glxp.api.admin.config.MasterDataSourceConfig", + "sourceMethod": "masterDataSource()" + } + ], + "properties": [ + { + "name": "cors.allowed-headers", + "type": "java.lang.String", + "sourceType": "com.glxp.api.admin.config.CorsConfig" + }, + { + "name": "cors.allowed-methods", + "type": "java.lang.String", + "sourceType": "com.glxp.api.admin.config.CorsConfig" + }, + { + "name": "cors.allowed-origins", + "type": "java.lang.String", + "sourceType": "com.glxp.api.admin.config.CorsConfig" + } + ], + "hints": [] +} \ No newline at end of file diff --git a/api-admin/target/classes/application-dev.properties b/api-admin/target/classes/application-dev.properties new file mode 100644 index 00000000..6e77cf8a --- /dev/null +++ b/api-admin/target/classes/application-dev.properties @@ -0,0 +1,26 @@ +# 本地环境 +server.port=9991 +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udiwms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true +spring.datasource.username=root +spring.datasource.password=123456 +#spring.datasource.password=mysql80 +server.servlet.context-path= + +logging.level.com.glxp.api.admin.dao=debug +logging.level.com.glxp.api.admin.erp.second=debug + +#logback配置 + +logging.path=output/logs +# 不指定的情况下默认生成在项目根目录，按照配置生成所需的日志名称 +logging.file=D:/udi.log +#UDI数据下载 +UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server +#UDI_SERVER_URL=http://139.9.178.73:8080/UDI_DL_Server +#UCLOD服务 +#UCLOD_SERVER_URL=http://127.0.0.1:9997 +UCLOD_SERVER_URL=http://127.0.0.1:8080/UDIC_UCLOUD_SERVER + + + diff --git a/api-admin/target/classes/application.properties b/api-admin/target/classes/application.properties new file mode 100644 index 00000000..e487e916 --- /dev/null +++ b/api-admin/target/classes/application.properties @@ -0,0 +1,8 @@ +spring.profiles.active=dev + +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver + +mybatis.config-location=classpath:mybatis/mybatis-config.xml +mybatis.mapper-locations=classpath:mybatis/mapper/*/*.xml + +spring.jmx.enabled=false \ No newline at end of file diff --git a/api-admin/target/classes/com/glxp/api/ApiAdminApplication.class b/api-admin/target/classes/com/glxp/api/ApiAdminApplication.class new file mode 100644 index 00000000..d2c9e8ea Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/ApiAdminApplication.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/annotation/AuthRuleAnnotation.class b/api-admin/target/classes/com/glxp/api/admin/annotation/AuthRuleAnnotation.class new file mode 100644 index 00000000..cd34f89b Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/annotation/AuthRuleAnnotation.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/aspect/AuthorizeAspect.class b/api-admin/target/classes/com/glxp/api/admin/aspect/AuthorizeAspect.class new file mode 100644 index 00000000..e1c51857 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/aspect/AuthorizeAspect.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/config/CorsConfig.class b/api-admin/target/classes/com/glxp/api/admin/config/CorsConfig.class new file mode 100644 index 00000000..2eaa1608 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/config/CorsConfig.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/config/CorsFilter.class b/api-admin/target/classes/com/glxp/api/admin/config/CorsFilter.class new file mode 100644 index 00000000..df5544fc Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/config/CorsFilter.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/config/DruidStatFilter.class b/api-admin/target/classes/com/glxp/api/admin/config/DruidStatFilter.class new file mode 100644 index 00000000..283ac219 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/config/DruidStatFilter.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/config/DruidStatViewServlet.class b/api-admin/target/classes/com/glxp/api/admin/config/DruidStatViewServlet.class new file mode 100644 index 00000000..f9103881 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/config/DruidStatViewServlet.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/config/MasterDataSourceConfig.class b/api-admin/target/classes/com/glxp/api/admin/config/MasterDataSourceConfig.class new file mode 100644 index 00000000..c99250ff Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/config/MasterDataSourceConfig.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/config/PageHelperConfig.class b/api-admin/target/classes/com/glxp/api/admin/config/PageHelperConfig.class new file mode 100644 index 00000000..9bba844e Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/config/PageHelperConfig.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/config/PublicFileUrlConfig.class b/api-admin/target/classes/com/glxp/api/admin/config/PublicFileUrlConfig.class new file mode 100644 index 00000000..026cc9cc Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/config/PublicFileUrlConfig.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/config/WebMvcConfig.class b/api-admin/target/classes/com/glxp/api/admin/config/WebMvcConfig.class new file mode 100644 index 00000000..677c3d07 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/config/WebMvcConfig.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/constant/BussinessTypeUtils.class b/api-admin/target/classes/com/glxp/api/admin/constant/BussinessTypeUtils.class new file mode 100644 index 00000000..cca5b133 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/constant/BussinessTypeUtils.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/constant/ConstantStatus.class b/api-admin/target/classes/com/glxp/api/admin/constant/ConstantStatus.class new file mode 100644 index 00000000..66e611a7 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/constant/ConstantStatus.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/constant/ConstantType.class b/api-admin/target/classes/com/glxp/api/admin/constant/ConstantType.class new file mode 100644 index 00000000..9e50edad Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/constant/ConstantType.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/controller/auth/AuthAdminController.class b/api-admin/target/classes/com/glxp/api/admin/controller/auth/AuthAdminController.class new file mode 100644 index 00000000..13ba4aae Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/controller/auth/AuthAdminController.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/controller/auth/AuthPermissionRuleController.class b/api-admin/target/classes/com/glxp/api/admin/controller/auth/AuthPermissionRuleController.class new file mode 100644 index 00000000..8f3c9a50 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/controller/auth/AuthPermissionRuleController.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/controller/auth/AuthRoleController.class b/api-admin/target/classes/com/glxp/api/admin/controller/auth/AuthRoleController.class new file mode 100644 index 00000000..dee23054 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/controller/auth/AuthRoleController.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/controller/auth/LoginController.class b/api-admin/target/classes/com/glxp/api/admin/controller/auth/LoginController.class new file mode 100644 index 00000000..97ec6890 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/controller/auth/LoginController.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/controller/basic/BasicUnitMaintainController.class b/api-admin/target/classes/com/glxp/api/admin/controller/basic/BasicUnitMaintainController.class new file mode 100644 index 00000000..3076ed16 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/controller/basic/BasicUnitMaintainController.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/controller/basic/BussinessTypeController.class b/api-admin/target/classes/com/glxp/api/admin/controller/basic/BussinessTypeController.class new file mode 100644 index 00000000..9de11442 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/controller/basic/BussinessTypeController.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/controller/basic/UdiInfoController.class b/api-admin/target/classes/com/glxp/api/admin/controller/basic/UdiInfoController.class new file mode 100644 index 00000000..b710fbd0 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/controller/basic/UdiInfoController.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/controller/basic/UdiRelevanceController.class b/api-admin/target/classes/com/glxp/api/admin/controller/basic/UdiRelevanceController.class new file mode 100644 index 00000000..b89b73d8 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/controller/basic/UdiRelevanceController.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/controller/info/CompanyController.class b/api-admin/target/classes/com/glxp/api/admin/controller/info/CompanyController.class new file mode 100644 index 00000000..f57dcdda Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/controller/info/CompanyController.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/controller/info/SetupController.class b/api-admin/target/classes/com/glxp/api/admin/controller/info/SetupController.class new file mode 100644 index 00000000..c1541e2a Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/controller/info/SetupController.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/controller/info/SystemParamConfigController.class b/api-admin/target/classes/com/glxp/api/admin/controller/info/SystemParamConfigController.class new file mode 100644 index 00000000..3a8d5d38 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/controller/info/SystemParamConfigController.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/controller/inout/OrderController.class b/api-admin/target/classes/com/glxp/api/admin/controller/inout/OrderController.class new file mode 100644 index 00000000..5b967bc9 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/controller/inout/OrderController.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/controller/inout/OrderDetailController.class b/api-admin/target/classes/com/glxp/api/admin/controller/inout/OrderDetailController.class new file mode 100644 index 00000000..2130f8a2 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/controller/inout/OrderDetailController.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/controller/inout/UdiTraceController.class b/api-admin/target/classes/com/glxp/api/admin/controller/inout/UdiTraceController.class new file mode 100644 index 00000000..119b3136 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/controller/inout/UdiTraceController.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/controller/inout/WareHouseController.class b/api-admin/target/classes/com/glxp/api/admin/controller/inout/WareHouseController.class new file mode 100644 index 00000000..5f8c97f1 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/controller/inout/WareHouseController.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/controller/inout/utils/ContrastErpUtil.class b/api-admin/target/classes/com/glxp/api/admin/controller/inout/utils/ContrastErpUtil.class new file mode 100644 index 00000000..bcd4fdee Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/controller/inout/utils/ContrastErpUtil.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/controller/inout/utils/DataTransUtil.class b/api-admin/target/classes/com/glxp/api/admin/controller/inout/utils/DataTransUtil.class new file mode 100644 index 00000000..d2e49160 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/controller/inout/utils/DataTransUtil.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/controller/inout/utils/InoutUtils.class b/api-admin/target/classes/com/glxp/api/admin/controller/inout/utils/InoutUtils.class new file mode 100644 index 00000000..3ab9dfdd Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/controller/inout/utils/InoutUtils.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/controller/inout/utils/TransInoutUtil.class b/api-admin/target/classes/com/glxp/api/admin/controller/inout/utils/TransInoutUtil.class new file mode 100644 index 00000000..8b92a399 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/controller/inout/utils/TransInoutUtil.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/controller/inventory/InvCheckController.class b/api-admin/target/classes/com/glxp/api/admin/controller/inventory/InvCheckController.class new file mode 100644 index 00000000..0b021aef Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/controller/inventory/InvCheckController.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/controller/inventory/InvErpOnhandController$1.class b/api-admin/target/classes/com/glxp/api/admin/controller/inventory/InvErpOnhandController$1.class new file mode 100644 index 00000000..43985967 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/controller/inventory/InvErpOnhandController$1.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/controller/inventory/InvErpOnhandController.class b/api-admin/target/classes/com/glxp/api/admin/controller/inventory/InvErpOnhandController.class new file mode 100644 index 00000000..1d462251 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/controller/inventory/InvErpOnhandController.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/controller/inventory/InvPrintController.class b/api-admin/target/classes/com/glxp/api/admin/controller/inventory/InvPrintController.class new file mode 100644 index 00000000..557e2bcc Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/controller/inventory/InvPrintController.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/dao/auth/AuthAdminDao.class b/api-admin/target/classes/com/glxp/api/admin/dao/auth/AuthAdminDao.class new file mode 100644 index 00000000..1c4e8a03 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/dao/auth/AuthAdminDao.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/dao/auth/AuthPermissionDao.class b/api-admin/target/classes/com/glxp/api/admin/dao/auth/AuthPermissionDao.class new file mode 100644 index 00000000..b864e1a6 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/dao/auth/AuthPermissionDao.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/dao/auth/AuthPermissionRuleDao.class b/api-admin/target/classes/com/glxp/api/admin/dao/auth/AuthPermissionRuleDao.class new file mode 100644 index 00000000..48d35122 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/dao/auth/AuthPermissionRuleDao.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/dao/auth/AuthRoleAdminDao.class b/api-admin/target/classes/com/glxp/api/admin/dao/auth/AuthRoleAdminDao.class new file mode 100644 index 00000000..32a83786 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/dao/auth/AuthRoleAdminDao.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/dao/auth/AuthRoleDao.class b/api-admin/target/classes/com/glxp/api/admin/dao/auth/AuthRoleDao.class new file mode 100644 index 00000000..39261863 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/dao/auth/AuthRoleDao.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/dao/basic/BasicUnitMaintainDao.class b/api-admin/target/classes/com/glxp/api/admin/dao/basic/BasicUnitMaintainDao.class new file mode 100644 index 00000000..3661e648 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/dao/basic/BasicUnitMaintainDao.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/dao/basic/BussinessTypeDao.class b/api-admin/target/classes/com/glxp/api/admin/dao/basic/BussinessTypeDao.class new file mode 100644 index 00000000..c1df76cc Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/dao/basic/BussinessTypeDao.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/dao/basic/UdiInfoDao.class b/api-admin/target/classes/com/glxp/api/admin/dao/basic/UdiInfoDao.class new file mode 100644 index 00000000..459325a0 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/dao/basic/UdiInfoDao.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/dao/basic/UdiRelevanceDao.class b/api-admin/target/classes/com/glxp/api/admin/dao/basic/UdiRelevanceDao.class new file mode 100644 index 00000000..5f6d9436 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/dao/basic/UdiRelevanceDao.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/dao/basic/UnitMaintainDao.class b/api-admin/target/classes/com/glxp/api/admin/dao/basic/UnitMaintainDao.class new file mode 100644 index 00000000..09ba24e7 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/dao/basic/UnitMaintainDao.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/dao/info/CompanyDao.class b/api-admin/target/classes/com/glxp/api/admin/dao/info/CompanyDao.class new file mode 100644 index 00000000..3ba22815 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/dao/info/CompanyDao.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/dao/info/ScheduledDao.class b/api-admin/target/classes/com/glxp/api/admin/dao/info/ScheduledDao.class new file mode 100644 index 00000000..645f9355 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/dao/info/ScheduledDao.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/dao/info/SetupDao.class b/api-admin/target/classes/com/glxp/api/admin/dao/info/SetupDao.class new file mode 100644 index 00000000..2c508ecc Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/dao/info/SetupDao.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/dao/info/SystemParamConfigDao.class b/api-admin/target/classes/com/glxp/api/admin/dao/info/SystemParamConfigDao.class new file mode 100644 index 00000000..a83bc372 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/dao/info/SystemParamConfigDao.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/dao/inout/CodesDao.class b/api-admin/target/classes/com/glxp/api/admin/dao/inout/CodesDao.class new file mode 100644 index 00000000..f063905b Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/dao/inout/CodesDao.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/dao/inout/CodesTempDao.class b/api-admin/target/classes/com/glxp/api/admin/dao/inout/CodesTempDao.class new file mode 100644 index 00000000..2b6a715c Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/dao/inout/CodesTempDao.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/dao/inout/OrderDao.class b/api-admin/target/classes/com/glxp/api/admin/dao/inout/OrderDao.class new file mode 100644 index 00000000..576162d4 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/dao/inout/OrderDao.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/dao/inout/OrderDetailDao.class b/api-admin/target/classes/com/glxp/api/admin/dao/inout/OrderDetailDao.class new file mode 100644 index 00000000..85ab8e92 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/dao/inout/OrderDetailDao.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/dao/inventory/InvErpStockDao.class b/api-admin/target/classes/com/glxp/api/admin/dao/inventory/InvErpStockDao.class new file mode 100644 index 00000000..46e65c26 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/dao/inventory/InvErpStockDao.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/dao/inventory/InvOrderCheckDao.class b/api-admin/target/classes/com/glxp/api/admin/dao/inventory/InvOrderCheckDao.class new file mode 100644 index 00000000..3a68d86f Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/dao/inventory/InvOrderCheckDao.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/dao/inventory/InvStockPrintDao.class b/api-admin/target/classes/com/glxp/api/admin/dao/inventory/InvStockPrintDao.class new file mode 100644 index 00000000..4677c73d Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/dao/inventory/InvStockPrintDao.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/auth/AuthAdmin.class b/api-admin/target/classes/com/glxp/api/admin/entity/auth/AuthAdmin.class new file mode 100644 index 00000000..ad8c3850 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/entity/auth/AuthAdmin.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/auth/AuthPermission.class b/api-admin/target/classes/com/glxp/api/admin/entity/auth/AuthPermission.class new file mode 100644 index 00000000..d2cb260e Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/entity/auth/AuthPermission.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/auth/AuthPermissionRule.class b/api-admin/target/classes/com/glxp/api/admin/entity/auth/AuthPermissionRule.class new file mode 100644 index 00000000..ded96602 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/entity/auth/AuthPermissionRule.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/auth/AuthRole.class b/api-admin/target/classes/com/glxp/api/admin/entity/auth/AuthRole.class new file mode 100644 index 00000000..2b468122 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/entity/auth/AuthRole.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/auth/AuthRoleAdmin.class b/api-admin/target/classes/com/glxp/api/admin/entity/auth/AuthRoleAdmin.class new file mode 100644 index 00000000..f0993219 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/entity/auth/AuthRoleAdmin.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/basic/BasicUnitMaintainEntity.class b/api-admin/target/classes/com/glxp/api/admin/entity/basic/BasicUnitMaintainEntity.class new file mode 100644 index 00000000..66279d2b Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/entity/basic/BasicUnitMaintainEntity.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/basic/BussinessTypeEntity.class b/api-admin/target/classes/com/glxp/api/admin/entity/basic/BussinessTypeEntity.class new file mode 100644 index 00000000..ed6f879e Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/entity/basic/BussinessTypeEntity.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/basic/ErpStockEntity.class b/api-admin/target/classes/com/glxp/api/admin/entity/basic/ErpStockEntity.class new file mode 100644 index 00000000..ab9fd45c Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/entity/basic/ErpStockEntity.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/basic/StockPrintEntity.class b/api-admin/target/classes/com/glxp/api/admin/entity/basic/StockPrintEntity.class new file mode 100644 index 00000000..8ca1bb17 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/entity/basic/StockPrintEntity.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/basic/UdiEntity.class b/api-admin/target/classes/com/glxp/api/admin/entity/basic/UdiEntity.class new file mode 100644 index 00000000..63169364 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/entity/basic/UdiEntity.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/basic/UdiInfoEntity.class b/api-admin/target/classes/com/glxp/api/admin/entity/basic/UdiInfoEntity.class new file mode 100644 index 00000000..d269d3bc Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/entity/basic/UdiInfoEntity.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/basic/UdiRelevanceEntity.class b/api-admin/target/classes/com/glxp/api/admin/entity/basic/UdiRelevanceEntity.class new file mode 100644 index 00000000..190f86b3 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/entity/basic/UdiRelevanceEntity.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/basic/UnitMaintainEntity.class b/api-admin/target/classes/com/glxp/api/admin/entity/basic/UnitMaintainEntity.class new file mode 100644 index 00000000..0492a743 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/entity/basic/UnitMaintainEntity.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/info/CompanyEntity.class b/api-admin/target/classes/com/glxp/api/admin/entity/info/CompanyEntity.class new file mode 100644 index 00000000..cc63a29f Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/entity/info/CompanyEntity.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/info/MipsServiceEntity.class b/api-admin/target/classes/com/glxp/api/admin/entity/info/MipsServiceEntity.class new file mode 100644 index 00000000..73669ecf Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/entity/info/MipsServiceEntity.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/info/ScheduledEntity.class b/api-admin/target/classes/com/glxp/api/admin/entity/info/ScheduledEntity.class new file mode 100644 index 00000000..8dac55d7 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/entity/info/ScheduledEntity.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/info/SetupEntity.class b/api-admin/target/classes/com/glxp/api/admin/entity/info/SetupEntity.class new file mode 100644 index 00000000..c79faba6 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/entity/info/SetupEntity.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/info/SystemParamConfigEntity.class b/api-admin/target/classes/com/glxp/api/admin/entity/info/SystemParamConfigEntity.class new file mode 100644 index 00000000..47fead34 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/entity/info/SystemParamConfigEntity.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/inout/ErpDetailCodeEntity.class b/api-admin/target/classes/com/glxp/api/admin/entity/inout/ErpDetailCodeEntity.class new file mode 100644 index 00000000..1aeae177 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/entity/inout/ErpDetailCodeEntity.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/inout/ErpOrderEntity.class b/api-admin/target/classes/com/glxp/api/admin/entity/inout/ErpOrderEntity.class new file mode 100644 index 00000000..a7266016 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/entity/inout/ErpOrderEntity.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/inout/FilterErpOrderRequest.class b/api-admin/target/classes/com/glxp/api/admin/entity/inout/FilterErpOrderRequest.class new file mode 100644 index 00000000..a0b569a8 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/entity/inout/FilterErpOrderRequest.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/inout/MipsDrugEntity.class b/api-admin/target/classes/com/glxp/api/admin/entity/inout/MipsDrugEntity.class new file mode 100644 index 00000000..e15dea49 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/entity/inout/MipsDrugEntity.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/inout/OrderDetailEntity.class b/api-admin/target/classes/com/glxp/api/admin/entity/inout/OrderDetailEntity.class new file mode 100644 index 00000000..32c19394 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/entity/inout/OrderDetailEntity.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/inout/OrderEntity.class b/api-admin/target/classes/com/glxp/api/admin/entity/inout/OrderEntity.class new file mode 100644 index 00000000..10ad3d2c Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/entity/inout/OrderEntity.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/inout/StockCheckEntity.class b/api-admin/target/classes/com/glxp/api/admin/entity/inout/StockCheckEntity.class new file mode 100644 index 00000000..36bfc875 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/entity/inout/StockCheckEntity.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/inout/Unit.class b/api-admin/target/classes/com/glxp/api/admin/entity/inout/Unit.class new file mode 100644 index 00000000..84d008bb Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/entity/inout/Unit.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/inout/WarehouseEntity.class b/api-admin/target/classes/com/glxp/api/admin/entity/inout/WarehouseEntity.class new file mode 100644 index 00000000..eb9a6469 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/entity/inout/WarehouseEntity.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/inout/Warehousetemp.class b/api-admin/target/classes/com/glxp/api/admin/entity/inout/Warehousetemp.class new file mode 100644 index 00000000..80fc6721 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/entity/inout/Warehousetemp.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/inout/WarehousetempExample$Criteria.class b/api-admin/target/classes/com/glxp/api/admin/entity/inout/WarehousetempExample$Criteria.class new file mode 100644 index 00000000..33d85d47 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/entity/inout/WarehousetempExample$Criteria.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/inout/WarehousetempExample$Criterion.class b/api-admin/target/classes/com/glxp/api/admin/entity/inout/WarehousetempExample$Criterion.class new file mode 100644 index 00000000..5cf649f2 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/entity/inout/WarehousetempExample$Criterion.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/inout/WarehousetempExample$GeneratedCriteria.class b/api-admin/target/classes/com/glxp/api/admin/entity/inout/WarehousetempExample$GeneratedCriteria.class new file mode 100644 index 00000000..8d81cf90 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/entity/inout/WarehousetempExample$GeneratedCriteria.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/inout/WarehousetempExample.class b/api-admin/target/classes/com/glxp/api/admin/entity/inout/WarehousetempExample.class new file mode 100644 index 00000000..5444d9db Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/entity/inout/WarehousetempExample.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/exception/JsonException.class b/api-admin/target/classes/com/glxp/api/admin/exception/JsonException.class new file mode 100644 index 00000000..73317100 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/exception/JsonException.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/handler/GlobalExceptionHandler.class b/api-admin/target/classes/com/glxp/api/admin/handler/GlobalExceptionHandler.class new file mode 100644 index 00000000..724d53d7 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/handler/GlobalExceptionHandler.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/httpclient/ErpBasicClient$1.class b/api-admin/target/classes/com/glxp/api/admin/httpclient/ErpBasicClient$1.class new file mode 100644 index 00000000..59d26d55 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/httpclient/ErpBasicClient$1.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/httpclient/ErpBasicClient.class b/api-admin/target/classes/com/glxp/api/admin/httpclient/ErpBasicClient.class new file mode 100644 index 00000000..71128ae2 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/httpclient/ErpBasicClient.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/httpclient/ErpInvClient$1.class b/api-admin/target/classes/com/glxp/api/admin/httpclient/ErpInvClient$1.class new file mode 100644 index 00000000..d2b9132c Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/httpclient/ErpInvClient$1.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/httpclient/ErpInvClient.class b/api-admin/target/classes/com/glxp/api/admin/httpclient/ErpInvClient.class new file mode 100644 index 00000000..0d8d3f6a Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/httpclient/ErpInvClient.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/httpclient/ErpOrderClient$1.class b/api-admin/target/classes/com/glxp/api/admin/httpclient/ErpOrderClient$1.class new file mode 100644 index 00000000..c5418bcf Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/httpclient/ErpOrderClient$1.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/httpclient/ErpOrderClient$2.class b/api-admin/target/classes/com/glxp/api/admin/httpclient/ErpOrderClient$2.class new file mode 100644 index 00000000..484aff66 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/httpclient/ErpOrderClient$2.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/httpclient/ErpOrderClient$3.class b/api-admin/target/classes/com/glxp/api/admin/httpclient/ErpOrderClient$3.class new file mode 100644 index 00000000..a82af823 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/httpclient/ErpOrderClient$3.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/httpclient/ErpOrderClient.class b/api-admin/target/classes/com/glxp/api/admin/httpclient/ErpOrderClient.class new file mode 100644 index 00000000..71612c69 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/httpclient/ErpOrderClient.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/httpclient/UdiDlHttpClient$1.class b/api-admin/target/classes/com/glxp/api/admin/httpclient/UdiDlHttpClient$1.class new file mode 100644 index 00000000..7854dc59 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/httpclient/UdiDlHttpClient$1.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/httpclient/UdiDlHttpClient.class b/api-admin/target/classes/com/glxp/api/admin/httpclient/UdiDlHttpClient.class new file mode 100644 index 00000000..1c7a5f9b Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/httpclient/UdiDlHttpClient.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/ListPageRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/ListPageRequest.class new file mode 100644 index 00000000..628119cb Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/req/ListPageRequest.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/auth/AuthAdminQueryRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/auth/AuthAdminQueryRequest.class new file mode 100644 index 00000000..c23f93c2 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/req/auth/AuthAdminQueryRequest.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/auth/AuthAdminSaveRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/auth/AuthAdminSaveRequest.class new file mode 100644 index 00000000..6c75ef17 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/req/auth/AuthAdminSaveRequest.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/auth/AuthPermissionRuleSaveRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/auth/AuthPermissionRuleSaveRequest.class new file mode 100644 index 00000000..5de3f6e8 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/req/auth/AuthPermissionRuleSaveRequest.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/auth/AuthRoleAuthRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/auth/AuthRoleAuthRequest.class new file mode 100644 index 00000000..d22bd22d Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/req/auth/AuthRoleAuthRequest.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/auth/AuthRoleQueryRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/auth/AuthRoleQueryRequest.class new file mode 100644 index 00000000..0f305f17 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/req/auth/AuthRoleQueryRequest.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/auth/AuthRoleSaveRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/auth/AuthRoleSaveRequest.class new file mode 100644 index 00000000..5f8bcf36 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/req/auth/AuthRoleSaveRequest.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/auth/LoginRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/auth/LoginRequest.class new file mode 100644 index 00000000..903ef1c3 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/req/auth/LoginRequest.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/auth/UpdatePasswordRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/auth/UpdatePasswordRequest.class new file mode 100644 index 00000000..f64c6f7e Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/req/auth/UpdatePasswordRequest.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/basic/BasicUnitMaintainFilterRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/basic/BasicUnitMaintainFilterRequest.class new file mode 100644 index 00000000..dc757676 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/req/basic/BasicUnitMaintainFilterRequest.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/basic/BasicUnitMaintainSaveRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/basic/BasicUnitMaintainSaveRequest.class new file mode 100644 index 00000000..7447bf07 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/req/basic/BasicUnitMaintainSaveRequest.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/basic/CombineRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/basic/CombineRequest.class new file mode 100644 index 00000000..5aae1bd5 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/req/basic/CombineRequest.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/basic/FilterErpGoodsRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/basic/FilterErpGoodsRequest.class new file mode 100644 index 00000000..37bb2cfd Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/req/basic/FilterErpGoodsRequest.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/basic/FilterStockprintRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/basic/FilterStockprintRequest.class new file mode 100644 index 00000000..5522dda6 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/req/basic/FilterStockprintRequest.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/basic/FilterUdiInfoRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/basic/FilterUdiInfoRequest.class new file mode 100644 index 00000000..93b98814 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/req/basic/FilterUdiInfoRequest.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/basic/UOnhandQueryRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/basic/UOnhandQueryRequest.class new file mode 100644 index 00000000..0cd47e8f Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/req/basic/UOnhandQueryRequest.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/basic/UpdatePrintStatusRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/basic/UpdatePrintStatusRequest.class new file mode 100644 index 00000000..b06c4504 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/req/basic/UpdatePrintStatusRequest.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/info/FilterSetupRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/info/FilterSetupRequest.class new file mode 100644 index 00000000..01db233f Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/req/info/FilterSetupRequest.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/info/SystemParamConfigRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/info/SystemParamConfigRequest.class new file mode 100644 index 00000000..19394310 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/req/info/SystemParamConfigRequest.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/info/SystemParamConfigSaveRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/info/SystemParamConfigSaveRequest.class new file mode 100644 index 00000000..10d3497f Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/req/info/SystemParamConfigSaveRequest.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/inout/CommitRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/inout/CommitRequest.class new file mode 100644 index 00000000..66e36094 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/req/inout/CommitRequest.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/inout/DeleteCodeRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/inout/DeleteCodeRequest.class new file mode 100644 index 00000000..fabe2eb6 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/req/inout/DeleteCodeRequest.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/inout/DeleteRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/inout/DeleteRequest.class new file mode 100644 index 00000000..b4d21e4e Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/req/inout/DeleteRequest.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/inout/ERPPostBillRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/inout/ERPPostBillRequest.class new file mode 100644 index 00000000..5a31ec0e Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/req/inout/ERPPostBillRequest.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/inout/FilterOrderRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/inout/FilterOrderRequest.class new file mode 100644 index 00000000..1749e423 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/req/inout/FilterOrderRequest.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/inout/FilterStockCheckRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/inout/FilterStockCheckRequest.class new file mode 100644 index 00000000..281290fe Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/req/inout/FilterStockCheckRequest.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/inout/ImportErpOrderRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/inout/ImportErpOrderRequest.class new file mode 100644 index 00000000..de5ef303 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/req/inout/ImportErpOrderRequest.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/inout/OrderFilterByCodeRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/inout/OrderFilterByCodeRequest.class new file mode 100644 index 00000000..decd2fc8 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/req/inout/OrderFilterByCodeRequest.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/inout/OrderFilterRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/inout/OrderFilterRequest.class new file mode 100644 index 00000000..4e37a566 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/req/inout/OrderFilterRequest.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/inout/OrderMergeRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/inout/OrderMergeRequest.class new file mode 100644 index 00000000..7888dce0 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/req/inout/OrderMergeRequest.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/inout/OrderQueryRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/inout/OrderQueryRequest.class new file mode 100644 index 00000000..0e72b4ab Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/req/inout/OrderQueryRequest.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/inout/PostOrderRequest$PostOrder.class b/api-admin/target/classes/com/glxp/api/admin/req/inout/PostOrderRequest$PostOrder.class new file mode 100644 index 00000000..f83b9ce0 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/req/inout/PostOrderRequest$PostOrder.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/inout/PostOrderRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/inout/PostOrderRequest.class new file mode 100644 index 00000000..2b259b0b Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/req/inout/PostOrderRequest.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/inout/USignRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/inout/USignRequest.class new file mode 100644 index 00000000..40076b40 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/req/inout/USignRequest.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/inout/UpdateExportStatusRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/inout/UpdateExportStatusRequest.class new file mode 100644 index 00000000..5531d324 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/req/inout/UpdateExportStatusRequest.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/inout/WarehouseQueryRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/inout/WarehouseQueryRequest.class new file mode 100644 index 00000000..76fff6bd Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/req/inout/WarehouseQueryRequest.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/inout/WarehouseSaveRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/inout/WarehouseSaveRequest.class new file mode 100644 index 00000000..032e5596 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/req/inout/WarehouseSaveRequest.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/inventory/ErpOnhandRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/inventory/ErpOnhandRequest.class new file mode 100644 index 00000000..8a34a446 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/req/inventory/ErpOnhandRequest.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/receipt/AddReceiptRequest$ReceiptRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/receipt/AddReceiptRequest$ReceiptRequest.class new file mode 100644 index 00000000..a0cf7423 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/req/receipt/AddReceiptRequest$ReceiptRequest.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/receipt/AddReceiptRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/receipt/AddReceiptRequest.class new file mode 100644 index 00000000..ed6cb184 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/req/receipt/AddReceiptRequest.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/receipt/BussinessTypeFilterRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/receipt/BussinessTypeFilterRequest.class new file mode 100644 index 00000000..912ce74c Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/req/receipt/BussinessTypeFilterRequest.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/receipt/ClearStockRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/receipt/ClearStockRequest.class new file mode 100644 index 00000000..32f19e1d Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/req/receipt/ClearStockRequest.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/receipt/CodeDetailRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/receipt/CodeDetailRequest.class new file mode 100644 index 00000000..37ace76d Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/req/receipt/CodeDetailRequest.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/receipt/CombineUnitRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/receipt/CombineUnitRequest.class new file mode 100644 index 00000000..b7335e42 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/req/receipt/CombineUnitRequest.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/receipt/ManuorderFilterRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/receipt/ManuorderFilterRequest.class new file mode 100644 index 00000000..31de71d2 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/req/receipt/ManuorderFilterRequest.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/receipt/ProductFilterRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/receipt/ProductFilterRequest.class new file mode 100644 index 00000000..037f3b82 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/req/receipt/ProductFilterRequest.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/receipt/ProductInfoFilterRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/receipt/ProductInfoFilterRequest.class new file mode 100644 index 00000000..89ccd849 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/req/receipt/ProductInfoFilterRequest.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/receipt/ReceiptDetailRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/receipt/ReceiptDetailRequest.class new file mode 100644 index 00000000..c51d3b37 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/req/receipt/ReceiptDetailRequest.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/receipt/ReceiptFilterRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/receipt/ReceiptFilterRequest.class new file mode 100644 index 00000000..db2e4265 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/req/receipt/ReceiptFilterRequest.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/receipt/U8Request.class b/api-admin/target/classes/com/glxp/api/admin/req/receipt/U8Request.class new file mode 100644 index 00000000..3527fc7f Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/req/receipt/U8Request.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/receipt/UnitMaintainFilterRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/receipt/UnitMaintainFilterRequest.class new file mode 100644 index 00000000..47e77da9 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/req/receipt/UnitMaintainFilterRequest.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/udid/ScheduledRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/udid/ScheduledRequest.class new file mode 100644 index 00000000..274a5408 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/req/udid/ScheduledRequest.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/res/PageSimpleResponse.class b/api-admin/target/classes/com/glxp/api/admin/res/PageSimpleResponse.class new file mode 100644 index 00000000..d7b36139 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/res/PageSimpleResponse.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/res/auth/AuthAdminResponse.class b/api-admin/target/classes/com/glxp/api/admin/res/auth/AuthAdminResponse.class new file mode 100644 index 00000000..af8bdca4 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/res/auth/AuthAdminResponse.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/res/auth/AuthAdminRoleResponse.class b/api-admin/target/classes/com/glxp/api/admin/res/auth/AuthAdminRoleResponse.class new file mode 100644 index 00000000..0a4d9bae Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/res/auth/AuthAdminRoleResponse.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/res/auth/AuthPermissionRuleMergeResponse.class b/api-admin/target/classes/com/glxp/api/admin/res/auth/AuthPermissionRuleMergeResponse.class new file mode 100644 index 00000000..c5554377 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/res/auth/AuthPermissionRuleMergeResponse.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/res/auth/AuthRoleResponse.class b/api-admin/target/classes/com/glxp/api/admin/res/auth/AuthRoleResponse.class new file mode 100644 index 00000000..023b9141 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/res/auth/AuthRoleResponse.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/res/auth/LoginUserInfoResponse.class b/api-admin/target/classes/com/glxp/api/admin/res/auth/LoginUserInfoResponse.class new file mode 100644 index 00000000..0995eea2 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/res/auth/LoginUserInfoResponse.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/res/basic/BasicUnitMaintainResponse.class b/api-admin/target/classes/com/glxp/api/admin/res/basic/BasicUnitMaintainResponse.class new file mode 100644 index 00000000..8abcb926 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/res/basic/BasicUnitMaintainResponse.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/res/basic/ErpProductsResponse.class b/api-admin/target/classes/com/glxp/api/admin/res/basic/ErpProductsResponse.class new file mode 100644 index 00000000..e867b83a Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/res/basic/ErpProductsResponse.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/res/basic/ErpUnitsResponse.class b/api-admin/target/classes/com/glxp/api/admin/res/basic/ErpUnitsResponse.class new file mode 100644 index 00000000..2f049389 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/res/basic/ErpUnitsResponse.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/res/basic/UOnhandQueryResponse.class b/api-admin/target/classes/com/glxp/api/admin/res/basic/UOnhandQueryResponse.class new file mode 100644 index 00000000..faa181a8 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/res/basic/UOnhandQueryResponse.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/res/basic/UdiRelevanceResponse.class b/api-admin/target/classes/com/glxp/api/admin/res/basic/UdiRelevanceResponse.class new file mode 100644 index 00000000..ffa2a870 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/res/basic/UdiRelevanceResponse.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/res/basic/UdiTraceResponse.class b/api-admin/target/classes/com/glxp/api/admin/res/basic/UdiTraceResponse.class new file mode 100644 index 00000000..e4ed7849 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/res/basic/UdiTraceResponse.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/res/info/SystemParamConfigResponse.class b/api-admin/target/classes/com/glxp/api/admin/res/info/SystemParamConfigResponse.class new file mode 100644 index 00000000..e8bb2450 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/res/info/SystemParamConfigResponse.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/res/inout/ErpOrderResponse$SubErpOrder.class b/api-admin/target/classes/com/glxp/api/admin/res/inout/ErpOrderResponse$SubErpOrder.class new file mode 100644 index 00000000..7c5f79a2 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/res/inout/ErpOrderResponse$SubErpOrder.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/res/inout/ErpOrderResponse.class b/api-admin/target/classes/com/glxp/api/admin/res/inout/ErpOrderResponse.class new file mode 100644 index 00000000..718b2d98 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/res/inout/ErpOrderResponse.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/res/inout/InvmandocResponse.class b/api-admin/target/classes/com/glxp/api/admin/res/inout/InvmandocResponse.class new file mode 100644 index 00000000..ec3beb85 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/res/inout/InvmandocResponse.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/res/inout/PurchaseinResponse$SubPurchase.class b/api-admin/target/classes/com/glxp/api/admin/res/inout/PurchaseinResponse$SubPurchase.class new file mode 100644 index 00000000..db87c3b3 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/res/inout/PurchaseinResponse$SubPurchase.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/res/inout/PurchaseinResponse.class b/api-admin/target/classes/com/glxp/api/admin/res/inout/PurchaseinResponse.class new file mode 100644 index 00000000..d4f6da49 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/res/inout/PurchaseinResponse.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/res/inout/WarehouseResponse.class b/api-admin/target/classes/com/glxp/api/admin/res/inout/WarehouseResponse.class new file mode 100644 index 00000000..44d3d5c7 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/res/inout/WarehouseResponse.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/res/inventory/ErpOnHandResponse.class b/api-admin/target/classes/com/glxp/api/admin/res/inventory/ErpOnHandResponse.class new file mode 100644 index 00000000..8d1738cb Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/res/inventory/ErpOnHandResponse.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/auth/AuthAdminService.class b/api-admin/target/classes/com/glxp/api/admin/service/auth/AuthAdminService.class new file mode 100644 index 00000000..6ff49e29 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/service/auth/AuthAdminService.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/auth/AuthLoginService.class b/api-admin/target/classes/com/glxp/api/admin/service/auth/AuthLoginService.class new file mode 100644 index 00000000..b211236c Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/service/auth/AuthLoginService.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/auth/AuthPermissionRuleService.class b/api-admin/target/classes/com/glxp/api/admin/service/auth/AuthPermissionRuleService.class new file mode 100644 index 00000000..d9ab6181 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/service/auth/AuthPermissionRuleService.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/auth/AuthPermissionService.class b/api-admin/target/classes/com/glxp/api/admin/service/auth/AuthPermissionService.class new file mode 100644 index 00000000..e68bd231 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/service/auth/AuthPermissionService.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/auth/AuthRoleAdminService.class b/api-admin/target/classes/com/glxp/api/admin/service/auth/AuthRoleAdminService.class new file mode 100644 index 00000000..3d670205 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/service/auth/AuthRoleAdminService.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/auth/AuthRoleService.class b/api-admin/target/classes/com/glxp/api/admin/service/auth/AuthRoleService.class new file mode 100644 index 00000000..8fcbb23f Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/service/auth/AuthRoleService.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/auth/impl/AuthAdminServiceImpl.class b/api-admin/target/classes/com/glxp/api/admin/service/auth/impl/AuthAdminServiceImpl.class new file mode 100644 index 00000000..00f97040 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/service/auth/impl/AuthAdminServiceImpl.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/auth/impl/AuthLoginServiceImpl.class b/api-admin/target/classes/com/glxp/api/admin/service/auth/impl/AuthLoginServiceImpl.class new file mode 100644 index 00000000..73826665 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/service/auth/impl/AuthLoginServiceImpl.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/auth/impl/AuthPermissionRuleServiceImpl.class b/api-admin/target/classes/com/glxp/api/admin/service/auth/impl/AuthPermissionRuleServiceImpl.class new file mode 100644 index 00000000..755552eb Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/service/auth/impl/AuthPermissionRuleServiceImpl.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/auth/impl/AuthPermissionServiceImpl.class b/api-admin/target/classes/com/glxp/api/admin/service/auth/impl/AuthPermissionServiceImpl.class new file mode 100644 index 00000000..5da1896d Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/service/auth/impl/AuthPermissionServiceImpl.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/auth/impl/AuthRoleAdminServiceImpl.class b/api-admin/target/classes/com/glxp/api/admin/service/auth/impl/AuthRoleAdminServiceImpl.class new file mode 100644 index 00000000..d351d101 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/service/auth/impl/AuthRoleAdminServiceImpl.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/auth/impl/AuthRoleServiceImpl.class b/api-admin/target/classes/com/glxp/api/admin/service/auth/impl/AuthRoleServiceImpl.class new file mode 100644 index 00000000..96eddd6e Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/service/auth/impl/AuthRoleServiceImpl.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/basic/BasicUnitMaintainService.class b/api-admin/target/classes/com/glxp/api/admin/service/basic/BasicUnitMaintainService.class new file mode 100644 index 00000000..bad8b7ef Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/service/basic/BasicUnitMaintainService.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/basic/BussinessTypeService.class b/api-admin/target/classes/com/glxp/api/admin/service/basic/BussinessTypeService.class new file mode 100644 index 00000000..1fce8b85 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/service/basic/BussinessTypeService.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/basic/UdiInfoService.class b/api-admin/target/classes/com/glxp/api/admin/service/basic/UdiInfoService.class new file mode 100644 index 00000000..44a4d012 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/service/basic/UdiInfoService.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/basic/UdiRelevanceService.class b/api-admin/target/classes/com/glxp/api/admin/service/basic/UdiRelevanceService.class new file mode 100644 index 00000000..48f96deb Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/service/basic/UdiRelevanceService.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/basic/UnitMaintainService.class b/api-admin/target/classes/com/glxp/api/admin/service/basic/UnitMaintainService.class new file mode 100644 index 00000000..c3a97b1a Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/service/basic/UnitMaintainService.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/basic/impl/BasicUnitMaintainServiceImpl.class b/api-admin/target/classes/com/glxp/api/admin/service/basic/impl/BasicUnitMaintainServiceImpl.class new file mode 100644 index 00000000..7d91945b Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/service/basic/impl/BasicUnitMaintainServiceImpl.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/basic/impl/BussinessTypeServiceImpl.class b/api-admin/target/classes/com/glxp/api/admin/service/basic/impl/BussinessTypeServiceImpl.class new file mode 100644 index 00000000..873664ad Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/service/basic/impl/BussinessTypeServiceImpl.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/basic/impl/UdiInfoServiceImpl.class b/api-admin/target/classes/com/glxp/api/admin/service/basic/impl/UdiInfoServiceImpl.class new file mode 100644 index 00000000..2fba91e0 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/service/basic/impl/UdiInfoServiceImpl.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/basic/impl/UdiRelevanceServiceImpl.class b/api-admin/target/classes/com/glxp/api/admin/service/basic/impl/UdiRelevanceServiceImpl.class new file mode 100644 index 00000000..c394f567 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/service/basic/impl/UdiRelevanceServiceImpl.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/basic/impl/UnitMaintainServiceImpl.class b/api-admin/target/classes/com/glxp/api/admin/service/basic/impl/UnitMaintainServiceImpl.class new file mode 100644 index 00000000..d10fc8e4 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/service/basic/impl/UnitMaintainServiceImpl.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/info/CompanyService.class b/api-admin/target/classes/com/glxp/api/admin/service/info/CompanyService.class new file mode 100644 index 00000000..38b31460 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/service/info/CompanyService.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/info/SetupService.class b/api-admin/target/classes/com/glxp/api/admin/service/info/SetupService.class new file mode 100644 index 00000000..6ba226e3 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/service/info/SetupService.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/info/SystemParamConfigService.class b/api-admin/target/classes/com/glxp/api/admin/service/info/SystemParamConfigService.class new file mode 100644 index 00000000..e9ea63a5 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/service/info/SystemParamConfigService.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/info/impl/CompanyServiceImpl.class b/api-admin/target/classes/com/glxp/api/admin/service/info/impl/CompanyServiceImpl.class new file mode 100644 index 00000000..68887bf0 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/service/info/impl/CompanyServiceImpl.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/info/impl/SetupServiceImpl.class b/api-admin/target/classes/com/glxp/api/admin/service/info/impl/SetupServiceImpl.class new file mode 100644 index 00000000..cef689dc Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/service/info/impl/SetupServiceImpl.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/info/impl/SystemParamConfigServiceImpl.class b/api-admin/target/classes/com/glxp/api/admin/service/info/impl/SystemParamConfigServiceImpl.class new file mode 100644 index 00000000..190ba559 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/service/info/impl/SystemParamConfigServiceImpl.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/inout/CodesService.class b/api-admin/target/classes/com/glxp/api/admin/service/inout/CodesService.class new file mode 100644 index 00000000..8a656bc9 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/service/inout/CodesService.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/inout/CodesTempService.class b/api-admin/target/classes/com/glxp/api/admin/service/inout/CodesTempService.class new file mode 100644 index 00000000..e9e82c14 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/service/inout/CodesTempService.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/inout/OrderDetailService.class b/api-admin/target/classes/com/glxp/api/admin/service/inout/OrderDetailService.class new file mode 100644 index 00000000..49142657 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/service/inout/OrderDetailService.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/inout/OrderService.class b/api-admin/target/classes/com/glxp/api/admin/service/inout/OrderService.class new file mode 100644 index 00000000..502da50b Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/service/inout/OrderService.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/inout/impl/CodesServiceImpl.class b/api-admin/target/classes/com/glxp/api/admin/service/inout/impl/CodesServiceImpl.class new file mode 100644 index 00000000..95804964 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/service/inout/impl/CodesServiceImpl.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/inout/impl/CodesTempServiceImpl.class b/api-admin/target/classes/com/glxp/api/admin/service/inout/impl/CodesTempServiceImpl.class new file mode 100644 index 00000000..b132e651 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/service/inout/impl/CodesTempServiceImpl.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/inout/impl/OrderDetailServiceImpl.class b/api-admin/target/classes/com/glxp/api/admin/service/inout/impl/OrderDetailServiceImpl.class new file mode 100644 index 00000000..db8e8145 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/service/inout/impl/OrderDetailServiceImpl.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.class b/api-admin/target/classes/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.class new file mode 100644 index 00000000..bc0560b2 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/inventory/InvErpStockService.class b/api-admin/target/classes/com/glxp/api/admin/service/inventory/InvErpStockService.class new file mode 100644 index 00000000..031bb0da Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/service/inventory/InvErpStockService.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/inventory/InvOrderCheckService.class b/api-admin/target/classes/com/glxp/api/admin/service/inventory/InvOrderCheckService.class new file mode 100644 index 00000000..ad11a162 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/service/inventory/InvOrderCheckService.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/inventory/InvStockPrintService.class b/api-admin/target/classes/com/glxp/api/admin/service/inventory/InvStockPrintService.class new file mode 100644 index 00000000..8381c470 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/service/inventory/InvStockPrintService.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/inventory/impl/InvErpStockServiceImpl.class b/api-admin/target/classes/com/glxp/api/admin/service/inventory/impl/InvErpStockServiceImpl.class new file mode 100644 index 00000000..5415584f Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/service/inventory/impl/InvErpStockServiceImpl.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/inventory/impl/InvOrderCheckServiceImpl.class b/api-admin/target/classes/com/glxp/api/admin/service/inventory/impl/InvOrderCheckServiceImpl.class new file mode 100644 index 00000000..b6d4fb55 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/service/inventory/impl/InvOrderCheckServiceImpl.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/inventory/impl/InvStockPrintServiceImpl.class b/api-admin/target/classes/com/glxp/api/admin/service/inventory/impl/InvStockPrintServiceImpl.class new file mode 100644 index 00000000..15853fe1 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/service/inventory/impl/InvStockPrintServiceImpl.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/thread/BasicUpdateErpDataTask.class b/api-admin/target/classes/com/glxp/api/admin/thread/BasicUpdateErpDataTask.class new file mode 100644 index 00000000..3869f8d8 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/thread/BasicUpdateErpDataTask.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/thread/BasicUpdateproductService.class b/api-admin/target/classes/com/glxp/api/admin/thread/BasicUpdateproductService.class new file mode 100644 index 00000000..360db9e1 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/thread/BasicUpdateproductService.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/thread/InvDlErpStockService.class b/api-admin/target/classes/com/glxp/api/admin/thread/InvDlErpStockService.class new file mode 100644 index 00000000..0294eb3c Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/thread/InvDlErpStockService.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/thread/InvDlErpStockTask.class b/api-admin/target/classes/com/glxp/api/admin/thread/InvDlErpStockTask.class new file mode 100644 index 00000000..6f8e146b Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/thread/InvDlErpStockTask.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/thread/InvImportStockService$1.class b/api-admin/target/classes/com/glxp/api/admin/thread/InvImportStockService$1.class new file mode 100644 index 00000000..6e1bf504 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/thread/InvImportStockService$1.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/thread/InvImportStockService$2.class b/api-admin/target/classes/com/glxp/api/admin/thread/InvImportStockService$2.class new file mode 100644 index 00000000..9acd1f0d Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/thread/InvImportStockService$2.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/thread/InvImportStockService$3.class b/api-admin/target/classes/com/glxp/api/admin/thread/InvImportStockService$3.class new file mode 100644 index 00000000..985ebf62 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/thread/InvImportStockService$3.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/thread/InvImportStockService.class b/api-admin/target/classes/com/glxp/api/admin/thread/InvImportStockService.class new file mode 100644 index 00000000..9c300468 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/thread/InvImportStockService.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/thread/InvUpdateStock1Task.class b/api-admin/target/classes/com/glxp/api/admin/thread/InvUpdateStock1Task.class new file mode 100644 index 00000000..2d215bfb Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/thread/InvUpdateStock1Task.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/thread/InvUpdateStock2Task.class b/api-admin/target/classes/com/glxp/api/admin/thread/InvUpdateStock2Task.class new file mode 100644 index 00000000..9f6061c2 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/thread/InvUpdateStock2Task.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/thread/IoModifyErpTask.class b/api-admin/target/classes/com/glxp/api/admin/thread/IoModifyErpTask.class new file mode 100644 index 00000000..60633921 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/thread/IoModifyErpTask.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/thread/IoTransInoutService.class b/api-admin/target/classes/com/glxp/api/admin/thread/IoTransInoutService.class new file mode 100644 index 00000000..4f1ce643 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/thread/IoTransInoutService.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/thread/IoTransInoutTask.class b/api-admin/target/classes/com/glxp/api/admin/thread/IoTransInoutTask.class new file mode 100644 index 00000000..d0e09609 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/thread/IoTransInoutTask.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/thread/TaskExecutorConfig$MyAsyncExceptionHandler.class b/api-admin/target/classes/com/glxp/api/admin/thread/TaskExecutorConfig$MyAsyncExceptionHandler.class new file mode 100644 index 00000000..7ba5c930 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/thread/TaskExecutorConfig$MyAsyncExceptionHandler.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/thread/TaskExecutorConfig.class b/api-admin/target/classes/com/glxp/api/admin/thread/TaskExecutorConfig.class new file mode 100644 index 00000000..6d41d1e9 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/thread/TaskExecutorConfig.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/util/CacheUtils.class b/api-admin/target/classes/com/glxp/api/admin/util/CacheUtils.class new file mode 100644 index 00000000..d8423320 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/util/CacheUtils.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/util/CheckUtils.class b/api-admin/target/classes/com/glxp/api/admin/util/CheckUtils.class new file mode 100644 index 00000000..08e75cfd Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/util/CheckUtils.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/util/CustomUtil.class b/api-admin/target/classes/com/glxp/api/admin/util/CustomUtil.class new file mode 100644 index 00000000..2a3d1be1 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/util/CustomUtil.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/util/DateUtil.class b/api-admin/target/classes/com/glxp/api/admin/util/DateUtil.class new file mode 100644 index 00000000..1fcd735b Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/util/DateUtil.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/util/FastJsonUtils$1.class b/api-admin/target/classes/com/glxp/api/admin/util/FastJsonUtils$1.class new file mode 100644 index 00000000..b3d0d565 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/util/FastJsonUtils$1.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/util/FastJsonUtils.class b/api-admin/target/classes/com/glxp/api/admin/util/FastJsonUtils.class new file mode 100644 index 00000000..08065602 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/util/FastJsonUtils.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/util/FilterUdiUtils.class b/api-admin/target/classes/com/glxp/api/admin/util/FilterUdiUtils.class new file mode 100644 index 00000000..0d827028 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/util/FilterUdiUtils.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/util/HttpClient.class b/api-admin/target/classes/com/glxp/api/admin/util/HttpClient.class new file mode 100644 index 00000000..c2d3ee78 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/util/HttpClient.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/util/IpUtils.class b/api-admin/target/classes/com/glxp/api/admin/util/IpUtils.class new file mode 100644 index 00000000..38980561 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/util/IpUtils.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/util/JwtUtils.class b/api-admin/target/classes/com/glxp/api/admin/util/JwtUtils.class new file mode 100644 index 00000000..25fb2f9c Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/util/JwtUtils.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/util/Md5Utils.class b/api-admin/target/classes/com/glxp/api/admin/util/Md5Utils.class new file mode 100644 index 00000000..3146ba81 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/util/Md5Utils.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/util/PasswordUtils.class b/api-admin/target/classes/com/glxp/api/admin/util/PasswordUtils.class new file mode 100644 index 00000000..8b5e2b29 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/util/PasswordUtils.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/util/PermissionRuleTreeUtils.class b/api-admin/target/classes/com/glxp/api/admin/util/PermissionRuleTreeUtils.class new file mode 100644 index 00000000..8bfc2943 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/util/PermissionRuleTreeUtils.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/util/PublicFileUtils.class b/api-admin/target/classes/com/glxp/api/admin/util/PublicFileUtils.class new file mode 100644 index 00000000..389e450c Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/util/PublicFileUtils.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/util/TreeUtils.class b/api-admin/target/classes/com/glxp/api/admin/util/TreeUtils.class new file mode 100644 index 00000000..a4f2c825 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/util/TreeUtils.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/util/UdidConfig.class b/api-admin/target/classes/com/glxp/api/admin/util/UdidConfig.class new file mode 100644 index 00000000..927d4a05 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/util/UdidConfig.class differ diff --git a/api-admin/target/classes/com/glxp/api/admin/util/serializer/Date2LongSerializer.class b/api-admin/target/classes/com/glxp/api/admin/util/serializer/Date2LongSerializer.class new file mode 100644 index 00000000..607198f9 Binary files /dev/null and b/api-admin/target/classes/com/glxp/api/admin/util/serializer/Date2LongSerializer.class differ diff --git a/api-admin/target/classes/logback-spring.xml b/api-admin/target/classes/logback-spring.xml new file mode 100644 index 00000000..daa05617 --- /dev/null +++ b/api-admin/target/classes/logback-spring.xml @@ -0,0 +1,145 @@ + + + logback + + + + + + %d{HH:mm:ss.SSS} %contextName [%thread] %-5level %logger{36} - %msg%n + + + + + + + + + + ${log.path}/web_debug.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + + ${log.path}/web-debug-%d{yyyy-MM-dd}.%i.log + + 40MB + + + 15 + + + + debug + ACCEPT + DENY + + + + + + + ${log.path}/web_info.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + + ${log.path}/web-info-%d{yyyy-MM-dd}.%i.log + + 40MB + + + 15 + + + + info + ACCEPT + DENY + + + + + + + ${log.path}/web_warn.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + ${log.path}/web-warn-%d{yyyy-MM-dd}.%i.log + + 40MB + + + 15 + + + + warn + ACCEPT + DENY + + + + + + + ${log.path}/web_error.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + ${log.path}/web-error-%d{yyyy-MM-dd}.%i.log + + 40MB + + + 15 + + + + ERROR + ACCEPT + DENY + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/api-admin/target/classes/mybatis/configuration.xml b/api-admin/target/classes/mybatis/configuration.xml new file mode 100644 index 00000000..771e01b3 --- /dev/null +++ b/api-admin/target/classes/mybatis/configuration.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + \ No newline at end of file diff --git a/api-admin/target/classes/mybatis/db.properties b/api-admin/target/classes/mybatis/db.properties new file mode 100644 index 00000000..8caaaaff --- /dev/null +++ b/api-admin/target/classes/mybatis/db.properties @@ -0,0 +1,5 @@ +jdbc.jar.path=D:/Program Files/maven/maven-repository/mysql/mysql-connector-java/8.0.21/mysql-connector-java-8.0.21.jar +jdbc.driver=com.mysql.cj.jdbc.Driver +jdbc.url=jdbc:mysql://127.0.0.1:3306/warehouse?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false +jdbc.username=root +jdbc.password=123456 \ No newline at end of file diff --git a/api-admin/target/classes/mybatis/mapper/auth/AuthAdminDao.xml b/api-admin/target/classes/mybatis/mapper/auth/AuthAdminDao.xml new file mode 100644 index 00000000..38549386 --- /dev/null +++ b/api-admin/target/classes/mybatis/mapper/auth/AuthAdminDao.xml @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + INSERT INTO auth_user(userName,passWord,lastLoginIp,lastLoginTime,createTime,userFlag,employeeName) + values + (#{userName}, + + + #{passWord}, + + + '', + + + + + + + #{lastLoginIp}, + + + '', + + + + + #{lastLoginTime}, + + + '0001-01-01 00:00:00', + + + #{createTime}, + #{userFlag,jdbcType=INTEGER}, + #{employeeName}) + + + + UPDATE auth_user + + userName=#{userName}, + passWord=#{passWord}, + lastLoginIp=#{lastLoginIp}, + lastLoginTime=#{lastLoginTime}, + userFlag=#{userFlag}, + employeeName=#{employeeName} + + WHERE id=#{id} + + + + delete from auth_user where id = #{id} + + + \ No newline at end of file diff --git a/api-admin/target/classes/mybatis/mapper/auth/AuthPermissionDao.xml b/api-admin/target/classes/mybatis/mapper/auth/AuthPermissionDao.xml new file mode 100644 index 00000000..199cd862 --- /dev/null +++ b/api-admin/target/classes/mybatis/mapper/auth/AuthPermissionDao.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + INSERT INTO auth_permission + (roleId, permissionRuleId,`type`) + VALUES + + + (#{item.roleId}, #{item.permissionRuleId}, #{item.type}) + + + + + + + delete from auth_permission where roleId = #{roleId} + + + \ No newline at end of file diff --git a/api-admin/target/classes/mybatis/mapper/auth/AuthPermissionRuleDao.xml b/api-admin/target/classes/mybatis/mapper/auth/AuthPermissionRuleDao.xml new file mode 100644 index 00000000..192b5680 --- /dev/null +++ b/api-admin/target/classes/mybatis/mapper/auth/AuthPermissionRuleDao.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + INSERT INTO auth_permission_rule(pid,`name`,`title`,`status`,`condition`,`listorder`,create_time,update_time) + values + (#{pid}, + #{name}, + #{title}, + #{status}, + + + #{condition}, + + + '', + + + #{listorder}, + #{createTime}, + #{updateTime}) + + + + UPDATE auth_permission_rule + + pid=#{pid}, + `name`=#{name}, + title=#{title}, + `status`=#{status}, + `condition`=#{condition}, + `listorder`=#{listorder}, + update_time=#{updateTime}, + + WHERE id=#{id} + + + + delete from auth_permission_rule where id = #{id} + + + \ No newline at end of file diff --git a/api-admin/target/classes/mybatis/mapper/auth/AuthRoleAdminDao.xml b/api-admin/target/classes/mybatis/mapper/auth/AuthRoleAdminDao.xml new file mode 100644 index 00000000..91f75dcc --- /dev/null +++ b/api-admin/target/classes/mybatis/mapper/auth/AuthRoleAdminDao.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + INSERT INTO auth_role_admin + (role_id, admin_id) + VALUES + + + (#{item.role_id}, #{item.admin_id}) + + + + + + delete from auth_role_admin where admin_id = #{adminId} + + + \ No newline at end of file diff --git a/api-admin/target/classes/mybatis/mapper/auth/AuthRoleDao.xml b/api-admin/target/classes/mybatis/mapper/auth/AuthRoleDao.xml new file mode 100644 index 00000000..ca9ed9cb --- /dev/null +++ b/api-admin/target/classes/mybatis/mapper/auth/AuthRoleDao.xml @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + INSERT INTO auth_role(`name`,pid,`status`,`remark`,`listorder`,create_time,update_time) + values + ( + #{name}, + + + #{pid}, + + + 0, + + + #{status}, + + + #{remark}, + + + '', + + + + + #{listorder}, + + + 999, + + + #{createTime}, + #{updateTime} + ) + + + + UPDATE auth_role + + `name`=#{name}, + pid=#{pid}, + `status`=#{status}, + remark=#{remark}, + `listorder`=#{listorder}, + update_time=#{updateTime}, + + WHERE id=#{id} + + + + delete from auth_role where id = #{id} + + + \ No newline at end of file diff --git a/api-admin/target/classes/mybatis/mapper/basic/BasicUnitMaintainDao.xml b/api-admin/target/classes/mybatis/mapper/basic/BasicUnitMaintainDao.xml new file mode 100644 index 00000000..7e52c3a6 --- /dev/null +++ b/api-admin/target/classes/mybatis/mapper/basic/BasicUnitMaintainDao.xml @@ -0,0 +1,85 @@ + + + + + + + + + + INSERT INTO basic_corp + (thirdId,erpId,name,spell, + addr,status,type,creditNo,contact,mobile) + values + ( + #{thirdId}, + #{erpId}, + #{name}, + #{spell}, + #{addr}, + #{status}, + #{type}, + #{creditNo}, + #{contact}, + #{mobile} + ) + + + + insert INTO basic_corp( + thirdId,erpId,name,spell,addr, + status,type,creditNo,contact,mobile + ) values + ( + #{thirdId}, + #{erpId}, + #{name}, + #{spell}, + #{addr}, + #{status}, + #{type}, + #{creditNo}, + #{contact}, + #{mobile} + ) + + + + UPDATE basic_corp + + thirdId=#{thirdId}, + erpId=#{erpId}, + name=#{name}, + spell=#{spell}, + addr=#{addr}, + status=#{status}, + type=#{type}, + creditNo=#{creditNo}, + contact=#{contact}, + mobile=#{mobile}, + + WHERE id=#{id} + + + + DELETE FROM basic_corp WHERE id = #{id} + + + + + diff --git a/api-admin/target/classes/mybatis/mapper/basic/BussinessTypeDao.xml b/api-admin/target/classes/mybatis/mapper/basic/BussinessTypeDao.xml new file mode 100644 index 00000000..7e9ec433 --- /dev/null +++ b/api-admin/target/classes/mybatis/mapper/basic/BussinessTypeDao.xml @@ -0,0 +1,56 @@ + + + + + + + + + + INSERT INTO basic_bussiness_type + (action,name,enable,remark,mainAction) + values + ( + #{action}, + #{name}, + #{enable}, + #{remark}, + #{mainAction} + ) + + + + UPDATE basic_bussiness_type SET + action = #{action}, + name = #{name}, + enable = #{enable}, + remark = #{remark} + mainAction = #{mainAction} + WHERE id = #{id} + + + + DELETE FROM basic_bussiness_type WHERE id = #{id} + + + + + diff --git a/api-admin/target/classes/mybatis/mapper/basic/UdiInfoDao.xml b/api-admin/target/classes/mybatis/mapper/basic/UdiInfoDao.xml new file mode 100644 index 00000000..18e30a35 --- /dev/null +++ b/api-admin/target/classes/mybatis/mapper/basic/UdiInfoDao.xml @@ -0,0 +1,154 @@ + + + + + + + + + + + + + + replace INTO basic_products + ( + nameCode,packRatio,packLevel,bhxjsl, + bhzxxsbzsl,zxxsbzbhsydysl,bhxjcpbm,bzcj,addType,deviceRecordKey, + cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm,ylqxzcrbarmc,zczbhhzbapzbh,ylqxzcrbarywmc,uuid,sjcpbm,versionNumber + ,diType + ) + values + ( + #{nameCode}, + #{packRatio}, + #{packLevel}, + #{bhxjsl}, + #{bhzxxsbzsl}, + #{zxxsbzbhsydysl}, + #{bhxjcpbm}, + #{bzcj}, + #{addType}, + #{deviceRecordKey}, + #{cpmctymc}, + #{cplb}, + #{flbm}, + #{ggxh}, + #{qxlb}, + #{tyshxydm}, + #{ylqxzcrbarmc}, + #{zczbhhzbapzbh}, + #{ylqxzcrbarywmc}, + #{uuid}, + #{sjcpbm}, + #{versionNumber}, + #{diType} + ) + + + + replace INTO basic_products + ( + nameCode,packRatio,packLevel,bhxjsl, + bhzxxsbzsl,zxxsbzbhsydysl,bhxjcpbm,bzcj,addType,deviceRecordKey, + cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm,ylqxzcrbarmc,zczbhhzbapzbh,ylqxzcrbarywmc,uuid,sjcpbm,versionNumber + ,diType + ) + values + + + ( + #{item.nameCode}, + #{item.packRatio}, + #{item.packLevel}, + #{item.bhxjsl}, + #{item.bhzxxsbzsl}, + #{item.zxxsbzbhsydysl}, + #{item.bhxjcpbm}, + #{item.bzcj}, + #{item.addType}, + #{item.deviceRecordKey}, + #{item.cpmctymc}, + #{item.cplb}, + #{item.flbm}, + #{item.ggxh}, + #{item.qxlb}, + #{item.tyshxydm}, + #{item.ylqxzcrbarmc}, + #{item.zczbhhzbapzbh}, + #{item.ylqxzcrbarywmc}, + #{item.uuid}, + #{item.sjcpbm}, + #{item.versionNumber}, + #{item.diType} + ) + + + + + DELETE FROM basic_products WHERE id = #{id} + + + + DELETE FROM basic_products WHERE uuid = #{uuid} + + + + UPDATE basic_products + + packRatio=#{packRatio}, + packLevel=#{packLevel}, + bhxjsl=#{bhxjsl}, + bhzxxsbzsl=#{bhzxxsbzsl}, + zxxsbzbhsydysl=#{zxxsbzbhsydysl}, + bhxjcpbm=#{bhxjcpbm}, + bzcj=#{bzcj}, + addType=#{addType}, + deviceRecordKey=#{deviceRecordKey}, + cpmctymc=#{cpmctymc}, + cplb=#{cplb}, + flbm=#{flbm}, + ggxh=#{ggxh}, + qxlb=#{qxlb}, + tyshxydm=#{tyshxydm}, + ylqxzcrbarmc=#{ylqxzcrbarmc}, + ylqxzcrbarywmc=#{ylqxzcrbarywmc}, + uuid=#{uuid}, + sjcpbm=#{sjcpbm}, + versionNumber=#{versionNumber}, + diType=#{diType}, + + WHERE nameCode = #{nameCode} + + \ No newline at end of file diff --git a/api-admin/target/classes/mybatis/mapper/basic/UdiRelevanceDao.xml b/api-admin/target/classes/mybatis/mapper/basic/UdiRelevanceDao.xml new file mode 100644 index 00000000..cbf199b0 --- /dev/null +++ b/api-admin/target/classes/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -0,0 +1,141 @@ + + + + + + + + + + + + + + + + + + + replace INTO basic_udirel + ( + thirdId,thirdName,uuid,isUseDy,updateTime,batchNo,warehouseName + ) + values + ( + #{thirdId}, + #{thirdName}, + #{uuid}, + #{isUseDy}, + #{updateTime}, + #{batchNo}, + #{warehouseName} + ) + + + + + DELETE FROM basic_udirel WHERE id = #{id} + + + DELETE FROM basic_udirel WHERE id in + + #{item} + + + + DELETE FROM basic_udirel WHERE uuid = #{uuid} + + + + UPDATE basic_udirel + + thirdId=#{thirdId}, + thirdName=#{thirdName}, + uuid=#{uuid}, + isUseDy=#{isUseDy}, + updateTime=#{updateTime}, + batchNo=#{batchNo}, + warehouseName=#{warehouseName}, + + WHERE id = #{id} + + \ No newline at end of file diff --git a/api-admin/target/classes/mybatis/mapper/basic/UnitMaintainDao.xml b/api-admin/target/classes/mybatis/mapper/basic/UnitMaintainDao.xml new file mode 100644 index 00000000..36ab4d15 --- /dev/null +++ b/api-admin/target/classes/mybatis/mapper/basic/UnitMaintainDao.xml @@ -0,0 +1,49 @@ + + + + + + + + + + INSERT INTO basic_corp + (thirdId,erpId,name,spell, + addr,status,type,contact,mobile,creditNo) + values + ( + #{thirdId}, + #{erpId}, + #{name}, + #{spell}, + #{addr}, + #{status}, + #{type}, + #{contact}, + #{mobile}, + #{creditNo} + ) + + + + DELETE FROM basic_corp WHERE id = #{id} + + + + + diff --git a/api-admin/target/classes/mybatis/mapper/info/CompanyDao.xml b/api-admin/target/classes/mybatis/mapper/info/CompanyDao.xml new file mode 100644 index 00000000..cb0ba302 --- /dev/null +++ b/api-admin/target/classes/mybatis/mapper/info/CompanyDao.xml @@ -0,0 +1,37 @@ + + + + + + + + + + UPDATE company SET + name = #{name}, + category = #{category}, + creditCode = #{creditCode}, + addr = #{addr}, + productAddr = #{productAddr}, + classes = #{classes}, + appId = #{appId}, + appSecret = #{appSecret} + + + + INSERT INTO company(name,category,creditCode,addr,productAddr,classes,appId,appSecret) values + ( #{name}, + #{category}, + #{creditCode}, + #{addr}, + #{productAddr}, + #{classes}, + #{appId}, + #{appSecret}) + + + + \ No newline at end of file diff --git a/api-admin/target/classes/mybatis/mapper/info/ScheduleDao.xml b/api-admin/target/classes/mybatis/mapper/info/ScheduleDao.xml new file mode 100644 index 00000000..951ad044 --- /dev/null +++ b/api-admin/target/classes/mybatis/mapper/info/ScheduleDao.xml @@ -0,0 +1,40 @@ + + + + + + + + insert INTO scheduled + (cronName,cron,customerId) + values + ( + #{cronName}, + #{cron}, + #{customerId} + ) + + + + + delete from scheduled where id = #{id} + + + + + + + diff --git a/api-admin/target/classes/mybatis/mapper/info/SetupDao.xml b/api-admin/target/classes/mybatis/mapper/info/SetupDao.xml new file mode 100644 index 00000000..49fbdb3e --- /dev/null +++ b/api-admin/target/classes/mybatis/mapper/info/SetupDao.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + UPDATE system_config + + erpSaleOutModify=#{erpSaleOutModify}, + erpGetSaleOut=#{erpGetSaleOut}, + erpSaleOutSign=#{erpSaleOutSign}, + filterSaleOutSign=#{filterSaleOutSign}, + erpGetSaleOutDay=#{erpGetSaleOutDay}, + + erpPruchaseModify=#{erpPruchaseModify}, + erpGetPurchaseIn=#{erpGetPurchaseIn}, + erpPruchaseSign=#{erpPruchaseSign}, + erpGetPurchaseDay=#{erpGetPurchaseDay}, + filterPurchaseSign=#{filterPurchaseSign}, + remark=#{remark}, + forbidSameErp=#{forbidSameErp}, + returnWareHouseOut=#{returnWareHouseOut}, + salesWareHouseOut=#{salesWareHouseOut}, + returnWareHouseIn=#{returnWareHouseIn}, + updateErpData=#{updateErpData}, + dlStockErp=#{dlStockErp}, + dlStockErpDay=#{dlStockErpDay}, + + WHERE id=#{id} + + + + + + insert INTO system_config(erpSaleOutModify, + erpGetSaleOut,erpSaleOutSign,filterSaleOutSign,erpGetSaleOutDay,erpPruchaseModify, + erpGetPurchaseIn,erpPruchaseSign, + erpGetPurchaseDay,filterPurchaseSign,remark,forbidSameErp, + returnWareHouseOut,salesWareHouseOut,returnWareHouseIn,updateErpData,dlStockErp,dlStockErpDay + ) values + ( + #{erpSaleOutModify},#{erpGetSaleOut}, #{erpSaleOutSign}, + #{filterSaleOutSign}, #{erpGetSaleOutDay},#{erpPruchaseModify}, #{erpGetPurchaseIn}, + #{erpPruchaseSign}, + #{erpGetPurchaseDay}, #{filterPurchaseSign}, + #{remark},#{forbidSameErp} + ,#{returnWareHouseOut},#{salesWareHouseOut},#{returnWareHouseIn},#{updateErpData},#{dlStockErp},#{dlStockErpDay}) + + + + \ No newline at end of file diff --git a/api-admin/target/classes/mybatis/mapper/info/SystemParamConfigDao.xml b/api-admin/target/classes/mybatis/mapper/info/SystemParamConfigDao.xml new file mode 100644 index 00000000..0b8fd2c6 --- /dev/null +++ b/api-admin/target/classes/mybatis/mapper/info/SystemParamConfigDao.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + UPDATE system_param_config + + paramName=#{paramName}, + paramKey=#{paramKey}, + paramValue=#{paramValue}, + paramStatus=#{paramStatus}, + paramType=#{paramType}, + paramExplain=#{paramExplain}, + + WHERE id=#{id} + + + + UPDATE system_param_config + + paramStatus=#{paramStatus}, + + WHERE parentId=#{parentId} + + + + insert INTO system_param_config(paramName, + paramKey,paramValue,paramStatus,paramType,paramExplain + ) values + ( + #{paramName}, + #{paramKey}, + #{paramValue}, + #{paramStatus}, + #{paramType}, + #{paramExplain} + ) + + + + \ No newline at end of file diff --git a/api-admin/target/classes/mybatis/mapper/inout/CodesDao.xml b/api-admin/target/classes/mybatis/mapper/inout/CodesDao.xml new file mode 100644 index 00000000..b8d2405a --- /dev/null +++ b/api-admin/target/classes/mybatis/mapper/inout/CodesDao.xml @@ -0,0 +1,115 @@ + + + + + + + + + + + + INSERT INTO io_codes(action,mainAction,code,corpOrderId,actor,actDate,wrongCode,upperCorpOrderId,fromCorpId,fromCorp,type) + values( + #{action}, + #{mainAction}, + #{code}, + #{corpOrderId}, + #{actor}, + #{actDate}, + #{wrongCode}, + #{upperCorpOrderId}, + #{fromCorpId}, + #{fromCorp},#{orderId},#{type}) + + + + INSERT INTO io_codes + (action, + mainAction, + code, + corpOrderId, + actor, + actDate, + wrongCode, + upperCorpOrderId, + fromCorpId,fromCorp,orderId,batchNo,produceDate,expireDate,serialNo,udi,count,type) + VALUES + + ( + #{item.action}, + #{item.mainAction}, + #{item.code}, + #{item.corpOrderId}, + #{item.actor}, + #{item.actDate}, + #{item.wrongCode}, + #{item.upperCorpOrderId}, + #{item.fromCorpId}, + #{ + item.fromCorp + },#{item.orderId},#{item.batchNo} + ,#{item.produceDate} + ,#{item.expireDate} + ,#{item.serialNo} + ,#{item.udi} + ,#{item.count} + ,#{item.type}) + + + + + + + + + + + UPDATE io_codes SET orderId = #{newOrderId} where orderId = #{oldOrderId} + + + + + UPDATE io_codes SET fromCorpID = #{fromCorpID}, fromCorp = #{fromCorp} + WHERE orderId = #{orderId} + + \ No newline at end of file diff --git a/api-admin/target/classes/mybatis/mapper/inout/CodesTempDao.xml b/api-admin/target/classes/mybatis/mapper/inout/CodesTempDao.xml new file mode 100644 index 00000000..9802f3d4 --- /dev/null +++ b/api-admin/target/classes/mybatis/mapper/inout/CodesTempDao.xml @@ -0,0 +1,46 @@ + + + + + + + + INSERT INTO io_codes_temp + (action, mainAction,code, corpOrderId, actor,actDate, + fromCorpID, fromCorp, orderId,batchNo,produceDate,expireDate,serialNo,udi,count) + VALUES + + ( + #{item.action}, + #{item.mainAction}, + #{item.code}, + #{item.corpOrderId}, + #{item.actor}, + #{item.actDate}, + #{item.fromCorpID}, + #{item.fromCorp}, + #{item.orderId} + ,#{item.batchNo} + ,#{item.produceDate} + ,#{item.expireDate} + ,#{item.serialNo} + ,#{item.udi} + ,#{item.count} + ) + + + + + + DELETE FROM io_codes_temp WHERE id IN + + #{item} + + + \ No newline at end of file diff --git a/api-admin/target/classes/mybatis/mapper/inout/OrderDao.xml b/api-admin/target/classes/mybatis/mapper/inout/OrderDao.xml new file mode 100644 index 00000000..9affeb6c --- /dev/null +++ b/api-admin/target/classes/mybatis/mapper/inout/OrderDao.xml @@ -0,0 +1,210 @@ + + + + + + + + + + + + + insert INTO io_order(id,action,corpOrderId,actDate,fromCorpId,actor,mainAction, + fromCorp,status,remark,exportStatus,fromType,contrastStatus,signStatus,erpFk,stockCheckFk) + values( + #{id}, + #{action}, + #{corpOrderId}, + #{actDate}, + #{fromCorpId}, + #{actor}, + #{mainAction}, + #{fromCorp}, + #{status}, + #{remark}, + #{exportStatus}, + #{fromType}, + #{contrastStatus}, + #{signStatus}, + #{erpFk}, + #{stockCheckFk}) + + + UPDATE io_order + + action=#{action}, + corpOrderId=#{corpOrderId}, + actDate=#{actDate}, + fromCorpId=#{fromCorpId}, + actor=#{actor}, + mainAction=#{mainAction}, + fromCorp=#{fromCorp}, + status=#{status}, + remark=#{remark}, + exportStatus=#{exportStatus}, + fromType=#{fromType}, + contrastStatus=#{contrastStatus}, + erpFk=#{erpFk}, + signStatus=#{signStatus} + stockCheckFk=#{stockCheckFk} + + WHERE id = #{id} + + + + + DELETE FROM io_order WHERE id = #{orderId} + + + + DELETE FROM io_order WHERE id = #{id} + + + + UPDATE io_order SET fromCorpId = #{fromCorpId},fromCorp = #{fromCorp} where id = #{id} + + + + UPDATE io_order SET `status` = #{status} where id = #{orderId} + + + UPDATE io_order SET `exportStatus` = #{exportStatus} where id = #{orderId} + + + UPDATE io_order SET `contrastStatus` = #{contrastStatus} where id = #{orderId} + + + UPDATE io_order SET `signStatus` = #{signStatus} where id = #{orderId} + + + UPDATE io_order SET `remark` = #{remark} where id = #{orderId} + + + + + + + + + + \ No newline at end of file diff --git a/api-admin/target/classes/mybatis/mapper/inout/OrderDetail.xml b/api-admin/target/classes/mybatis/mapper/inout/OrderDetail.xml new file mode 100644 index 00000000..9d33e0b0 --- /dev/null +++ b/api-admin/target/classes/mybatis/mapper/inout/OrderDetail.xml @@ -0,0 +1,183 @@ + + + + + + + + + + + + + + + + + + + + + + + + replace INTO io_order_detail(id, + companyid,erpOrderId,iodtlId,inoutId,goodsunit,goodsid, + batchNoId,goodsname,companyname, + batchNo,erpCount,credate,nameCode,productCompany, + coName,authCode,packSpec,packRatio,bhzxxsbzsl, + zxxsbzbhsydysl,orderIdFk,count,reCount) + values( + #{id}, + #{companyid}, + #{erpOrderId}, + #{iodtlId}, + #{inoutId}, + #{goodsunit}, + #{goodsid}, + #{batchNoId}, + #{goodsname}, + #{companyname}, + #{batchNo}, + #{erpCount}, + #{credate}, + #{nameCode},#{productCompany},#{coName},#{authCode},#{packSpec},#{packRatio}, + #{bhzxxsbzsl},#{zxxsbzbhsydysl},#{orderIdFk},#{count},#{reCount} + ) + + + + replace INTO io_order_detail(id, + companyid,erpOrderId,iodtlId,inoutId,goodsunit,goodsid,batchNoId,goodsname,companyname, + batchNo,erpCount,credate,nameCode,productCompany, + coName,authCode,packSpec,packRatio,bhzxxsbzsl,zxxsbzbhsydysl,orderIdFk,count,reCount) + values + + + ( + #{item.id}, + #{item.companyid}, + #{item.erpOrderId}, + #{item.iodtlId}, + #{item.inoutId}, + #{item.goodsunit}, + #{item.goodsid}, + #{item.batchNoId}, + #{item.goodsname}, + #{item.companyname}, + #{item.batchNo}, + #{item.erpCount}, #{item.credate}, + #{item.nameCode}, #{item.productCompany}, #{item.coName}, #{item.authCode}, #{item.packSpec}, + #{item.packRatio}, #{item.bhzxxsbzsl}, + #{item.zxxsbzbhsydysl}, #{item.orderIdFk}, #{item.count},#{item.reCount}) + + + + + UPDATE io_order_detail + + count=#{count}, + reCount=#{reCount}, + + WHERE id = #{id} + + + DELETE FROM io_order_detail WHERE docid = #{id} + + + + DELETE FROM io_order_detail WHERE id = #{id} + + + + DELETE FROM io_order_detail WHERE orderIdFk = #{id} + + + + \ No newline at end of file diff --git a/api-admin/target/classes/mybatis/mapper/inventory/InvErpStockDao.xml b/api-admin/target/classes/mybatis/mapper/inventory/InvErpStockDao.xml new file mode 100644 index 00000000..0c07cb75 --- /dev/null +++ b/api-admin/target/classes/mybatis/mapper/inventory/InvErpStockDao.xml @@ -0,0 +1,71 @@ + + + + + + + + + replace INTO erpstock + ( + orderId,code,batchNo,manufacturingDate,expirationDate,count,remark,name + ) + values + ( + #{orderId}, + #{code}, + #{batchNo}, + #{manufacturingDate}, + #{count}, + #{remark}, + #{name} + ) + + + + replace INTO erpstock + ( + orderId,code,batchNo,manufacturingDate,expirationDate,count,remark,name + ) + values + + + ( + #{item.orderId}, + #{item.code}, + #{item.batchNo}, + #{item.manufacturingDate}, + #{item.expirationDate}, + #{item.count}, + #{item.remark}, + #{item.name} + ) + + + + + DELETE FROM erpstock WHERE id = #{id} + + + + UPDATE erpstock + + orderId=#{orderId}, + code=#{code}, + batchNo=#{batchNo}, + manufacturingDate=#{manufacturingDate}, + expirationDate=#{expirationDate}, + count=#{count}, + remark=#{remark}, + name=#{name}, + + WHERE id = #{id} + + + + \ No newline at end of file diff --git a/api-admin/target/classes/mybatis/mapper/inventory/InvOrderCheckDao.xml b/api-admin/target/classes/mybatis/mapper/inventory/InvOrderCheckDao.xml new file mode 100644 index 00000000..fb6ad438 --- /dev/null +++ b/api-admin/target/classes/mybatis/mapper/inventory/InvOrderCheckDao.xml @@ -0,0 +1,66 @@ + + + + + + + + + + insert INTO stockcheck + ( + action,actDate,status,remark,endTime,whouse,houseCard + ) + values + ( + #{action}, + #{actDate}, + #{status}, + #{remark},#{endTime},#{whouse},#{houseCard} + ) + + + + + DELETE FROM stockcheck WHERE id = #{id} + + + + UPDATE stockcheck + + action=#{action}, + actDate=#{actDate}, + status=#{status}, + remark=#{remark}, + endTime=#{endTime}, + whouse=#{whouse}, + houseCard=#{houseCard}, + + WHERE id = #{id} + + + \ No newline at end of file diff --git a/api-admin/target/classes/mybatis/mapper/inventory/InvStockPrintDao.xml b/api-admin/target/classes/mybatis/mapper/inventory/InvStockPrintDao.xml new file mode 100644 index 00000000..baddf9a6 --- /dev/null +++ b/api-admin/target/classes/mybatis/mapper/inventory/InvStockPrintDao.xml @@ -0,0 +1,142 @@ + + + + + + + + + + + + replace INTO stockprint + ( + udiCode,udiRlIdFk,nameCode,cpmctymc,batchNo, + produceDate,expireDate,serialNo,codeType,thirdId,thirdName, + ggxh,ylqxzcrbarmc,zczbhhzbapzbh,warehouseName,warehouseCode + ) + values + ( + #{udiCode}, + #{udiRlIdFk}, + #{nameCode}, + #{cpmctymc}, + #{batchNo}, + #{produceDate}, + #{expireDate}, + #{serialNo}, + #{codeType}, + #{thirdId}, + #{thirdName}, + #{ggxh}, + #{ylqxzcrbarmc}, + #{zczbhhzbapzbh}, + #{warehouseName}, + #{warehouseCode} + ) + + + + replace INTO stockprint + ( + udiCode,udiRlIdFk,nameCode,cpmctymc,batchNo, + produceDate,expireDate,serialNo,codeType,thirdId,thirdName, + ggxh,ylqxzcrbarmc,zczbhhzbapzbh,warehouseName,warehouseCode + ) + values + + + ( + #{item.udiCode}, + #{item.udiRlIdFk}, + #{item.nameCode}, + #{item.cpmctymc}, + #{item.batchNo}, + #{item.produceDate}, + #{item.expireDate}, + #{item.serialNo}, + #{item.codeType}, + #{item.thirdId}, + #{item.thirdName}, + #{item.ggxh}, + #{item.ylqxzcrbarmc}, + #{item.zczbhhzbapzbh}, + #{item.warehouseName}, + #{item.warehouseCode} + ) + + + + + DELETE FROM stockprint WHERE id = #{id} + + + + UPDATE stockprint + + udiCode=#{udiCode}, + udiRlIdFk=#{udiRlIdFk}, + nameCode=#{nameCode}, + cpmctymc=#{cpmctymc}, + batchNo=#{batchNo}, + produceDate=#{produceDate}, + expireDate=#{expireDate}, + serialNo=#{serialNo}, + codeType=#{codeType}, + thirdId=#{thirdId}, + thirdName=#{thirdName}, + printStatus=#{printStatus}, + ggxh=#{ggxh}, + ylqxzcrbarmc=#{ylqxzcrbarmc}, + zczbhhzbapzbh=#{zczbhhzbapzbh}, + warehouseName=#{warehouseName}, + warehouseCode=#{warehouseCode}, + + + WHERE id = #{id} + + + + + update stockprint + set printStatus = 1 + WHERE id in + + #{item} + + + \ No newline at end of file diff --git a/api-admin/target/classes/mybatis/mybatis-config.xml b/api-admin/target/classes/mybatis/mybatis-config.xml new file mode 100644 index 00000000..a72d9782 --- /dev/null +++ b/api-admin/target/classes/mybatis/mybatis-config.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/api-admin/target/classes/static/.gitignore b/api-admin/target/classes/static/.gitignore new file mode 100644 index 00000000..c96a04f0 --- /dev/null +++ b/api-admin/target/classes/static/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore \ No newline at end of file diff --git a/api-admin/target/classes/templates/.gitignore b/api-admin/target/classes/templates/.gitignore new file mode 100644 index 00000000..c96a04f0 --- /dev/null +++ b/api-admin/target/classes/templates/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore \ No newline at end of file diff --git a/api-admin/target/test-classes/META-INF/api-admin.kotlin_module b/api-admin/target/test-classes/META-INF/api-admin.kotlin_module new file mode 100644 index 00000000..8fb60192 Binary files /dev/null and b/api-admin/target/test-classes/META-INF/api-admin.kotlin_module differ diff --git a/api-admin/target/test-classes/com/glxp/api/BaseApiAdminApplicationTest.class b/api-admin/target/test-classes/com/glxp/api/BaseApiAdminApplicationTest.class new file mode 100644 index 00000000..47b22117 Binary files /dev/null and b/api-admin/target/test-classes/com/glxp/api/BaseApiAdminApplicationTest.class differ diff --git a/api-admin/target/test-classes/com/glxp/api/admin/service/auth/impl/AuthAdminServiceImplTest.class b/api-admin/target/test-classes/com/glxp/api/admin/service/auth/impl/AuthAdminServiceImplTest.class new file mode 100644 index 00000000..90d58254 Binary files /dev/null and b/api-admin/target/test-classes/com/glxp/api/admin/service/auth/impl/AuthAdminServiceImplTest.class differ diff --git a/api-admin/target/test-classes/com/glxp/api/admin/service/auth/impl/AuthLoginServiceImplTest.class b/api-admin/target/test-classes/com/glxp/api/admin/service/auth/impl/AuthLoginServiceImplTest.class new file mode 100644 index 00000000..3f12e385 Binary files /dev/null and b/api-admin/target/test-classes/com/glxp/api/admin/service/auth/impl/AuthLoginServiceImplTest.class differ diff --git a/api-admin/target/test-classes/com/glxp/api/admin/service/auth/impl/AuthPermissionRuleServiceImplTest.class b/api-admin/target/test-classes/com/glxp/api/admin/service/auth/impl/AuthPermissionRuleServiceImplTest.class new file mode 100644 index 00000000..1670bd9d Binary files /dev/null and b/api-admin/target/test-classes/com/glxp/api/admin/service/auth/impl/AuthPermissionRuleServiceImplTest.class differ diff --git a/api-admin/target/test-classes/com/glxp/api/admin/service/auth/impl/AuthRoleAdminServiceImplTest.class b/api-admin/target/test-classes/com/glxp/api/admin/service/auth/impl/AuthRoleAdminServiceImplTest.class new file mode 100644 index 00000000..43563b9d Binary files /dev/null and b/api-admin/target/test-classes/com/glxp/api/admin/service/auth/impl/AuthRoleAdminServiceImplTest.class differ diff --git a/api-admin/target/test-classes/com/glxp/api/admin/service/auth/impl/AuthRoleServiceImplTest.class b/api-admin/target/test-classes/com/glxp/api/admin/service/auth/impl/AuthRoleServiceImplTest.class new file mode 100644 index 00000000..7ebe7adb Binary files /dev/null and b/api-admin/target/test-classes/com/glxp/api/admin/service/auth/impl/AuthRoleServiceImplTest.class differ diff --git a/api-admin/target/test-classes/com/glxp/api/admin/service/auth/impl/MmpaTest.class b/api-admin/target/test-classes/com/glxp/api/admin/service/auth/impl/MmpaTest.class new file mode 100644 index 00000000..965bb0ce Binary files /dev/null and b/api-admin/target/test-classes/com/glxp/api/admin/service/auth/impl/MmpaTest.class differ diff --git a/api-admin/target/test-classes/com/glxp/api/admin/util/DlDeviceTest.class b/api-admin/target/test-classes/com/glxp/api/admin/util/DlDeviceTest.class new file mode 100644 index 00000000..ed755951 Binary files /dev/null and b/api-admin/target/test-classes/com/glxp/api/admin/util/DlDeviceTest.class differ diff --git a/api-admin/target/test-classes/com/glxp/api/admin/util/JwtUtilsTest.class b/api-admin/target/test-classes/com/glxp/api/admin/util/JwtUtilsTest.class new file mode 100644 index 00000000..206b4193 Binary files /dev/null and b/api-admin/target/test-classes/com/glxp/api/admin/util/JwtUtilsTest.class differ diff --git a/api-admin/target/test-classes/com/glxp/api/admin/util/NormalTest.class b/api-admin/target/test-classes/com/glxp/api/admin/util/NormalTest.class new file mode 100644 index 00000000..35000679 Binary files /dev/null and b/api-admin/target/test-classes/com/glxp/api/admin/util/NormalTest.class differ diff --git a/api-admin/target/test-classes/com/glxp/api/admin/util/PermissionRuleTreeUtilsTest.class b/api-admin/target/test-classes/com/glxp/api/admin/util/PermissionRuleTreeUtilsTest.class new file mode 100644 index 00000000..1897ca36 Binary files /dev/null and b/api-admin/target/test-classes/com/glxp/api/admin/util/PermissionRuleTreeUtilsTest.class differ diff --git a/api-common/pom.xml b/api-common/pom.xml new file mode 100644 index 00000000..601c0907 --- /dev/null +++ b/api-common/pom.xml @@ -0,0 +1,29 @@ + + + + api + com.glxp + 0.0.1 + + 4.0.0 + + api-common + + + + + org.projectlombok + lombok + true + + + + org.apache.commons + commons-lang3 + + + + + \ No newline at end of file diff --git a/api-common/src/main/java/com/glxp/api/common/constant/CacheConstant.java b/api-common/src/main/java/com/glxp/api/common/constant/CacheConstant.java new file mode 100644 index 00000000..f38b5aef --- /dev/null +++ b/api-common/src/main/java/com/glxp/api/common/constant/CacheConstant.java @@ -0,0 +1,10 @@ +package com.glxp.api.common.constant; + +/** + * redis 常量 + */ +public interface CacheConstant { + + String ADMIN_AUTH_RULES = "admin_auth_rules:%s"; // 管理员的权限 + +} diff --git a/api-common/src/main/java/com/glxp/api/common/converter/LongList2StringConverter.java b/api-common/src/main/java/com/glxp/api/common/converter/LongList2StringConverter.java new file mode 100644 index 00000000..94b54c26 --- /dev/null +++ b/api-common/src/main/java/com/glxp/api/common/converter/LongList2StringConverter.java @@ -0,0 +1,33 @@ +package com.glxp.api.common.converter; + + +import org.apache.commons.lang3.StringUtils; + +import java.util.*; + +/** + * Long 类型的 List 转为字符串 + */ +public class LongList2StringConverter { + + /** + * Long 类型的 List 转为字符串 + * @param longList + * @param regex + * @return + */ + public static String convert(List longList, String regex) { + + if (longList.isEmpty()) { + return null; + } + Set stringSet = new HashSet<>(); + for (Long value: longList){ + stringSet.add(value.toString()); + } + if (stringSet.isEmpty()) { + return null; + } + return StringUtils.join(stringSet, regex); + } +} diff --git a/api-common/src/main/java/com/glxp/api/common/converter/String2LongListConverter.java b/api-common/src/main/java/com/glxp/api/common/converter/String2LongListConverter.java new file mode 100644 index 00000000..c5868e4f --- /dev/null +++ b/api-common/src/main/java/com/glxp/api/common/converter/String2LongListConverter.java @@ -0,0 +1,38 @@ +package com.glxp.api.common.converter; + + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +/** + * 字符串切割为 List + */ +public class String2LongListConverter { + + /** + * + * @param string + * @param regex 切割的字符 + * @return + */ + public static List convert(String string, String regex) { + try { + if (null == string || "".equals(string)) { + return Collections.emptyList(); + } + String[] strings = string.split(regex); + if (strings.length == 0) { + return Collections.emptyList(); + } + + List longList = new ArrayList<>(); + for (String str : strings) { + longList.add(Long.valueOf(str)); + } + return longList; + }catch (Exception e) { + return Collections.emptyList(); + } + } +} diff --git a/api-common/src/main/java/com/glxp/api/common/converter/String2StringListConverter.java b/api-common/src/main/java/com/glxp/api/common/converter/String2StringListConverter.java new file mode 100644 index 00000000..aee6ae6c --- /dev/null +++ b/api-common/src/main/java/com/glxp/api/common/converter/String2StringListConverter.java @@ -0,0 +1,34 @@ +package com.glxp.api.common.converter; + + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +/** + * 字符串切割为 List + */ +public class String2StringListConverter { + + /** + * + * @param string + * @param regex 切割的字符 + * @return + */ + public static List convert(String string, String regex) { + try { + if (null == string || "".equals(string)) { + return Collections.emptyList(); + } + String[] strings = string.split(regex); + if (strings.length == 0) { + return Collections.emptyList(); + } + return new ArrayList<>(Arrays.asList(strings)); + }catch (Exception e) { + return Collections.emptyList(); + } + } +} diff --git a/api-common/src/main/java/com/glxp/api/common/enums/ResultEnum.java b/api-common/src/main/java/com/glxp/api/common/enums/ResultEnum.java new file mode 100644 index 00000000..7889eef6 --- /dev/null +++ b/api-common/src/main/java/com/glxp/api/common/enums/ResultEnum.java @@ -0,0 +1,30 @@ +package com.glxp.api.common.enums; + +import lombok.Getter; + +/** + * 返回结果的枚举类 + */ +@Getter +public enum ResultEnum { + + SUCCESS(0, "success"), + NOT_NETWORK(1, "系统繁忙，请稍后再试。"), + LOGIN_VERIFY_FALL(2, "登录失效"), + PARAM_VERIFY_FALL(3, "参数验证错误"), + AUTH_FAILED(4, "权限验证失败"), + DATA_NOT(5, "没有相关数据"), + DATA_CHANGE(6, "数据没有任何更改"), + DATA_REPEAT(7, "数据已存在"), + DATA_ERROR(8, "参数错误"), + ; + + private Integer code; + + private String message; + + ResultEnum(Integer code, String message) { + this.code = code; + this.message = message; + } +} diff --git a/api-common/src/main/java/com/glxp/api/common/req/BaseLimitRequest.java b/api-common/src/main/java/com/glxp/api/common/req/BaseLimitRequest.java new file mode 100644 index 00000000..ff84e655 --- /dev/null +++ b/api-common/src/main/java/com/glxp/api/common/req/BaseLimitRequest.java @@ -0,0 +1,56 @@ +package com.glxp.api.common.req; + +/** + * 分页的请求 + */ +public class BaseLimitRequest extends BaseRequest { + + /** + * 页码 + */ + private Integer page; + + /** + * 数量 + */ + private Integer limit; + + /** + * 偏移量 + */ + private Integer offset; + + public Integer getPage() { + return page; + } + + public void setPage(Integer page) { + this.page = page; + } + + public Integer getLimit() { + return limit; + } + + public void setLimit(Integer limit) { + this.limit = limit; + } + + public Integer getOffset() { + return offset; + } + + /** + * 设置偏移量 + */ + public void setOffset() { + if (null == this.getPage() || this.getPage() <= 0) { + this.setPage(1); + } + if (null == this.getLimit() || this.getLimit() <= 0) { + this.setLimit(10); + } + this.offset = (this.getPage() - 1) * this.getLimit(); + } + +} diff --git a/api-common/src/main/java/com/glxp/api/common/req/BaseRequest.java b/api-common/src/main/java/com/glxp/api/common/req/BaseRequest.java new file mode 100644 index 00000000..aaaa9c43 --- /dev/null +++ b/api-common/src/main/java/com/glxp/api/common/req/BaseRequest.java @@ -0,0 +1,37 @@ +package com.glxp.api.common.req; + +import java.util.UUID; + +public class BaseRequest { + + /** + * 唯一请求号 + */ + private String reqNo; + + /** + * 请求的时间戳 + */ + private Long timeStamp; + + public BaseRequest() { + this.reqNo = UUID.randomUUID().toString(); + this.timeStamp = System.currentTimeMillis(); + } + + public String getReqNo() { + return reqNo; + } + + public void setReqNo(String reqNo) { + this.reqNo = reqNo; + } + + public Long getTimeStamp() { + return timeStamp; + } + + public void setTimeStamp(Long timeStamp) { + this.timeStamp = timeStamp; + } +} diff --git a/api-common/src/main/java/com/glxp/api/common/res/BaseResponse.java b/api-common/src/main/java/com/glxp/api/common/res/BaseResponse.java new file mode 100644 index 00000000..12e3217a --- /dev/null +++ b/api-common/src/main/java/com/glxp/api/common/res/BaseResponse.java @@ -0,0 +1,17 @@ +package com.glxp.api.common.res; + +import lombok.Data; + +/** + * 返回结果类 + * @param + */ +@Data +public class BaseResponse { + + private Integer code; + + private String message; + + private T data; +} diff --git a/api-common/src/main/java/com/glxp/api/common/util/ResultVOUtils.java b/api-common/src/main/java/com/glxp/api/common/util/ResultVOUtils.java new file mode 100644 index 00000000..2d1bded2 --- /dev/null +++ b/api-common/src/main/java/com/glxp/api/common/util/ResultVOUtils.java @@ -0,0 +1,70 @@ +package com.glxp.api.common.util; + +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; + +import java.util.HashMap; +import java.util.Map; + +/** + * 返回结果的操作类 + */ +public class ResultVOUtils { + + /** + * 成功时返回 + * @param data 返回的data对象 + * @return {@link BaseResponse} + */ + public static BaseResponse success(Object data) { + BaseResponse baseResponse = new BaseResponse<>(); + baseResponse.setCode(20000); + baseResponse.setMessage("success"); + baseResponse.setData(data); + return baseResponse; + } + + /** + * 成功时返回 + * @return {@link BaseResponse} + */ + public static BaseResponse success() { + Map data = new HashMap(); + return success(data); + } + + /** + * 错误时返回 + * @param code 错误码 + * @param message 错误信息 + * @return {@link BaseResponse} + */ + public static BaseResponse error(Integer code, String message) { + BaseResponse baseResponse = new BaseResponse<>(); + baseResponse.setCode(code); + baseResponse.setMessage(message); + Map data = new HashMap(); + baseResponse.setData(data); + return baseResponse; + } + + /** + * 错误时返回 + * @param resultEnum 错误枚举类 + * @return {@link BaseResponse} + */ + public static BaseResponse error(ResultEnum resultEnum) { + return error(resultEnum.getCode(), resultEnum.getMessage()); + } + + /** + * 错误时返回 + * @param resultEnum 错误枚举类 + * @param message 错误的信息 + * @return {@link BaseResponse} + */ + public static BaseResponse error(ResultEnum resultEnum, String message) { + return error(resultEnum.getCode(), message); + } + +} diff --git a/api-common/src/main/resources/application.properties b/api-common/src/main/resources/application.properties new file mode 100644 index 00000000..e69de29b diff --git a/api-common/src/test/java/com/glxp/api/common/util/ResultVOUtilsTest.java b/api-common/src/test/java/com/glxp/api/common/util/ResultVOUtilsTest.java new file mode 100644 index 00000000..6c647709 --- /dev/null +++ b/api-common/src/test/java/com/glxp/api/common/util/ResultVOUtilsTest.java @@ -0,0 +1,8 @@ +package com.glxp.api.common.util; + + +public class ResultVOUtilsTest { + + public void success() { + } +} \ No newline at end of file diff --git a/api-common/target/classes/application.properties b/api-common/target/classes/application.properties new file mode 100644 index 00000000..e69de29b diff --git a/api-common/target/classes/com/glxp/api/common/constant/CacheConstant.class b/api-common/target/classes/com/glxp/api/common/constant/CacheConstant.class new file mode 100644 index 00000000..577b074a Binary files /dev/null and b/api-common/target/classes/com/glxp/api/common/constant/CacheConstant.class differ diff --git a/api-common/target/classes/com/glxp/api/common/converter/LongList2StringConverter.class b/api-common/target/classes/com/glxp/api/common/converter/LongList2StringConverter.class new file mode 100644 index 00000000..c7286a80 Binary files /dev/null and b/api-common/target/classes/com/glxp/api/common/converter/LongList2StringConverter.class differ diff --git a/api-common/target/classes/com/glxp/api/common/converter/String2LongListConverter.class b/api-common/target/classes/com/glxp/api/common/converter/String2LongListConverter.class new file mode 100644 index 00000000..9c2dfb69 Binary files /dev/null and b/api-common/target/classes/com/glxp/api/common/converter/String2LongListConverter.class differ diff --git a/api-common/target/classes/com/glxp/api/common/converter/String2StringListConverter.class b/api-common/target/classes/com/glxp/api/common/converter/String2StringListConverter.class new file mode 100644 index 00000000..3a936c69 Binary files /dev/null and b/api-common/target/classes/com/glxp/api/common/converter/String2StringListConverter.class differ diff --git a/api-common/target/classes/com/glxp/api/common/enums/ResultEnum.class b/api-common/target/classes/com/glxp/api/common/enums/ResultEnum.class new file mode 100644 index 00000000..0d2a8722 Binary files /dev/null and b/api-common/target/classes/com/glxp/api/common/enums/ResultEnum.class differ diff --git a/api-common/target/classes/com/glxp/api/common/req/BaseLimitRequest.class b/api-common/target/classes/com/glxp/api/common/req/BaseLimitRequest.class new file mode 100644 index 00000000..61ab44a7 Binary files /dev/null and b/api-common/target/classes/com/glxp/api/common/req/BaseLimitRequest.class differ diff --git a/api-common/target/classes/com/glxp/api/common/req/BaseRequest.class b/api-common/target/classes/com/glxp/api/common/req/BaseRequest.class new file mode 100644 index 00000000..f3adc5d3 Binary files /dev/null and b/api-common/target/classes/com/glxp/api/common/req/BaseRequest.class differ diff --git a/api-common/target/classes/com/glxp/api/common/res/BaseResponse.class b/api-common/target/classes/com/glxp/api/common/res/BaseResponse.class new file mode 100644 index 00000000..68d9f9d4 Binary files /dev/null and b/api-common/target/classes/com/glxp/api/common/res/BaseResponse.class differ diff --git a/api-common/target/classes/com/glxp/api/common/util/ResultVOUtils.class b/api-common/target/classes/com/glxp/api/common/util/ResultVOUtils.class new file mode 100644 index 00000000..f5446c73 Binary files /dev/null and b/api-common/target/classes/com/glxp/api/common/util/ResultVOUtils.class differ diff --git a/api-common/target/test-classes/com/glxp/api/common/util/ResultVOUtilsTest.class b/api-common/target/test-classes/com/glxp/api/common/util/ResultVOUtilsTest.class new file mode 100644 index 00000000..032c8eeb Binary files /dev/null and b/api-common/target/test-classes/com/glxp/api/common/util/ResultVOUtilsTest.class differ diff --git a/pom.xml b/pom.xml new file mode 100644 index 00000000..5c39d206 --- /dev/null +++ b/pom.xml @@ -0,0 +1,55 @@ + + + 4.0.0 + + com.glxp + api + 0.0.1 + + api-admin + api-common + + pom + + api + vue后台管理系统 + + + org.springframework.boot + spring-boot-starter-parent + 2.1.3.RELEASE + + + + + 1.8 + + + + + + + com.glxp + api-common + ${version} + + + + + com.alibaba + fastjson + 1.2.51 + + + + + org.apache.commons + commons-lang3 + 3.9 + + + + + + diff --git a/scripts/vue-admin.sql b/scripts/vue-admin.sql new file mode 100644 index 00000000..a26086b1 --- /dev/null +++ b/scripts/vue-admin.sql @@ -0,0 +1,234 @@ +/* +Navicat MySQL Data Transfer + +Source Server : php +Source Server Version : 50553 +Source Host : localhost:3306 +Source Database : vue-admin + +Target Server Type : MYSQL +Target Server Version : 50553 +File Encoding : 65001 + +Date: 2018-11-20 18:59:57 +*/ + +SET FOREIGN_KEY_CHECKS=0; + +-- ---------------------------- +-- Table structure for ad +-- ---------------------------- +DROP TABLE IF EXISTS `ad`; +CREATE TABLE `ad` ( + `ad_id` int(11) NOT NULL AUTO_INCREMENT COMMENT '广告ID', + `title` varchar(255) NOT NULL COMMENT '广告标题', + `describe` varchar(255) NOT NULL DEFAULT '' COMMENT '描述', + `pic` varchar(255) NOT NULL DEFAULT '' COMMENT '图片的地址', + `jump_type` tinyint(4) unsigned NOT NULL DEFAULT '0' COMMENT '跳转方式（0，web 页面，1：APP内链接，2：小程序）', + `jump_url` varchar(255) NOT NULL DEFAULT '' COMMENT '跳转的url路径', + `ios_url` varchar(255) NOT NULL DEFAULT '' COMMENT 'ios 的类名', + `android_url` varchar(255) NOT NULL DEFAULT '' COMMENT 'android 的类名', + `wxa_appid` varchar(50) NOT NULL DEFAULT '' COMMENT '微信小程序的APPID（跳转类型为 1 时有效）', + `channel_type` tinyint(4) NOT NULL DEFAULT '0' COMMENT '渠道名单类型（0：不做处理，1：白名单，2：黑名单）', + `channel_list` varchar(255) NOT NULL DEFAULT '' COMMENT '渠道黑名单', + `android_version_type` tinyint(4) unsigned NOT NULL DEFAULT '0' COMMENT 'android 版本名单类型（0：不做处理，1：白名单，2：黑名单）', + `android_version_list` varchar(255) NOT NULL DEFAULT '' COMMENT 'android 版本黑名单', + `ios_version_type` tinyint(4) unsigned NOT NULL DEFAULT '0' COMMENT 'ios 版本名单类型（0：不做处理，1：白名单，2：黑名单）', + `ios_version_list` varchar(255) NOT NULL DEFAULT '' COMMENT 'ios 版本黑名单', + `new_show_start_num` int(11) NOT NULL DEFAULT '0' COMMENT '新用户从第几次开始展示', + `new_show_max_num` int(11) NOT NULL DEFAULT '0' COMMENT '新用户最大展示几次', + `old_show_start_num` int(11) NOT NULL DEFAULT '0' COMMENT '老用户第几次开始展示', + `old_show_max_num` int(11) NOT NULL DEFAULT '0' COMMENT '老用户最大展示几次', + `start_time` datetime DEFAULT NULL COMMENT '开始时间', + `end_time` datetime DEFAULT NULL COMMENT '结束时间', + `event_name` varchar(255) NOT NULL DEFAULT '' COMMENT '统计事件名称', + `status` tinyint(4) NOT NULL DEFAULT '0' COMMENT '广告状态（0：禁用，1：正常）', + `create_time` datetime NOT NULL COMMENT '创建时间', + `modified_time` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ad_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='广告表'; + +-- ---------------------------- +-- Table structure for ad_site +-- ---------------------------- +DROP TABLE IF EXISTS `ad_site`; +CREATE TABLE `ad_site` ( + `site_id` int(11) NOT NULL AUTO_INCREMENT COMMENT '广告位id', + `site_name` varchar(255) NOT NULL COMMENT '广告位名称', + `describe` varchar(255) NOT NULL DEFAULT '' COMMENT '广告位描述', + `ad_ids` varchar(255) NOT NULL DEFAULT '' COMMENT '广告位的广告id（用 , 隔开）', + `create_time` datetime NOT NULL COMMENT '创建时间', + `modified_time` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`site_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='广告位'; + +-- ---------------------------- +-- Table structure for auth_admin +-- ---------------------------- +DROP TABLE IF EXISTS `auth_admin`; +CREATE TABLE `auth_admin` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, + `username` varchar(60) NOT NULL DEFAULT '' COMMENT '用户名', + `password` varchar(64) NOT NULL DEFAULT '' COMMENT '登录密码；sp_password加密', + `tel` varchar(50) NOT NULL DEFAULT '' COMMENT '用户手机号', + `email` varchar(100) NOT NULL DEFAULT '' COMMENT '登录邮箱', + `avatar` varchar(255) NOT NULL DEFAULT '' COMMENT '用户头像', + `sex` smallint(1) NOT NULL DEFAULT '0' COMMENT '性别；0：保密，1：男；2：女', + `last_login_ip` varchar(16) NOT NULL DEFAULT '' COMMENT '最后登录ip', + `last_login_time` datetime NOT NULL COMMENT '最后登录时间', + `create_time` datetime NOT NULL COMMENT '注册时间', + `status` int(11) NOT NULL DEFAULT '1' COMMENT '用户状态 0：禁用； 1：正常 ；2：未验证', + PRIMARY KEY (`id`), + KEY `user_login_key` (`username`) +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COMMENT='管理员表'; + +-- ---------------------------- +-- Records of auth_admin +-- ---------------------------- +INSERT INTO `auth_admin` VALUES ('1', 'admin', 'c3284d0f94606de1fd2af172aba15bf3', 'admin', 'lmxdawn@gmail.com', 'sssss', '0', '127.0.0.1', '2018-07-06 17:19:00', '2018-07-06 17:19:00', '1'); + +-- ---------------------------- +-- Table structure for auth_permission +-- ---------------------------- +DROP TABLE IF EXISTS `auth_permission`; +CREATE TABLE `auth_permission` ( + `role_id` int(11) unsigned NOT NULL COMMENT '角色', + `permission_rule_id` int(11) NOT NULL DEFAULT '0' COMMENT '权限id', + `type` varchar(30) DEFAULT NULL COMMENT '权限规则分类，请加应用前缀,如admin_' +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='权限授权表'; + +-- ---------------------------- +-- Records of auth_permission +-- ---------------------------- +INSERT INTO `auth_permission` VALUES ('1', '4', 'admin'); +INSERT INTO `auth_permission` VALUES ('1', '3', 'admin'); +INSERT INTO `auth_permission` VALUES ('1', '2', 'admin'); +INSERT INTO `auth_permission` VALUES ('1', '1', 'admin'); + +-- ---------------------------- +-- Table structure for auth_permission_rule +-- ---------------------------- +DROP TABLE IF EXISTS `auth_permission_rule`; +CREATE TABLE `auth_permission_rule` ( + `id` int(8) unsigned NOT NULL AUTO_INCREMENT COMMENT '规则编号', + `pid` int(11) NOT NULL DEFAULT '0' COMMENT '父级id', + `name` char(80) NOT NULL DEFAULT '' COMMENT '规则唯一标识', + `title` char(20) NOT NULL DEFAULT '' COMMENT '规则中文名称', + `status` tinyint(1) NOT NULL DEFAULT '1' COMMENT '状态：为1正常，为0禁用', + `condition` char(100) NOT NULL DEFAULT '' COMMENT '规则表达式，为空表示存在就验证，不为空表示按照条件验证', + `listorder` int(10) NOT NULL DEFAULT '0' COMMENT '排序，优先级，越小优先级越高', + `create_time` datetime NOT NULL COMMENT '创建时间', + `update_time` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`id`), + UNIQUE KEY `name` (`name`) +) ENGINE=InnoDB AUTO_INCREMENT=26 DEFAULT CHARSET=utf8 COMMENT='规则表'; + +-- ---------------------------- +-- Records of auth_permission_rule +-- ---------------------------- +INSERT INTO `auth_permission_rule` VALUES ('1', '0', 'user_manage', '用户管理', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); +INSERT INTO `auth_permission_rule` VALUES ('2', '1', 'user_manage/admin_manage', '管理组', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); +INSERT INTO `auth_permission_rule` VALUES ('3', '2', 'admin/auth_admin/index', '管理员管理', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); +INSERT INTO `auth_permission_rule` VALUES ('4', '3', 'admin/auth_admin/save', '添加管理员', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); +INSERT INTO `auth_permission_rule` VALUES ('5', '3', 'admin/auth_admin/edit', '编辑管理员', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); +INSERT INTO `auth_permission_rule` VALUES ('6', '3', 'admin/auth_admin/delete', '删除管理员', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); +INSERT INTO `auth_permission_rule` VALUES ('7', '2', 'admin/auth_role/index', '角色管理', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); +INSERT INTO `auth_permission_rule` VALUES ('8', '7', 'admin/auth_role/save', '添加角色', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); +INSERT INTO `auth_permission_rule` VALUES ('9', '7', 'admin/auth_role/edit', '编辑角色', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); +INSERT INTO `auth_permission_rule` VALUES ('10', '7', 'admin/auth_role/delete', '删除角色', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); +INSERT INTO `auth_permission_rule` VALUES ('11', '7', 'admin/auth_role/auth', '角色授权', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); +INSERT INTO `auth_permission_rule` VALUES ('12', '2', 'admin/auth_permission_rule/index', '权限管理', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); +INSERT INTO `auth_permission_rule` VALUES ('13', '12', 'admin/auth_permission_rule/save', '添加权限', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); +INSERT INTO `auth_permission_rule` VALUES ('14', '12', 'admin/auth_permission_rule/edit', '编辑权限', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); +INSERT INTO `auth_permission_rule` VALUES ('15', '12', 'admin/auth_permission_rule/delete', '删除权限', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); +INSERT INTO `auth_permission_rule` VALUES ('16', '0', 'ad_manage', '广告相关', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); +INSERT INTO `auth_permission_rule` VALUES ('17', '16', 'admin/ad_site/index', '广告位管理', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); +INSERT INTO `auth_permission_rule` VALUES ('18', '17', 'admin/ad_site/save', '广告位添加', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); +INSERT INTO `auth_permission_rule` VALUES ('19', '17', 'admin/ad_site/edit', '广告位编辑', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); +INSERT INTO `auth_permission_rule` VALUES ('20', '17', 'admin/ad_site/delete', '广告位删除', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); +INSERT INTO `auth_permission_rule` VALUES ('21', '16', 'admin/ad/index', '广告管理', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); +INSERT INTO `auth_permission_rule` VALUES ('22', '21', 'admin/ad/save', '广告添加', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); +INSERT INTO `auth_permission_rule` VALUES ('23', '21', 'admin/ad/edit', '广告编辑', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); +INSERT INTO `auth_permission_rule` VALUES ('24', '21', 'admin/ad/delete', '广告删除', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); +INSERT INTO `auth_permission_rule` VALUES ('25', '17', 'admin/ad_site/adlist', '广告位选择时的广告列表', '1', '', '999', '2018-07-06 17:19:00', '2018-07-06 17:19:00'); + +-- ---------------------------- +-- Table structure for auth_role +-- ---------------------------- +DROP TABLE IF EXISTS `auth_role`; +CREATE TABLE `auth_role` ( + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `name` varchar(20) NOT NULL COMMENT '角色名称', + `pid` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '父角色ID', + `status` tinyint(1) unsigned NOT NULL DEFAULT '0' COMMENT '状态', + `remark` varchar(255) NOT NULL DEFAULT '' COMMENT '备注', + `create_time` datetime NOT NULL COMMENT '创建时间', + `update_time` datetime NOT NULL COMMENT '更新时间', + `listorder` int(3) NOT NULL DEFAULT '0' COMMENT '排序，优先级，越小优先级越高', + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COMMENT='角色表'; + +-- ---------------------------- +-- Records of auth_role +-- ---------------------------- +INSERT INTO `auth_role` VALUES ('1', '超级管理员', '0', '1', '拥有网站最高管理员权限！', '2018-07-06 17:19:00', '2018-07-06 17:19:00', '0'); + +-- ---------------------------- +-- Table structure for auth_role_admin +-- ---------------------------- +DROP TABLE IF EXISTS `auth_role_admin`; +CREATE TABLE `auth_role_admin` ( + `role_id` int(11) unsigned DEFAULT '0' COMMENT '角色 id', + `admin_id` int(11) DEFAULT '0' COMMENT '管理员id' +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='用户角色对应表'; + +-- ---------------------------- +-- Records of auth_role_admin +-- ---------------------------- + +-- ---------------------------- +-- Table structure for file_resource +-- ---------------------------- +DROP TABLE IF EXISTS `file_resource`; +CREATE TABLE `file_resource` ( + `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '资源id', + `tag_id` int(11) NOT NULL DEFAULT '0' COMMENT '资源分组id', + `type` tinyint(4) NOT NULL DEFAULT '0' COMMENT '资源的类型（0：图片）', + `filename` varchar(255) NOT NULL DEFAULT '' COMMENT '资源的原名', + `path` varchar(255) NOT NULL DEFAULT '' COMMENT '资源的路径（不加 域名的地址）', + `size` int(11) NOT NULL DEFAULT '0' COMMENT '大小', + `ext` varchar(10) NOT NULL DEFAULT '' COMMENT '资源的文件后缀', + `create_time` datetime NOT NULL COMMENT '创建时间', + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8 COMMENT='资源表'; + +-- ---------------------------- +-- Records of file_resource +-- ---------------------------- +INSERT INTO `file_resource` VALUES ('1', '1', '0', 'Group 5.png', 'resources/image/20180530/854ae62758c585be5128cf344a511242.png', '7539', 'png', '2018-05-30 20:41:54'); +INSERT INTO `file_resource` VALUES ('2', '0', '0', '643353_sdfaf123.png', 'resources/image/20180823/c356ca140f631a512f1c3a5e37a15dc1.png', '11507', 'png', '2018-08-23 13:38:42'); +INSERT INTO `file_resource` VALUES ('3', '0', '0', '643353_sdfaf123.png', 'resources/image/20180823/4549c39e9c07c35681ee9fa94e0fc07e.png', '11507', 'png', '2018-08-23 14:05:18'); +INSERT INTO `file_resource` VALUES ('4', '0', '0', '', '', '0', '', '2018-08-23 15:45:21'); +INSERT INTO `file_resource` VALUES ('5', '0', '0', '', '', '2000000', '', '2018-08-23 15:45:21'); +INSERT INTO `file_resource` VALUES ('6', '0', '0', '', '', '0', '', '2018-08-23 15:45:21'); +INSERT INTO `file_resource` VALUES ('7', '0', '0', '', '', '0', '', '2018-08-23 15:45:21'); +INSERT INTO `file_resource` VALUES ('8', '0', '0', '643353_sdfaf123.png', 'resources/image/20180823/0c424412b231eb8cb969377e15dbb812.png', '11507', 'png', '2018-08-23 15:53:32'); +INSERT INTO `file_resource` VALUES ('9', '0', '0', '232826334630444283.png', 'FjBRVPOPF9gLeNBCAvK7jbif4yg8', '9668', 'png', '2018-08-23 16:08:13'); +INSERT INTO `file_resource` VALUES ('10', '0', '0', '232826334630444283.png', 'FjBRVPOPF9gLeNBCAvK7jbif4yg8', '9668', 'png', '2018-08-23 16:09:07'); +INSERT INTO `file_resource` VALUES ('11', '0', '0', '643353_sdfaf123.png', 'resources/image/20180823/52af5f8556a3af84cee696972b61baf4.png', '11507', 'png', '2018-08-23 17:06:05'); + +-- ---------------------------- +-- Table structure for file_resource_tag +-- ---------------------------- +DROP TABLE IF EXISTS `file_resource_tag`; +CREATE TABLE `file_resource_tag` ( + `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '资源分组的id', + `tag` varchar(255) NOT NULL DEFAULT '' COMMENT '资源分组的tag', + `create_time` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COMMENT='资源的分组表'; + +-- ---------------------------- +-- Records of file_resource_tag +-- ---------------------------- +INSERT INTO `file_resource_tag` VALUES ('1', '测试', '2018-05-30 20:41:48');