Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang

Reviewed-on: #40

.drone.yml

@@ -11,16 +11,16 @@ steps:
   - name: dockerconfig
     path: /root/.docker
   commands:
-  - docker build -t harbor.picaiba.com/kszny/mes-api:1.0.0-india ./ && docker push harbor.picaiba.com/kszny/mes-api:1.0.0-india
+  - docker build -t harbor.picaiba.com/kszny/mes-api:1.0.0-cigs4 ./ && docker push harbor.picaiba.com/kszny/mes-api:1.0.0-cigs4
 
 - name: deploy
   image: harbor.picaiba.com/tools/kubectl
   commands:
   - echo "172.27.0.20 lb.kubesphere.local" >> /etc/hosts
   - sleep 1
-  - kubectl scale --replicas=0 deployment/mes-api -n mes-india
+  - kubectl scale --replicas=0 deployment/mes-api -n mes-cigs4
   - sleep 3
-  - kubectl scale --replicas=1 deployment/mes-api -n mes-india
+  - kubectl scale --replicas=1 deployment/mes-api -n mes-cigs4
   depends_on:
   - build
 
@@ -34,6 +34,6 @@ volumes:
     
 trigger:
   branch:
-  - porject/yd-monitor
+  - master
   event:
   - push

Dockerfile

@@ -49,7 +49,7 @@ ENV TZ="Asia/Shanghai"
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 # 定义一些环境变量，方便环境变量传参
 ENV JVM_OPTS=""
-ENV JAVA_OPTS="-Dspring.profiles.active=dev"
+ENV JAVA_OPTS=""
 # 指定暴露的端口，起到说明的作用，不指定也会暴露对应端口
 EXPOSE 8080
 # 启动 jar 的命令

README.md

@@ -26,4 +26,11 @@
 - Maven3.0+
 - MySQL8.0
 - redis6.0+
-<br>
+<br>
+
+
+**切换到现场环境**
+- gateway 下的 application.yml 改redis地址 改成10.0.1.249那个
+- gateway 下的 application-dev.yml 选用 “MySQL-local” 和 “camline系统 - local” 这两个 
+- packaging 下的 KukaJoinThread 要把 三个启动线程放开（kukaStep1.scheduleAtFixedRate、kukaStep2.scheduleAtFixedRate、kukaStep3.scheduleAtFixedRate）
+  <br>

pom.xml

@@ -18,6 +18,7 @@
         <module>ym-websocket</module>
         <module>ym-packing</module>
         <module>ym-s7</module>
+        <module>ym-dynamic-datasource</module>
     </modules>
     <packaging>pom</packaging>
 
@@ -37,7 +38,10 @@
         <junit.version>4.13.2</junit.version>
         <jedis.version>4.2.2</jedis.version>
         <druid.version>1.2.9</druid.version>
-        <mybatisplus.version>3.5.1</mybatisplus.version>
+
+<!--        <mybatisplus.version>3.5.1</mybatisplus.version>-->
+        <mybatisplus.version>3.5.3</mybatisplus.version>
+
         <sqlserver.version>4.0</sqlserver.version>
         <oracle.version>11.2.0.3</oracle.version>
         <commons.lang.version>3.12.0</commons.lang.version>
@@ -241,4 +245,4 @@
         </pluginRepository>
     </pluginRepositories>
 
-</project>
+</project>

ym-admin/pom.xml

@@ -43,6 +43,11 @@
             <artifactId>ym-common</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.75</version>
+        </dependency>
 
     </dependencies>
 

ym-admin/src/main/java/com/cnbm/admin/base/BaseSupport.java

@@ -0,0 +1,167 @@
+/*
+ * Copyright (c) 2018.
+ * http://www.ulabcare.com
+ */
+
+package com.cnbm.admin.base;
+
+import com.alibaba.fastjson.JSON;
+import com.cnbm.admin.entity.LoginUser;
+import com.cnbm.admin.enums.WhetherEnum;
+import lombok.Builder;
+import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 接口支持基类
+ *
+ * @author jiff
+ * @date 2018/11/1
+ * @since 1.0
+ */
+@Service
+public class BaseSupport {
+
+    protected LoginUser getLoginUser() {
+        // 后续完善拦截器再使用该方式
+//        LoginUser loginUser = loginUserHolder.get();
+//        if (loginUser != null) {
+//            return loginUser;
+//        }
+        HttpSession session = getHttpServletRequest().getSession(false);
+        LoginUser loginUser = null;
+        if (session != null) {
+            String loginUserJson = (String) session.getAttribute(LoginUser.HTTP_HEADER_NAME);
+            if (StringUtils.isNotBlank(loginUserJson)) {
+                loginUser = JSON.parseObject(loginUserJson, LoginUser.class);
+                return loginUser;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 获取当前http请求对象
+     *
+     * @return
+     */
+    protected HttpServletRequest getHttpServletRequest() {
+        return ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+    }
+
+    /**
+     * 获取当前http响应对象
+     *
+     * @return
+     */
+    protected HttpServletResponse getHttpServletResponse() {
+        return ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getResponse();
+    }
+
+
+    /**
+     * 设置公共字段值，一般用于创建新记录，包含以下字段：
+     *
+     * <p>
+     * {@link CommonField#enabled}<br>
+     * {@link CommonField#valid}<br>
+     * {@link CommonField#creatorId}<br>
+     * {@link CommonField#creatorName}<br>
+     * {@link CommonField#createTime}<br>
+     * {@link CommonField#updaterId}<br>
+     * {@link CommonField#updaterName}<br>
+     * {@link CommonField#updateTime}<br>
+     * </p>
+     *
+     * @param t                需要设置的对象
+     * @param ignoreProperties 忽略的字段
+     * @param <T>
+     */
+    public <T extends Serializable> T setCommonField(T t, String... ignoreProperties) {
+
+        CommonField commonField = CommonField.builder()
+                .enabled(WhetherEnum.YES.getValue())
+                .valid(WhetherEnum.YES.getValue())
+                .createTime(LocalDateTime.now())
+                .creatorId(getLoginUser().getSysUserEntity().getId())
+                .creatorName(getLoginUser().getUsername())
+                .updateTime(LocalDateTime.now())
+                .updaterId(getLoginUser().getSysUserEntity().getId())
+                .updaterName(getLoginUser().getUsername())
+                .build();
+        BeanUtils.copyProperties(commonField, t, ignoreProperties);
+        return t;
+    }
+
+    /**
+     * 设置更新的公共字段值，一般用于更新记录，包含以下字段：
+     *
+     * <p>
+     * {@link CommonField#updaterId}<br>
+     * {@link CommonField#updaterName}<br>
+     * {@link CommonField#updateTime}<br>
+     * </p>
+     *
+     * @param t   需要设置的对象
+     * @param <T>
+     */
+    public <T extends Serializable> T setUpdateCommonField(T t) {
+        CommonField commonField = CommonField.builder()
+                .updaterId(getLoginUser().getSysUserEntity().getId())
+                .updaterName(getLoginUser().getUsername())
+                .updateTime(LocalDateTime.now())
+                .build();
+        BeanUtils.copyProperties(commonField, t, "enabled", "valid");
+        return t;
+    }
+
+    @Data
+    @Builder
+    private static class CommonField implements Serializable {
+        /**
+         * 启用状态:0 、停用，1、启用
+         */
+        private Integer enabled;
+        /**
+         * 删除标志，是否有效:1 可用 0不可用
+         */
+        private Integer valid;
+
+        /**
+         * 创建人
+         */
+        private Long creatorId;
+        /**
+         * 创建人
+         */
+        private String creatorName;
+        /**
+         * 创建时间
+         */
+        private LocalDateTime createTime;
+
+
+        /**
+         * 更新人
+         */
+        private Long updaterId;
+        /**
+         * 更新人
+         */
+        private String updaterName;
+        /**
+         * 更新时间
+         */
+        private LocalDateTime updateTime;
+    }
+}

ym-admin/src/main/java/com/cnbm/admin/config/SecurityConfig.java

@@ -72,8 +72,14 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
                         "/swagger-ui/**",
                         "/webjars/**",
                         "/websocket/**",
+                        "/test/**",
+                        "/**/expert",
                         "/captcha",
-                        "druid/**").anonymous()
+                        "druid/**",
+                        "/packing/woPackagingBox/page",
+                        "/packing/printModel/page"
+
+                ).anonymous()
 //                .antMatchers("/testCors").hasAuthority("system:dept:list222")
                 // 除上面外的所有请求全部需要鉴权认证
                 .anyRequest()

ym-admin/src/main/java/com/cnbm/admin/controller/SysLogLoginController.java

@@ -61,7 +61,7 @@ public class SysLogLoginController {
     public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<SysLogLoginDTO> list = sysLogLoginService.list(params);
 
-        ExcelUtils.exportExcelToTarget(response, null, list, SysLogLoginExcel.class);
+        ExcelUtils.exportExcelToTarget(response, "登入登出日志导出", list, SysLogLoginExcel.class);
     }
 
 }

ym-admin/src/main/java/com/cnbm/admin/controller/SysLogOperationController.java

@@ -46,7 +46,6 @@ public class SysLogOperationController {
     })
     public Result<PageData<SysLogOperationDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
         PageData<SysLogOperationDTO> page = sysLogOperationService.page(params);
-
         return new Result<PageData<SysLogOperationDTO>>().ok(page);
     }
 
@@ -56,7 +55,7 @@ public class SysLogOperationController {
     public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<SysLogOperationDTO> list = sysLogOperationService.list(params);
 
-        ExcelUtils.exportExcelToTarget(response, null, list, SysLogOperationExcel.class);
+        ExcelUtils.exportExcelToTarget(response, "操作日志导出", list, SysLogOperationExcel.class);
     }
 
 }

ym-admin/src/main/java/com/cnbm/admin/entity/LoginUser.java

@@ -24,6 +24,8 @@ public class LoginUser implements UserDetails{
 
     private static final long serialVersionUID = 1L;
 
+    public static final String HTTP_HEADER_NAME = "loginUser";
+
     private SysUserEntity sysUserEntity;
 
     private List<String> permissions;

ym-admin/src/main/java/com/cnbm/admin/execl/SysLogLoginExcel.java

@@ -7,8 +7,8 @@ import java.util.Date;
 
 @Data
 public class SysLogLoginExcel {
-    @Excel(name = "用户操作")
+    @Excel(name = "用户操作", replace = {"登入_0", "登出_1"})
-    private String operation;
+    private Integer operation;
     @Excel(name = "状态", replace = {"失败_0", "成功_1", "账号已锁定_1"})
     private Integer status;
     @Excel(name = "User-Agent")

ym-admin/src/main/java/com/cnbm/admin/service/impl/LoginServiceImpl.java

@@ -1,5 +1,6 @@
 package com.cnbm.admin.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.cnbm.admin.entity.LoginUser;
 import com.cnbm.admin.entity.SysLogLoginEntity;
 import com.cnbm.admin.enums.LoginOperationEnum;
@@ -9,7 +10,6 @@ import com.cnbm.admin.service.CaptchaService;
 import com.cnbm.admin.service.SysLogLoginService;
 import com.cnbm.admin.utils.JwtUtil;
 import com.cnbm.admin.service.LoginService;
-import com.cnbm.admin.utils.ResponseResult;
 import com.cnbm.common.exception.ErrorCode;
 import com.cnbm.common.utils.IpUtils;
 import com.cnbm.common.utils.Result;
@@ -22,8 +22,11 @@ import org.springframework.security.authentication.UsernamePasswordAuthenticatio
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -53,10 +56,10 @@ public class LoginServiceImpl implements LoginService {
     @Override
     public Result login(HttpServletRequest request, LoginParam loginParam) {
         //验证码是否正确
-        boolean flag = captchaService.validate(loginParam.getUuid(), loginParam.getCaptcha());
+//        boolean flag = captchaService.validate(loginParam.getUuid(), loginParam.getCaptcha());
-        if(!flag){
+//        if(!flag){
-            return new Result<>().error(ErrorCode.CAPTCHA_ERROR, "验证码错误");
+//            return new Result<>().error(ErrorCode.CAPTCHA_ERROR, "验证码错误");
-        }
+//        }
         UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(loginParam.getUsername(),loginParam.getPassword());
         Authentication authenticate = authenticationManager.authenticate(authenticationToken);
         //登录日志
@@ -81,6 +84,11 @@ public class LoginServiceImpl implements LoginService {
         map.put("token",jwt);
         //把完整的用户信息存入redis  userid作为key
         redisTemplate.opsForValue().set("login:"+userid,loginUser,1, TimeUnit.DAYS);
+
+        //当前登录用户信息存入session中
+        HttpSession session = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest().getSession();
+        session.setAttribute(loginUser.HTTP_HEADER_NAME, JSON.toJSONString(loginUser));
+
         //登录成功
         log.setStatus(LoginStatusEnum.SUCCESS.value());
         log.setCreator(loginUser.getSysUserEntity().getId());

ym-admin/src/main/java/com/cnbm/admin/service/impl/SysRoleServiceImpl.java

@@ -9,6 +9,7 @@ import com.cnbm.admin.entity.SysRoleEntity;
 import com.cnbm.admin.entity.SysUserEntity;
 import com.cnbm.admin.enums.SuperAdminEnum;
 import com.cnbm.admin.service.*;
+import com.cnbm.admin.utils.BaseSupportUtils;
 import com.cnbm.common.constant.Constant;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.impl.BaseServiceImpl;
@@ -20,6 +21,7 @@ import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.sql.Timestamp;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -89,6 +91,8 @@ public class SysRoleServiceImpl extends BaseServiceImpl<SysRoleDao, SysRoleEntit
         SysRoleEntity entity = ConvertUtils.sourceToTarget(dto, SysRoleEntity.class);
 
         //保存角色
+        Timestamp timestamp = new Timestamp(System.currentTimeMillis());
+        entity.setCreateDate(timestamp);
         insert(entity);
 
         //保存角色菜单关系

ym-admin/src/main/java/com/cnbm/admin/service/impl/SysUserServiceImpl.java

@@ -9,6 +9,7 @@ import com.cnbm.admin.enums.SuperAdminEnum;
 import com.cnbm.admin.service.SysDeptService;
 import com.cnbm.admin.service.SysRoleUserService;
 import com.cnbm.admin.service.SysUserService;
+import com.cnbm.admin.utils.BaseSupportUtils;
 import com.cnbm.admin.utils.PasswordUtils;
 import com.cnbm.common.constant.Constant;
 import com.cnbm.common.page.PageData;
@@ -21,6 +22,7 @@ import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.sql.Timestamp;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -98,6 +100,8 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
 
         //保存用户
         entity.setSuperAdmin(SuperAdminEnum.NO.value());
+        Timestamp timestamp = new Timestamp(System.currentTimeMillis());
+        entity.setCreateDate(timestamp);
         insert(entity);
 
         //保存角色用户关系

ym-admin/src/main/java/com/cnbm/admin/utils/BaseSupportUtils.java

@@ -58,7 +58,7 @@ public abstract class BaseSupportUtils {
      */
     public static <T extends Serializable> T setCommonField(T t, String... ignoreProperties) {
         CommonField commonField = CommonField.builder()
-                .enabled(WhetherEnum.YES.getValue())
+//                .enabled(WhetherEnum.YES.getValue())
                 .valid(WhetherEnum.YES.getValue())
                 .createTime(LocalDateTime.now())
                 .creatorId(getLoginUser().getId())
@@ -89,7 +89,7 @@ public abstract class BaseSupportUtils {
                 .updaterName(getLoginUser().getUsername())
                 .updateTime(LocalDateTime.now())
                 .build();
-        BeanUtils.copyProperties(commonField, t, "enabled", "valid");
+        BeanUtils.copyProperties(commonField, t,  "valid");
         return t;
     }
 

ym-admin/src/main/java/com/cnbm/admin/utils/JwtUtil.java

@@ -82,9 +82,11 @@ public class JwtUtil {
 
     public static void main(String[] args) throws Exception {
 //        String jwt = createJWT("123");
-        Claims claims = parseJWT("eyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiI5OWNhNGJhMjg5ZjU0OTVjODE5YTM0N2ExZmNlZjc0YSIsInN1YiI6IjEyMyIsImlzcyI6IndoeSIsImlhdCI6MTY1NDc1OTg5NiwiZXhwIjoxNjU0NzYzNDk2fQ.CTgS6yQjfXSGPJUTu-_rqjkh_KB_F9SzPThFfnvB5yg");
+        Claims claims = parseJWT("eyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiJkNTQxODQ5NjNjMWM0NzgzOTA0ZDAwZGI1ZmNkNWU3NiIsInN1YiI6IjEwNjcyNDY4NzU4MDAwMDAwMDEiLCJpc3MiOiJ3aHkiLCJpYXQiOjE2Nzg5MzE1MjAsImV4cCI6MTY3ODkzNTEyMH0.2we9FhhFU2Qvx2fvywqmA8A1qs0mbdXvr8T2CjJUz7o");
         String subject = claims.getSubject();
         System.out.println(subject);
+
+        System.out.println(claims.toString());
 //        System.out.println(claims);
     }
 

ym-admin/src/main/resources/mapper/SysDeptDao.xml

@@ -23,7 +23,7 @@
 	</select>
 
 	<select id="getIdAndPidList" resultType="com.cnbm.admin.entity.SysDeptEntity">
-		select t1.id, t1.pid from sys_dept t1  AND t1.valid = 1
+		select t1.id, t1.pid from sys_dept t1 where t1.valid = 1
 	</select>
 
 	<select id="getSubDeptIdList" resultType="long">

ym-dynamic-datasource/pom.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>ym-pass</artifactId>
+        <groupId>com.cnbm</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ym-dynamic-datasource</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+
+    <build>
+        <finalName>${project.artifactId}</finalName>
+    </build>
+
+
+</project>

ym-dynamic-datasource/src/main/java/com/cnbm/dynamic/datasource/annotation/DataSource.java

@@ -0,0 +1,11 @@
+package com.cnbm.dynamic.datasource.annotation;
+
+import java.lang.annotation.*;
+
+@Target({ElementType.METHOD, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Inherited
+public @interface DataSource {
+    String value() default "";
+}

ym-dynamic-datasource/src/main/java/com/cnbm/dynamic/datasource/aspect/DataSourceAspect.java

@@ -0,0 +1,57 @@
+package com.cnbm.dynamic.datasource.aspect;
+
+import com.cnbm.dynamic.datasource.annotation.DataSource;
+import com.cnbm.dynamic.datasource.config.DynamicContextHolder;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.core.Ordered;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+
+import java.lang.reflect.Method;
+
+@Aspect
+@Component
+@Order(Ordered.HIGHEST_PRECEDENCE)
+public class DataSourceAspect {
+    protected Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Pointcut("@annotation(com.cnbm.dynamic.datasource.annotation.DataSource) " +
+            "|| @within(com.cnbm.dynamic.datasource.annotation.DataSource)")
+    public void dataSourcePointCut() {
+
+    }
+
+    @Around("dataSourcePointCut()")
+    public Object around(ProceedingJoinPoint point) throws Throwable {
+        MethodSignature signature = (MethodSignature) point.getSignature();
+        Class targetClass = point.getTarget().getClass();
+        Method method = signature.getMethod();
+
+        DataSource targetDataSource = (DataSource)targetClass.getAnnotation(DataSource.class);
+        DataSource methodDataSource = method.getAnnotation(DataSource.class);
+        if(targetDataSource != null || methodDataSource != null){
+            String value;
+            if(methodDataSource != null){
+                value = methodDataSource.value();
+            }else {
+                value = targetDataSource.value();
+            }
+
+            DynamicContextHolder.push(value);
+            logger.debug("set datasource is {}", value);
+        }
+
+        try {
+            return point.proceed();
+        } finally {
+            DynamicContextHolder.poll();
+            logger.debug("clean datasource");
+        }
+    }
+}

ym-dynamic-datasource/src/main/java/com/cnbm/dynamic/datasource/config/DynamicContextHolder.java

@@ -0,0 +1,44 @@
+package com.cnbm.dynamic.datasource.config;
+
+import java.util.ArrayDeque;
+import java.util.Deque;
+
+public class DynamicContextHolder {
+    @SuppressWarnings("unchecked")
+    private static final ThreadLocal<Deque<String>> CONTEXT_HOLDER = new ThreadLocal() {
+        @Override
+        protected Object initialValue() {
+            return new ArrayDeque();
+        }
+    };
+
+    /**
+     * 获得当前线程数据源
+     *
+     * @return 数据源名称
+     */
+    public static String peek() {
+        return CONTEXT_HOLDER.get().peek();
+    }
+
+    /**
+     * 设置当前线程数据源
+     *
+     * @param dataSource 数据源名称
+     */
+    public static void push(String dataSource) {
+        CONTEXT_HOLDER.get().push(dataSource);
+    }
+
+    /**
+     * 清空当前线程数据源
+     */
+    public static void poll() {
+        Deque<String> deque = CONTEXT_HOLDER.get();
+        deque.poll();
+        if (deque.isEmpty()) {
+            CONTEXT_HOLDER.remove();
+        }
+    }
+
+}

ym-dynamic-datasource/src/main/java/com/cnbm/dynamic/datasource/config/DynamicDataSource.java

@@ -0,0 +1,12 @@
+package com.cnbm.dynamic.datasource.config;
+
+import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource;
+
+public class DynamicDataSource extends AbstractRoutingDataSource {
+
+    @Override
+    protected Object determineCurrentLookupKey() {
+        return DynamicContextHolder.peek();
+    }
+
+}

ym-dynamic-datasource/src/main/java/com/cnbm/dynamic/datasource/config/DynamicDataSourceConfig.java

@@ -0,0 +1,50 @@
+package com.cnbm.dynamic.datasource.config;
+
+import com.alibaba.druid.pool.DruidDataSource;
+import com.cnbm.dynamic.datasource.properties.DataSourceProperties;
+import com.cnbm.dynamic.datasource.properties.DynamicDataSourceProperties;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Configuration
+@EnableConfigurationProperties(DynamicDataSourceProperties.class)
+public class DynamicDataSourceConfig {
+    @Autowired
+    private DynamicDataSourceProperties properties;
+
+    @Bean
+    @ConfigurationProperties(prefix = "spring.datasource")
+    public DataSourceProperties dataSourceProperties() {
+        return new DataSourceProperties();
+    }
+
+    @Bean
+    public DynamicDataSource dynamicDataSource(DataSourceProperties dataSourceProperties) {
+        DynamicDataSource dynamicDataSource = new DynamicDataSource();
+        dynamicDataSource.setTargetDataSources(getDynamicDataSource());
+
+        //默认数据源
+        DruidDataSource defaultDataSource = DynamicDataSourceFactory.buildDruidDataSource(dataSourceProperties);
+        dynamicDataSource.setDefaultTargetDataSource(defaultDataSource);
+
+        return dynamicDataSource;
+    }
+
+    private Map<Object, Object> getDynamicDataSource(){
+        Map<String, DataSourceProperties> dataSourcePropertiesMap = properties.getDatasource();
+        Map<Object, Object> targetDataSources = new HashMap<>(dataSourcePropertiesMap.size());
+        dataSourcePropertiesMap.forEach((k, v) -> {
+            DruidDataSource druidDataSource = DynamicDataSourceFactory.buildDruidDataSource(v);
+            targetDataSources.put(k, druidDataSource);
+        });
+
+        return targetDataSources;
+    }
+
+}

ym-dynamic-datasource/src/main/java/com/cnbm/dynamic/datasource/config/DynamicDataSourceFactory.java

@@ -0,0 +1,40 @@
+package com.cnbm.dynamic.datasource.config;
+
+import com.alibaba.druid.pool.DruidDataSource;
+import com.cnbm.dynamic.datasource.properties.DataSourceProperties;
+
+import java.sql.SQLException;
+
+public class DynamicDataSourceFactory {
+
+    public static DruidDataSource buildDruidDataSource(DataSourceProperties properties) {
+        DruidDataSource druidDataSource = new DruidDataSource();
+        druidDataSource.setDriverClassName(properties.getDriverClassName());
+        druidDataSource.setUrl(properties.getUrl());
+        druidDataSource.setUsername(properties.getUsername());
+        druidDataSource.setPassword(properties.getPassword());
+
+        druidDataSource.setInitialSize(properties.getInitialSize());
+        druidDataSource.setMaxActive(properties.getMaxActive());
+        druidDataSource.setMinIdle(properties.getMinIdle());
+        druidDataSource.setMaxWait(properties.getMaxWait());
+        druidDataSource.setTimeBetweenEvictionRunsMillis(properties.getTimeBetweenEvictionRunsMillis());
+        druidDataSource.setMinEvictableIdleTimeMillis(properties.getMinEvictableIdleTimeMillis());
+        druidDataSource.setMaxEvictableIdleTimeMillis(properties.getMaxEvictableIdleTimeMillis());
+        druidDataSource.setValidationQuery(properties.getValidationQuery());
+        druidDataSource.setValidationQueryTimeout(properties.getValidationQueryTimeout());
+        druidDataSource.setTestOnBorrow(properties.isTestOnBorrow());
+        druidDataSource.setTestOnReturn(properties.isTestOnReturn());
+        druidDataSource.setPoolPreparedStatements(properties.isPoolPreparedStatements());
+        druidDataSource.setMaxOpenPreparedStatements(properties.getMaxOpenPreparedStatements());
+        druidDataSource.setSharePreparedStatements(properties.isSharePreparedStatements());
+
+        try {
+            druidDataSource.setFilters(properties.getFilters());
+            druidDataSource.init();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return druidDataSource;
+    }
+}

ym-dynamic-datasource/src/main/java/com/cnbm/dynamic/datasource/properties/DataSourceProperties.java

@@ -0,0 +1,188 @@
+package com.cnbm.dynamic.datasource.properties;
+
+public class DataSourceProperties {
+    private String driverClassName;
+    private String url;
+    private String username;
+    private String password;
+
+    /**
+     * Druid默认参数
+     */
+    private int initialSize = 2;
+    private int maxActive = 10;
+    private int minIdle = -1;
+    private long maxWait = 60 * 1000L;
+    private long timeBetweenEvictionRunsMillis = 60 * 1000L;
+    private long minEvictableIdleTimeMillis = 1000L * 60L * 30L;
+    private long maxEvictableIdleTimeMillis = 1000L * 60L * 60L * 7;
+    private String validationQuery = "select 1";
+    private int validationQueryTimeout = -1;
+    private boolean testOnBorrow = false;
+    private boolean testOnReturn = false;
+    private boolean testWhileIdle = true;
+    private boolean poolPreparedStatements = false;
+    private int maxOpenPreparedStatements = -1;
+    private boolean sharePreparedStatements = false;
+    private String filters = "stat,wall";
+
+    public String getDriverClassName() {
+        return driverClassName;
+    }
+
+    public void setDriverClassName(String driverClassName) {
+        this.driverClassName = driverClassName;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public int getInitialSize() {
+        return initialSize;
+    }
+
+    public void setInitialSize(int initialSize) {
+        this.initialSize = initialSize;
+    }
+
+    public int getMaxActive() {
+        return maxActive;
+    }
+
+    public void setMaxActive(int maxActive) {
+        this.maxActive = maxActive;
+    }
+
+    public int getMinIdle() {
+        return minIdle;
+    }
+
+    public void setMinIdle(int minIdle) {
+        this.minIdle = minIdle;
+    }
+
+    public long getMaxWait() {
+        return maxWait;
+    }
+
+    public void setMaxWait(long maxWait) {
+        this.maxWait = maxWait;
+    }
+
+    public long getTimeBetweenEvictionRunsMillis() {
+        return timeBetweenEvictionRunsMillis;
+    }
+
+    public void setTimeBetweenEvictionRunsMillis(long timeBetweenEvictionRunsMillis) {
+        this.timeBetweenEvictionRunsMillis = timeBetweenEvictionRunsMillis;
+    }
+
+    public long getMinEvictableIdleTimeMillis() {
+        return minEvictableIdleTimeMillis;
+    }
+
+    public void setMinEvictableIdleTimeMillis(long minEvictableIdleTimeMillis) {
+        this.minEvictableIdleTimeMillis = minEvictableIdleTimeMillis;
+    }
+
+    public long getMaxEvictableIdleTimeMillis() {
+        return maxEvictableIdleTimeMillis;
+    }
+
+    public void setMaxEvictableIdleTimeMillis(long maxEvictableIdleTimeMillis) {
+        this.maxEvictableIdleTimeMillis = maxEvictableIdleTimeMillis;
+    }
+
+    public String getValidationQuery() {
+        return validationQuery;
+    }
+
+    public void setValidationQuery(String validationQuery) {
+        this.validationQuery = validationQuery;
+    }
+
+    public int getValidationQueryTimeout() {
+        return validationQueryTimeout;
+    }
+
+    public void setValidationQueryTimeout(int validationQueryTimeout) {
+        this.validationQueryTimeout = validationQueryTimeout;
+    }
+
+    public boolean isTestOnBorrow() {
+        return testOnBorrow;
+    }
+
+    public void setTestOnBorrow(boolean testOnBorrow) {
+        this.testOnBorrow = testOnBorrow;
+    }
+
+    public boolean isTestOnReturn() {
+        return testOnReturn;
+    }
+
+    public void setTestOnReturn(boolean testOnReturn) {
+        this.testOnReturn = testOnReturn;
+    }
+
+    public boolean isTestWhileIdle() {
+        return testWhileIdle;
+    }
+
+    public void setTestWhileIdle(boolean testWhileIdle) {
+        this.testWhileIdle = testWhileIdle;
+    }
+
+    public boolean isPoolPreparedStatements() {
+        return poolPreparedStatements;
+    }
+
+    public void setPoolPreparedStatements(boolean poolPreparedStatements) {
+        this.poolPreparedStatements = poolPreparedStatements;
+    }
+
+    public int getMaxOpenPreparedStatements() {
+        return maxOpenPreparedStatements;
+    }
+
+    public void setMaxOpenPreparedStatements(int maxOpenPreparedStatements) {
+        this.maxOpenPreparedStatements = maxOpenPreparedStatements;
+    }
+
+    public boolean isSharePreparedStatements() {
+        return sharePreparedStatements;
+    }
+
+    public void setSharePreparedStatements(boolean sharePreparedStatements) {
+        this.sharePreparedStatements = sharePreparedStatements;
+    }
+
+    public String getFilters() {
+        return filters;
+    }
+
+    public void setFilters(String filters) {
+        this.filters = filters;
+    }
+}

ym-dynamic-datasource/src/main/java/com/cnbm/dynamic/datasource/properties/DynamicDataSourceProperties.java

@@ -0,0 +1,20 @@
+package com.cnbm.dynamic.datasource.properties;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+@ConfigurationProperties(prefix = "dynamic")
+public class DynamicDataSourceProperties {
+    private Map<String, DataSourceProperties> datasource = new LinkedHashMap<>();
+
+    public Map<String, DataSourceProperties> getDatasource() {
+        return datasource;
+    }
+
+    public void setDatasource(Map<String, DataSourceProperties> datasource) {
+        this.datasource = datasource;
+    }
+}
+

ym-gateway/pom.xml

@@ -67,6 +67,11 @@
             <artifactId>ym-websocket</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+	<dependency>
+            <groupId>com.cnbm</groupId>
+            <artifactId>ym-dynamic-datasource</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-boot-starter</artifactId>

ym-gateway/src/main/resources/application-dev.yml

@@ -1,7 +1,12 @@
 spring:
   datasource:
-      #MySQL
       driver-class-name: com.mysql.cj.jdbc.Driver
+      #MySQL-local
+#      url: jdbc:mysql://10.0.1.249:3306/mt_cigs4?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+#      username: cigs4
+#      password: 1qazxsw2
+
+      #MySQL-remote
       url: jdbc:mysql://mysql.picaiba.com:30307/mt_cigs4?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
       username: root
       password: 1qaz@WSX3edc$RFV
@@ -52,15 +57,24 @@ spring:
 #        maximum-pool-size: 10
 
 ##多数据源的配置，需要引用renren-dynamic-datasource
-#dynamic:
+dynamic:
-#  datasource:
+  datasource:
+#    ## 本mes系统
 #    slave1:
-#      driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+#      driver-class-name: com.mysql.cj.jdbc.Driver
-#      url: jdbc:sqlserver://123456:1433;DatabaseName=renren_security
+#      url: jdbc:mysql://mysql.picaiba.com:30307/mt_cigs4?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
-#      username: sa
+#      username: root
-#      password: 123456
+#      password: 1qaz@WSX3edc$RFV
-#    slave2:
+    ## camline系统 - remote
-#      driver-class-name: org.postgresql.Driver
+    camline:
-#      url: jdbc:postgresql://123456:5432/renren_security
+      driver-class-name: com.mysql.cj.jdbc.Driver
-#      username: postgres
+      url: jdbc:mysql://mysql.picaiba.com:30307/mt_cigs4?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
-#      password: 123456
+      username: root
+      password: 1qaz@WSX3edc$RFV
+#
+    #camline系统 - local
+#    camline:
+#      driver-class-name: com.mysql.cj.jdbc.Driver
+#      url: jdbc:mysql://10.0.1.23:3306/synapse?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+#      username: offline_data
+#      password: tpvmfab4

ym-gateway/src/main/resources/application-test.yml

@@ -2,7 +2,7 @@ spring:
   datasource:
     #MySQL
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://mysql.picaiba.com:30307/ym_pass?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://mysql.picaiba.com:30307/mt_cigs4?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
     username: root
     password: 1qaz@WSX3edc$RFV
     #      #Oracle

ym-gateway/src/main/resources/application.yml

@@ -33,9 +33,11 @@ spring:
       enabled: true
   redis:
     database: 6
-    host: redis.picaiba.com
+    host: 127.0.0.1
-    port: 6380
+    #host: 10.0.1.249
-    password: '@WSXcde3'   # 密码（默认为空）
+    #host: 192.168.0.102
+    port: 6379
+    password: ''   # 密码（默认为空）
     timeout: 6000ms  # 连接超时时长（毫秒）
     jedis:
       pool:

ym-gateway/src/main/resources/logback.xml

@@ -0,0 +1,669 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 日志级别从低到高分为TRACE < DEBUG < INFO < WARN < ERROR < FATAL，如果设置为WARN，则低于WARN的信息都不会输出 -->
+<!-- scan:当此属性设置为true时，配置文档如果发生改变，将会被重新加载，默认值为true -->
+<!-- scanPeriod:设置监测配置文档是否有修改的时间间隔，如果没有给出时间单位，默认单位是毫秒。
+                 当scan为true时，此属性生效。默认的时间间隔为1分钟。 -->
+<!-- debug:当此属性设置为true时，将打印出logback内部日志信息，实时查看logback运行状态。默认值为false。 -->
+<configuration  scan="true" scanPeriod="10 seconds">
+    <contextName>logback-spring</contextName>
+
+    <!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义后，可以使“${}”来使用变量。 -->
+
+<!--    <property name="logging.pathwork" value="C:/qgs_logger/work" />-->
+<!--    <property name="logging.pathopc" value="C:/qgs_logger/opc" />-->
+<!--    <property name="logging.pathmq" value="C:/qgs_logger/mq" />-->
+<!--    <property name="logging.eqlog" value="C:/qgs_logger/s7" />-->
+
+    <property name="logging.eqlog" value="/var/log/logger/EQCommunicationLog" />
+    <property name="logging.eventlog" value="/var/log/logger/EventLog" />
+    <property name="logging.packing" value="/var/log/logger/Packing" />
+    <property name="logging.pathwork" value="/var/log/logger/Working" />
+
+
+    <!--0. 日志格式和颜色渲染 -->
+    <!-- 彩色日志依赖的渲染类 -->
+    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
+    <conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
+    <conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
+    <!-- 彩色日志格式 -->
+    <property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+    <!--1. 输出到控制台-->
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+
+        <encoder>
+            <Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
+            <!-- 设置字符集 -->
+            <charset>UTF-8</charset>
+        </encoder>
+
+
+        <!--此日志appender是为开发使用，只配置最底级别，控制台输出的日志级别是大于或等于此级别的日志信息-->
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>info</level>
+        </filter>
+
+    </appender>
+
+    <!--2. 输出到文档-->
+    <!-- 2.1 level为 DEBUG 日志，时间滚动输出  -->
+    <appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${logging.pathwork}/debug/work-log-debug.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 设置字符集 -->
+        </encoder>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!-- rollover daily -->
+            <fileNamePattern>${logging.pathwork}/work-log-debug-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <!-- each file should be at most 100MB, keep 60 days worth of history, but at most 20GB -->
+            <maxFileSize>100MB</maxFileSize>
+            <maxHistory>999</maxHistory>
+            <totalSizeCap>200GB</totalSizeCap>
+        </rollingPolicy>
+
+        <!-- 此日志文档只记录debug级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>debug</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+    <appender name="EQ_COMM_LOG_DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${logging.eqlog}/debug/s7-log-debug.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 设置字符集 -->
+        </encoder>
+
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!-- rollover daily -->
+            <fileNamePattern>${logging.eqlog}/s7-eq-debug-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <!-- each file should be at most 100MB, keep 60 days worth of history, but at most 20GB -->
+            <maxFileSize>100MB</maxFileSize>
+
+            <maxHistory>999</maxHistory>
+            <totalSizeCap>200GB</totalSizeCap>
+        </rollingPolicy>
+        <!-- 此日志文档只记录debug级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>debug</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+    <appender name="PACKING_LOG_DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${logging.packing}/debug/packing-log-debug.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 设置字符集 -->
+        </encoder>
+
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!-- rollover daily -->
+            <fileNamePattern>${logging.packing}/packing-log-debug-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <!-- each file should be at most 100MB, keep 60 days worth of history, but at most 20GB -->
+            <maxFileSize>100MB</maxFileSize>
+
+            <maxHistory>999</maxHistory>
+            <totalSizeCap>200GB</totalSizeCap>
+        </rollingPolicy>
+        <!-- 此日志文档只记录debug级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>debug</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+
+    <!-- 2.2 level为 INFO 日志，时间滚动输出  -->
+    <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${logging.pathwork}/info/work-log-info.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!-- rollover daily -->
+            <fileNamePattern>${logging.pathwork}/work-log-info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <!-- each file should be at most 100MB, keep 60 days worth of history, but at most 20GB -->
+            <maxFileSize>100MB</maxFileSize>
+            <maxHistory>999</maxHistory>
+            <totalSizeCap>200GB</totalSizeCap>
+        </rollingPolicy>
+        <!-- 此日志文档只记录info级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>info</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+    <appender name="EQ_COMM_LOG_INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${logging.eqlog}/info/s7-eq-info.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!-- rollover daily -->
+            <fileNamePattern>${logging.eqlog}/s7-eq-info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <!-- each file should be at most 100MB, keep 60 days worth of history, but at most 20GB -->
+            <maxFileSize>100MB</maxFileSize>
+
+            <maxHistory>999</maxHistory>
+            <totalSizeCap>200GB</totalSizeCap>
+        </rollingPolicy>
+        <!-- 此日志文档只记录info级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>info</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+    <appender name="PACKING_LOG_INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${logging.packing}/info/packing-log-info.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!-- rollover daily -->
+            <fileNamePattern>${logging.packing}/packing-log-info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <!-- each file should be at most 100MB, keep 60 days worth of history, but at most 20GB -->
+            <maxFileSize>100MB</maxFileSize>
+
+            <maxHistory>999</maxHistory>
+            <totalSizeCap>200GB</totalSizeCap>
+        </rollingPolicy>
+        <!-- 此日志文档只记录info级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>info</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+    <!-- 2线  开始 -->
+    <appender name="EVENT1_APPENDER_LINE2" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${logging.eventlog}/line2/event1/kuka-event1-log-info.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!-- rollover daily -->
+            <fileNamePattern>${logging.eventlog}/line2/kuka-event1-log-info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <!-- each file should be at most 100MB, keep 60 days worth of history, but at most 20GB -->
+            <maxFileSize>100MB</maxFileSize>
+
+            <maxHistory>999</maxHistory>
+            <totalSizeCap>200GB</totalSizeCap>
+        </rollingPolicy>
+        <!-- 此日志文档只记录info级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>info</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+    <appender name="EVENT2_APPENDER_LINE2" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${logging.eventlog}/line2/event2/kuka-event2-log-info.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!-- rollover daily -->
+            <fileNamePattern>${logging.eventlog}/line2/kuka-event2-log-info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <!-- each file should be at most 100MB, keep 60 days worth of history, but at most 20GB -->
+            <maxFileSize>100MB</maxFileSize>
+
+            <maxHistory>999</maxHistory>
+            <totalSizeCap>200GB</totalSizeCap>
+        </rollingPolicy>
+        <!-- 此日志文档只记录info级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>info</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+    <appender name="EVENT3_APPENDER_LINE2" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${logging.eventlog}/line2/event3/kuka-event3-log-info.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!-- rollover daily -->
+            <fileNamePattern>${logging.eventlog}/line2/kuka-event3-log-info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <!-- each file should be at most 100MB, keep 60 days worth of history, but at most 20GB -->
+            <maxFileSize>100MB</maxFileSize>
+
+            <maxHistory>999</maxHistory>
+            <totalSizeCap>200GB</totalSizeCap>
+        </rollingPolicy>
+        <!-- 此日志文档只记录info级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>info</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+    <!-- 2线  结束 -->
+
+    <!-- 1线  开始 -->
+    <appender name="EVENT1_APPENDER_LINE1" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${logging.eventlog}/line1/event1/kuka-event1-log-info.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!-- rollover daily -->
+            <fileNamePattern>${logging.eventlog}/line1/kuka-event1-log-info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <!-- each file should be at most 100MB, keep 60 days worth of history, but at most 20GB -->
+            <maxFileSize>100MB</maxFileSize>
+
+            <maxHistory>999</maxHistory>
+            <totalSizeCap>200GB</totalSizeCap>
+        </rollingPolicy>
+        <!-- 此日志文档只记录info级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>info</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+    <appender name="EVENT2_APPENDER_LINE1" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${logging.eventlog}/line1/event2/kuka-event2-log-info.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!-- rollover daily -->
+            <fileNamePattern>${logging.eventlog}/line1/kuka-event2-log-info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <!-- each file should be at most 100MB, keep 60 days worth of history, but at most 20GB -->
+            <maxFileSize>100MB</maxFileSize>
+
+            <maxHistory>999</maxHistory>
+            <totalSizeCap>200GB</totalSizeCap>
+        </rollingPolicy>
+        <!-- 此日志文档只记录info级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>info</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+    <appender name="EVENT3_APPENDER_LINE1" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${logging.eventlog}/line1/event3/kuka-event3-log-info.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!-- rollover daily -->
+            <fileNamePattern>${logging.eventlog}/line1/kuka-event3-log-info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <!-- each file should be at most 100MB, keep 60 days worth of history, but at most 20GB -->
+            <maxFileSize>100MB</maxFileSize>
+
+            <maxHistory>999</maxHistory>
+            <totalSizeCap>200GB</totalSizeCap>
+        </rollingPolicy>
+        <!-- 此日志文档只记录info级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>info</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+    <!-- 1线  结束 -->
+
+    <!-- event4  开始 -->
+    <appender name="EVENT4_APPENDER_LINE1" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${logging.eventlog}/line1/event4/kuka-ngEvent-log-info.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!-- rollover daily -->
+            <fileNamePattern>${logging.eventlog}/line1/kuka-ngEvent-log-info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <!-- each file should be at most 100MB, keep 60 days worth of history, but at most 20GB -->
+            <maxFileSize>100MB</maxFileSize>
+
+            <maxHistory>999</maxHistory>
+            <totalSizeCap>200GB</totalSizeCap>
+        </rollingPolicy>
+        <!-- 此日志文档只记录info级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>info</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+    <appender name="EVENT4_APPENDER_LINE2" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${logging.eventlog}/line2/event4/kuka-ngEvent-log-info.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!-- rollover daily -->
+            <fileNamePattern>${logging.eventlog}/line2/kuka-ngEvent-log-info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <!-- each file should be at most 100MB, keep 60 days worth of history, but at most 20GB -->
+            <maxFileSize>100MB</maxFileSize>
+
+            <maxHistory>999</maxHistory>
+            <totalSizeCap>200GB</totalSizeCap>
+        </rollingPolicy>
+        <!-- 此日志文档只记录info级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>info</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+    <!-- event4  结束 -->
+
+    <!-- 2.3 level为 WARN 日志，时间滚动输出  -->
+    <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${logging.pathwork}/warn/work-log-warn.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+<!--        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">-->
+<!--            <fileNamePattern>${logging.pathwork}/work-log-warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern>-->
+<!--            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">-->
+<!--                <maxFileSize>100MB</maxFileSize>-->
+<!--            </timeBasedFileNamingAndTriggeringPolicy>-->
+<!--            &lt;!&ndash;日志文档保留天数&ndash;&gt;-->
+<!--            <maxHistory>999</maxHistory>-->
+<!--        </rollingPolicy>-->
+
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!-- rollover daily -->
+            <fileNamePattern>${logging.pathwork}/work-log-warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <!-- each file should be at most 100MB, keep 60 days worth of history, but at most 20GB -->
+            <maxFileSize>100MB</maxFileSize>
+            <maxHistory>999</maxHistory>
+            <totalSizeCap>200GB</totalSizeCap>
+        </rollingPolicy>
+        <!-- 此日志文档只记录warn级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>warn</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+    <appender name="EQ_COMM_LOG_WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${logging.eqlog}/warn/s7-log-warn.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
+        </encoder>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!-- rollover daily -->
+            <fileNamePattern>${logging.eqlog}/s7-log-warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <!-- each file should be at most 100MB, keep 60 days worth of history, but at most 20GB -->
+            <maxFileSize>100MB</maxFileSize>
+
+            <maxHistory>999</maxHistory>
+            <totalSizeCap>200GB</totalSizeCap>
+        </rollingPolicy>
+        <!-- 此日志文档只记录warn级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>warn</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+    <appender name="PACKING_LOG_WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${logging.packing}/warn/packing-log-warn.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
+        </encoder>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!-- rollover daily -->
+            <fileNamePattern>${logging.packing}/packing-log-warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <!-- each file should be at most 100MB, keep 60 days worth of history, but at most 20GB -->
+            <maxFileSize>100MB</maxFileSize>
+
+            <maxHistory>999</maxHistory>
+            <totalSizeCap>200GB</totalSizeCap>
+        </rollingPolicy>
+        <!-- 此日志文档只记录warn级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>warn</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 2.4 level为 ERROR 日志，时间滚动输出  -->
+    <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${logging.pathwork}/error/work-log-error.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+<!--        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">-->
+<!--            <fileNamePattern>${logging.pathwork}/work-log-error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>-->
+<!--            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">-->
+<!--                <maxFileSize>100MB</maxFileSize>-->
+<!--            </timeBasedFileNamingAndTriggeringPolicy>-->
+<!--            &lt;!&ndash;日志文档保留天数&ndash;&gt;-->
+<!--            <maxHistory>999</maxHistory>-->
+<!--        </rollingPolicy>-->
+
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!-- rollover daily -->
+            <fileNamePattern>${logging.pathwork}/work-log-error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <!-- each file should be at most 100MB, keep 60 days worth of history, but at most 20GB -->
+            <maxFileSize>100MB</maxFileSize>
+            <maxHistory>999</maxHistory>
+            <totalSizeCap>200GB</totalSizeCap>
+        </rollingPolicy>
+
+        <!-- 此日志文档只记录ERROR级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+    <appender name="EQ_COMM_LOG_ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${logging.eqlog}/error/s7-log-error.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
+        </encoder>
+
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!-- rollover daily -->
+            <fileNamePattern>${logging.eqlog}/s7-log-error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <!-- each file should be at most 100MB, keep 60 days worth of history, but at most 20GB -->
+            <maxFileSize>100MB</maxFileSize>
+            <maxHistory>999</maxHistory>
+            <totalSizeCap>200GB</totalSizeCap>
+        </rollingPolicy>
+
+        <!-- 此日志文档只记录ERROR级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+    <appender name="PACKING_LOG_ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文档的路径及文档名 -->
+        <file>${logging.packing}/error/packing-log-error.log</file>
+        <!--日志文档输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
+        </encoder>
+
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!-- rollover daily -->
+            <fileNamePattern>${logging.packing}/packing-log-error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <!-- each file should be at most 100MB, keep 60 days worth of history, but at most 20GB -->
+            <maxFileSize>100MB</maxFileSize>
+            <maxHistory>999</maxHistory>
+            <totalSizeCap>200GB</totalSizeCap>
+        </rollingPolicy>
+
+        <!-- 此日志文档只记录ERROR级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!--
+        <logger>用来设置某一个包或者具体的某一个类的日志打印级别、
+        以及指定<appender>。<logger>仅有一个name属性，
+        一个可选的level和一个可选的addtivity属性。
+        name:用来指定受此logger约束的某一个包或者具体的某一个类。
+        level:用来设置打印级别，大小写无关：TRACE, DEBUG, INFO, WARN, ERROR, ALL 和 OFF，
+              还有一个特俗值INHERITED或者同义词NULL，代表强制执行上级的级别。
+              如果未设置此属性，那么当前logger将会继承上级的级别。
+        addtivity:是否向上级logger传递打印信息。默认是true。
+        <logger name="org.springframework.web" level="info"/>
+        <logger name="org.springframework.scheduling.annotation.ScheduledAnnotationBeanPostProcessor" level="INFO"/>
+    -->
+
+    <!--
+        使用mybatis的时候，sql语句是debug下才会打印，而这里我们只配置了info，所以想要查看sql语句的话，有以下两种操作：
+        第一种把<root level="info">改成<root level="DEBUG">这样就会打印sql，不过这样日志那边会出现很多其他消息
+        第二种就是单独给dao下目录配置debug模式，代码如下，这样配置sql语句会打印，其他还是正常info级别：
+        【logging.level.org.mybatis=debug logging.level.dao=debug】
+     -->
+
+    <!--
+        root节点是必选节点，用来指定最基础的日志输出级别，只有一个level属性
+        level:用来设置打印级别，大小写无关：TRACE, DEBUG, INFO, WARN, ERROR, ALL 和 OFF，
+        不能设置为INHERITED或者同义词NULL。默认是DEBUG
+        可以包含零个或多个元素，标识这个appender将会添加到这个logger。
+    -->
+
+    <!-- name就是包名，这个包下的 所有logger 输出就以下配置（这里的logger只会输出代码里 你指定打印的log ） -->
+
+<!--    <logger name="com.cnbm.pathwork" additivity="false">-->
+<!--        <appender-ref ref="WORKING_DEBUG_FILE" />-->
+<!--        <appender-ref ref="WORKING_INFO_FILE" />-->
+<!--        <appender-ref ref="WORKING_WARN_FILE" />-->
+<!--        <appender-ref ref="WORKING_ERROR_FILE" />-->
+<!--    </logger>-->
+    <logger name="com.cnbm.dispatch" additivity="false">
+        <appender-ref ref="EQ_COMM_LOG_DEBUG_FILE" />
+        <appender-ref ref="EQ_COMM_LOG_INFO_FILE" />
+        <appender-ref ref="EQ_COMM_LOG_WARN_FILE" />
+        <appender-ref ref="EQ_COMM_LOG_ERROR_FILE" />
+    </logger>
+
+    <!-- LINE2 开始 -->
+    <logger name="EVENT1Line2" level="INFO" additivity="false">
+        <appender-ref ref="EVENT1_APPENDER_LINE2" />
+    </logger>
+    <logger name="EVENT2Line2" level="INFO" additivity="false">
+        <appender-ref ref="EVENT2_APPENDER_LINE2" />
+    </logger>
+    <logger name="EVENT3Line2" level="INFO" additivity="false">
+        <appender-ref ref="EVENT3_APPENDER_LINE2" />
+    </logger>
+    <!-- LINE2 结束 -->
+
+    <!-- LINE4NG 开始 -->
+    <logger name="EVENT4NGLine1" level="INFO" additivity="false">
+        <appender-ref ref="EVENT4_APPENDER_LINE1" />
+    </logger>
+    <logger name="EVENT4NGLine2" level="INFO" additivity="false">
+        <appender-ref ref="EVENT4_APPENDER_LINE2" />
+    </logger>
+    <!-- LINE4NG 结束 -->
+
+    <!-- LINE1 开始 -->
+    <logger name="EVENT1Line1" level="INFO" additivity="false">
+        <appender-ref ref="EVENT1_APPENDER_LINE1" />
+    </logger>
+    <logger name="EVENT2Line1" level="INFO" additivity="false">
+        <appender-ref ref="EVENT2_APPENDER_LINE1" />
+    </logger>
+    <logger name="EVENT3Line1" level="INFO" additivity="false">
+        <appender-ref ref="EVENT3_APPENDER_LINE1" />
+    </logger>
+    <!-- LINE1 结束 -->
+
+
+    <logger name="com.cnbm.packing"  additivity="false">
+        <appender-ref ref="PACKING_LOG_DEBUG_FILE" />
+        <appender-ref ref="PACKING_LOG_INFO_FILE" />
+        <appender-ref ref="PACKING_LOG_WARN_FILE" />
+        <appender-ref ref="PACKING_LOG_ERROR_FILE" />
+    </logger>
+
+    <!--    work这个目录 是所有控制台信息 + 第三方jar包 输出的信息  -->
+    <root level="info">
+        <appender-ref ref="CONSOLE" />
+        <appender-ref ref="DEBUG_FILE" />
+        <appender-ref ref="INFO_FILE" />
+        <appender-ref ref="WARN_FILE" />
+        <appender-ref ref="ERROR_FILE" />
+    </root>
+
+    <!-- 4.2 生产环境:输出到文档
+    <springProfile name="pro">
+        <root level="info">
+            <appender-ref ref="CONSOLE" />
+            <appender-ref ref="DEBUG_FILE" />
+            <appender-ref ref="INFO_FILE" />
+            <appender-ref ref="ERROR_FILE" />
+            <appender-ref ref="WARN_FILE" />
+        </root>
+    </springProfile> -->
+</configuration>

ym-generator/src/main/java/com/cnbm/generator/build/CodeGenerator.java

@@ -19,7 +19,7 @@ public class CodeGenerator {
 
     @Test
     public void test(){
-        mybatisPlusGenerator(new String[]{"t_test"});
+        mybatisPlusGenerator(new String[]{"t_working_time"});
     }
 
     public static void mybatisPlusGenerator(String[] include){

ym-generator/src/main/java/com/cnbm/generator/code/controller/ChangePackagingBoxHistoryController.java

@@ -0,0 +1,116 @@
+package com.cnbm.generator.code.controller;
+
+import com.cnbm.admin.annotation.LogOperation;
+import com.cnbm.common.constant.Constant;
+import com.cnbm.common.page.PageData;
+import com.cnbm.common.utils.ExcelUtils;
+import com.cnbm.common.utils.Result;
+import com.cnbm.common.validator.AssertUtils;
+import com.cnbm.common.validator.ValidatorUtils;
+import com.cnbm.common.validator.group.AddGroup;
+import com.cnbm.common.validator.group.DefaultGroup;
+import com.cnbm.common.validator.group.UpdateGroup;
+import com.cnbm.generator.code.dto.ChangePackagingBoxHistoryDTO;
+import com.cnbm.generator.code.excel.ChangePackagingBoxHistoryExcel;
+import com.cnbm.generator.code.service.ChangePackagingBoxHistoryServiceBiz;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 包装箱拆合箱历史表  前端控制器
+ *
+ * @author codeGenerator
+ * @since  2023-02-16
+ */
+@RestController
+@RequestMapping("/code/changePackagingBoxHistory")
+@Api(tags="包装箱拆合箱历史表")
+public class ChangePackagingBoxHistoryController {
+    @Autowired
+    private ChangePackagingBoxHistoryServiceBiz changePackagingBoxHistoryService;
+
+    @GetMapping("page")
+    @ApiOperation("分页")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataTypeClass=Integer.class) ,
+        @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataTypeClass=Integer.class) ,
+        @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) ,
+        @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class)
+    })
+    @PreAuthorize("@ex.hasAuthority('code:changePackagingBoxHistory:page')")
+    public Result<PageData<ChangePackagingBoxHistoryDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
+        PageData<ChangePackagingBoxHistoryDTO> page = changePackagingBoxHistoryService.page(params);
+
+        return new Result<PageData<ChangePackagingBoxHistoryDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    @ApiOperation("信息")
+    @PreAuthorize("@ex.hasAuthority('code:changePackagingBoxHistory:info')")
+    public Result<ChangePackagingBoxHistoryDTO> get(@PathVariable("id") Long id){
+        ChangePackagingBoxHistoryDTO data = changePackagingBoxHistoryService.get(id);
+
+        return new Result<ChangePackagingBoxHistoryDTO>().ok(data);
+    }
+
+    @PostMapping
+    @ApiOperation("保存")
+    @LogOperation("保存")
+    @PreAuthorize("@ex.hasAuthority('code:changePackagingBoxHistory:save')")
+    public Result<Long> save(@RequestBody ChangePackagingBoxHistoryDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+
+        changePackagingBoxHistoryService.save(dto);
+
+        return new Result<Long>().ok(dto.getId());
+    }
+
+    @PutMapping
+    @ApiOperation("修改")
+    @LogOperation("修改")
+    @PreAuthorize("@ex.hasAuthority('code:changePackagingBoxHistory:update')")
+    public Result<Long> update(@RequestBody ChangePackagingBoxHistoryDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+        changePackagingBoxHistoryService.update(dto);
+
+        return new Result<Long>().ok(dto.getId());
+    }
+
+    @DeleteMapping
+    @ApiOperation("删除")
+    @LogOperation("删除")
+    @PreAuthorize("@ex.hasAuthority('code:changePackagingBoxHistory:delete')")
+    public Result delete(@RequestBody Long[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+
+        changePackagingBoxHistoryService.delete(ids);
+
+        return new Result();
+    }
+
+    @GetMapping("export")
+    @ApiOperation("导出")
+    @LogOperation("导出")
+    @PreAuthorize("@ex.hasAuthority('code:changePackagingBoxHistory:export')")
+    public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<ChangePackagingBoxHistoryDTO> list = changePackagingBoxHistoryService.list(params);
+
+        ExcelUtils.exportExcelToTarget(response, null, list, ChangePackagingBoxHistoryExcel.class);
+    }
+
+}

ym-generator/src/main/java/com/cnbm/generator/code/controller/PrintModelController.java

@@ -0,0 +1,116 @@
+package com.cnbm.generator.code.controller;
+
+import com.cnbm.admin.annotation.LogOperation;
+import com.cnbm.common.constant.Constant;
+import com.cnbm.common.page.PageData;
+import com.cnbm.common.utils.ExcelUtils;
+import com.cnbm.common.utils.Result;
+import com.cnbm.common.validator.AssertUtils;
+import com.cnbm.common.validator.ValidatorUtils;
+import com.cnbm.common.validator.group.AddGroup;
+import com.cnbm.common.validator.group.DefaultGroup;
+import com.cnbm.common.validator.group.UpdateGroup;
+import com.cnbm.generator.code.dto.PrintModelDTO;
+import com.cnbm.generator.code.excel.PrintModelExcel;
+import com.cnbm.generator.code.service.PrintModelServiceBiz;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 打印标签模板表  前端控制器
+ *
+ * @author codeGenerator
+ * @since  2024-01-25
+ */
+@RestController
+@RequestMapping("/code/printModel")
+@Api(tags="打印标签模板表")
+public class PrintModelController {
+    @Autowired
+    private PrintModelServiceBiz printModelService;
+
+    @GetMapping("page")
+    @ApiOperation("分页")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataTypeClass=Integer.class) ,
+        @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataTypeClass=Integer.class) ,
+        @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) ,
+        @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class)
+    })
+    @PreAuthorize("@ex.hasAuthority('code:printModel:page')")
+    public Result<PageData<PrintModelDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
+        PageData<PrintModelDTO> page = printModelService.page(params);
+
+        return new Result<PageData<PrintModelDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    @ApiOperation("信息")
+    @PreAuthorize("@ex.hasAuthority('code:printModel:info')")
+    public Result<PrintModelDTO> get(@PathVariable("id") Long id){
+        PrintModelDTO data = printModelService.get(id);
+
+        return new Result<PrintModelDTO>().ok(data);
+    }
+
+    @PostMapping
+    @ApiOperation("保存")
+    @LogOperation("保存")
+    @PreAuthorize("@ex.hasAuthority('code:printModel:save')")
+    public Result<Long> save(@RequestBody PrintModelDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+
+        printModelService.save(dto);
+
+        return new Result<Long>().ok(dto.getId());
+    }
+
+    @PutMapping
+    @ApiOperation("修改")
+    @LogOperation("修改")
+    @PreAuthorize("@ex.hasAuthority('code:printModel:update')")
+    public Result<Long> update(@RequestBody PrintModelDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+        printModelService.update(dto);
+
+        return new Result<Long>().ok(dto.getId());
+    }
+
+    @DeleteMapping
+    @ApiOperation("删除")
+    @LogOperation("删除")
+    @PreAuthorize("@ex.hasAuthority('code:printModel:delete')")
+    public Result delete(@RequestBody Long[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+
+        printModelService.delete(ids);
+
+        return new Result();
+    }
+
+    @GetMapping("export")
+    @ApiOperation("导出")
+    @LogOperation("导出")
+    @PreAuthorize("@ex.hasAuthority('code:printModel:export')")
+    public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<PrintModelDTO> list = printModelService.list(params);
+
+        ExcelUtils.exportExcelToTarget(response, null, list, PrintModelExcel.class);
+    }
+
+}

ym-generator/src/main/java/com/cnbm/generator/code/controller/ProductLevelController.java

@@ -0,0 +1,116 @@
+package com.cnbm.generator.code.controller;
+
+import com.cnbm.admin.annotation.LogOperation;
+import com.cnbm.common.constant.Constant;
+import com.cnbm.common.page.PageData;
+import com.cnbm.common.utils.ExcelUtils;
+import com.cnbm.common.utils.Result;
+import com.cnbm.common.validator.AssertUtils;
+import com.cnbm.common.validator.ValidatorUtils;
+import com.cnbm.common.validator.group.AddGroup;
+import com.cnbm.common.validator.group.DefaultGroup;
+import com.cnbm.common.validator.group.UpdateGroup;
+import com.cnbm.generator.code.dto.ProductLevelDTO;
+import com.cnbm.generator.code.excel.ProductLevelExcel;
+import com.cnbm.generator.code.service.ProductLevelServiceBiz;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 产品等级 表  前端控制器
+ *
+ * @author codeGenerator
+ * @since  2023-12-28
+ */
+@RestController
+@RequestMapping("/code/productLevel")
+@Api(tags="产品等级 表")
+public class ProductLevelController {
+    @Autowired
+    private ProductLevelServiceBiz productLevelService;
+
+    @GetMapping("page")
+    @ApiOperation("分页")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataTypeClass=Integer.class) ,
+        @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataTypeClass=Integer.class) ,
+        @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) ,
+        @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class)
+    })
+    @PreAuthorize("@ex.hasAuthority('code:productLevel:page')")
+    public Result<PageData<ProductLevelDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
+        PageData<ProductLevelDTO> page = productLevelService.page(params);
+
+        return new Result<PageData<ProductLevelDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    @ApiOperation("信息")
+    @PreAuthorize("@ex.hasAuthority('code:productLevel:info')")
+    public Result<ProductLevelDTO> get(@PathVariable("id") Long id){
+        ProductLevelDTO data = productLevelService.get(id);
+
+        return new Result<ProductLevelDTO>().ok(data);
+    }
+
+    @PostMapping
+    @ApiOperation("保存")
+    @LogOperation("保存")
+    @PreAuthorize("@ex.hasAuthority('code:productLevel:save')")
+    public Result<Long> save(@RequestBody ProductLevelDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+
+        productLevelService.save(dto);
+
+        return new Result<Long>().ok(dto.getId());
+    }
+
+    @PutMapping
+    @ApiOperation("修改")
+    @LogOperation("修改")
+    @PreAuthorize("@ex.hasAuthority('code:productLevel:update')")
+    public Result<Long> update(@RequestBody ProductLevelDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+        productLevelService.update(dto);
+
+        return new Result<Long>().ok(dto.getId());
+    }
+
+    @DeleteMapping
+    @ApiOperation("删除")
+    @LogOperation("删除")
+    @PreAuthorize("@ex.hasAuthority('code:productLevel:delete')")
+    public Result delete(@RequestBody Long[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+
+        productLevelService.delete(ids);
+
+        return new Result();
+    }
+
+    @GetMapping("export")
+    @ApiOperation("导出")
+    @LogOperation("导出")
+    @PreAuthorize("@ex.hasAuthority('code:productLevel:export')")
+    public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<ProductLevelDTO> list = productLevelService.list(params);
+
+        ExcelUtils.exportExcelToTarget(response, null, list, ProductLevelExcel.class);
+    }
+
+}

ym-generator/src/main/java/com/cnbm/generator/code/controller/ScenesController.java

@@ -0,0 +1,116 @@
+package com.cnbm.generator.code.controller;
+
+import com.cnbm.admin.annotation.LogOperation;
+import com.cnbm.common.constant.Constant;
+import com.cnbm.common.page.PageData;
+import com.cnbm.common.utils.ExcelUtils;
+import com.cnbm.common.utils.Result;
+import com.cnbm.common.validator.AssertUtils;
+import com.cnbm.common.validator.ValidatorUtils;
+import com.cnbm.common.validator.group.AddGroup;
+import com.cnbm.common.validator.group.DefaultGroup;
+import com.cnbm.common.validator.group.UpdateGroup;
+import com.cnbm.generator.code.dto.ScenesDTO;
+import com.cnbm.generator.code.excel.ScenesExcel;
+import com.cnbm.generator.code.service.ScenesServiceBiz;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 场景 表  前端控制器
+ *
+ * @author codeGenerator
+ * @since  2023-12-28
+ */
+@RestController
+@RequestMapping("/code/scenes")
+@Api(tags="场景 表")
+public class ScenesController {
+    @Autowired
+    private ScenesServiceBiz scenesService;
+
+    @GetMapping("page")
+    @ApiOperation("分页")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataTypeClass=Integer.class) ,
+        @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataTypeClass=Integer.class) ,
+        @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) ,
+        @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class)
+    })
+    @PreAuthorize("@ex.hasAuthority('code:scenes:page')")
+    public Result<PageData<ScenesDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
+        PageData<ScenesDTO> page = scenesService.page(params);
+
+        return new Result<PageData<ScenesDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    @ApiOperation("信息")
+    @PreAuthorize("@ex.hasAuthority('code:scenes:info')")
+    public Result<ScenesDTO> get(@PathVariable("id") Long id){
+        ScenesDTO data = scenesService.get(id);
+
+        return new Result<ScenesDTO>().ok(data);
+    }
+
+    @PostMapping
+    @ApiOperation("保存")
+    @LogOperation("保存")
+    @PreAuthorize("@ex.hasAuthority('code:scenes:save')")
+    public Result<Long> save(@RequestBody ScenesDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+
+        scenesService.save(dto);
+
+        return new Result<Long>().ok(dto.getId());
+    }
+
+    @PutMapping
+    @ApiOperation("修改")
+    @LogOperation("修改")
+    @PreAuthorize("@ex.hasAuthority('code:scenes:update')")
+    public Result<Long> update(@RequestBody ScenesDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+        scenesService.update(dto);
+
+        return new Result<Long>().ok(dto.getId());
+    }
+
+    @DeleteMapping
+    @ApiOperation("删除")
+    @LogOperation("删除")
+    @PreAuthorize("@ex.hasAuthority('code:scenes:delete')")
+    public Result delete(@RequestBody Long[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+
+        scenesService.delete(ids);
+
+        return new Result();
+    }
+
+    @GetMapping("export")
+    @ApiOperation("导出")
+    @LogOperation("导出")
+    @PreAuthorize("@ex.hasAuthority('code:scenes:export')")
+    public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<ScenesDTO> list = scenesService.list(params);
+
+        ExcelUtils.exportExcelToTarget(response, null, list, ScenesExcel.class);
+    }
+
+}

ym-generator/src/main/java/com/cnbm/generator/code/controller/WoCompensationPowerController.java

@@ -0,0 +1,116 @@
+package com.cnbm.generator.code.controller;
+
+import com.cnbm.admin.annotation.LogOperation;
+import com.cnbm.common.constant.Constant;
+import com.cnbm.common.page.PageData;
+import com.cnbm.common.utils.ExcelUtils;
+import com.cnbm.common.utils.Result;
+import com.cnbm.common.validator.AssertUtils;
+import com.cnbm.common.validator.ValidatorUtils;
+import com.cnbm.common.validator.group.AddGroup;
+import com.cnbm.common.validator.group.DefaultGroup;
+import com.cnbm.common.validator.group.UpdateGroup;
+import com.cnbm.generator.code.dto.WoCompensationPowerDTO;
+import com.cnbm.generator.code.excel.WoCompensationPowerExcel;
+import com.cnbm.generator.code.service.WoCompensationPowerServiceBiz;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 基板补偿功率 表  前端控制器
+ *
+ * @author codeGenerator
+ * @since  2023-02-20
+ */
+@RestController
+@RequestMapping("/code/woCompensationPower")
+@Api(tags="基板补偿功率 表")
+public class WoCompensationPowerController {
+    @Autowired
+    private WoCompensationPowerServiceBiz woCompensationPowerService;
+
+    @GetMapping("page")
+    @ApiOperation("分页")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataTypeClass=Integer.class) ,
+        @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataTypeClass=Integer.class) ,
+        @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) ,
+        @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class)
+    })
+    @PreAuthorize("@ex.hasAuthority('code:woCompensationPower:page')")
+    public Result<PageData<WoCompensationPowerDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
+        PageData<WoCompensationPowerDTO> page = woCompensationPowerService.page(params);
+
+        return new Result<PageData<WoCompensationPowerDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    @ApiOperation("信息")
+    @PreAuthorize("@ex.hasAuthority('code:woCompensationPower:info')")
+    public Result<WoCompensationPowerDTO> get(@PathVariable("id") Long id){
+        WoCompensationPowerDTO data = woCompensationPowerService.get(id);
+
+        return new Result<WoCompensationPowerDTO>().ok(data);
+    }
+
+    @PostMapping
+    @ApiOperation("保存")
+    @LogOperation("保存")
+    @PreAuthorize("@ex.hasAuthority('code:woCompensationPower:save')")
+    public Result<Long> save(@RequestBody WoCompensationPowerDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+
+        woCompensationPowerService.save(dto);
+
+        return new Result<Long>().ok(dto.getId());
+    }
+
+    @PutMapping
+    @ApiOperation("修改")
+    @LogOperation("修改")
+    @PreAuthorize("@ex.hasAuthority('code:woCompensationPower:update')")
+    public Result<Long> update(@RequestBody WoCompensationPowerDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+        woCompensationPowerService.update(dto);
+
+        return new Result<Long>().ok(dto.getId());
+    }
+
+    @DeleteMapping
+    @ApiOperation("删除")
+    @LogOperation("删除")
+    @PreAuthorize("@ex.hasAuthority('code:woCompensationPower:delete')")
+    public Result delete(@RequestBody Long[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+
+        woCompensationPowerService.delete(ids);
+
+        return new Result();
+    }
+
+    @GetMapping("export")
+    @ApiOperation("导出")
+    @LogOperation("导出")
+    @PreAuthorize("@ex.hasAuthority('code:woCompensationPower:export')")
+    public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<WoCompensationPowerDTO> list = woCompensationPowerService.list(params);
+
+        ExcelUtils.exportExcelToTarget(response, null, list, WoCompensationPowerExcel.class);
+    }
+
+}

ym-generator/src/main/java/com/cnbm/generator/code/controller/WoPackagingBoxController.java

@@ -0,0 +1,116 @@
+package com.cnbm.generator.code.controller;
+
+import com.cnbm.admin.annotation.LogOperation;
+import com.cnbm.common.constant.Constant;
+import com.cnbm.common.page.PageData;
+import com.cnbm.common.utils.ExcelUtils;
+import com.cnbm.common.utils.Result;
+import com.cnbm.common.validator.AssertUtils;
+import com.cnbm.common.validator.ValidatorUtils;
+import com.cnbm.common.validator.group.AddGroup;
+import com.cnbm.common.validator.group.DefaultGroup;
+import com.cnbm.common.validator.group.UpdateGroup;
+import com.cnbm.generator.code.dto.WoPackagingBoxDTO;
+import com.cnbm.generator.code.excel.WoPackagingBoxExcel;
+import com.cnbm.generator.code.service.WoPackagingBoxServiceBiz;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 包装箱表  前端控制器
+ *
+ * @author codeGenerator
+ * @since  2024-01-29
+ */
+@RestController
+@RequestMapping("/code/woPackagingBox")
+@Api(tags="包装箱表")
+public class WoPackagingBoxController {
+    @Autowired
+    private WoPackagingBoxServiceBiz woPackagingBoxService;
+
+    @GetMapping("page")
+    @ApiOperation("分页")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataTypeClass=Integer.class) ,
+        @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataTypeClass=Integer.class) ,
+        @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) ,
+        @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class)
+    })
+    @PreAuthorize("@ex.hasAuthority('code:woPackagingBox:page')")
+    public Result<PageData<WoPackagingBoxDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
+        PageData<WoPackagingBoxDTO> page = woPackagingBoxService.page(params);
+
+        return new Result<PageData<WoPackagingBoxDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    @ApiOperation("信息")
+    @PreAuthorize("@ex.hasAuthority('code:woPackagingBox:info')")
+    public Result<WoPackagingBoxDTO> get(@PathVariable("id") Long id){
+        WoPackagingBoxDTO data = woPackagingBoxService.get(id);
+
+        return new Result<WoPackagingBoxDTO>().ok(data);
+    }
+
+    @PostMapping
+    @ApiOperation("保存")
+    @LogOperation("保存")
+    @PreAuthorize("@ex.hasAuthority('code:woPackagingBox:save')")
+    public Result<Long> save(@RequestBody WoPackagingBoxDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+
+        woPackagingBoxService.save(dto);
+
+        return new Result<Long>().ok(dto.getId());
+    }
+
+    @PutMapping
+    @ApiOperation("修改")
+    @LogOperation("修改")
+    @PreAuthorize("@ex.hasAuthority('code:woPackagingBox:update')")
+    public Result<Long> update(@RequestBody WoPackagingBoxDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+        woPackagingBoxService.update(dto);
+
+        return new Result<Long>().ok(dto.getId());
+    }
+
+    @DeleteMapping
+    @ApiOperation("删除")
+    @LogOperation("删除")
+    @PreAuthorize("@ex.hasAuthority('code:woPackagingBox:delete')")
+    public Result delete(@RequestBody Long[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+
+        woPackagingBoxService.delete(ids);
+
+        return new Result();
+    }
+
+    @GetMapping("export")
+    @ApiOperation("导出")
+    @LogOperation("导出")
+    @PreAuthorize("@ex.hasAuthority('code:woPackagingBox:export')")
+    public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<WoPackagingBoxDTO> list = woPackagingBoxService.list(params);
+
+        ExcelUtils.exportExcelToTarget(response, null, list, WoPackagingBoxExcel.class);
+    }
+
+}

ym-generator/src/main/java/com/cnbm/generator/code/controller/WoPackagingBoxSubstrateController.java

@@ -0,0 +1,116 @@
+package com.cnbm.generator.code.controller;
+
+import com.cnbm.admin.annotation.LogOperation;
+import com.cnbm.common.constant.Constant;
+import com.cnbm.common.page.PageData;
+import com.cnbm.common.utils.ExcelUtils;
+import com.cnbm.common.utils.Result;
+import com.cnbm.common.validator.AssertUtils;
+import com.cnbm.common.validator.ValidatorUtils;
+import com.cnbm.common.validator.group.AddGroup;
+import com.cnbm.common.validator.group.DefaultGroup;
+import com.cnbm.common.validator.group.UpdateGroup;
+import com.cnbm.generator.code.dto.WoPackagingBoxSubstrateDTO;
+import com.cnbm.generator.code.excel.WoPackagingBoxSubstrateExcel;
+import com.cnbm.generator.code.service.WoPackagingBoxSubstrateServiceBiz;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 包装箱基板关联表 ( 基板表 )  前端控制器
+ *
+ * @author codeGenerator
+ * @since  2023-03-03
+ */
+@RestController
+@RequestMapping("/code/woPackagingBoxSubstrate")
+@Api(tags="包装箱基板关联表 ( 基板表 )")
+public class WoPackagingBoxSubstrateController {
+    @Autowired
+    private WoPackagingBoxSubstrateServiceBiz woPackagingBoxSubstrateService;
+
+    @GetMapping("page")
+    @ApiOperation("分页")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataTypeClass=Integer.class) ,
+        @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataTypeClass=Integer.class) ,
+        @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) ,
+        @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class)
+    })
+    @PreAuthorize("@ex.hasAuthority('code:woPackagingBoxSubstrate:page')")
+    public Result<PageData<WoPackagingBoxSubstrateDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
+        PageData<WoPackagingBoxSubstrateDTO> page = woPackagingBoxSubstrateService.page(params);
+
+        return new Result<PageData<WoPackagingBoxSubstrateDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    @ApiOperation("信息")
+    @PreAuthorize("@ex.hasAuthority('code:woPackagingBoxSubstrate:info')")
+    public Result<WoPackagingBoxSubstrateDTO> get(@PathVariable("id") Long id){
+        WoPackagingBoxSubstrateDTO data = woPackagingBoxSubstrateService.get(id);
+
+        return new Result<WoPackagingBoxSubstrateDTO>().ok(data);
+    }
+
+    @PostMapping
+    @ApiOperation("保存")
+    @LogOperation("保存")
+    @PreAuthorize("@ex.hasAuthority('code:woPackagingBoxSubstrate:save')")
+    public Result<Long> save(@RequestBody WoPackagingBoxSubstrateDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+
+        woPackagingBoxSubstrateService.save(dto);
+
+        return new Result<Long>().ok(dto.getId());
+    }
+
+    @PutMapping
+    @ApiOperation("修改")
+    @LogOperation("修改")
+    @PreAuthorize("@ex.hasAuthority('code:woPackagingBoxSubstrate:update')")
+    public Result<Long> update(@RequestBody WoPackagingBoxSubstrateDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+        woPackagingBoxSubstrateService.update(dto);
+
+        return new Result<Long>().ok(dto.getId());
+    }
+
+    @DeleteMapping
+    @ApiOperation("删除")
+    @LogOperation("删除")
+    @PreAuthorize("@ex.hasAuthority('code:woPackagingBoxSubstrate:delete')")
+    public Result delete(@RequestBody Long[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+
+        woPackagingBoxSubstrateService.delete(ids);
+
+        return new Result();
+    }
+
+    @GetMapping("export")
+    @ApiOperation("导出")
+    @LogOperation("导出")
+    @PreAuthorize("@ex.hasAuthority('code:woPackagingBoxSubstrate:export')")
+    public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<WoPackagingBoxSubstrateDTO> list = woPackagingBoxSubstrateService.list(params);
+
+        ExcelUtils.exportExcelToTarget(response, null, list, WoPackagingBoxSubstrateExcel.class);
+    }
+
+}

ym-generator/src/main/java/com/cnbm/generator/code/controller/WoPackagingPrintHistoryController.java

@@ -0,0 +1,116 @@
+package com.cnbm.generator.code.controller;
+
+import com.cnbm.admin.annotation.LogOperation;
+import com.cnbm.common.constant.Constant;
+import com.cnbm.common.page.PageData;
+import com.cnbm.common.utils.ExcelUtils;
+import com.cnbm.common.utils.Result;
+import com.cnbm.common.validator.AssertUtils;
+import com.cnbm.common.validator.ValidatorUtils;
+import com.cnbm.common.validator.group.AddGroup;
+import com.cnbm.common.validator.group.DefaultGroup;
+import com.cnbm.common.validator.group.UpdateGroup;
+import com.cnbm.generator.code.dto.WoPackagingPrintHistoryDTO;
+import com.cnbm.generator.code.excel.WoPackagingPrintHistoryExcel;
+import com.cnbm.generator.code.service.WoPackagingPrintHistoryServiceBiz;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 包装箱打印历史表  前端控制器
+ *
+ * @author codeGenerator
+ * @since  2023-02-20
+ */
+@RestController
+@RequestMapping("/code/woPackagingPrintHistory")
+@Api(tags="包装箱打印历史表")
+public class WoPackagingPrintHistoryController {
+    @Autowired
+    private WoPackagingPrintHistoryServiceBiz woPackagingPrintHistoryService;
+
+    @GetMapping("page")
+    @ApiOperation("分页")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataTypeClass=Integer.class) ,
+        @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataTypeClass=Integer.class) ,
+        @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) ,
+        @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class)
+    })
+    @PreAuthorize("@ex.hasAuthority('code:woPackagingPrintHistory:page')")
+    public Result<PageData<WoPackagingPrintHistoryDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
+        PageData<WoPackagingPrintHistoryDTO> page = woPackagingPrintHistoryService.page(params);
+
+        return new Result<PageData<WoPackagingPrintHistoryDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    @ApiOperation("信息")
+    @PreAuthorize("@ex.hasAuthority('code:woPackagingPrintHistory:info')")
+    public Result<WoPackagingPrintHistoryDTO> get(@PathVariable("id") Long id){
+        WoPackagingPrintHistoryDTO data = woPackagingPrintHistoryService.get(id);
+
+        return new Result<WoPackagingPrintHistoryDTO>().ok(data);
+    }
+
+    @PostMapping
+    @ApiOperation("保存")
+    @LogOperation("保存")
+    @PreAuthorize("@ex.hasAuthority('code:woPackagingPrintHistory:save')")
+    public Result<Long> save(@RequestBody WoPackagingPrintHistoryDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+
+        woPackagingPrintHistoryService.save(dto);
+
+        return new Result<Long>().ok(dto.getId());
+    }
+
+    @PutMapping
+    @ApiOperation("修改")
+    @LogOperation("修改")
+    @PreAuthorize("@ex.hasAuthority('code:woPackagingPrintHistory:update')")
+    public Result<Long> update(@RequestBody WoPackagingPrintHistoryDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+        woPackagingPrintHistoryService.update(dto);
+
+        return new Result<Long>().ok(dto.getId());
+    }
+
+    @DeleteMapping
+    @ApiOperation("删除")
+    @LogOperation("删除")
+    @PreAuthorize("@ex.hasAuthority('code:woPackagingPrintHistory:delete')")
+    public Result delete(@RequestBody Long[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+
+        woPackagingPrintHistoryService.delete(ids);
+
+        return new Result();
+    }
+
+    @GetMapping("export")
+    @ApiOperation("导出")
+    @LogOperation("导出")
+    @PreAuthorize("@ex.hasAuthority('code:woPackagingPrintHistory:export')")
+    public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<WoPackagingPrintHistoryDTO> list = woPackagingPrintHistoryService.list(params);
+
+        ExcelUtils.exportExcelToTarget(response, null, list, WoPackagingPrintHistoryExcel.class);
+    }
+
+}

ym-generator/src/main/java/com/cnbm/generator/code/controller/WoPowerLevelController.java

@@ -0,0 +1,116 @@
+package com.cnbm.generator.code.controller;
+
+import com.cnbm.admin.annotation.LogOperation;
+import com.cnbm.common.constant.Constant;
+import com.cnbm.common.page.PageData;
+import com.cnbm.common.utils.ExcelUtils;
+import com.cnbm.common.utils.Result;
+import com.cnbm.common.validator.AssertUtils;
+import com.cnbm.common.validator.ValidatorUtils;
+import com.cnbm.common.validator.group.AddGroup;
+import com.cnbm.common.validator.group.DefaultGroup;
+import com.cnbm.common.validator.group.UpdateGroup;
+import com.cnbm.generator.code.dto.WoPowerLevelDTO;
+import com.cnbm.generator.code.excel.WoPowerLevelExcel;
+import com.cnbm.generator.code.service.WoPowerLevelServiceBiz;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 功率等级 表  前端控制器
+ *
+ * @author codeGenerator
+ * @since  2023-02-22
+ */
+@RestController
+@RequestMapping("/code/woPowerLevel")
+@Api(tags="功率等级 表")
+public class WoPowerLevelController {
+    @Autowired
+    private WoPowerLevelServiceBiz woPowerLevelService;
+
+    @GetMapping("page")
+    @ApiOperation("分页")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataTypeClass=Integer.class) ,
+        @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataTypeClass=Integer.class) ,
+        @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) ,
+        @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class)
+    })
+    @PreAuthorize("@ex.hasAuthority('code:woPowerLevel:page')")
+    public Result<PageData<WoPowerLevelDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
+        PageData<WoPowerLevelDTO> page = woPowerLevelService.page(params);
+
+        return new Result<PageData<WoPowerLevelDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    @ApiOperation("信息")
+    @PreAuthorize("@ex.hasAuthority('code:woPowerLevel:info')")
+    public Result<WoPowerLevelDTO> get(@PathVariable("id") Long id){
+        WoPowerLevelDTO data = woPowerLevelService.get(id);
+
+        return new Result<WoPowerLevelDTO>().ok(data);
+    }
+
+    @PostMapping
+    @ApiOperation("保存")
+    @LogOperation("保存")
+    @PreAuthorize("@ex.hasAuthority('code:woPowerLevel:save')")
+    public Result<Long> save(@RequestBody WoPowerLevelDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+
+        woPowerLevelService.save(dto);
+
+        return new Result<Long>().ok(dto.getId());
+    }
+
+    @PutMapping
+    @ApiOperation("修改")
+    @LogOperation("修改")
+    @PreAuthorize("@ex.hasAuthority('code:woPowerLevel:update')")
+    public Result<Long> update(@RequestBody WoPowerLevelDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+        woPowerLevelService.update(dto);
+
+        return new Result<Long>().ok(dto.getId());
+    }
+
+    @DeleteMapping
+    @ApiOperation("删除")
+    @LogOperation("删除")
+    @PreAuthorize("@ex.hasAuthority('code:woPowerLevel:delete')")
+    public Result delete(@RequestBody Long[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+
+        woPowerLevelService.delete(ids);
+
+        return new Result();
+    }
+
+    @GetMapping("export")
+    @ApiOperation("导出")
+    @LogOperation("导出")
+    @PreAuthorize("@ex.hasAuthority('code:woPowerLevel:export')")
+    public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<WoPowerLevelDTO> list = woPowerLevelService.list(params);
+
+        ExcelUtils.exportExcelToTarget(response, null, list, WoPowerLevelExcel.class);
+    }
+
+}

ym-generator/src/main/java/com/cnbm/generator/code/controller/WorkingTimeController.java

@@ -0,0 +1,116 @@
+package com.cnbm.generator.code.controller;
+
+import com.cnbm.admin.annotation.LogOperation;
+import com.cnbm.common.constant.Constant;
+import com.cnbm.common.page.PageData;
+import com.cnbm.common.utils.ExcelUtils;
+import com.cnbm.common.utils.Result;
+import com.cnbm.common.validator.AssertUtils;
+import com.cnbm.common.validator.ValidatorUtils;
+import com.cnbm.common.validator.group.AddGroup;
+import com.cnbm.common.validator.group.DefaultGroup;
+import com.cnbm.common.validator.group.UpdateGroup;
+import com.cnbm.generator.code.dto.WorkingTimeDTO;
+import com.cnbm.generator.code.excel.WorkingTimeExcel;
+import com.cnbm.generator.code.service.WorkingTimeServiceBiz;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 班次时间段 表  前端控制器
+ *
+ * @author codeGenerator
+ * @since  2023-12-28
+ */
+@RestController
+@RequestMapping("/code/workingTime")
+@Api(tags="班次时间段 表")
+public class WorkingTimeController {
+    @Autowired
+    private WorkingTimeServiceBiz workingTimeService;
+
+    @GetMapping("page")
+    @ApiOperation("分页")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataTypeClass=Integer.class) ,
+        @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataTypeClass=Integer.class) ,
+        @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) ,
+        @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class)
+    })
+    @PreAuthorize("@ex.hasAuthority('code:workingTime:page')")
+    public Result<PageData<WorkingTimeDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
+        PageData<WorkingTimeDTO> page = workingTimeService.page(params);
+
+        return new Result<PageData<WorkingTimeDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    @ApiOperation("信息")
+    @PreAuthorize("@ex.hasAuthority('code:workingTime:info')")
+    public Result<WorkingTimeDTO> get(@PathVariable("id") Long id){
+        WorkingTimeDTO data = workingTimeService.get(id);
+
+        return new Result<WorkingTimeDTO>().ok(data);
+    }
+
+    @PostMapping
+    @ApiOperation("保存")
+    @LogOperation("保存")
+    @PreAuthorize("@ex.hasAuthority('code:workingTime:save')")
+    public Result<Long> save(@RequestBody WorkingTimeDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+
+        workingTimeService.save(dto);
+
+        return new Result<Long>().ok(dto.getId());
+    }
+
+    @PutMapping
+    @ApiOperation("修改")
+    @LogOperation("修改")
+    @PreAuthorize("@ex.hasAuthority('code:workingTime:update')")
+    public Result<Long> update(@RequestBody WorkingTimeDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+        workingTimeService.update(dto);
+
+        return new Result<Long>().ok(dto.getId());
+    }
+
+    @DeleteMapping
+    @ApiOperation("删除")
+    @LogOperation("删除")
+    @PreAuthorize("@ex.hasAuthority('code:workingTime:delete')")
+    public Result delete(@RequestBody Long[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+
+        workingTimeService.delete(ids);
+
+        return new Result();
+    }
+
+    @GetMapping("export")
+    @ApiOperation("导出")
+    @LogOperation("导出")
+    @PreAuthorize("@ex.hasAuthority('code:workingTime:export')")
+    public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<WorkingTimeDTO> list = workingTimeService.list(params);
+
+        ExcelUtils.exportExcelToTarget(response, null, list, WorkingTimeExcel.class);
+    }
+
+}

ym-generator/src/main/java/com/cnbm/generator/code/dto/ChangePackagingBoxHistoryDTO.java

@@ -0,0 +1,80 @@
+package com.cnbm.generator.code.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import java.math.BigDecimal;
+
+
+/**
+ * 包装箱拆合箱历史表
+ *
+ * @author codeGenerator
+ * @since  2023-02-16
+ */
+@Data
+@ApiModel(value = "包装箱拆合箱历史表DTO对象")
+public class ChangePackagingBoxHistoryDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+
+
+	@ApiModelProperty(value = "ID")
+	private Long id;
+
+	@ApiModelProperty(value = "基板ID或模组id")
+	private String substrateId;
+
+	@ApiModelProperty(value = "源包装箱box no, 关联t_wo_packaging_box.box_no 字段")
+	private Long sourceBoxNo;
+
+	@ApiModelProperty(value = "源箱slot")
+	private Integer sourceSlot;
+
+	@ApiModelProperty(value = "离开时间")
+	private LocalDateTime leaveTime;
+
+	@ApiModelProperty(value = "目标箱box no, 关联t_wo_packaging_box.box_no 字段")
+	private Long targetBoxNo;
+
+	@ApiModelProperty(value = "目标箱slot")
+	private Integer targetSlot;
+
+	@ApiModelProperty(value = "进入时间")
+	private LocalDateTime inputTime;
+
+	@ApiModelProperty(value = "等级")
+	private String grade;
+
+	@ApiModelProperty(value = "类型，1为拆箱，2为合箱")
+	private Integer type;
+
+	@ApiModelProperty(value = "删除标志，是否有效:1 可用 0不可用")
+	private Integer valid;
+
+	@ApiModelProperty(value = "创建人")
+	private Long creatorId;
+
+	@ApiModelProperty(value = "创建人姓名")
+	private String creatorName;
+
+	@ApiModelProperty(value = "创建时间")
+	private LocalDateTime createTime;
+
+	@ApiModelProperty(value = "更新人")
+	private Long updaterId;
+
+	@ApiModelProperty(value = "更新人姓名")
+	private String updaterName;
+
+	@ApiModelProperty(value = "更新时间")
+	private LocalDateTime updateTime;
+
+	@ApiModelProperty(value = "版本号")
+	private Integer version;
+
+}

ym-generator/src/main/java/com/cnbm/generator/code/dto/PrintModelDTO.java

@@ -0,0 +1,98 @@
+package com.cnbm.generator.code.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import java.math.BigDecimal;
+
+
+/**
+ * 打印标签模板表
+ *
+ * @author codeGenerator
+ * @since  2024-01-25
+ */
+@Data
+@ApiModel(value = "打印标签模板表DTO对象")
+public class PrintModelDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+
+
+	@ApiModelProperty(value = "id")
+	private Long id;
+
+	@ApiModelProperty(value = "编码")
+	private String code;
+
+	@ApiModelProperty(value = "班组名称")
+	private String name;
+
+	@ApiModelProperty(value = "启用状态:0 、停用，1、启用")
+	private Integer enabled;
+
+	@ApiModelProperty(value = "创建人")
+	private Long creatorId;
+
+	@ApiModelProperty(value = "创建人姓名")
+	private String creatorName;
+
+	@ApiModelProperty(value = "创建时间")
+	private LocalDateTime createTime;
+
+	@ApiModelProperty(value = "更新人")
+	private Long updaterId;
+
+	@ApiModelProperty(value = "更新人姓名")
+	private String updaterName;
+
+	@ApiModelProperty(value = "更新时间")
+	private LocalDateTime updateTime;
+
+	@ApiModelProperty(value = "版本号")
+	private Integer version;
+
+	@ApiModelProperty(value = "删除标志，是否有效:1 可用 0不可用")
+	private Integer valid;
+
+	@ApiModelProperty(value = "备注")
+	private String remark;
+
+	@ApiModelProperty(value = "类型，1：手动，2：自动")
+	private Integer type;
+
+	@ApiModelProperty(value = "是否默认模板，0：否，1：是")
+	private Integer isDefault;
+
+	@ApiModelProperty(value = "是否要预览，0：否，1：是")
+	private Integer isPreview;
+
+	@ApiModelProperty(value = "模板内容")
+	private String content;
+
+	@ApiModelProperty(value = "线体，1=F ; 2=S (用于过程1比对，和包装打印)（设备传给我们的）")
+	private Integer lineBody;
+
+	@ApiModelProperty(value = "是否启用，0 停用；1 启用")
+	private Integer isEnable;
+
+	@ApiModelProperty(value = "场景（用不着了，废弃）")
+	private String scenes;
+
+	@ApiModelProperty(value = "产品等级，t_product_level 把code传过来放进去，不要放id")
+	private String productGrade;
+
+	@ApiModelProperty(value = "节数，前端写死，输入")
+	private String pitchNumber;
+
+	@ApiModelProperty(value = "产品等级，前端写死，输入")
+	private String maxFuseCurrent;
+
+	@ApiModelProperty(value = "产品等级，前端写死，输入")
+	private String coverName;
+
+}

ym-generator/src/main/java/com/cnbm/generator/code/dto/ProductLevelDTO.java

@@ -0,0 +1,65 @@
+package com.cnbm.generator.code.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import java.math.BigDecimal;
+
+
+/**
+ * 产品等级 表
+ *
+ * @author codeGenerator
+ * @since  2023-12-28
+ */
+@Data
+@ApiModel(value = "产品等级 表DTO对象")
+public class ProductLevelDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+
+
+	@ApiModelProperty(value = "ID")
+	private Long id;
+
+	@ApiModelProperty(value = "产品名")
+	private String productName;
+
+	@ApiModelProperty(value = "产品等级，A1/A2/A3/A4/NK")
+	private String productLevel;
+
+	@ApiModelProperty(value = "备注")
+	private String remark;
+
+	@ApiModelProperty(value = "删除标志，是否有效:1 可用 0不可用")
+	private Integer valid;
+
+	@ApiModelProperty(value = "创建人")
+	private Long creatorId;
+
+	@ApiModelProperty(value = "创建人姓名")
+	private String creatorName;
+
+	@ApiModelProperty(value = "创建时间")
+	private LocalDateTime createTime;
+
+	@ApiModelProperty(value = "更新人")
+	private Long updaterId;
+
+	@ApiModelProperty(value = "更新人姓名")
+	private String updaterName;
+
+	@ApiModelProperty(value = "更新时间")
+	private LocalDateTime updateTime;
+
+	@ApiModelProperty(value = "版本号")
+	private Integer version;
+
+	@ApiModelProperty(value = "产品等级代码")
+	private String code;
+
+}

ym-generator/src/main/java/com/cnbm/generator/code/dto/ScenesDTO.java

@@ -0,0 +1,62 @@
+package com.cnbm.generator.code.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import java.math.BigDecimal;
+
+
+/**
+ * 场景 表
+ *
+ * @author codeGenerator
+ * @since  2023-12-28
+ */
+@Data
+@ApiModel(value = "场景 表DTO对象")
+public class ScenesDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+
+
+	@ApiModelProperty(value = "ID")
+	private Long id;
+
+	@ApiModelProperty(value = "场景名")
+	private String scenesName;
+
+	@ApiModelProperty(value = "备注")
+	private String remark;
+
+	@ApiModelProperty(value = "删除标志，是否有效:1 可用 0不可用")
+	private Integer valid;
+
+	@ApiModelProperty(value = "创建人")
+	private Long creatorId;
+
+	@ApiModelProperty(value = "创建人姓名")
+	private String creatorName;
+
+	@ApiModelProperty(value = "创建时间")
+	private LocalDateTime createTime;
+
+	@ApiModelProperty(value = "更新人")
+	private Long updaterId;
+
+	@ApiModelProperty(value = "更新人姓名")
+	private String updaterName;
+
+	@ApiModelProperty(value = "更新时间")
+	private LocalDateTime updateTime;
+
+	@ApiModelProperty(value = "版本号")
+	private Integer version;
+
+	@ApiModelProperty(value = "场景code")
+	private String code;
+
+}

ym-generator/src/main/java/com/cnbm/generator/code/dto/WoCompensationPowerDTO.java

@@ -0,0 +1,74 @@
+package com.cnbm.generator.code.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import java.math.BigDecimal;
+
+
+/**
+ * 基板补偿功率 表
+ *
+ * @author codeGenerator
+ * @since  2023-02-20
+ */
+@Data
+@ApiModel(value = "基板补偿功率 表DTO对象")
+public class WoCompensationPowerDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+
+
+	@ApiModelProperty(value = "ID")
+	private Long id;
+
+	@ApiModelProperty(value = "实际功率下限,（现场人员手动录入），如果实际功率不在范围，那么实际功率就是补偿功率")
+	private Float actlPmppLow;
+
+	@ApiModelProperty(value = "实际功率上限,（现场人员手动录入），如果实际功率不在范围，那么实际功率就是补偿功率")
+	private Float actlPmppHigh;
+
+	@ApiModelProperty(value = "计算公式")
+	private String formula;
+
+	@ApiModelProperty(value = "线体，1=F ; 2=S (用于过程1比对，和包装打印)（设备传给我们的）")
+	private Integer lineBody;
+
+	@ApiModelProperty(value = "系数a,（手动录入）")
+	private Float coefficientA;
+
+	@ApiModelProperty(value = "系数b,（手动录入）")
+	private Float coefficientB;
+
+	@ApiModelProperty(value = "备注")
+	private String remark;
+
+	@ApiModelProperty(value = "删除标志，是否有效:1 可用 0不可用")
+	private Integer valid;
+
+	@ApiModelProperty(value = "创建人")
+	private Long creatorId;
+
+	@ApiModelProperty(value = "创建人姓名")
+	private String creatorName;
+
+	@ApiModelProperty(value = "创建时间")
+	private LocalDateTime createTime;
+
+	@ApiModelProperty(value = "更新人")
+	private Long updaterId;
+
+	@ApiModelProperty(value = "更新人姓名")
+	private String updaterName;
+
+	@ApiModelProperty(value = "更新时间")
+	private LocalDateTime updateTime;
+
+	@ApiModelProperty(value = "版本号")
+	private Integer version;
+
+}

ym-generator/src/main/java/com/cnbm/generator/code/dto/WoPackagingBoxDTO.java

@@ -0,0 +1,128 @@
+package com.cnbm.generator.code.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import java.math.BigDecimal;
+
+
+/**
+ * 包装箱表
+ *
+ * @author codeGenerator
+ * @since  2024-01-29
+ */
+@Data
+@ApiModel(value = "包装箱表DTO对象")
+public class WoPackagingBoxDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+
+
+	@ApiModelProperty(value = "ID")
+	private Long id;
+
+	@ApiModelProperty(value = "订单ID(舍弃)")
+	private Long orderId;
+
+	@ApiModelProperty(value = "工单ID（舍弃啊）")
+	private Long workOrderId;
+
+	@ApiModelProperty(value = "包装箱编号，这个就是boxId,关联 t_wo_packaging_box表的 boxId")
+	private String boxNo;
+
+	@ApiModelProperty(value = "功率，单位瓦（舍弃）")
+	private Integer power;
+
+	@ApiModelProperty(value = "等级（舍弃）")
+	private Integer grade;
+
+	@ApiModelProperty(value = "基板数量，每个包装箱最大20片")
+	private Integer substrateQuantity;
+
+	@ApiModelProperty(value = "装箱完成时间，指的是包装完成时间")
+	private LocalDateTime packagingTime;
+
+	@ApiModelProperty(value = "打印时间（最近一次打印时间）")
+	private LocalDateTime printTime;
+
+	@ApiModelProperty(value = "打印状态：0、未打印，1、已打印")
+	private Integer printStatus;
+
+	@ApiModelProperty(value = "报工状态：0、未报工，1、已报工(舍弃)")
+	private Integer completionReportingStatus;
+
+	@ApiModelProperty(value = "备注")
+	private String remark;
+
+	@ApiModelProperty(value = "删除标志，是否有效:1 可用 0不可用")
+	private Integer valid;
+
+	@ApiModelProperty(value = "创建人")
+	private Long creatorId;
+
+	@ApiModelProperty(value = "创建人姓名")
+	private String creatorName;
+
+	@ApiModelProperty(value = "创建时间")
+	private LocalDateTime createTime;
+
+	@ApiModelProperty(value = "更新人")
+	private Long updaterId;
+
+	@ApiModelProperty(value = "更新人姓名")
+	private String updaterName;
+
+	@ApiModelProperty(value = "更新时间")
+	private LocalDateTime updateTime;
+
+	@ApiModelProperty(value = "版本号")
+	private Integer version;
+
+	@ApiModelProperty(value = "离开产线时间（舍弃）")
+	private LocalDateTime leaveLineTime;
+
+	@ApiModelProperty(value = "下片端口id（舍弃）")
+	private String portId;
+
+	@ApiModelProperty(value = "打印次数")
+	private Integer printCount;
+
+	@ApiModelProperty(value = "功率等级")
+	private String powerLevel;
+
+	@ApiModelProperty(value = "客户id（舍弃）")
+	private Long customerId;
+
+	@ApiModelProperty(value = "SAP MATERIAL,从t_wo_power_level 对应过来的")
+	private String sapMaterial;
+
+	@ApiModelProperty(value = "线体,从t_wo_power_level 对应过来的，1=F ; 2=S")
+	private Integer lineBody;
+
+	@ApiModelProperty(value = "模式，1-手动模式；2-自动模式")
+	private Integer model;
+
+	@ApiModelProperty(value = "是否到达包装台，1=到达；2=未达到")
+	private Integer isArrived;
+
+	@ApiModelProperty(value = "订单号")
+	private String orderNum;
+
+	@ApiModelProperty(value = "产品等级，t_product_level 把code传过来放进去，不要放id")
+	private String productGrade;
+
+	@ApiModelProperty(value = "节数，前端写死，输入")
+	private String pitchNumber;
+
+	@ApiModelProperty(value = "最大额定熔断电流，前端写死，输入")
+	private String maxFuseCurrent;
+
+	@ApiModelProperty(value = "盖板，前端写死，输入")
+	private String coverName;
+
+}

ym-generator/src/main/java/com/cnbm/generator/code/dto/WoPackagingBoxSubstrateDTO.java

@@ -0,0 +1,176 @@
+package com.cnbm.generator.code.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import java.math.BigDecimal;
+
+
+/**
+ * 包装箱基板关联表 ( 基板表 )
+ *
+ * @author codeGenerator
+ * @since  2023-03-03
+ */
+@Data
+@ApiModel(value = "包装箱基板关联表 ( 基板表 )DTO对象")
+public class WoPackagingBoxSubstrateDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+
+
+	@ApiModelProperty(value = "ID")
+	private Long id;
+
+	@ApiModelProperty(value = "包装箱ID，BoxId")
+	private String packagingBoxId;
+
+	@ApiModelProperty(value = "基板ID")
+	private String woSubstrateId;
+
+	@ApiModelProperty(value = "创建人")
+	private Long creatorId;
+
+	@ApiModelProperty(value = "创建人姓名")
+	private String creatorName;
+
+	@ApiModelProperty(value = "创建时间")
+	private LocalDateTime createTime;
+
+	@ApiModelProperty(value = "更新人")
+	private Long updaterId;
+
+	@ApiModelProperty(value = "更新人姓名")
+	private String updaterName;
+
+	@ApiModelProperty(value = "更新时间")
+	private LocalDateTime updateTime;
+
+	@ApiModelProperty(value = "版本号")
+	private Integer version;
+
+	@ApiModelProperty(value = "箱中位置")
+	private Integer slot;
+
+	@ApiModelProperty(value = "进入时间")
+	private LocalDateTime inputTime;
+
+	@ApiModelProperty(value = "删除标志，是否有效:1 可用 0不可用")
+	private Integer valid;
+
+	@ApiModelProperty(value = "SAP MATERIAL,从t_wo_power_level 对应过来的")
+	private String sapMaterial;
+
+	@ApiModelProperty(value = "线体,从t_wo_power_level 对应过来的，1=F ; 2=S")
+	private Integer lineBody;
+
+	@ApiModelProperty(value = "功率等级")
+	private String powerLevel;
+
+	@ApiModelProperty(value = "")
+	private LocalDateTime lastUpdateTime;
+
+	@ApiModelProperty(value = "补偿后的功率，pmpp")
+	private Float pmpp;
+
+	@ApiModelProperty(value = "订单名")
+	private String orderName;
+
+	@ApiModelProperty(value = "")
+	private Long binclassFl1;
+
+	@ApiModelProperty(value = "")
+	private Long binclassFl2;
+
+	@ApiModelProperty(value = "")
+	private Float etaFl1;
+
+	@ApiModelProperty(value = "")
+	private Float etaFl2;
+
+	@ApiModelProperty(value = "")
+	private Float ffFl1;
+
+	@ApiModelProperty(value = "")
+	private Float ffFl2;
+
+	@ApiModelProperty(value = "")
+	private Float imppFl1;
+
+	@ApiModelProperty(value = "")
+	private Float imppFl2;
+
+	@ApiModelProperty(value = "")
+	private Float insolflashcontrolFl1;
+
+	@ApiModelProperty(value = "")
+	private Float insolflashcontrolFl2;
+
+	@ApiModelProperty(value = "")
+	private Float insolmppFl1;
+
+	@ApiModelProperty(value = "")
+	private Float insolmppFl2;
+
+	@ApiModelProperty(value = "")
+	private Float insolvocFl1;
+
+	@ApiModelProperty(value = "")
+	private Float insolvocFl2;
+
+	@ApiModelProperty(value = "")
+	private Float insolFl1;
+
+	@ApiModelProperty(value = "")
+	private Float insolFl2;
+
+	@ApiModelProperty(value = "")
+	private Float iscFl1;
+
+	@ApiModelProperty(value = "")
+	private Float iscFl2;
+
+	@ApiModelProperty(value = "")
+	private LocalDateTime measTimeFl1;
+
+	@ApiModelProperty(value = "")
+	private LocalDateTime measTimeFl2;
+
+	@ApiModelProperty(value = "")
+	private Float pmppFl1;
+
+	@ApiModelProperty(value = "")
+	private Float pmppFl2;
+
+	@ApiModelProperty(value = "")
+	private Float tcellFl1;
+
+	@ApiModelProperty(value = "")
+	private Float tcellFl2;
+
+	@ApiModelProperty(value = "")
+	private Float tmonicellFl1;
+
+	@ApiModelProperty(value = "")
+	private Float tmonicellFl2;
+
+	@ApiModelProperty(value = "")
+	private Float umppFl1;
+
+	@ApiModelProperty(value = "")
+	private Float umppFl2;
+
+	@ApiModelProperty(value = "")
+	private Float uocFl1;
+
+	@ApiModelProperty(value = "")
+	private Float uocFl2;
+
+	@ApiModelProperty(value = "真实PMPP")
+	private Float actualPmpp;
+
+}

ym-generator/src/main/java/com/cnbm/generator/code/dto/WoPackagingPrintHistoryDTO.java

@@ -0,0 +1,83 @@
+package com.cnbm.generator.code.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import java.math.BigDecimal;
+
+
+/**
+ * 包装箱打印历史表
+ *
+ * @author codeGenerator
+ * @since  2023-02-20
+ */
+@Data
+@ApiModel(value = "包装箱打印历史表DTO对象")
+public class WoPackagingPrintHistoryDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+
+
+	@ApiModelProperty(value = "ID")
+	private Long id;
+
+	@ApiModelProperty(value = "包装箱编号，关联t_wo_packaging_box.box_no")
+	private Long boxNo;
+
+	@ApiModelProperty(value = "打印时间")
+	private LocalDateTime printTime;
+
+	@ApiModelProperty(value = "报工时间（舍弃）")
+	private LocalDateTime completionReportingTime;
+
+	@ApiModelProperty(value = "打印状态：0、未打印，1、已打印")
+	private Integer printStatus;
+
+	@ApiModelProperty(value = "报工状态：0、未报工，1、已报工, 指的是向ERP报工（舍弃）")
+	private Integer completionReportingStatus;
+
+	@ApiModelProperty(value = "移箱时间（点击打印后，这个时间从t_wo_packaging_box 里面带过来）")
+	private LocalDateTime leaveLineTime;
+
+	@ApiModelProperty(value = "下片端口id（舍弃）")
+	private String portId;
+
+	@ApiModelProperty(value = "打印次数")
+	private Integer printCount;
+
+	@ApiModelProperty(value = "删除标志，是否有效:1 可用 0不可用")
+	private Integer valid;
+
+	@ApiModelProperty(value = "创建人")
+	private Long creatorId;
+
+	@ApiModelProperty(value = "创建人姓名")
+	private String creatorName;
+
+	@ApiModelProperty(value = "创建时间")
+	private LocalDateTime createTime;
+
+	@ApiModelProperty(value = "更新人")
+	private Long updaterId;
+
+	@ApiModelProperty(value = "更新人姓名")
+	private String updaterName;
+
+	@ApiModelProperty(value = "更新时间")
+	private LocalDateTime updateTime;
+
+	@ApiModelProperty(value = "版本号")
+	private Integer version;
+
+	@ApiModelProperty(value = "备注")
+	private String remark;
+
+	@ApiModelProperty(value = "模式，1-手动模式；2-自动模式")
+	private Integer model;
+
+}

ym-generator/src/main/java/com/cnbm/generator/code/dto/WoPowerLevelDTO.java

@@ -0,0 +1,83 @@
+package com.cnbm.generator.code.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import java.math.BigDecimal;
+
+
+/**
+ * 功率等级 表
+ *
+ * @author codeGenerator
+ * @since  2023-02-22
+ */
+@Data
+@ApiModel(value = "功率等级 表DTO对象")
+public class WoPowerLevelDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+
+
+	@ApiModelProperty(value = "ID")
+	private Long id;
+
+	@ApiModelProperty(value = "功率等级名称，（现场人员手动录入）")
+	private String powerClass;
+
+	@ApiModelProperty(value = "pmpp_low,（现场人员手动录入）")
+	private Float pmppLow;
+
+	@ApiModelProperty(value = "pmpp_high,（现场人员手动录入）")
+	private Float pmppHigh;
+
+	@ApiModelProperty(value = "物料号,（现场人员手动录入）")
+	private String sapMaterialNum;
+
+	@ApiModelProperty(value = "线体，1=F ; 2=S (用于过程1比对，和包装打印)（设备传给我们的）（一个功率等级可能对应多个线体）")
+	private Integer lineBody;
+
+	@ApiModelProperty(value = "lable_voc,（手动录入）")
+	private BigDecimal lableVoc;
+
+	@ApiModelProperty(value = "lable_isc,（手动录入）")
+	private BigDecimal lableIsc;
+
+	@ApiModelProperty(value = "lable_vmpp,（手动录入）")
+	private BigDecimal lableVmpp;
+
+	@ApiModelProperty(value = "lable_impp,（手动录入）")
+	private BigDecimal lableImpp;
+
+	@ApiModelProperty(value = "备注")
+	private String remark;
+
+	@ApiModelProperty(value = "删除标志，是否有效:1 可用 0不可用")
+	private Integer valid;
+
+	@ApiModelProperty(value = "创建人")
+	private Long creatorId;
+
+	@ApiModelProperty(value = "创建人姓名")
+	private String creatorName;
+
+	@ApiModelProperty(value = "创建时间")
+	private LocalDateTime createTime;
+
+	@ApiModelProperty(value = "更新人")
+	private Long updaterId;
+
+	@ApiModelProperty(value = "更新人姓名")
+	private String updaterName;
+
+	@ApiModelProperty(value = "更新时间")
+	private LocalDateTime updateTime;
+
+	@ApiModelProperty(value = "版本号")
+	private Integer version;
+
+}

ym-generator/src/main/java/com/cnbm/generator/code/dto/WorkingTimeDTO.java

@@ -0,0 +1,68 @@
+package com.cnbm.generator.code.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import java.math.BigDecimal;
+
+
+/**
+ * 班次时间段 表
+ *
+ * @author codeGenerator
+ * @since  2023-12-28
+ */
+@Data
+@ApiModel(value = "班次时间段 表DTO对象")
+public class WorkingTimeDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+
+
+	@ApiModelProperty(value = "ID")
+	private Long id;
+
+	@ApiModelProperty(value = "班次名 ,A/B/C...")
+	private String orderName;
+
+	@ApiModelProperty(value = "班次开始时间, 0点 - 24点")
+	private LocalDateTime beginTime;
+
+	@ApiModelProperty(value = "班次结束时间, 0点 - 24点")
+	private LocalDateTime endTime;
+
+	@ApiModelProperty(value = "备注")
+	private String remark;
+
+	@ApiModelProperty(value = "删除标志，是否有效:1 可用 0不可用")
+	private Integer valid;
+
+	@ApiModelProperty(value = "创建人")
+	private Long creatorId;
+
+	@ApiModelProperty(value = "创建人姓名")
+	private String creatorName;
+
+	@ApiModelProperty(value = "创建时间")
+	private LocalDateTime createTime;
+
+	@ApiModelProperty(value = "更新人")
+	private Long updaterId;
+
+	@ApiModelProperty(value = "更新人姓名")
+	private String updaterName;
+
+	@ApiModelProperty(value = "更新时间")
+	private LocalDateTime updateTime;
+
+	@ApiModelProperty(value = "版本号")
+	private Integer version;
+
+	@ApiModelProperty(value = "班次代码")
+	private String code;
+
+}

ym-generator/src/main/java/com/cnbm/generator/code/entity/ChangePackagingBoxHistory.java

@@ -0,0 +1,118 @@
+package com.cnbm.generator.code.entity;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * 包装箱拆合箱历史表
+ * </p>
+ *
+ * @author codeGenerator
+ * @since 2023-02-16
+ */
+@Data
+@TableName("t_change_packaging_box_history")
+@ApiModel(value = "ChangePackagingBoxHistory对象", description = "包装箱拆合箱历史表")
+public class ChangePackagingBoxHistory implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("ID")
+    private Long id;
+
+    @ApiModelProperty("基板ID或模组id")
+    private String substrateId;
+
+    @ApiModelProperty("源包装箱box no, 关联t_wo_packaging_box.box_no 字段")
+    private Long sourceBoxNo;
+
+    @ApiModelProperty("源箱slot")
+    private Integer sourceSlot;
+
+    @ApiModelProperty("离开时间")
+    private LocalDateTime leaveTime;
+
+    @ApiModelProperty("目标箱box no, 关联t_wo_packaging_box.box_no 字段")
+    private Long targetBoxNo;
+
+    @ApiModelProperty("目标箱slot")
+    private Integer targetSlot;
+
+    @ApiModelProperty("进入时间")
+    private LocalDateTime inputTime;
+
+    @ApiModelProperty("等级")
+    private String grade;
+
+    @ApiModelProperty("类型，1为拆箱，2为合箱")
+    private Integer type;
+
+    @ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
+    @TableLogic
+    private Integer valid;
+
+    @ApiModelProperty("创建人")
+    private Long creatorId;
+
+    @ApiModelProperty("创建人姓名")
+    private String creatorName;
+
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty("更新人")
+    private Long updaterId;
+
+    @ApiModelProperty("更新人姓名")
+    private String updaterName;
+
+    @ApiModelProperty("更新时间")
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty("版本号")
+    private Integer version;
+
+
+    public static final String ID = "ID";
+
+    public static final String SUBSTRATE_ID = "SUBSTRATE_ID";
+
+    public static final String SOURCE_BOX_NO = "SOURCE_BOX_NO";
+
+    public static final String SOURCE_SLOT = "SOURCE_SLOT";
+
+    public static final String LEAVE_TIME = "LEAVE_TIME";
+
+    public static final String TARGET_BOX_NO = "TARGET_BOX_NO";
+
+    public static final String TARGET_SLOT = "TARGET_SLOT";
+
+    public static final String INPUT_TIME = "INPUT_TIME";
+
+    public static final String GRADE = "GRADE";
+
+    public static final String TYPE = "TYPE";
+
+    public static final String VALID = "VALID";
+
+    public static final String CREATOR_ID = "CREATOR_ID";
+
+    public static final String CREATOR_NAME = "CREATOR_NAME";
+
+    public static final String CREATE_TIME = "CREATE_TIME";
+
+    public static final String UPDATER_ID = "UPDATER_ID";
+
+    public static final String UPDATER_NAME = "UPDATER_NAME";
+
+    public static final String UPDATE_TIME = "UPDATE_TIME";
+
+    public static final String VERSION = "VERSION";
+
+}

ym-generator/src/main/java/com/cnbm/generator/code/entity/PrintModel.java

@@ -0,0 +1,148 @@
+package com.cnbm.generator.code.entity;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * 打印标签模板表
+ * </p>
+ *
+ * @author codeGenerator
+ * @since 2024-01-25
+ */
+@Data
+@TableName("t_print_model")
+@ApiModel(value = "PrintModel对象", description = "打印标签模板表")
+public class PrintModel implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("id")
+    private Long id;
+
+    @ApiModelProperty("编码")
+    private String code;
+
+    @ApiModelProperty("班组名称")
+    private String name;
+
+    @ApiModelProperty("启用状态:0 、停用，1、启用")
+    private Integer enabled;
+
+    @ApiModelProperty("创建人")
+    private Long creatorId;
+
+    @ApiModelProperty("创建人姓名")
+    private String creatorName;
+
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty("更新人")
+    private Long updaterId;
+
+    @ApiModelProperty("更新人姓名")
+    private String updaterName;
+
+    @ApiModelProperty("更新时间")
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty("版本号")
+    private Integer version;
+
+    @ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
+    @TableLogic
+    private Integer valid;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("类型，1：手动，2：自动")
+    private Integer type;
+
+    @ApiModelProperty("是否默认模板，0：否，1：是")
+    private Integer isDefault;
+
+    @ApiModelProperty("是否要预览，0：否，1：是")
+    private Integer isPreview;
+
+    @ApiModelProperty("模板内容")
+    private String content;
+
+    @ApiModelProperty("线体，1=F ; 2=S (用于过程1比对，和包装打印)（设备传给我们的）")
+    private Integer lineBody;
+
+    @ApiModelProperty("是否启用，0 停用；1 启用")
+    private Integer isEnable;
+
+    @ApiModelProperty("场景（用不着了，废弃）")
+    private String scenes;
+
+    @ApiModelProperty("产品等级，t_product_level 把code传过来放进去，不要放id")
+    private String productGrade;
+
+    @ApiModelProperty("节数，前端写死，输入")
+    private String pitchNumber;
+
+    @ApiModelProperty("产品等级，前端写死，输入")
+    private String maxFuseCurrent;
+
+    @ApiModelProperty("产品等级，前端写死，输入")
+    private String coverName;
+
+
+    public static final String ID = "ID";
+
+    public static final String CODE = "CODE";
+
+    public static final String NAME = "NAME";
+
+    public static final String ENABLED = "ENABLED";
+
+    public static final String CREATOR_ID = "CREATOR_ID";
+
+    public static final String CREATOR_NAME = "CREATOR_NAME";
+
+    public static final String CREATE_TIME = "CREATE_TIME";
+
+    public static final String UPDATER_ID = "UPDATER_ID";
+
+    public static final String UPDATER_NAME = "UPDATER_NAME";
+
+    public static final String UPDATE_TIME = "UPDATE_TIME";
+
+    public static final String VERSION = "VERSION";
+
+    public static final String VALID = "VALID";
+
+    public static final String REMARK = "REMARK";
+
+    public static final String TYPE = "TYPE";
+
+    public static final String IS_DEFAULT = "IS_DEFAULT";
+
+    public static final String IS_PREVIEW = "IS_PREVIEW";
+
+    public static final String CONTENT = "CONTENT";
+
+    public static final String LINE_BODY = "line_body";
+
+    public static final String IS_ENABLE = "is_enable";
+
+    public static final String SCENES = "scenes";
+
+    public static final String PRODUCT_GRADE = "product_grade";
+
+    public static final String PITCH_NUMBER = "pitch_number";
+
+    public static final String MAX_FUSE_CURRENT = "max_fuse_current";
+
+    public static final String COVER_NAME = "cover_name";
+
+}

ym-generator/src/main/java/com/cnbm/generator/code/entity/ProductLevel.java

@@ -0,0 +1,93 @@
+package com.cnbm.generator.code.entity;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * 产品等级 表
+ * </p>
+ *
+ * @author codeGenerator
+ * @since 2023-12-28
+ */
+@Data
+@TableName("t_product_level")
+@ApiModel(value = "ProductLevel对象", description = "产品等级 表")
+public class ProductLevel implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("ID")
+    private Long id;
+
+    @ApiModelProperty("产品名")
+    private String productName;
+
+    @ApiModelProperty("产品等级，A1/A2/A3/A4/NK")
+    private String productLevel;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
+    @TableLogic
+    private Integer valid;
+
+    @ApiModelProperty("创建人")
+    private Long creatorId;
+
+    @ApiModelProperty("创建人姓名")
+    private String creatorName;
+
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty("更新人")
+    private Long updaterId;
+
+    @ApiModelProperty("更新人姓名")
+    private String updaterName;
+
+    @ApiModelProperty("更新时间")
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty("版本号")
+    private Integer version;
+
+    @ApiModelProperty("产品等级代码")
+    private String code;
+
+
+    public static final String ID = "id";
+
+    public static final String PRODUCT_NAME = "product_name";
+
+    public static final String PRODUCT_LEVEL = "product_level";
+
+    public static final String REMARK = "remark";
+
+    public static final String VALID = "valid";
+
+    public static final String CREATOR_ID = "creator_id";
+
+    public static final String CREATOR_NAME = "creator_name";
+
+    public static final String CREATE_TIME = "create_time";
+
+    public static final String UPDATER_ID = "updater_id";
+
+    public static final String UPDATER_NAME = "updater_name";
+
+    public static final String UPDATE_TIME = "update_time";
+
+    public static final String VERSION = "version";
+
+    public static final String CODE = "code";
+
+}

ym-generator/src/main/java/com/cnbm/generator/code/entity/Scenes.java

@@ -0,0 +1,88 @@
+package com.cnbm.generator.code.entity;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * 场景 表
+ * </p>
+ *
+ * @author codeGenerator
+ * @since 2023-12-28
+ */
+@Data
+@TableName("t_scenes")
+@ApiModel(value = "Scenes对象", description = "场景 表")
+public class Scenes implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("ID")
+    private Long id;
+
+    @ApiModelProperty("场景名")
+    private String scenesName;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
+    @TableLogic
+    private Integer valid;
+
+    @ApiModelProperty("创建人")
+    private Long creatorId;
+
+    @ApiModelProperty("创建人姓名")
+    private String creatorName;
+
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty("更新人")
+    private Long updaterId;
+
+    @ApiModelProperty("更新人姓名")
+    private String updaterName;
+
+    @ApiModelProperty("更新时间")
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty("版本号")
+    private Integer version;
+
+    @ApiModelProperty("场景code")
+    private String code;
+
+
+    public static final String ID = "id";
+
+    public static final String SCENES_NAME = "scenes_name";
+
+    public static final String REMARK = "remark";
+
+    public static final String VALID = "valid";
+
+    public static final String CREATOR_ID = "creator_id";
+
+    public static final String CREATOR_NAME = "creator_name";
+
+    public static final String CREATE_TIME = "create_time";
+
+    public static final String UPDATER_ID = "updater_id";
+
+    public static final String UPDATER_NAME = "updater_name";
+
+    public static final String UPDATE_TIME = "update_time";
+
+    public static final String VERSION = "version";
+
+    public static final String CODE = "code";
+
+}

ym-generator/src/main/java/com/cnbm/generator/code/entity/WoCompensationPower.java

@@ -0,0 +1,108 @@
+package com.cnbm.generator.code.entity;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * 基板补偿功率 表
+ * </p>
+ *
+ * @author codeGenerator
+ * @since 2023-02-20
+ */
+@Data
+@TableName("t_wo_compensation_power")
+@ApiModel(value = "WoCompensationPower对象", description = "基板补偿功率 表")
+public class WoCompensationPower implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("ID")
+    private Long id;
+
+    @ApiModelProperty("实际功率下限,（现场人员手动录入），如果实际功率不在范围，那么实际功率就是补偿功率")
+    private Float actlPmppLow;
+
+    @ApiModelProperty("实际功率上限,（现场人员手动录入），如果实际功率不在范围，那么实际功率就是补偿功率")
+    private Float actlPmppHigh;
+
+    @ApiModelProperty("计算公式")
+    private String formula;
+
+    @ApiModelProperty("线体，1=F ; 2=S (用于过程1比对，和包装打印)（设备传给我们的）")
+    private Integer lineBody;
+
+    @ApiModelProperty("系数a,（手动录入）")
+    private Float coefficientA;
+
+    @ApiModelProperty("系数b,（手动录入）")
+    private Float coefficientB;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
+    @TableLogic
+    private Integer valid;
+
+    @ApiModelProperty("创建人")
+    private Long creatorId;
+
+    @ApiModelProperty("创建人姓名")
+    private String creatorName;
+
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty("更新人")
+    private Long updaterId;
+
+    @ApiModelProperty("更新人姓名")
+    private String updaterName;
+
+    @ApiModelProperty("更新时间")
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty("版本号")
+    private Integer version;
+
+
+    public static final String ID = "id";
+
+    public static final String ACTL_PMPP_LOW = "actl_pmpp_low";
+
+    public static final String ACTL_PMPP_HIGH = "actl_pmpp_high";
+
+    public static final String FORMULA = "formula";
+
+    public static final String LINE_BODY = "line_body";
+
+    public static final String COEFFICIENT_A = "coefficient_a";
+
+    public static final String COEFFICIENT_B = "coefficient_b";
+
+    public static final String REMARK = "remark";
+
+    public static final String VALID = "valid";
+
+    public static final String CREATOR_ID = "creator_id";
+
+    public static final String CREATOR_NAME = "creator_name";
+
+    public static final String CREATE_TIME = "create_time";
+
+    public static final String UPDATER_ID = "updater_id";
+
+    public static final String UPDATER_NAME = "updater_name";
+
+    public static final String UPDATE_TIME = "update_time";
+
+    public static final String VERSION = "version";
+
+}

ym-generator/src/main/java/com/cnbm/generator/code/entity/WoPackagingBox.java

@@ -0,0 +1,198 @@
+package com.cnbm.generator.code.entity;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * 包装箱表
+ * </p>
+ *
+ * @author codeGenerator
+ * @since 2024-01-29
+ */
+@Data
+@TableName("t_wo_packaging_box")
+@ApiModel(value = "WoPackagingBox对象", description = "包装箱表")
+public class WoPackagingBox implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("ID")
+    private Long id;
+
+    @ApiModelProperty("订单ID(舍弃)")
+    private Long orderId;
+
+    @ApiModelProperty("工单ID（舍弃啊）")
+    private Long workOrderId;
+
+    @ApiModelProperty("包装箱编号，这个就是boxId,关联 t_wo_packaging_box表的 boxId")
+    private String boxNo;
+
+    @ApiModelProperty("功率，单位瓦（舍弃）")
+    private Integer power;
+
+    @ApiModelProperty("等级（舍弃）")
+    private Integer grade;
+
+    @ApiModelProperty("基板数量，每个包装箱最大20片")
+    private Integer substrateQuantity;
+
+    @ApiModelProperty("装箱完成时间，指的是包装完成时间")
+    private LocalDateTime packagingTime;
+
+    @ApiModelProperty("打印时间（最近一次打印时间）")
+    private LocalDateTime printTime;
+
+    @ApiModelProperty("打印状态：0、未打印，1、已打印")
+    private Integer printStatus;
+
+    @ApiModelProperty("报工状态：0、未报工，1、已报工(舍弃)")
+    private Integer completionReportingStatus;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
+    @TableLogic
+    private Integer valid;
+
+    @ApiModelProperty("创建人")
+    private Long creatorId;
+
+    @ApiModelProperty("创建人姓名")
+    private String creatorName;
+
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty("更新人")
+    private Long updaterId;
+
+    @ApiModelProperty("更新人姓名")
+    private String updaterName;
+
+    @ApiModelProperty("更新时间")
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty("版本号")
+    private Integer version;
+
+    @ApiModelProperty("离开产线时间（舍弃）")
+    private LocalDateTime leaveLineTime;
+
+    @ApiModelProperty("下片端口id（舍弃）")
+    private String portId;
+
+    @ApiModelProperty("打印次数")
+    private Integer printCount;
+
+    @ApiModelProperty("功率等级")
+    private String powerLevel;
+
+    @ApiModelProperty("客户id（舍弃）")
+    private Long customerId;
+
+    @ApiModelProperty("SAP MATERIAL,从t_wo_power_level 对应过来的")
+    private String sapMaterial;
+
+    @ApiModelProperty("线体,从t_wo_power_level 对应过来的，1=F ; 2=S")
+    private Integer lineBody;
+
+    @ApiModelProperty("模式，1-手动模式；2-自动模式")
+    private Integer model;
+
+    @ApiModelProperty("是否到达包装台，1=到达；2=未达到")
+    private Integer isArrived;
+
+    @ApiModelProperty("订单号")
+    private String orderNum;
+
+    @ApiModelProperty("产品等级，t_product_level 把code传过来放进去，不要放id")
+    private String productGrade;
+
+    @ApiModelProperty("节数，前端写死，输入")
+    private String pitchNumber;
+
+    @ApiModelProperty("最大额定熔断电流，前端写死，输入")
+    private String maxFuseCurrent;
+
+    @ApiModelProperty("盖板，前端写死，输入")
+    private String coverName;
+
+
+    public static final String ID = "ID";
+
+    public static final String ORDER_ID = "ORDER_ID";
+
+    public static final String WORK_ORDER_ID = "WORK_ORDER_ID";
+
+    public static final String BOX_NO = "BOX_NO";
+
+    public static final String POWER = "POWER";
+
+    public static final String GRADE = "GRADE";
+
+    public static final String SUBSTRATE_QUANTITY = "SUBSTRATE_QUANTITY";
+
+    public static final String PACKAGING_TIME = "PACKAGING_TIME";
+
+    public static final String PRINT_TIME = "PRINT_TIME";
+
+    public static final String PRINT_STATUS = "PRINT_STATUS";
+
+    public static final String COMPLETION_REPORTING_STATUS = "COMPLETION_REPORTING_STATUS";
+
+    public static final String REMARK = "REMARK";
+
+    public static final String VALID = "VALID";
+
+    public static final String CREATOR_ID = "CREATOR_ID";
+
+    public static final String CREATOR_NAME = "CREATOR_NAME";
+
+    public static final String CREATE_TIME = "CREATE_TIME";
+
+    public static final String UPDATER_ID = "UPDATER_ID";
+
+    public static final String UPDATER_NAME = "UPDATER_NAME";
+
+    public static final String UPDATE_TIME = "UPDATE_TIME";
+
+    public static final String VERSION = "VERSION";
+
+    public static final String LEAVE_LINE_TIME = "LEAVE_LINE_TIME";
+
+    public static final String PORT_ID = "PORT_ID";
+
+    public static final String PRINT_COUNT = "PRINT_COUNT";
+
+    public static final String POWER_LEVEL = "POWER_LEVEL";
+
+    public static final String CUSTOMER_ID = "CUSTOMER_ID";
+
+    public static final String SAP_MATERIAL = "SAP_MATERIAL";
+
+    public static final String LINE_BODY = "LINE_BODY";
+
+    public static final String MODEL = "model";
+
+    public static final String IS_ARRIVED = "is_arrived";
+
+    public static final String ORDER_NUM = "ORDER_NUM";
+
+    public static final String PRODUCT_GRADE = "product_grade";
+
+    public static final String PITCH_NUMBER = "pitch_number";
+
+    public static final String MAX_FUSE_CURRENT = "max_fuse_current";
+
+    public static final String COVER_NAME = "cover_name";
+
+}

ym-generator/src/main/java/com/cnbm/generator/code/entity/WoPackagingBoxSubstrate.java

@@ -0,0 +1,247 @@
+package com.cnbm.generator.code.entity;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * 包装箱基板关联表 ( 基板表 )
+ * </p>
+ *
+ * @author codeGenerator
+ * @since 2023-03-03
+ */
+@Data
+@TableName("t_wo_packaging_box_substrate")
+@ApiModel(value = "WoPackagingBoxSubstrate对象", description = "包装箱基板关联表 ( 基板表 )")
+public class WoPackagingBoxSubstrate implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("ID")
+    private Long id;
+
+    @ApiModelProperty("包装箱ID，BoxId")
+    private String packagingBoxId;
+
+    @ApiModelProperty("基板ID")
+    private String woSubstrateId;
+
+    @ApiModelProperty("创建人")
+    private Long creatorId;
+
+    @ApiModelProperty("创建人姓名")
+    private String creatorName;
+
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty("更新人")
+    private Long updaterId;
+
+    @ApiModelProperty("更新人姓名")
+    private String updaterName;
+
+    @ApiModelProperty("更新时间")
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty("版本号")
+    private Integer version;
+
+    @ApiModelProperty("箱中位置")
+    private Integer slot;
+
+    @ApiModelProperty("进入时间")
+    private LocalDateTime inputTime;
+
+    @ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
+    @TableLogic
+    private Integer valid;
+
+    @ApiModelProperty("SAP MATERIAL,从t_wo_power_level 对应过来的")
+    private String sapMaterial;
+
+    @ApiModelProperty("线体,从t_wo_power_level 对应过来的，1=F ; 2=S")
+    private Integer lineBody;
+
+    @ApiModelProperty("功率等级")
+    private String powerLevel;
+
+    private LocalDateTime lastUpdateTime;
+
+    @ApiModelProperty("补偿后的功率，pmpp")
+    private Float pmpp;
+
+    @ApiModelProperty("订单名")
+    private String orderName;
+
+    private Long binclassFl1;
+
+    private Long binclassFl2;
+
+    private Float etaFl1;
+
+    private Float etaFl2;
+
+    private Float ffFl1;
+
+    private Float ffFl2;
+
+    private Float imppFl1;
+
+    private Float imppFl2;
+
+    private Float insolflashcontrolFl1;
+
+    private Float insolflashcontrolFl2;
+
+    private Float insolmppFl1;
+
+    private Float insolmppFl2;
+
+    private Float insolvocFl1;
+
+    private Float insolvocFl2;
+
+    private Float insolFl1;
+
+    private Float insolFl2;
+
+    private Float iscFl1;
+
+    private Float iscFl2;
+
+    private LocalDateTime measTimeFl1;
+
+    private LocalDateTime measTimeFl2;
+
+    private Float pmppFl1;
+
+    private Float pmppFl2;
+
+    private Float tcellFl1;
+
+    private Float tcellFl2;
+
+    private Float tmonicellFl1;
+
+    private Float tmonicellFl2;
+
+    private Float umppFl1;
+
+    private Float umppFl2;
+
+    private Float uocFl1;
+
+    private Float uocFl2;
+
+    @ApiModelProperty("真实PMPP")
+    private Float actualPmpp;
+
+
+    public static final String ID = "ID";
+
+    public static final String PACKAGING_BOX_ID = "PACKAGING_BOX_ID";
+
+    public static final String WO_SUBSTRATE_ID = "WO_SUBSTRATE_ID";
+
+    public static final String CREATOR_ID = "CREATOR_ID";
+
+    public static final String CREATOR_NAME = "CREATOR_NAME";
+
+    public static final String CREATE_TIME = "CREATE_TIME";
+
+    public static final String UPDATER_ID = "UPDATER_ID";
+
+    public static final String UPDATER_NAME = "UPDATER_NAME";
+
+    public static final String UPDATE_TIME = "UPDATE_TIME";
+
+    public static final String VERSION = "VERSION";
+
+    public static final String SLOT = "SLOT";
+
+    public static final String INPUT_TIME = "INPUT_TIME";
+
+    public static final String VALID = "VALID";
+
+    public static final String SAP_MATERIAL = "SAP_MATERIAL";
+
+    public static final String LINE_BODY = "LINE_BODY";
+
+    public static final String POWER_LEVEL = "POWER_LEVEL";
+
+    public static final String LAST_UPDATE_TIME = "LAST_UPDATE_TIME";
+
+    public static final String PMPP = "PMPP";
+
+    public static final String ORDER_NAME = "ORDER_NAME";
+
+    public static final String BINCLASS_FL1 = "BINCLASS_FL1";
+
+    public static final String BINCLASS_FL2 = "BINCLASS_FL2";
+
+    public static final String ETA_FL1 = "ETA_FL1";
+
+    public static final String ETA_FL2 = "ETA_FL2";
+
+    public static final String FF_FL1 = "FF_FL1";
+
+    public static final String FF_FL2 = "FF_FL2";
+
+    public static final String IMPP_FL1 = "IMPP_FL1";
+
+    public static final String IMPP_FL2 = "IMPP_FL2";
+
+    public static final String INSOLFLASHCONTROL_FL1 = "InsolFlashControl_FL1";
+
+    public static final String INSOLFLASHCONTROL_FL2 = "InsolFlashControl_FL2";
+
+    public static final String INSOLMPP_FL1 = "InsolMPP_FL1";
+
+    public static final String INSOLMPP_FL2 = "InsolMPP_FL2";
+
+    public static final String INSOLVOC_FL1 = "InsolVoc_FL1";
+
+    public static final String INSOLVOC_FL2 = "InsolVoc_FL2";
+
+    public static final String INSOL_FL1 = "Insol_FL1";
+
+    public static final String INSOL_FL2 = "Insol_FL2";
+
+    public static final String ISC_FL1 = "ISC_FL1";
+
+    public static final String ISC_FL2 = "ISC_FL2";
+
+    public static final String MEAS_TIME_FL1 = "MEAS_TIME_FL1";
+
+    public static final String MEAS_TIME_FL2 = "MEAS_TIME_FL2";
+
+    public static final String PMPP_FL1 = "PMPP_FL1";
+
+    public static final String PMPP_FL2 = "PMPP_FL2";
+
+    public static final String TCELL_FL1 = "Tcell_FL1";
+
+    public static final String TCELL_FL2 = "Tcell_FL2";
+
+    public static final String TMONICELL_FL1 = "Tmonicell_FL1";
+
+    public static final String TMONICELL_FL2 = "Tmonicell_FL2";
+
+    public static final String UMPP_FL1 = "UMPP_FL1";
+
+    public static final String UMPP_FL2 = "UMPP_FL2";
+
+    public static final String UOC_FL1 = "UOC_FL1";
+
+    public static final String UOC_FL2 = "UOC_FL2";
+
+    public static final String ACTUAL_PMPP = "ACTUAL_PMPP";
+
+}

ym-generator/src/main/java/com/cnbm/generator/code/entity/WoPackagingPrintHistory.java

@@ -0,0 +1,123 @@
+package com.cnbm.generator.code.entity;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * 包装箱打印历史表
+ * </p>
+ *
+ * @author codeGenerator
+ * @since 2023-02-20
+ */
+@Data
+@TableName("t_wo_packaging_print_history")
+@ApiModel(value = "WoPackagingPrintHistory对象", description = "包装箱打印历史表")
+public class WoPackagingPrintHistory implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("ID")
+    private Long id;
+
+    @ApiModelProperty("包装箱编号，关联t_wo_packaging_box.box_no")
+    private Long boxNo;
+
+    @ApiModelProperty("打印时间")
+    private LocalDateTime printTime;
+
+    @ApiModelProperty("报工时间（舍弃）")
+    private LocalDateTime completionReportingTime;
+
+    @ApiModelProperty("打印状态：0、未打印，1、已打印")
+    private Integer printStatus;
+
+    @ApiModelProperty("报工状态：0、未报工，1、已报工, 指的是向ERP报工（舍弃）")
+    private Integer completionReportingStatus;
+
+    @ApiModelProperty("移箱时间（点击打印后，这个时间从t_wo_packaging_box 里面带过来）")
+    private LocalDateTime leaveLineTime;
+
+    @ApiModelProperty("下片端口id（舍弃）")
+    private String portId;
+
+    @ApiModelProperty("打印次数")
+    private Integer printCount;
+
+    @ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
+    @TableLogic
+    private Integer valid;
+
+    @ApiModelProperty("创建人")
+    private Long creatorId;
+
+    @ApiModelProperty("创建人姓名")
+    private String creatorName;
+
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty("更新人")
+    private Long updaterId;
+
+    @ApiModelProperty("更新人姓名")
+    private String updaterName;
+
+    @ApiModelProperty("更新时间")
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty("版本号")
+    private Integer version;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("模式，1-手动模式；2-自动模式")
+    private Integer model;
+
+
+    public static final String ID = "ID";
+
+    public static final String BOX_NO = "BOX_NO";
+
+    public static final String PRINT_TIME = "PRINT_TIME";
+
+    public static final String COMPLETION_REPORTING_TIME = "COMPLETION_REPORTING_TIME";
+
+    public static final String PRINT_STATUS = "PRINT_STATUS";
+
+    public static final String COMPLETION_REPORTING_STATUS = "COMPLETION_REPORTING_STATUS";
+
+    public static final String LEAVE_LINE_TIME = "LEAVE_LINE_TIME";
+
+    public static final String PORT_ID = "PORT_ID";
+
+    public static final String PRINT_COUNT = "PRINT_COUNT";
+
+    public static final String VALID = "VALID";
+
+    public static final String CREATOR_ID = "CREATOR_ID";
+
+    public static final String CREATOR_NAME = "CREATOR_NAME";
+
+    public static final String CREATE_TIME = "CREATE_TIME";
+
+    public static final String UPDATER_ID = "UPDATER_ID";
+
+    public static final String UPDATER_NAME = "UPDATER_NAME";
+
+    public static final String UPDATE_TIME = "UPDATE_TIME";
+
+    public static final String VERSION = "VERSION";
+
+    public static final String REMARK = "REMARK";
+
+    public static final String MODEL = "model";
+
+}

ym-generator/src/main/java/com/cnbm/generator/code/entity/WoPowerLevel.java

@@ -0,0 +1,124 @@
+package com.cnbm.generator.code.entity;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * 功率等级 表
+ * </p>
+ *
+ * @author codeGenerator
+ * @since 2023-02-22
+ */
+@Data
+@TableName("t_wo_power_level")
+@ApiModel(value = "WoPowerLevel对象", description = "功率等级 表")
+public class WoPowerLevel implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("ID")
+    private Long id;
+
+    @ApiModelProperty("功率等级名称，（现场人员手动录入）")
+    private String powerClass;
+
+    @ApiModelProperty("pmpp_low,（现场人员手动录入）")
+    private Float pmppLow;
+
+    @ApiModelProperty("pmpp_high,（现场人员手动录入）")
+    private Float pmppHigh;
+
+    @ApiModelProperty("物料号,（现场人员手动录入）")
+    private String sapMaterialNum;
+
+    @ApiModelProperty("线体，1=F ; 2=S (用于过程1比对，和包装打印)（设备传给我们的）（一个功率等级可能对应多个线体）")
+    private Integer lineBody;
+
+    @ApiModelProperty("lable_voc,（手动录入）")
+    private BigDecimal lableVoc;
+
+    @ApiModelProperty("lable_isc,（手动录入）")
+    private BigDecimal lableIsc;
+
+    @ApiModelProperty("lable_vmpp,（手动录入）")
+    private BigDecimal lableVmpp;
+
+    @ApiModelProperty("lable_impp,（手动录入）")
+    private BigDecimal lableImpp;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
+    @TableLogic
+    private Integer valid;
+
+    @ApiModelProperty("创建人")
+    private Long creatorId;
+
+    @ApiModelProperty("创建人姓名")
+    private String creatorName;
+
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty("更新人")
+    private Long updaterId;
+
+    @ApiModelProperty("更新人姓名")
+    private String updaterName;
+
+    @ApiModelProperty("更新时间")
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty("版本号")
+    private Integer version;
+
+
+    public static final String ID = "id";
+
+    public static final String POWER_CLASS = "power_class";
+
+    public static final String PMPP_LOW = "pmpp_low";
+
+    public static final String PMPP_HIGH = "pmpp_high";
+
+    public static final String SAP_MATERIAL_NUM = "sap_material_num";
+
+    public static final String LINE_BODY = "line_body";
+
+    public static final String LABLE_VOC = "lable_voc";
+
+    public static final String LABLE_ISC = "lable_isc";
+
+    public static final String LABLE_VMPP = "lable_vmpp";
+
+    public static final String LABLE_IMPP = "lable_impp";
+
+    public static final String REMARK = "remark";
+
+    public static final String VALID = "valid";
+
+    public static final String CREATOR_ID = "creator_id";
+
+    public static final String CREATOR_NAME = "creator_name";
+
+    public static final String CREATE_TIME = "create_time";
+
+    public static final String UPDATER_ID = "updater_id";
+
+    public static final String UPDATER_NAME = "updater_name";
+
+    public static final String UPDATE_TIME = "update_time";
+
+    public static final String VERSION = "version";
+
+}

ym-generator/src/main/java/com/cnbm/generator/code/entity/WorkingTime.java

@@ -0,0 +1,98 @@
+package com.cnbm.generator.code.entity;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * 班次时间段 表
+ * </p>
+ *
+ * @author codeGenerator
+ * @since 2023-12-28
+ */
+@Data
+@TableName("t_working_time")
+@ApiModel(value = "WorkingTime对象", description = "班次时间段 表")
+public class WorkingTime implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("ID")
+    private Long id;
+
+    @ApiModelProperty("班次名 ,A/B/C...")
+    private String orderName;
+
+    @ApiModelProperty("班次开始时间, 0点 - 24点")
+    private LocalDateTime beginTime;
+
+    @ApiModelProperty("班次结束时间, 0点 - 24点")
+    private LocalDateTime endTime;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
+    @TableLogic
+    private Integer valid;
+
+    @ApiModelProperty("创建人")
+    private Long creatorId;
+
+    @ApiModelProperty("创建人姓名")
+    private String creatorName;
+
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty("更新人")
+    private Long updaterId;
+
+    @ApiModelProperty("更新人姓名")
+    private String updaterName;
+
+    @ApiModelProperty("更新时间")
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty("版本号")
+    private Integer version;
+
+    @ApiModelProperty("班次代码")
+    private String code;
+
+
+    public static final String ID = "id";
+
+    public static final String ORDER_NAME = "order_name";
+
+    public static final String BEGIN_TIME = "begin_time";
+
+    public static final String END_TIME = "end_time";
+
+    public static final String REMARK = "remark";
+
+    public static final String VALID = "valid";
+
+    public static final String CREATOR_ID = "creator_id";
+
+    public static final String CREATOR_NAME = "creator_name";
+
+    public static final String CREATE_TIME = "create_time";
+
+    public static final String UPDATER_ID = "updater_id";
+
+    public static final String UPDATER_NAME = "updater_name";
+
+    public static final String UPDATE_TIME = "update_time";
+
+    public static final String VERSION = "version";
+
+    public static final String CODE = "code";
+
+}

ym-generator/src/main/java/com/cnbm/generator/code/excel/ChangePackagingBoxHistoryExcel.java

@@ -0,0 +1,56 @@
+package com.cnbm.generator.code.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+
+import java.util.Date;
+
+/**
+ * 包装箱拆合箱历史表
+ *
+ * @author codeGenerator
+ * @since  2023-02-16
+ */
+@Data
+public class ChangePackagingBoxHistoryExcel {
+    @Excel(name = "ID")
+    private Long id;
+    @Excel(name = "基板ID或模组id")
+    private String substrateId;
+    @Excel(name = "源包装箱box no, 关联t_wo_packaging_box.box_no 字段")
+    private Long sourceBoxNo;
+    @Excel(name = "源箱slot")
+    private Integer sourceSlot;
+    @Excel(name = "离开时间")
+    private LocalDateTime leaveTime;
+    @Excel(name = "目标箱box no, 关联t_wo_packaging_box.box_no 字段")
+    private Long targetBoxNo;
+    @Excel(name = "目标箱slot")
+    private Integer targetSlot;
+    @Excel(name = "进入时间")
+    private LocalDateTime inputTime;
+    @Excel(name = "等级")
+    private String grade;
+    @Excel(name = "类型，1为拆箱，2为合箱")
+    private Integer type;
+    @Excel(name = "删除标志，是否有效:1 可用 0不可用")
+    private Integer valid;
+    @Excel(name = "创建人")
+    private Long creatorId;
+    @Excel(name = "创建人姓名")
+    private String creatorName;
+    @Excel(name = "创建时间")
+    private LocalDateTime createTime;
+    @Excel(name = "更新人")
+    private Long updaterId;
+    @Excel(name = "更新人姓名")
+    private String updaterName;
+    @Excel(name = "更新时间")
+    private LocalDateTime updateTime;
+    @Excel(name = "版本号")
+    private Integer version;
+
+}

ym-generator/src/main/java/com/cnbm/generator/code/excel/PrintModelExcel.java

@@ -0,0 +1,68 @@
+package com.cnbm.generator.code.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+
+import java.util.Date;
+
+/**
+ * 打印标签模板表
+ *
+ * @author codeGenerator
+ * @since  2024-01-25
+ */
+@Data
+public class PrintModelExcel {
+    @Excel(name = "id")
+    private Long id;
+    @Excel(name = "编码")
+    private String code;
+    @Excel(name = "班组名称")
+    private String name;
+    @Excel(name = "启用状态:0 、停用，1、启用")
+    private Integer enabled;
+    @Excel(name = "创建人")
+    private Long creatorId;
+    @Excel(name = "创建人姓名")
+    private String creatorName;
+    @Excel(name = "创建时间")
+    private LocalDateTime createTime;
+    @Excel(name = "更新人")
+    private Long updaterId;
+    @Excel(name = "更新人姓名")
+    private String updaterName;
+    @Excel(name = "更新时间")
+    private LocalDateTime updateTime;
+    @Excel(name = "版本号")
+    private Integer version;
+    @Excel(name = "删除标志，是否有效:1 可用 0不可用")
+    private Integer valid;
+    @Excel(name = "备注")
+    private String remark;
+    @Excel(name = "类型，1：手动，2：自动")
+    private Integer type;
+    @Excel(name = "是否默认模板，0：否，1：是")
+    private Integer isDefault;
+    @Excel(name = "是否要预览，0：否，1：是")
+    private Integer isPreview;
+    @Excel(name = "模板内容")
+    private String content;
+    @Excel(name = "线体，1=F ; 2=S (用于过程1比对，和包装打印)（设备传给我们的）")
+    private Integer lineBody;
+    @Excel(name = "是否启用，0 停用；1 启用")
+    private Integer isEnable;
+    @Excel(name = "场景（用不着了，废弃）")
+    private String scenes;
+    @Excel(name = "产品等级，t_product_level 把code传过来放进去，不要放id")
+    private String productGrade;
+    @Excel(name = "节数，前端写死，输入")
+    private String pitchNumber;
+    @Excel(name = "产品等级，前端写死，输入")
+    private String maxFuseCurrent;
+    @Excel(name = "产品等级，前端写死，输入")
+    private String coverName;
+
+}

ym-generator/src/main/java/com/cnbm/generator/code/excel/ProductLevelExcel.java

@@ -0,0 +1,46 @@
+package com.cnbm.generator.code.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+
+import java.util.Date;
+
+/**
+ * 产品等级 表
+ *
+ * @author codeGenerator
+ * @since  2023-12-28
+ */
+@Data
+public class ProductLevelExcel {
+    @Excel(name = "ID")
+    private Long id;
+    @Excel(name = "产品名")
+    private String productName;
+    @Excel(name = "产品等级，A1/A2/A3/A4/NK")
+    private String productLevel;
+    @Excel(name = "备注")
+    private String remark;
+    @Excel(name = "删除标志，是否有效:1 可用 0不可用")
+    private Integer valid;
+    @Excel(name = "创建人")
+    private Long creatorId;
+    @Excel(name = "创建人姓名")
+    private String creatorName;
+    @Excel(name = "创建时间")
+    private LocalDateTime createTime;
+    @Excel(name = "更新人")
+    private Long updaterId;
+    @Excel(name = "更新人姓名")
+    private String updaterName;
+    @Excel(name = "更新时间")
+    private LocalDateTime updateTime;
+    @Excel(name = "版本号")
+    private Integer version;
+    @Excel(name = "产品等级代码")
+    private String code;
+
+}

ym-generator/src/main/java/com/cnbm/generator/code/excel/ScenesExcel.java

@@ -0,0 +1,44 @@
+package com.cnbm.generator.code.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+
+import java.util.Date;
+
+/**
+ * 场景 表
+ *
+ * @author codeGenerator
+ * @since  2023-12-28
+ */
+@Data
+public class ScenesExcel {
+    @Excel(name = "ID")
+    private Long id;
+    @Excel(name = "场景名")
+    private String scenesName;
+    @Excel(name = "备注")
+    private String remark;
+    @Excel(name = "删除标志，是否有效:1 可用 0不可用")
+    private Integer valid;
+    @Excel(name = "创建人")
+    private Long creatorId;
+    @Excel(name = "创建人姓名")
+    private String creatorName;
+    @Excel(name = "创建时间")
+    private LocalDateTime createTime;
+    @Excel(name = "更新人")
+    private Long updaterId;
+    @Excel(name = "更新人姓名")
+    private String updaterName;
+    @Excel(name = "更新时间")
+    private LocalDateTime updateTime;
+    @Excel(name = "版本号")
+    private Integer version;
+    @Excel(name = "场景code")
+    private String code;
+
+}

ym-generator/src/main/java/com/cnbm/generator/code/excel/WoCompensationPowerExcel.java

@@ -0,0 +1,52 @@
+package com.cnbm.generator.code.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+
+import java.util.Date;
+
+/**
+ * 基板补偿功率 表
+ *
+ * @author codeGenerator
+ * @since  2023-02-20
+ */
+@Data
+public class WoCompensationPowerExcel {
+    @Excel(name = "ID")
+    private Long id;
+    @Excel(name = "实际功率下限,（现场人员手动录入），如果实际功率不在范围，那么实际功率就是补偿功率")
+    private Float actlPmppLow;
+    @Excel(name = "实际功率上限,（现场人员手动录入），如果实际功率不在范围，那么实际功率就是补偿功率")
+    private Float actlPmppHigh;
+    @Excel(name = "计算公式")
+    private String formula;
+    @Excel(name = "线体，1=F ; 2=S (用于过程1比对，和包装打印)（设备传给我们的）")
+    private Integer lineBody;
+    @Excel(name = "系数a,（手动录入）")
+    private Float coefficientA;
+    @Excel(name = "系数b,（手动录入）")
+    private Float coefficientB;
+    @Excel(name = "备注")
+    private String remark;
+    @Excel(name = "删除标志，是否有效:1 可用 0不可用")
+    private Integer valid;
+    @Excel(name = "创建人")
+    private Long creatorId;
+    @Excel(name = "创建人姓名")
+    private String creatorName;
+    @Excel(name = "创建时间")
+    private LocalDateTime createTime;
+    @Excel(name = "更新人")
+    private Long updaterId;
+    @Excel(name = "更新人姓名")
+    private String updaterName;
+    @Excel(name = "更新时间")
+    private LocalDateTime updateTime;
+    @Excel(name = "版本号")
+    private Integer version;
+
+}

ym-generator/src/main/java/com/cnbm/generator/code/excel/WoPackagingBoxExcel.java

@@ -0,0 +1,88 @@
+package com.cnbm.generator.code.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+
+import java.util.Date;
+
+/**
+ * 包装箱表
+ *
+ * @author codeGenerator
+ * @since  2024-01-29
+ */
+@Data
+public class WoPackagingBoxExcel {
+    @Excel(name = "ID")
+    private Long id;
+    @Excel(name = "订单ID(舍弃)")
+    private Long orderId;
+    @Excel(name = "工单ID（舍弃啊）")
+    private Long workOrderId;
+    @Excel(name = "包装箱编号，这个就是boxId,关联 t_wo_packaging_box表的 boxId")
+    private String boxNo;
+    @Excel(name = "功率，单位瓦（舍弃）")
+    private Integer power;
+    @Excel(name = "等级（舍弃）")
+    private Integer grade;
+    @Excel(name = "基板数量，每个包装箱最大20片")
+    private Integer substrateQuantity;
+    @Excel(name = "装箱完成时间，指的是包装完成时间")
+    private LocalDateTime packagingTime;
+    @Excel(name = "打印时间（最近一次打印时间）")
+    private LocalDateTime printTime;
+    @Excel(name = "打印状态：0、未打印，1、已打印")
+    private Integer printStatus;
+    @Excel(name = "报工状态：0、未报工，1、已报工(舍弃)")
+    private Integer completionReportingStatus;
+    @Excel(name = "备注")
+    private String remark;
+    @Excel(name = "删除标志，是否有效:1 可用 0不可用")
+    private Integer valid;
+    @Excel(name = "创建人")
+    private Long creatorId;
+    @Excel(name = "创建人姓名")
+    private String creatorName;
+    @Excel(name = "创建时间")
+    private LocalDateTime createTime;
+    @Excel(name = "更新人")
+    private Long updaterId;
+    @Excel(name = "更新人姓名")
+    private String updaterName;
+    @Excel(name = "更新时间")
+    private LocalDateTime updateTime;
+    @Excel(name = "版本号")
+    private Integer version;
+    @Excel(name = "离开产线时间（舍弃）")
+    private LocalDateTime leaveLineTime;
+    @Excel(name = "下片端口id（舍弃）")
+    private String portId;
+    @Excel(name = "打印次数")
+    private Integer printCount;
+    @Excel(name = "功率等级")
+    private String powerLevel;
+    @Excel(name = "客户id（舍弃）")
+    private Long customerId;
+    @Excel(name = "SAP MATERIAL,从t_wo_power_level 对应过来的")
+    private String sapMaterial;
+    @Excel(name = "线体,从t_wo_power_level 对应过来的，1=F ; 2=S")
+    private Integer lineBody;
+    @Excel(name = "模式，1-手动模式；2-自动模式")
+    private Integer model;
+    @Excel(name = "是否到达包装台，1=到达；2=未达到")
+    private Integer isArrived;
+    @Excel(name = "订单号")
+    private String orderNum;
+    @Excel(name = "产品等级，t_product_level 把code传过来放进去，不要放id")
+    private String productGrade;
+    @Excel(name = "节数，前端写死，输入")
+    private String pitchNumber;
+    @Excel(name = "最大额定熔断电流，前端写死，输入")
+    private String maxFuseCurrent;
+    @Excel(name = "盖板，前端写死，输入")
+    private String coverName;
+
+}

ym-generator/src/main/java/com/cnbm/generator/code/excel/WoPackagingBoxSubstrateExcel.java

@@ -0,0 +1,120 @@
+package com.cnbm.generator.code.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+
+import java.util.Date;
+
+/**
+ * 包装箱基板关联表 ( 基板表 )
+ *
+ * @author codeGenerator
+ * @since  2023-03-03
+ */
+@Data
+public class WoPackagingBoxSubstrateExcel {
+    @Excel(name = "ID")
+    private Long id;
+    @Excel(name = "包装箱ID，BoxId")
+    private String packagingBoxId;
+    @Excel(name = "基板ID")
+    private String woSubstrateId;
+    @Excel(name = "创建人")
+    private Long creatorId;
+    @Excel(name = "创建人姓名")
+    private String creatorName;
+    @Excel(name = "创建时间")
+    private LocalDateTime createTime;
+    @Excel(name = "更新人")
+    private Long updaterId;
+    @Excel(name = "更新人姓名")
+    private String updaterName;
+    @Excel(name = "更新时间")
+    private LocalDateTime updateTime;
+    @Excel(name = "版本号")
+    private Integer version;
+    @Excel(name = "箱中位置")
+    private Integer slot;
+    @Excel(name = "进入时间")
+    private LocalDateTime inputTime;
+    @Excel(name = "删除标志，是否有效:1 可用 0不可用")
+    private Integer valid;
+    @Excel(name = "SAP MATERIAL,从t_wo_power_level 对应过来的")
+    private String sapMaterial;
+    @Excel(name = "线体,从t_wo_power_level 对应过来的，1=F ; 2=S")
+    private Integer lineBody;
+    @Excel(name = "功率等级")
+    private String powerLevel;
+    @Excel(name = "")
+    private LocalDateTime lastUpdateTime;
+    @Excel(name = "补偿后的功率，pmpp")
+    private Float pmpp;
+    @Excel(name = "订单名")
+    private String orderName;
+    @Excel(name = "")
+    private Long binclassFl1;
+    @Excel(name = "")
+    private Long binclassFl2;
+    @Excel(name = "")
+    private Float etaFl1;
+    @Excel(name = "")
+    private Float etaFl2;
+    @Excel(name = "")
+    private Float ffFl1;
+    @Excel(name = "")
+    private Float ffFl2;
+    @Excel(name = "")
+    private Float imppFl1;
+    @Excel(name = "")
+    private Float imppFl2;
+    @Excel(name = "")
+    private Float insolflashcontrolFl1;
+    @Excel(name = "")
+    private Float insolflashcontrolFl2;
+    @Excel(name = "")
+    private Float insolmppFl1;
+    @Excel(name = "")
+    private Float insolmppFl2;
+    @Excel(name = "")
+    private Float insolvocFl1;
+    @Excel(name = "")
+    private Float insolvocFl2;
+    @Excel(name = "")
+    private Float insolFl1;
+    @Excel(name = "")
+    private Float insolFl2;
+    @Excel(name = "")
+    private Float iscFl1;
+    @Excel(name = "")
+    private Float iscFl2;
+    @Excel(name = "")
+    private LocalDateTime measTimeFl1;
+    @Excel(name = "")
+    private LocalDateTime measTimeFl2;
+    @Excel(name = "")
+    private Float pmppFl1;
+    @Excel(name = "")
+    private Float pmppFl2;
+    @Excel(name = "")
+    private Float tcellFl1;
+    @Excel(name = "")
+    private Float tcellFl2;
+    @Excel(name = "")
+    private Float tmonicellFl1;
+    @Excel(name = "")
+    private Float tmonicellFl2;
+    @Excel(name = "")
+    private Float umppFl1;
+    @Excel(name = "")
+    private Float umppFl2;
+    @Excel(name = "")
+    private Float uocFl1;
+    @Excel(name = "")
+    private Float uocFl2;
+    @Excel(name = "真实PMPP")
+    private Float actualPmpp;
+
+}

ym-generator/src/main/java/com/cnbm/generator/code/excel/WoPackagingPrintHistoryExcel.java

@@ -0,0 +1,58 @@
+package com.cnbm.generator.code.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+
+import java.util.Date;
+
+/**
+ * 包装箱打印历史表
+ *
+ * @author codeGenerator
+ * @since  2023-02-20
+ */
+@Data
+public class WoPackagingPrintHistoryExcel {
+    @Excel(name = "ID")
+    private Long id;
+    @Excel(name = "包装箱编号，关联t_wo_packaging_box.box_no")
+    private Long boxNo;
+    @Excel(name = "打印时间")
+    private LocalDateTime printTime;
+    @Excel(name = "报工时间（舍弃）")
+    private LocalDateTime completionReportingTime;
+    @Excel(name = "打印状态：0、未打印，1、已打印")
+    private Integer printStatus;
+    @Excel(name = "报工状态：0、未报工，1、已报工, 指的是向ERP报工（舍弃）")
+    private Integer completionReportingStatus;
+    @Excel(name = "移箱时间（点击打印后，这个时间从t_wo_packaging_box 里面带过来）")
+    private LocalDateTime leaveLineTime;
+    @Excel(name = "下片端口id（舍弃）")
+    private String portId;
+    @Excel(name = "打印次数")
+    private Integer printCount;
+    @Excel(name = "删除标志，是否有效:1 可用 0不可用")
+    private Integer valid;
+    @Excel(name = "创建人")
+    private Long creatorId;
+    @Excel(name = "创建人姓名")
+    private String creatorName;
+    @Excel(name = "创建时间")
+    private LocalDateTime createTime;
+    @Excel(name = "更新人")
+    private Long updaterId;
+    @Excel(name = "更新人姓名")
+    private String updaterName;
+    @Excel(name = "更新时间")
+    private LocalDateTime updateTime;
+    @Excel(name = "版本号")
+    private Integer version;
+    @Excel(name = "备注")
+    private String remark;
+    @Excel(name = "模式，1-手动模式；2-自动模式")
+    private Integer model;
+
+}

ym-generator/src/main/java/com/cnbm/generator/code/excel/WoPowerLevelExcel.java

@@ -0,0 +1,58 @@
+package com.cnbm.generator.code.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+
+import java.util.Date;
+
+/**
+ * 功率等级 表
+ *
+ * @author codeGenerator
+ * @since  2023-02-22
+ */
+@Data
+public class WoPowerLevelExcel {
+    @Excel(name = "ID")
+    private Long id;
+    @Excel(name = "功率等级名称，（现场人员手动录入）")
+    private String powerClass;
+    @Excel(name = "pmpp_low,（现场人员手动录入）")
+    private Float pmppLow;
+    @Excel(name = "pmpp_high,（现场人员手动录入）")
+    private Float pmppHigh;
+    @Excel(name = "物料号,（现场人员手动录入）")
+    private String sapMaterialNum;
+    @Excel(name = "线体，1=F ; 2=S (用于过程1比对，和包装打印)（设备传给我们的）（一个功率等级可能对应多个线体）")
+    private Integer lineBody;
+    @Excel(name = "lable_voc,（手动录入）")
+    private BigDecimal lableVoc;
+    @Excel(name = "lable_isc,（手动录入）")
+    private BigDecimal lableIsc;
+    @Excel(name = "lable_vmpp,（手动录入）")
+    private BigDecimal lableVmpp;
+    @Excel(name = "lable_impp,（手动录入）")
+    private BigDecimal lableImpp;
+    @Excel(name = "备注")
+    private String remark;
+    @Excel(name = "删除标志，是否有效:1 可用 0不可用")
+    private Integer valid;
+    @Excel(name = "创建人")
+    private Long creatorId;
+    @Excel(name = "创建人姓名")
+    private String creatorName;
+    @Excel(name = "创建时间")
+    private LocalDateTime createTime;
+    @Excel(name = "更新人")
+    private Long updaterId;
+    @Excel(name = "更新人姓名")
+    private String updaterName;
+    @Excel(name = "更新时间")
+    private LocalDateTime updateTime;
+    @Excel(name = "版本号")
+    private Integer version;
+
+}

ym-generator/src/main/java/com/cnbm/generator/code/excel/WorkingTimeExcel.java

@@ -0,0 +1,48 @@
+package com.cnbm.generator.code.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+
+import java.util.Date;
+
+/**
+ * 班次时间段 表
+ *
+ * @author codeGenerator
+ * @since  2023-12-28
+ */
+@Data
+public class WorkingTimeExcel {
+    @Excel(name = "ID")
+    private Long id;
+    @Excel(name = "班次名 ,A/B/C...")
+    private String orderName;
+    @Excel(name = "班次开始时间, 0点 - 24点")
+    private LocalDateTime beginTime;
+    @Excel(name = "班次结束时间, 0点 - 24点")
+    private LocalDateTime endTime;
+    @Excel(name = "备注")
+    private String remark;
+    @Excel(name = "删除标志，是否有效:1 可用 0不可用")
+    private Integer valid;
+    @Excel(name = "创建人")
+    private Long creatorId;
+    @Excel(name = "创建人姓名")
+    private String creatorName;
+    @Excel(name = "创建时间")
+    private LocalDateTime createTime;
+    @Excel(name = "更新人")
+    private Long updaterId;
+    @Excel(name = "更新人姓名")
+    private String updaterName;
+    @Excel(name = "更新时间")
+    private LocalDateTime updateTime;
+    @Excel(name = "版本号")
+    private Integer version;
+    @Excel(name = "班次代码")
+    private String code;
+
+}

ym-generator/src/main/java/com/cnbm/generator/code/mapper/ChangePackagingBoxHistoryMapper.java

@@ -0,0 +1,16 @@
+package com.cnbm.generator.code.mapper;
+
+import com.cnbm.common.dao.BaseDao;
+import com.cnbm.generator.code.entity.ChangePackagingBoxHistory;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 包装箱拆合箱历史表
+ *
+ * @author codeGenerator
+ * @since 2023-02-16
+ */
+@Mapper
+public interface ChangePackagingBoxHistoryMapper extends BaseDao<ChangePackagingBoxHistory> {
+	
+}

ym-generator/src/main/java/com/cnbm/generator/code/mapper/ChangePackagingBoxHistoryMapper.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.cnbm.generator.code.mapper.ChangePackagingBoxHistoryMapper">
+    <resultMap type="com.cnbm.generator.code.entity.ChangePackagingBoxHistory" id="ChangePackagingBoxHistoryMap">
+            <id column="ID" property="id" />
+            <id column="SUBSTRATE_ID" property="substrateId" />
+            <id column="SOURCE_BOX_NO" property="sourceBoxNo" />
+            <id column="SOURCE_SLOT" property="sourceSlot" />
+            <id column="LEAVE_TIME" property="leaveTime" />
+            <id column="TARGET_BOX_NO" property="targetBoxNo" />
+            <id column="TARGET_SLOT" property="targetSlot" />
+            <id column="INPUT_TIME" property="inputTime" />
+            <id column="GRADE" property="grade" />
+            <id column="TYPE" property="type" />
+            <id column="VALID" property="valid" />
+            <id column="CREATOR_ID" property="creatorId" />
+            <id column="CREATOR_NAME" property="creatorName" />
+            <id column="CREATE_TIME" property="createTime" />
+            <id column="UPDATER_ID" property="updaterId" />
+            <id column="UPDATER_NAME" property="updaterName" />
+            <id column="UPDATE_TIME" property="updateTime" />
+            <id column="VERSION" property="version" />
+    </resultMap>
+
+</mapper>

ym-generator/src/main/java/com/cnbm/generator/code/mapper/PrintModelMapper.java

@@ -0,0 +1,16 @@
+package com.cnbm.generator.code.mapper;
+
+import com.cnbm.common.dao.BaseDao;
+import com.cnbm.generator.code.entity.PrintModel;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 打印标签模板表
+ *
+ * @author codeGenerator
+ * @since 2024-01-25
+ */
+@Mapper
+public interface PrintModelMapper extends BaseDao<PrintModel> {
+	
+}

ym-generator/src/main/java/com/cnbm/generator/code/mapper/PrintModelMapper.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.cnbm.generator.code.mapper.PrintModelMapper">
+    <resultMap type="com.cnbm.generator.code.entity.PrintModel" id="PrintModelMap">
+            <id column="ID" property="id" />
+            <id column="CODE" property="code" />
+            <id column="NAME" property="name" />
+            <id column="ENABLED" property="enabled" />
+            <id column="CREATOR_ID" property="creatorId" />
+            <id column="CREATOR_NAME" property="creatorName" />
+            <id column="CREATE_TIME" property="createTime" />
+            <id column="UPDATER_ID" property="updaterId" />
+            <id column="UPDATER_NAME" property="updaterName" />
+            <id column="UPDATE_TIME" property="updateTime" />
+            <id column="VERSION" property="version" />
+            <id column="VALID" property="valid" />
+            <id column="REMARK" property="remark" />
+            <id column="TYPE" property="type" />
+            <id column="IS_DEFAULT" property="isDefault" />
+            <id column="IS_PREVIEW" property="isPreview" />
+            <id column="CONTENT" property="content" />
+            <id column="line_body" property="lineBody" />
+            <id column="is_enable" property="isEnable" />
+            <id column="scenes" property="scenes" />
+            <id column="product_grade" property="productGrade" />
+            <id column="pitch_number" property="pitchNumber" />
+            <id column="max_fuse_current" property="maxFuseCurrent" />
+            <id column="cover_name" property="coverName" />
+    </resultMap>
+
+</mapper>

ym-generator/src/main/java/com/cnbm/generator/code/mapper/ProductLevelMapper.java

@@ -0,0 +1,16 @@
+package com.cnbm.generator.code.mapper;
+
+import com.cnbm.common.dao.BaseDao;
+import com.cnbm.generator.code.entity.ProductLevel;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 产品等级 表
+ *
+ * @author codeGenerator
+ * @since 2023-12-28
+ */
+@Mapper
+public interface ProductLevelMapper extends BaseDao<ProductLevel> {
+	
+}

ym-generator/src/main/java/com/cnbm/generator/code/mapper/ProductLevelMapper.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.cnbm.generator.code.mapper.ProductLevelMapper">
+    <resultMap type="com.cnbm.generator.code.entity.ProductLevel" id="ProductLevelMap">
+            <id column="id" property="id" />
+            <id column="product_name" property="productName" />
+            <id column="product_level" property="productLevel" />
+            <id column="remark" property="remark" />
+            <id column="valid" property="valid" />
+            <id column="creator_id" property="creatorId" />
+            <id column="creator_name" property="creatorName" />
+            <id column="create_time" property="createTime" />
+            <id column="updater_id" property="updaterId" />
+            <id column="updater_name" property="updaterName" />
+            <id column="update_time" property="updateTime" />
+            <id column="version" property="version" />
+            <id column="code" property="code" />
+    </resultMap>
+
+</mapper>

ym-generator/src/main/java/com/cnbm/generator/code/mapper/ScenesMapper.java

@@ -0,0 +1,16 @@
+package com.cnbm.generator.code.mapper;
+
+import com.cnbm.common.dao.BaseDao;
+import com.cnbm.generator.code.entity.Scenes;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 场景 表
+ *
+ * @author codeGenerator
+ * @since 2023-12-28
+ */
+@Mapper
+public interface ScenesMapper extends BaseDao<Scenes> {
+	
+}

ym-generator/src/main/java/com/cnbm/generator/code/mapper/ScenesMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.cnbm.generator.code.mapper.ScenesMapper">
+    <resultMap type="com.cnbm.generator.code.entity.Scenes" id="ScenesMap">
+            <id column="id" property="id" />
+            <id column="scenes_name" property="scenesName" />
+            <id column="remark" property="remark" />
+            <id column="valid" property="valid" />
+            <id column="creator_id" property="creatorId" />
+            <id column="creator_name" property="creatorName" />
+            <id column="create_time" property="createTime" />
+            <id column="updater_id" property="updaterId" />
+            <id column="updater_name" property="updaterName" />
+            <id column="update_time" property="updateTime" />
+            <id column="version" property="version" />
+            <id column="code" property="code" />
+    </resultMap>
+
+</mapper>

ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoCompensationPowerMapper.java

@@ -0,0 +1,16 @@
+package com.cnbm.generator.code.mapper;
+
+import com.cnbm.common.dao.BaseDao;
+import com.cnbm.generator.code.entity.WoCompensationPower;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 基板补偿功率 表
+ *
+ * @author codeGenerator
+ * @since 2023-02-20
+ */
+@Mapper
+public interface WoCompensationPowerMapper extends BaseDao<WoCompensationPower> {
+	
+}

ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoCompensationPowerMapper.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.cnbm.generator.code.mapper.WoCompensationPowerMapper">
+    <resultMap type="com.cnbm.generator.code.entity.WoCompensationPower" id="WoCompensationPowerMap">
+            <id column="id" property="id" />
+            <id column="actl_pmpp_low" property="actlPmppLow" />
+            <id column="actl_pmpp_high" property="actlPmppHigh" />
+            <id column="formula" property="formula" />
+            <id column="line_body" property="lineBody" />
+            <id column="coefficient_a" property="coefficientA" />
+            <id column="coefficient_b" property="coefficientB" />
+            <id column="remark" property="remark" />
+            <id column="valid" property="valid" />
+            <id column="creator_id" property="creatorId" />
+            <id column="creator_name" property="creatorName" />
+            <id column="create_time" property="createTime" />
+            <id column="updater_id" property="updaterId" />
+            <id column="updater_name" property="updaterName" />
+            <id column="update_time" property="updateTime" />
+            <id column="version" property="version" />
+    </resultMap>
+
+</mapper>

ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPackagingBoxMapper.java

@@ -0,0 +1,16 @@
+package com.cnbm.generator.code.mapper;
+
+import com.cnbm.common.dao.BaseDao;
+import com.cnbm.generator.code.entity.WoPackagingBox;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 包装箱表
+ *
+ * @author codeGenerator
+ * @since 2024-01-29
+ */
+@Mapper
+public interface WoPackagingBoxMapper extends BaseDao<WoPackagingBox> {
+	
+}

ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPackagingBoxMapper.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.cnbm.generator.code.mapper.WoPackagingBoxMapper">
+    <resultMap type="com.cnbm.generator.code.entity.WoPackagingBox" id="WoPackagingBoxMap">
+            <id column="ID" property="id" />
+            <id column="ORDER_ID" property="orderId" />
+            <id column="WORK_ORDER_ID" property="workOrderId" />
+            <id column="BOX_NO" property="boxNo" />
+            <id column="POWER" property="power" />
+            <id column="GRADE" property="grade" />
+            <id column="SUBSTRATE_QUANTITY" property="substrateQuantity" />
+            <id column="PACKAGING_TIME" property="packagingTime" />
+            <id column="PRINT_TIME" property="printTime" />
+            <id column="PRINT_STATUS" property="printStatus" />
+            <id column="COMPLETION_REPORTING_STATUS" property="completionReportingStatus" />
+            <id column="REMARK" property="remark" />
+            <id column="VALID" property="valid" />
+            <id column="CREATOR_ID" property="creatorId" />
+            <id column="CREATOR_NAME" property="creatorName" />
+            <id column="CREATE_TIME" property="createTime" />
+            <id column="UPDATER_ID" property="updaterId" />
+            <id column="UPDATER_NAME" property="updaterName" />
+            <id column="UPDATE_TIME" property="updateTime" />
+            <id column="VERSION" property="version" />
+            <id column="LEAVE_LINE_TIME" property="leaveLineTime" />
+            <id column="PORT_ID" property="portId" />
+            <id column="PRINT_COUNT" property="printCount" />
+            <id column="POWER_LEVEL" property="powerLevel" />
+            <id column="CUSTOMER_ID" property="customerId" />
+            <id column="SAP_MATERIAL" property="sapMaterial" />
+            <id column="LINE_BODY" property="lineBody" />
+            <id column="model" property="model" />
+            <id column="is_arrived" property="isArrived" />
+            <id column="ORDER_NUM" property="orderNum" />
+            <id column="product_grade" property="productGrade" />
+            <id column="pitch_number" property="pitchNumber" />
+            <id column="max_fuse_current" property="maxFuseCurrent" />
+            <id column="cover_name" property="coverName" />
+    </resultMap>
+
+</mapper>

ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPackagingBoxSubstrateMapper.java

@@ -0,0 +1,16 @@
+package com.cnbm.generator.code.mapper;
+
+import com.cnbm.common.dao.BaseDao;
+import com.cnbm.generator.code.entity.WoPackagingBoxSubstrate;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 包装箱基板关联表 ( 基板表 )
+ *
+ * @author codeGenerator
+ * @since 2023-03-03
+ */
+@Mapper
+public interface WoPackagingBoxSubstrateMapper extends BaseDao<WoPackagingBoxSubstrate> {
+	
+}

ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPackagingBoxSubstrateMapper.xml

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.cnbm.generator.code.mapper.WoPackagingBoxSubstrateMapper">
+    <resultMap type="com.cnbm.generator.code.entity.WoPackagingBoxSubstrate" id="WoPackagingBoxSubstrateMap">
+            <id column="ID" property="id" />
+            <id column="PACKAGING_BOX_ID" property="packagingBoxId" />
+            <id column="WO_SUBSTRATE_ID" property="woSubstrateId" />
+            <id column="CREATOR_ID" property="creatorId" />
+            <id column="CREATOR_NAME" property="creatorName" />
+            <id column="CREATE_TIME" property="createTime" />
+            <id column="UPDATER_ID" property="updaterId" />
+            <id column="UPDATER_NAME" property="updaterName" />
+            <id column="UPDATE_TIME" property="updateTime" />
+            <id column="VERSION" property="version" />
+            <id column="SLOT" property="slot" />
+            <id column="INPUT_TIME" property="inputTime" />
+            <id column="VALID" property="valid" />
+            <id column="SAP_MATERIAL" property="sapMaterial" />
+            <id column="LINE_BODY" property="lineBody" />
+            <id column="POWER_LEVEL" property="powerLevel" />
+            <id column="LAST_UPDATE_TIME" property="lastUpdateTime" />
+            <id column="PMPP" property="pmpp" />
+            <id column="ORDER_NAME" property="orderName" />
+            <id column="BINCLASS_FL1" property="binclassFl1" />
+            <id column="BINCLASS_FL2" property="binclassFl2" />
+            <id column="ETA_FL1" property="etaFl1" />
+            <id column="ETA_FL2" property="etaFl2" />
+            <id column="FF_FL1" property="ffFl1" />
+            <id column="FF_FL2" property="ffFl2" />
+            <id column="IMPP_FL1" property="imppFl1" />
+            <id column="IMPP_FL2" property="imppFl2" />
+            <id column="InsolFlashControl_FL1" property="insolflashcontrolFl1" />
+            <id column="InsolFlashControl_FL2" property="insolflashcontrolFl2" />
+            <id column="InsolMPP_FL1" property="insolmppFl1" />
+            <id column="InsolMPP_FL2" property="insolmppFl2" />
+            <id column="InsolVoc_FL1" property="insolvocFl1" />
+            <id column="InsolVoc_FL2" property="insolvocFl2" />
+            <id column="Insol_FL1" property="insolFl1" />
+            <id column="Insol_FL2" property="insolFl2" />
+            <id column="ISC_FL1" property="iscFl1" />
+            <id column="ISC_FL2" property="iscFl2" />
+            <id column="MEAS_TIME_FL1" property="measTimeFl1" />
+            <id column="MEAS_TIME_FL2" property="measTimeFl2" />
+            <id column="PMPP_FL1" property="pmppFl1" />
+            <id column="PMPP_FL2" property="pmppFl2" />
+            <id column="Tcell_FL1" property="tcellFl1" />
+            <id column="Tcell_FL2" property="tcellFl2" />
+            <id column="Tmonicell_FL1" property="tmonicellFl1" />
+            <id column="Tmonicell_FL2" property="tmonicellFl2" />
+            <id column="UMPP_FL1" property="umppFl1" />
+            <id column="UMPP_FL2" property="umppFl2" />
+            <id column="UOC_FL1" property="uocFl1" />
+            <id column="UOC_FL2" property="uocFl2" />
+            <id column="ACTUAL_PMPP" property="actualPmpp" />
+    </resultMap>
+
+</mapper>

ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPackagingPrintHistoryMapper.java

@@ -0,0 +1,16 @@
+package com.cnbm.generator.code.mapper;
+
+import com.cnbm.common.dao.BaseDao;
+import com.cnbm.generator.code.entity.WoPackagingPrintHistory;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 包装箱打印历史表
+ *
+ * @author codeGenerator
+ * @since 2023-02-20
+ */
+@Mapper
+public interface WoPackagingPrintHistoryMapper extends BaseDao<WoPackagingPrintHistory> {
+	
+}

ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPackagingPrintHistoryMapper.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.cnbm.generator.code.mapper.WoPackagingPrintHistoryMapper">
+    <resultMap type="com.cnbm.generator.code.entity.WoPackagingPrintHistory" id="WoPackagingPrintHistoryMap">
+            <id column="ID" property="id" />
+            <id column="BOX_NO" property="boxNo" />
+            <id column="PRINT_TIME" property="printTime" />
+            <id column="COMPLETION_REPORTING_TIME" property="completionReportingTime" />
+            <id column="PRINT_STATUS" property="printStatus" />
+            <id column="COMPLETION_REPORTING_STATUS" property="completionReportingStatus" />
+            <id column="LEAVE_LINE_TIME" property="leaveLineTime" />
+            <id column="PORT_ID" property="portId" />
+            <id column="PRINT_COUNT" property="printCount" />
+            <id column="VALID" property="valid" />
+            <id column="CREATOR_ID" property="creatorId" />
+            <id column="CREATOR_NAME" property="creatorName" />
+            <id column="CREATE_TIME" property="createTime" />
+            <id column="UPDATER_ID" property="updaterId" />
+            <id column="UPDATER_NAME" property="updaterName" />
+            <id column="UPDATE_TIME" property="updateTime" />
+            <id column="VERSION" property="version" />
+            <id column="REMARK" property="remark" />
+            <id column="model" property="model" />
+    </resultMap>
+
+</mapper>

ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPowerLevelMapper.java

@@ -0,0 +1,16 @@
+package com.cnbm.generator.code.mapper;
+
+import com.cnbm.common.dao.BaseDao;
+import com.cnbm.generator.code.entity.WoPowerLevel;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 功率等级 表
+ *
+ * @author codeGenerator
+ * @since 2023-02-22
+ */
+@Mapper
+public interface WoPowerLevelMapper extends BaseDao<WoPowerLevel> {
+	
+}

ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPowerLevelMapper.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.cnbm.generator.code.mapper.WoPowerLevelMapper">
+    <resultMap type="com.cnbm.generator.code.entity.WoPowerLevel" id="WoPowerLevelMap">
+            <id column="id" property="id" />
+            <id column="power_class" property="powerClass" />
+            <id column="pmpp_low" property="pmppLow" />
+            <id column="pmpp_high" property="pmppHigh" />
+            <id column="sap_material_num" property="sapMaterialNum" />
+            <id column="line_body" property="lineBody" />
+            <id column="lable_voc" property="lableVoc" />
+            <id column="lable_isc" property="lableIsc" />
+            <id column="lable_vmpp" property="lableVmpp" />
+            <id column="lable_impp" property="lableImpp" />
+            <id column="remark" property="remark" />
+            <id column="valid" property="valid" />
+            <id column="creator_id" property="creatorId" />
+            <id column="creator_name" property="creatorName" />
+            <id column="create_time" property="createTime" />
+            <id column="updater_id" property="updaterId" />
+            <id column="updater_name" property="updaterName" />
+            <id column="update_time" property="updateTime" />
+            <id column="version" property="version" />
+    </resultMap>
+
+</mapper>

ym-generator/src/main/java/com/cnbm/generator/code/mapper/WorkingTimeMapper.java

@@ -0,0 +1,16 @@
+package com.cnbm.generator.code.mapper;
+
+import com.cnbm.common.dao.BaseDao;
+import com.cnbm.generator.code.entity.WorkingTime;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 班次时间段 表
+ *
+ * @author codeGenerator
+ * @since 2023-12-28
+ */
+@Mapper
+public interface WorkingTimeMapper extends BaseDao<WorkingTime> {
+	
+}

ym-generator/src/main/java/com/cnbm/generator/code/mapper/WorkingTimeMapper.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.cnbm.generator.code.mapper.WorkingTimeMapper">
+    <resultMap type="com.cnbm.generator.code.entity.WorkingTime" id="WorkingTimeMap">
+            <id column="id" property="id" />
+            <id column="order_name" property="orderName" />
+            <id column="begin_time" property="beginTime" />
+            <id column="end_time" property="endTime" />
+            <id column="remark" property="remark" />
+            <id column="valid" property="valid" />
+            <id column="creator_id" property="creatorId" />
+            <id column="creator_name" property="creatorName" />
+            <id column="create_time" property="createTime" />
+            <id column="updater_id" property="updaterId" />
+            <id column="updater_name" property="updaterName" />
+            <id column="update_time" property="updateTime" />
+            <id column="version" property="version" />
+            <id column="code" property="code" />
+    </resultMap>
+
+</mapper>

ym-generator/src/main/java/com/cnbm/generator/code/mysql/ChangePackagingBoxHistorymysql.sql

@@ -0,0 +1,7 @@
+-- 菜单初始SQL
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1626059890161434625, 1067246875800000035, '包装箱拆合箱历史表', 'packing/changePackagingBoxHistory', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1626059890161434626, 1626059890161434625, '查看', NULL, 'packing:changePackagingBoxHistory:page,packing:changePackagingBoxHistory:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1626059890161434627, 1626059890161434625, '新增', NULL, 'packing:changePackagingBoxHistory:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1626059890161434628, 1626059890161434625, '修改', NULL, 'packing:changePackagingBoxHistory:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1626059890161434629, 1626059890161434625, '删除', NULL, 'packing:changePackagingBoxHistory:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1626059890161434630, 1626059890161434625, '导出', NULL, 'packing:changePackagingBoxHistory:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

ym-generator/src/main/java/com/cnbm/generator/code/mysql/PrintModelmysql.sql

@@ -0,0 +1,7 @@
+-- 菜单初始SQL
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1750401797217132546, 1067246875800000035, '打印标签模板表', 'code/printModel', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1750401797217132547, 1750401797217132546, '查看', NULL, 'code:printModel:page,code:printModel:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1750401797217132548, 1750401797217132546, '新增', NULL, 'code:printModel:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1750401797217132549, 1750401797217132546, '修改', NULL, 'code:printModel:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1750401797217132550, 1750401797217132546, '删除', NULL, 'code:printModel:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1750401797217132551, 1750401797217132546, '导出', NULL, 'code:printModel:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

ym-generator/src/main/java/com/cnbm/generator/code/mysql/ProductLevelmysql.sql

@@ -0,0 +1,7 @@
+-- 菜单初始SQL
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1740170405581496322, 1067246875800000035, '产品等级 表', 'code/productLevel', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1740170405581496323, 1740170405581496322, '查看', NULL, 'code:productLevel:page,code:productLevel:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1740170405581496324, 1740170405581496322, '新增', NULL, 'code:productLevel:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1740170405581496325, 1740170405581496322, '修改', NULL, 'code:productLevel:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1740170405581496326, 1740170405581496322, '删除', NULL, 'code:productLevel:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1740170405581496327, 1740170405581496322, '导出', NULL, 'code:productLevel:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

ym-generator/src/main/java/com/cnbm/generator/code/mysql/Scenesmysql.sql

@@ -0,0 +1,7 @@
+-- 菜单初始SQL
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1740173054175444994, 1067246875800000035, '场景 表', 'code/scenes', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1740173054175444995, 1740173054175444994, '查看', NULL, 'code:scenes:page,code:scenes:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1740173054175444996, 1740173054175444994, '新增', NULL, 'code:scenes:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1740173054175444997, 1740173054175444994, '修改', NULL, 'code:scenes:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1740173054175444998, 1740173054175444994, '删除', NULL, 'code:scenes:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1740173054175444999, 1740173054175444994, '导出', NULL, 'code:scenes:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

ym-generator/src/main/java/com/cnbm/generator/code/mysql/WoCompensationPowermysql.sql

@@ -0,0 +1,7 @@
+-- 菜单初始SQL
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1627488175458189314, 1067246875800000035, '基板补偿功率 表', 'packing/woCompensationPower', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1627488175458189315, 1627488175458189314, '查看', NULL, 'packing:woCompensationPower:page,packing:woCompensationPower:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1627488175458189316, 1627488175458189314, '新增', NULL, 'packing:woCompensationPower:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1627488175458189317, 1627488175458189314, '修改', NULL, 'packing:woCompensationPower:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1627488175458189318, 1627488175458189314, '删除', NULL, 'packing:woCompensationPower:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1627488175458189319, 1627488175458189314, '导出', NULL, 'packing:woCompensationPower:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

ym-generator/src/main/java/com/cnbm/generator/code/mysql/WoPackagingBoxSubstratemysql.sql

@@ -0,0 +1,7 @@
+-- 菜单初始SQL
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1631549072342364161, 1067246875800000035, '包装箱基板关联表 ( 基板表 )', 'code/woPackagingBoxSubstrate', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1631549072342364162, 1631549072342364161, '查看', NULL, 'code:woPackagingBoxSubstrate:page,code:woPackagingBoxSubstrate:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1631549072342364163, 1631549072342364161, '新增', NULL, 'code:woPackagingBoxSubstrate:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1631549072342364164, 1631549072342364161, '修改', NULL, 'code:woPackagingBoxSubstrate:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1631549072342364165, 1631549072342364161, '删除', NULL, 'code:woPackagingBoxSubstrate:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1631549072342364166, 1631549072342364161, '导出', NULL, 'code:woPackagingBoxSubstrate:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

ym-generator/src/main/java/com/cnbm/generator/code/mysql/WoPackagingBoxmysql.sql

@@ -0,0 +1,7 @@
+-- 菜单初始SQL
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1751843769903550465, 1067246875800000035, '包装箱表', 'code/woPackagingBox', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1751843769903550466, 1751843769903550465, '查看', NULL, 'code:woPackagingBox:page,code:woPackagingBox:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1751843769903550467, 1751843769903550465, '新增', NULL, 'code:woPackagingBox:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1751843769903550468, 1751843769903550465, '修改', NULL, 'code:woPackagingBox:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1751843769903550469, 1751843769903550465, '删除', NULL, 'code:woPackagingBox:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1751843769903550470, 1751843769903550465, '导出', NULL, 'code:woPackagingBox:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

ym-generator/src/main/java/com/cnbm/generator/code/mysql/WoPackagingPrintHistorymysql.sql

@@ -0,0 +1,7 @@
+-- 菜单初始SQL
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1627603723110080513, 1067246875800000035, '包装箱打印历史表', 'packing/woPackagingPrintHistory', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1627603723110080514, 1627603723110080513, '查看', NULL, 'packing:woPackagingPrintHistory:page,packing:woPackagingPrintHistory:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1627603723110080515, 1627603723110080513, '新增', NULL, 'packing:woPackagingPrintHistory:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1627603723110080516, 1627603723110080513, '修改', NULL, 'packing:woPackagingPrintHistory:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1627603723110080517, 1627603723110080513, '删除', NULL, 'packing:woPackagingPrintHistory:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now());
+INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1627603723110080518, 1627603723110080513, '导出', NULL, 'packing:woPackagingPrintHistory:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());