Merge pull request 'yanyang' (#15) from yanyang into master

Reviewed-on: #15

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/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/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;
@@ -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-generator/src/main/java/com/cnbm/generator/code/controller/WoPackagingBoxSubstrateController.java

@@ -31,7 +31,7 @@ import java.util.Map;
  * 包装箱基板关联表 ( 基板表 )  前端控制器
  *
  * @author codeGenerator
- * @since  2023-02-23
+ * @since  2023-03-03
  */
 @RestController
 @RequestMapping("/code/woPackagingBoxSubstrate")

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

@@ -14,7 +14,7 @@ import java.math.BigDecimal;
  * 包装箱基板关联表 ( 基板表 )
  *
  * @author codeGenerator
- * @since  2023-02-23
+ * @since  2023-03-03
  */
 @Data
 @ApiModel(value = "包装箱基板关联表 ( 基板表 )DTO对象")
@@ -74,7 +74,7 @@ public class WoPackagingBoxSubstrateDTO implements Serializable {
 	@ApiModelProperty(value = "")
 	private LocalDateTime lastUpdateTime;
 
-	@ApiModelProperty(value = "补偿pmpp")
+	@ApiModelProperty(value = "补偿后的功率，pmpp")
 	private Float pmpp;
 
 	@ApiModelProperty(value = "订单名")
@@ -170,4 +170,7 @@ public class WoPackagingBoxSubstrateDTO implements Serializable {
 	@ApiModelProperty(value = "")
 	private Float uocFl2;
 
+	@ApiModelProperty(value = "真实PMPP")
+	private Float actualPmpp;
+
 }

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

@@ -14,7 +14,7 @@ import lombok.Data;
  * </p>
  *
  * @author codeGenerator
- * @since 2023-02-23
+ * @since 2023-03-03
  */
 @Data
 @TableName("t_wo_packaging_box_substrate")
@@ -74,7 +74,7 @@ public class WoPackagingBoxSubstrate implements Serializable {
 
     private LocalDateTime lastUpdateTime;
 
-    @ApiModelProperty("补偿pmpp")
+    @ApiModelProperty("补偿后的功率，pmpp")
     private Float pmpp;
 
     @ApiModelProperty("订单名")
@@ -140,6 +140,9 @@ public class WoPackagingBoxSubstrate implements Serializable {
 
     private Float uocFl2;
 
+    @ApiModelProperty("真实PMPP")
+    private Float actualPmpp;
+
 
     public static final String ID = "ID";
 
@@ -239,4 +242,6 @@ public class WoPackagingBoxSubstrate implements Serializable {
 
     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/excel/WoPackagingBoxSubstrateExcel.java

@@ -12,7 +12,7 @@ import java.util.Date;
  * 包装箱基板关联表 ( 基板表 )
  *
  * @author codeGenerator
- * @since  2023-02-23
+ * @since  2023-03-03
  */
 @Data
 public class WoPackagingBoxSubstrateExcel {
@@ -50,7 +50,7 @@ public class WoPackagingBoxSubstrateExcel {
     private String powerLevel;
     @Excel(name = "")
     private LocalDateTime lastUpdateTime;
-    @Excel(name = "补偿pmpp")
+    @Excel(name = "补偿后的功率，pmpp")
     private Float pmpp;
     @Excel(name = "订单名")
     private String orderName;
@@ -114,5 +114,7 @@ public class WoPackagingBoxSubstrateExcel {
     private Float uocFl1;
     @Excel(name = "")
     private Float uocFl2;
+    @Excel(name = "真实PMPP")
+    private Float actualPmpp;
 
 }

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

@@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper;
  * 包装箱基板关联表 ( 基板表 )
  *
  * @author codeGenerator
- * @since 2023-02-23
+ * @since 2023-03-03
  */
 @Mapper
 public interface WoPackagingBoxSubstrateMapper extends BaseDao<WoPackagingBoxSubstrate> {

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

@@ -51,6 +51,7 @@
             <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/mysql/WoPackagingBoxSubstratemysql.sql

@@ -1,7 +1,7 @@
 -- 菜单初始SQL
-INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1628638869145812994, 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 (1628638869145812995, 1628638869145812994, '查看', 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 (1628638869145812996, 1628638869145812994, '新增', 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 (1628638869145812997, 1628638869145812994, '修改', 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 (1628638869145812998, 1628638869145812994, '删除', 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 (1628638869145812999, 1628638869145812994, '导出', NULL, 'code:woPackagingBoxSubstrate:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());
+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/service/WoPackagingBoxSubstrateServiceBiz.java

@@ -8,7 +8,7 @@ import com.cnbm.generator.code.entity.WoPackagingBoxSubstrate;
  * 包装箱基板关联表 ( 基板表 )
  *
  * @author codeGenerator
- * @since  2023-02-23
+ * @since  2023-03-03
  */
 public interface WoPackagingBoxSubstrateServiceBiz extends CrudService<WoPackagingBoxSubstrate, WoPackagingBoxSubstrateDTO> {
 

ym-generator/src/main/java/com/cnbm/generator/code/service/impl/WoPackagingBoxSubstrateServiceBizImpl.java

@@ -15,7 +15,7 @@ import java.util.Map;
  * 包装箱基板关联表 ( 基板表 )
  *
  * @author codeGenerator
- * @since 2023-02-23
+ * @since 2023-03-03
  */
 @Service
 public class WoPackagingBoxSubstrateServiceBizImpl extends CrudServiceImpl<WoPackagingBoxSubstrateMapper, WoPackagingBoxSubstrate, WoPackagingBoxSubstrateDTO> implements WoPackagingBoxSubstrateServiceBiz {

ym-packing/src/main/java/com/cnbm/dispatch/KukaJoinThread.java

@@ -7,6 +7,10 @@ import com.cnbm.dispatch.enums.kuka.step2.Step2Mes2PlcVar;
 import com.cnbm.dispatch.enums.kuka.step2.Step2Plc2MesVar;
 import com.cnbm.dispatch.enums.kuka.step3.Step3Mes2PlcVar;
 import com.cnbm.dispatch.enums.kuka.step3.Step3Plc2MesVar;
+import com.cnbm.packing.dto.CamlineExtendArgDTO;
+import com.cnbm.packing.entity.WoPackagingBox;
+import com.cnbm.packing.entity.WoPackagingBoxSubstrate;
+import com.cnbm.packing.entity.WoPowerLevel;
 import com.cnbm.packing.service.*;
 import com.cnbm.s7.s7connector.enmuc.S7Client;
 import com.cnbm.s7.s7connector.type.PlcVar;
@@ -18,6 +22,8 @@ import org.springframework.boot.ApplicationRunner;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 
+import java.time.LocalDateTime;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
@@ -150,199 +156,191 @@ public class KukaJoinThread implements ApplicationRunner {
     @Override
     public void run(ApplicationArguments args) throws Exception {
 
-//        kukaStep1.scheduleAtFixedRate(new Runnable() {
-//            @Override
-//            public void run() {
+        kukaStep1.scheduleAtFixedRate(new Runnable() {
+            @Override
+            public void run() {
+                //调度开始
+//                logger.info("");
 //                logger.info("=================  现在开始执行 过程一 任务   ==================");
-//            }
-//        },1,1, TimeUnit.SECONDS);
+                Integer subArrived = waitingForTarget(Step1Plc2MesVar.SubArrivedToMes, true);
+                if(subArrived != 1){
+                    logger.info("失败"+" --- "+" MES监听 Step1Plc2MesVar.SubArrivedToMes 是否 等于 1 失败");
+                }
+
+                //一. 从plc 中获取 subId 和 lineNum
+                String subId = (String) read(S7Client.S7_KUKA,Step1Plc2MesVar.SubIdToMes);
+                Integer lineNum = (Integer) read(S7Client.S7_KUKA,Step1Plc2MesVar.LineNum);
 
 
+                //二. MES 业务
+                //===============           MES 业务 开始         =================
+                //1. 从comline数据库中获取 实际pmpp
+                float pmppBySubId = service.getPMPPBySubId(subId);
+                //2. 匹配和计算补偿功率
+                float actualPMPP = compensationPowerServiceBiz.calculCompensationPMPP(pmppBySubId,lineNum);
+                //3. 依据补偿功率，获取工艺参数，并且把这些工艺参数传给kuka
+                WoPowerLevel argByPMPP = levelServiceBiz.getArgByPMPP(actualPMPP, lineNum);
+                write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Pnom,Integer.valueOf(argByPMPP.getPowerClass()));
+                write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Voc,argByPMPP.getLableVoc());
+                write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Isc,argByPMPP.getLableIsc());
+                write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Vmpp,argByPMPP.getLableVmpp());
+                write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Impp,argByPMPP.getLableImpp());
+                logger.info("采集到 基板ID: "+subId+", 线边号："+lineNum+",dLable_Pnom: "+argByPMPP.getPowerClass() +",dLable_Voc: "+argByPMPP.getLableVoc()+",dLable_Isc: "+argByPMPP.getLableIsc()+",dLable_Vmpp: "+argByPMPP.getLableVmpp()+",dLable_Impp: "+argByPMPP.getLableImpp());
 
-//        kukaStep1.scheduleAtFixedRate(new Runnable() {
-//            @Override
-//            public void run() {
-//                //调度开始
-////                logger.info("");
-////                logger.info("=================  现在开始执行 过程一 任务   ==================");
-//                Integer subArrived = waitingForTarget(Step1Plc2MesVar.SubArrivedToMes, true);
-//                if(subArrived != 1){
-//                    logger.info("失败"+" --- "+" MES监听 Step1Plc2MesVar.SubArrivedToMes 是否 等于 1 失败");
-//                }
-//
-//                //一. 从plc 中获取 subId 和 lineNum
-//                String subId = (String) read(S7Client.S7_KUKA,Step1Plc2MesVar.SubIdToMes);
-//                Integer lineNum = (Integer) read(S7Client.S7_KUKA,Step1Plc2MesVar.LineNum);
-//                logger.info("采集到 基板ID: "+subId+", 线边号："+lineNum);
-//
-//                //二. MES 业务
-//                //===============           MES 业务 开始         =================
-//                //1. 从comline数据库中获取 实际pmpp
-//                float pmppBySubId = service.getPMPPBySubId(subId);
-//                //2. 匹配和计算补偿功率
-//                float actualPMPP = compensationPowerServiceBiz.calculCompensationPMPP(pmppBySubId,lineNum);
-//                //3. 依据补偿功率，获取工艺参数，并且把这些工艺参数传给kuka
-//                WoPowerLevel argByPMPP = levelServiceBiz.getArgByPMPP(actualPMPP, lineNum);
-//                write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Pnom,Integer.valueOf(argByPMPP.getPowerClass()));
-//                write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Voc,argByPMPP.getLableVoc());
-//                write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Isc,argByPMPP.getLableIsc());
-//                write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Vmpp,argByPMPP.getLableVmpp());
-//                write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Impp,argByPMPP.getLableImpp());
-//
-//
-//
-//                //4. 把基板录到数据库
-//                WoPackagingBoxSubstrate woPackagingBoxSubstrate = new WoPackagingBoxSubstrate();
-//                woPackagingBoxSubstrate.setLineBody(lineNum);
-//                woPackagingBoxSubstrate.setPowerLevel(argByPMPP.getPowerClass());
-//                woPackagingBoxSubstrate.setSapMaterial(argByPMPP.getSapMaterialNum());
-//                woPackagingBoxSubstrate.setWoSubstrateId(subId);
-//
-//                //5. 从camline那里获取可变字段
-//                CamlineExtendArgDTO extendArgFromCamline = service.getExtendArgFromCamline(subId);
-//                woPackagingBoxSubstrate.setLastUpdateTime(extendArgFromCamline.getLastUpdateTime());
-//                woPackagingBoxSubstrate.setPmpp(actualPMPP);
-//                woPackagingBoxSubstrate.setOrderName(extendArgFromCamline.getOrderName());
-//                woPackagingBoxSubstrate.setBinclassFl1(extendArgFromCamline.getBinclassFl1());
-//                woPackagingBoxSubstrate.setBinclassFl2(extendArgFromCamline.getBinclassFl2());
-//                woPackagingBoxSubstrate.setEtaFl1(extendArgFromCamline.getEtaFl1());
-//                woPackagingBoxSubstrate.setEtaFl2(extendArgFromCamline.getEtaFl2());
-//                woPackagingBoxSubstrate.setFfFl1(extendArgFromCamline.getFfFl1());
-//                woPackagingBoxSubstrate.setFfFl2(extendArgFromCamline.getFfFl2());
-//                woPackagingBoxSubstrate.setImppFl1(extendArgFromCamline.getImppFl1());
-//                woPackagingBoxSubstrate.setImppFl2(extendArgFromCamline.getImppFl2());
-//                woPackagingBoxSubstrate.setInsolflashcontrolFl1(extendArgFromCamline.getInsolflashcontrolFl1());
-//                woPackagingBoxSubstrate.setInsolflashcontrolFl2(extendArgFromCamline.getInsolflashcontrolFl2());
-//                woPackagingBoxSubstrate.setInsolmppFl1(extendArgFromCamline.getInsolmppFl1());
-//                woPackagingBoxSubstrate.setInsolmppFl2(extendArgFromCamline.getInsolmppFl2());
-//                woPackagingBoxSubstrate.setInsolvocFl1(extendArgFromCamline.getInsolvocFl1());
-//                woPackagingBoxSubstrate.setInsolvocFl2(extendArgFromCamline.getInsolvocFl2());
-//                woPackagingBoxSubstrate.setInsolFl1(extendArgFromCamline.getInsolFl1());
-//                woPackagingBoxSubstrate.setInsolFl2(extendArgFromCamline.getInsolFl2());
-//                woPackagingBoxSubstrate.setIscFl1(extendArgFromCamline.getIscFl1());
-//                woPackagingBoxSubstrate.setIscFl2(extendArgFromCamline.getIscFl2());
-//                woPackagingBoxSubstrate.setMeasTimeFl1(extendArgFromCamline.getMeasTimeFl1());
-//                woPackagingBoxSubstrate.setMeasTimeFl2(extendArgFromCamline.getMeasTimeFl2());
-//                woPackagingBoxSubstrate.setPmppFl1(extendArgFromCamline.getPmppFl1());
-//                woPackagingBoxSubstrate.setPmppFl2(extendArgFromCamline.getPmppFl2());
-//                woPackagingBoxSubstrate.setTcellFl1(extendArgFromCamline.getTcellFl1());
-//                woPackagingBoxSubstrate.setTcellFl2(extendArgFromCamline.getTcellFl2());
-//                woPackagingBoxSubstrate.setTmonicellFl1(extendArgFromCamline.getTmonicellFl1());
-//                woPackagingBoxSubstrate.setTmonicellFl2(extendArgFromCamline.getTmonicellFl2());
-//                woPackagingBoxSubstrate.setUmppFl1(extendArgFromCamline.getUmppFl1());
-//                woPackagingBoxSubstrate.setUmppFl2(extendArgFromCamline.getUmppFl2());
-//                woPackagingBoxSubstrate.setUocFl1(extendArgFromCamline.getUocFl1());
-//                woPackagingBoxSubstrate.setUocFl1(extendArgFromCamline.getUocFl2());
-//
-//                substrateServiceBiz.insert(woPackagingBoxSubstrate);
-//                //===============           MES 业务 结束         =================
-//
-//                //三. 当MES完成任务后，把MesToPlc.SubArrivedFinish变量置为true，告诉plc，我操作完成了
-//                write(S7Client.S7_KUKA,Step1Mes2PlcVar.SubArrivedFinish,true);
-//
-//                //四. mes 监控 到PlcToMes.SubArrived==false，就把MesToPlc.SubArrivedFinish置为false
-//                Integer subArrived2 = waitingForTarget(Step1Plc2MesVar.SubArrivedToMes, false);
-//                if(subArrived2 != 1){
-//                    logger.info("失败"+" --- "+"MES监听 Step1Plc2MesVar.SubArrivedToMes 是否 等于 1 失败");
-//                }
-//                write(S7Client.S7_KUKA,Step1Mes2PlcVar.SubArrivedFinish,false);
-//            }
-//        },1,1, TimeUnit.SECONDS);
-//
-//
-//        kukaStep2.scheduleAtFixedRate(new Runnable() {
-//            @Override
-//            public void run() {
-//                //调度开始
-//
-//                Integer shelfIsFull = waitingForTarget(Step2Plc2MesVar.ShelfIsFull, true);
-//                if(shelfIsFull != 1){
-//                    logger.info("失败"+" --- "+"MES监听 Step2Plc2MesVar.ShelfIsFull 是否 等于 1 失败");
-//                }
-//
-//                //一. 从plc 中获取 subIdList 和 lineNum
-//                String[] subIdList = (String[])read(S7Client.S7_KUKA,Step2Plc2MesVar.SubIdList);
-////                Integer lineNum = (Integer) read(S7Client.S7_KUKA,Step2Plc2MesVar.LineNum);
-//                logger.info("获取到基板列表："+ Arrays.toString(subIdList));
-//
-//                //二. MES 业务
-//                //===============           MES 业务 开始         =================
-//                //1.MES 生成BoxId
-//                if(subIdList.length<=0){
-//                    logger.info("失败"+" --- "+"从plc里面获取到的基板列表 为空");
-//                }
-//                WoPackagingBoxSubstrate bySubId = substrateServiceBiz.getBySubId(subIdList[0]);
-//                String boxId = getBoxId(bySubId.getSapMaterial());
-//                logger.info("mes 生成的boxId :"+ boxId);
-//                //2. 依次update 基板表，把boxId 赋予这些基板
-//                for(int i=0;i<subIdList.length;i++){
-//                    substrateServiceBiz.updatePackagingBoxIdByWoSubstrateId(boxId,subIdList[i]);
-//                }
-//                //3.去camline数据库 查询此基板ID 对应的订单
-//                String orderNameBySubId = service.getOrderNameBySubId(subIdList[0]);
-//                //4. box信息录入到box表
-//                WoPackagingBox woPackagingBox = new WoPackagingBox();
-//                woPackagingBox.setBoxNo(boxId);
-//                woPackagingBox.setPackagingTime(LocalDateTime.now());
-//                woPackagingBox.setPowerLevel(bySubId.getPowerLevel());
-//                woPackagingBox.setLineBody(bySubId.getLineBody());
-//                woPackagingBox.setSapMaterial(bySubId.getSapMaterial());
-//                woPackagingBox.setOrderNum(orderNameBySubId);
-//                //1-手动模式，2-自动模式
-//                woPackagingBox.setModel(2);
-//                boxServiceBiz.insert(woPackagingBox);
-//                //===============           MES 业务 结束         =================
-//
-//                //三. 把生成的BoxId 告诉kuka
-//                write(S7Client.S7_KUKA,Step2Mes2PlcVar.BoxId,boxId);
-//
-//                //四. 当MES完成任务后，把MesToPlc.ShelfIsFullFinish变量置为true，告诉plc，我操作完成了
-//                write(S7Client.S7_KUKA,Step2Mes2PlcVar.ShelfIsFullFinish,true);
-//
-//                //四. mes 监控 到PlcToMes.SubArrived==false，就把MesToPlc.SubArrivedFinish置为false
-//                Integer subArrived2 = waitingForTarget(Step2Plc2MesVar.ShelfIsFull, false);
-//                if(subArrived2 != 1){
-//                    logger.info("失败"+" --- "+"步骤1.  MES监听 Step1Plc2MesVar.SubArrivedToMes 是否 等于 1 失败");
-//                }
-//                write(S7Client.S7_KUKA,Step2Mes2PlcVar.ShelfIsFullFinish,false);
-//            }
-//        },1,1, TimeUnit.SECONDS);
-//
-//
-//        kukaStep3.scheduleAtFixedRate(new Runnable() {
-//            @Override
-//            public void run() {
-//                //调度开始
-//                Integer shelfIsFull = waitingForTarget(Step3Plc2MesVar.ShelfIsFullArrived, true);
-//                if(shelfIsFull != 1){
-//                    logger.info("失败"+" --- "+"MES监听 Step3Plc2MesVar.ShelfIsFullArrived 是否 等于 1 失败");
-//                }
-//
-//                //一. 从plc 中获取 subIdList 和 lineNum
-//                String boxId = (String)read(S7Client.S7_KUKA,Step3Plc2MesVar.BoxId);
-//                Integer lineNum = (Integer) read(S7Client.S7_KUKA,Step3Plc2MesVar.LineNum);
-//                logger.info("到达站台的boxId :"+boxId);
-//
-//                //二. MES 业务
-//                //===============           MES 业务 开始         =================
-//                //1. box信息录入到box表
-//                boxServiceBiz.updateIsArrivedByBoxNo(1,boxId);
-//                //===============           MES 业务 结束         =================
-//
-//
-//                //四. 当MES完成任务后，把MesToPlc.ShelfIsFullArrivedFinish变量置为true，告诉plc，我操作完成了
-//                write(S7Client.S7_KUKA,Step3Mes2PlcVar.ShelfIsFullArrivedFinish,true);
-//
-//                //四. mes 监控 到PlcToMes.SubArrived==false，就把MesToPlc.SubArrivedFinish置为false
-//                Integer subArrived2 = waitingForTarget(Step3Plc2MesVar.ShelfIsFullArrived, false);
-//                if(subArrived2 != 1){
-//                    logger.info("失败"+" --- "+"步骤1.  MES监听 Step3Plc2MesVar.ShelfIsFullArrived 是否 等于 1 失败");
-//                }
-//                write(S7Client.S7_KUKA,Step3Mes2PlcVar.ShelfIsFullArrivedFinish,false);
-//
-//
-//            }
-//        },1,1, TimeUnit.SECONDS);
+
+                //4. 把基板录到数据库
+                WoPackagingBoxSubstrate woPackagingBoxSubstrate = new WoPackagingBoxSubstrate();
+                woPackagingBoxSubstrate.setLineBody(lineNum);
+                woPackagingBoxSubstrate.setPowerLevel(argByPMPP.getPowerClass());
+                woPackagingBoxSubstrate.setSapMaterial(argByPMPP.getSapMaterialNum());
+                woPackagingBoxSubstrate.setWoSubstrateId(subId);
+
+                //5. 从camline那里获取可变字段
+                CamlineExtendArgDTO extendArgFromCamline = service.getExtendArgFromCamline(subId);
+                woPackagingBoxSubstrate.setLastUpdateTime(extendArgFromCamline.getLastUpdateTime());
+                woPackagingBoxSubstrate.setPmpp(actualPMPP);
+                woPackagingBoxSubstrate.setOrderName(extendArgFromCamline.getOrderName());
+                woPackagingBoxSubstrate.setBinclassFl1(extendArgFromCamline.getBinclassFl1());
+                woPackagingBoxSubstrate.setBinclassFl2(extendArgFromCamline.getBinclassFl2());
+                woPackagingBoxSubstrate.setEtaFl1(extendArgFromCamline.getEtaFl1());
+                woPackagingBoxSubstrate.setEtaFl2(extendArgFromCamline.getEtaFl2());
+                woPackagingBoxSubstrate.setFfFl1(extendArgFromCamline.getFfFl1());
+                woPackagingBoxSubstrate.setFfFl2(extendArgFromCamline.getFfFl2());
+                woPackagingBoxSubstrate.setImppFl1(extendArgFromCamline.getImppFl1());
+                woPackagingBoxSubstrate.setImppFl2(extendArgFromCamline.getImppFl2());
+                woPackagingBoxSubstrate.setInsolflashcontrolFl1(extendArgFromCamline.getInsolflashcontrolFl1());
+                woPackagingBoxSubstrate.setInsolflashcontrolFl2(extendArgFromCamline.getInsolflashcontrolFl2());
+                woPackagingBoxSubstrate.setInsolmppFl1(extendArgFromCamline.getInsolmppFl1());
+                woPackagingBoxSubstrate.setInsolmppFl2(extendArgFromCamline.getInsolmppFl2());
+                woPackagingBoxSubstrate.setInsolvocFl1(extendArgFromCamline.getInsolvocFl1());
+                woPackagingBoxSubstrate.setInsolvocFl2(extendArgFromCamline.getInsolvocFl2());
+                woPackagingBoxSubstrate.setInsolFl1(extendArgFromCamline.getInsolFl1());
+                woPackagingBoxSubstrate.setInsolFl2(extendArgFromCamline.getInsolFl2());
+                woPackagingBoxSubstrate.setIscFl1(extendArgFromCamline.getIscFl1());
+                woPackagingBoxSubstrate.setIscFl2(extendArgFromCamline.getIscFl2());
+                woPackagingBoxSubstrate.setMeasTimeFl1(extendArgFromCamline.getMeasTimeFl1());
+                woPackagingBoxSubstrate.setMeasTimeFl2(extendArgFromCamline.getMeasTimeFl2());
+                woPackagingBoxSubstrate.setPmppFl1(extendArgFromCamline.getPmppFl1());
+                woPackagingBoxSubstrate.setPmppFl2(extendArgFromCamline.getPmppFl2());
+                woPackagingBoxSubstrate.setTcellFl1(extendArgFromCamline.getTcellFl1());
+                woPackagingBoxSubstrate.setTcellFl2(extendArgFromCamline.getTcellFl2());
+                woPackagingBoxSubstrate.setTmonicellFl1(extendArgFromCamline.getTmonicellFl1());
+                woPackagingBoxSubstrate.setTmonicellFl2(extendArgFromCamline.getTmonicellFl2());
+                woPackagingBoxSubstrate.setUmppFl1(extendArgFromCamline.getUmppFl1());
+                woPackagingBoxSubstrate.setUmppFl2(extendArgFromCamline.getUmppFl2());
+                woPackagingBoxSubstrate.setUocFl1(extendArgFromCamline.getUocFl1());
+                woPackagingBoxSubstrate.setUocFl1(extendArgFromCamline.getUocFl2());
+
+                substrateServiceBiz.insert(woPackagingBoxSubstrate);
+                //===============           MES 业务 结束         =================
+
+                //三. 当MES完成任务后，把MesToPlc.SubArrivedFinish变量置为true，告诉plc，我操作完成了
+                write(S7Client.S7_KUKA,Step1Mes2PlcVar.SubArrivedFinish,true);
+
+                //四. mes 监控 到PlcToMes.SubArrived==false，就把MesToPlc.SubArrivedFinish置为false
+                Integer subArrived2 = waitingForTarget(Step1Plc2MesVar.SubArrivedToMes, false);
+                if(subArrived2 != 1){
+                    logger.info("失败"+" --- "+"MES监听 Step1Plc2MesVar.SubArrivedToMes 是否 等于 1 失败");
+                }
+                write(S7Client.S7_KUKA,Step1Mes2PlcVar.SubArrivedFinish,false);
+            }
+        },1,1, TimeUnit.SECONDS);
+
+
+        kukaStep2.scheduleAtFixedRate(new Runnable() {
+            @Override
+            public void run() {
+                //调度开始
+
+                Integer shelfIsFull = waitingForTarget(Step2Plc2MesVar.ShelfIsFull, true);
+                if(shelfIsFull != 1){
+                    logger.info("失败"+" --- "+"MES监听 Step2Plc2MesVar.ShelfIsFull 是否 等于 1 失败");
+                }
+
+                //一. 从plc 中获取 subIdList 和 lineNum
+                String[] subIdList = (String[])read(S7Client.S7_KUKA,Step2Plc2MesVar.SubIdList);
+//                Integer lineNum = (Integer) read(S7Client.S7_KUKA,Step2Plc2MesVar.LineNum);
+                logger.info("获取到基板列表："+ Arrays.toString(subIdList));
+
+                //二. MES 业务
+                //===============           MES 业务 开始         =================
+                //1.MES 生成BoxId
+                if(subIdList.length<=0){
+                    logger.info("失败"+" --- "+"从plc里面获取到的基板列表 为空");
+                }
+                WoPackagingBoxSubstrate bySubId = substrateServiceBiz.getBySubId(subIdList[0]);
+                String boxId = getBoxId(bySubId.getSapMaterial());
+                logger.info("mes 生成的boxId :"+ boxId);
+                //2. 依次update 基板表，把boxId 赋予这些基板
+                for(int i=0;i<subIdList.length;i++){
+                    substrateServiceBiz.updatePackagingBoxIdByWoSubstrateId(boxId,subIdList[i]);
+                }
+                //3.去camline数据库 查询此基板ID 对应的订单
+                String orderNameBySubId = service.getOrderNameBySubId(subIdList[0]);
+                //4. box信息录入到box表
+                WoPackagingBox woPackagingBox = new WoPackagingBox();
+                woPackagingBox.setBoxNo(boxId);
+                woPackagingBox.setPackagingTime(LocalDateTime.now());
+                woPackagingBox.setPowerLevel(bySubId.getPowerLevel());
+                woPackagingBox.setLineBody(bySubId.getLineBody());
+                woPackagingBox.setSapMaterial(bySubId.getSapMaterial());
+                woPackagingBox.setOrderNum(orderNameBySubId);
+                //1-手动模式，2-自动模式
+                woPackagingBox.setModel(2);
+                woPackagingBox.setCreateTime(LocalDateTime.now());
+                boxServiceBiz.insert(woPackagingBox);
+                //===============           MES 业务 结束         =================
+
+                //三. 把生成的BoxId 告诉kuka
+                write(S7Client.S7_KUKA,Step2Mes2PlcVar.BoxId,boxId);
+
+                //四. 当MES完成任务后，把MesToPlc.ShelfIsFullFinish变量置为true，告诉plc，我操作完成了
+                write(S7Client.S7_KUKA,Step2Mes2PlcVar.ShelfIsFullFinish,true);
+
+                //四. mes 监控 到PlcToMes.SubArrived==false，就把MesToPlc.SubArrivedFinish置为false
+                Integer subArrived2 = waitingForTarget(Step2Plc2MesVar.ShelfIsFull, false);
+                if(subArrived2 != 1){
+                    logger.info("失败"+" --- "+"步骤1.  MES监听 Step1Plc2MesVar.SubArrivedToMes 是否 等于 1 失败");
+                }
+                write(S7Client.S7_KUKA,Step2Mes2PlcVar.ShelfIsFullFinish,false);
+            }
+        },1,1, TimeUnit.SECONDS);
+
+
+        kukaStep3.scheduleAtFixedRate(new Runnable() {
+            @Override
+            public void run() {
+                //调度开始
+                Integer shelfIsFull = waitingForTarget(Step3Plc2MesVar.ShelfIsFullArrived, true);
+                if(shelfIsFull != 1){
+                    logger.info("失败"+" --- "+"MES监听 Step3Plc2MesVar.ShelfIsFullArrived 是否 等于 1 失败");
+                }
+
+                //一. 从plc 中获取 subIdList 和 lineNum
+                String boxId = (String)read(S7Client.S7_KUKA,Step3Plc2MesVar.BoxId);
+                Integer lineNum = (Integer) read(S7Client.S7_KUKA,Step3Plc2MesVar.LineNum);
+                logger.info("到达站台的boxId :"+boxId);
+
+                //二. MES 业务
+                //===============           MES 业务 开始         =================
+                //1. box信息录入到box表
+                boxServiceBiz.updateIsArrivedByBoxNo(1,boxId);
+                //===============           MES 业务 结束         =================
+
+
+                //四. 当MES完成任务后，把MesToPlc.ShelfIsFullArrivedFinish变量置为true，告诉plc，我操作完成了
+                write(S7Client.S7_KUKA,Step3Mes2PlcVar.ShelfIsFullArrivedFinish,true);
+
+                //四. mes 监控 到PlcToMes.SubArrived==false，就把MesToPlc.SubArrivedFinish置为false
+                Integer subArrived2 = waitingForTarget(Step3Plc2MesVar.ShelfIsFullArrived, false);
+                if(subArrived2 != 1){
+                    logger.info("失败"+" --- "+"步骤1.  MES监听 Step3Plc2MesVar.ShelfIsFullArrived 是否 等于 1 失败");
+                }
+                write(S7Client.S7_KUKA,Step3Mes2PlcVar.ShelfIsFullArrivedFinish,false);
+
+
+            }
+        },1,1, TimeUnit.SECONDS);
 
     }
 

ym-packing/src/main/java/com/cnbm/packing/controller/ChangePackagingBoxHistoryController.java

@@ -110,11 +110,16 @@ public class ChangePackagingBoxHistoryController {
     @GetMapping("export")
     @ApiOperation("导出")
     @LogOperation("导出")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "query", dataTypeClass = LocalDateTime.class),
+            @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataTypeClass = LocalDateTime.class),
+            @ApiImplicitParam(name = "type", value = "类型，1=加入包装箱；2=移除包装箱；3=换箱", paramType = "query", dataTypeClass=Integer.class)
+    })
     @PreAuthorize("@ex.hasAuthority('packing: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);
+        ExcelUtils.exportExcelToTarget(response, "包装箱模组操作记录", list, ChangePackagingBoxHistoryExcel.class);
     }
 
 }

ym-packing/src/main/java/com/cnbm/packing/controller/TestController.java

@@ -9,6 +9,7 @@ import com.cnbm.dispatch.enums.kuka.step3.Step3Plc2MesVar;
 import com.cnbm.packing.service.DynamicDataSourceService;
 import com.cnbm.s7.entity.R;
 import com.cnbm.s7.s7connector.enmuc.S7Client;
+import com.cnbm.s7.s7connector.type.PlcVar;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -20,6 +21,7 @@ import com.cnbm.common.utils.Result;
 import springfox.documentation.annotations.ApiIgnore;
 
 import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
 import java.text.ParseException;
 import java.util.Map;
 
@@ -124,6 +126,34 @@ public class TestController {
         }
         return R.ok();
     }
+
+    public static void main(String[] args) {
+        BigDecimal voc = new BigDecimal(59.799);
+        System.out.println(Float.valueOf(voc.toString()));
+    }
+
+    @PostMapping("/testWrite")
+    public R testWrite() {
+        BigDecimal voc = new BigDecimal(59.799);
+        BigDecimal isc = new BigDecimal(3.799);
+        BigDecimal vmpp = new BigDecimal(46.799);
+        BigDecimal impp = new BigDecimal(3.0799);
+        write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Pnom,new Integer(1));
+        write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Voc,voc);
+        write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Isc,isc);
+        write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Vmpp,vmpp);
+        write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Impp,impp);
+
+
+        write(S7Client.S7_KUKA,Step2Mes2PlcVar.BoxId,"12345678901111111111");
+        write(S7Client.S7_KUKA,Step1Mes2PlcVar.SubArrivedFinish,true);
+        write(S7Client.S7_KUKA,Step2Mes2PlcVar.ShelfIsFullFinish,false);
+
+        write(S7Client.S7_KUKA,Step3Mes2PlcVar.ShelfIsFullArrivedFinish,true);
+
+
+        return R.ok();
+    }
     @PostMapping("/testlogger")
     public R testlogger() {
         logger.info("test logger");
@@ -159,4 +189,51 @@ public class TestController {
         return new Result<String>().ok(service.getExtendArgFromCamline(subId.toString()).toString());
     }
 
+    private void write(S7Client s7Client, Step1Mes2PlcVar var, Object newValue) {
+        if(var.getType().equals(PlcVar.STRING_Array)){
+            String[] s = (String[])newValue;
+            String[] ss = (String[])newValue;
+            if(s.length > var.getLength() ){
+                ss = new String[var.getLength()];
+                for(int i=0;i< var.getLength();i++){
+                    ss[i] = s[i];
+                }
+            }
+            s7Client.write(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getStrSize(), var.getType(),ss);
+        }else {
+            s7Client.write(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getStrSize(), var.getType(),newValue);
+        }
+    }
+    private void write(S7Client s7Client, Step2Mes2PlcVar var, Object newValue) {
+        if(var.getType().equals(PlcVar.STRING_Array)){
+            String[] s = (String[])newValue;
+            String[] ss = (String[])newValue;
+            if(s.length > var.getLength() ){
+                ss = new String[var.getLength()];
+                for(int i=0;i< var.getLength();i++){
+                    ss[i] = s[i];
+                }
+            }
+            s7Client.write(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getStrSize(), var.getType(),ss);
+        }else {
+            s7Client.write(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getStrSize(), var.getType(),newValue);
+        }
+    }
+
+    private void write(S7Client s7Client, Step3Mes2PlcVar var, Object newValue) {
+        if(var.getType().equals(PlcVar.STRING_Array)){
+            String[] s = (String[])newValue;
+            String[] ss = (String[])newValue;
+            if(s.length > var.getLength() ){
+                ss = new String[var.getLength()];
+                for(int i=0;i< var.getLength();i++){
+                    ss[i] = s[i];
+                }
+            }
+            s7Client.write(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getStrSize(), var.getType(),ss);
+        }else {
+            s7Client.write(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getStrSize(), var.getType(),newValue);
+        }
+    }
+
 }

ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingBoxSubstrateController.java

@@ -210,9 +210,9 @@ public class WoPackagingBoxSubstrateController {
     @PostMapping("insertSubstrateManual")
     @ApiOperation("手动装箱")
     @LogOperation("手动装箱")
-    public Result insertSubstrateManual(@RequestBody ChangePackingBoxDTO dto){
+    public Result insertSubstrateManual(@RequestBody ChangePackingBoxDTO[] dtos){
 
-        woPackagingBoxSubstrateService.insertSubstrateManual(dto);
+        woPackagingBoxSubstrateService.insertSubstrateManual(dtos);
 
         return new Result();
     }

ym-packing/src/main/java/com/cnbm/packing/dto/WoPackagingBoxSubstrateDTO.java

@@ -74,7 +74,7 @@ public class WoPackagingBoxSubstrateDTO implements Serializable {
 	@ApiModelProperty(value = "")
 	private LocalDateTime lastUpdateTime;
 
-	@ApiModelProperty(value = "补偿pmpp")
+	@ApiModelProperty(value = "补偿后的功率，pmpp")
 	private Float pmpp;
 
 	@ApiModelProperty(value = "订单名")
@@ -170,4 +170,7 @@ public class WoPackagingBoxSubstrateDTO implements Serializable {
 	@ApiModelProperty(value = "")
 	private Float uocFl2;
 
+	@ApiModelProperty(value = "真实PMPP")
+	private Float actualPmpp;
+
 }

ym-packing/src/main/java/com/cnbm/packing/entity/WoPackagingBoxSubstrate.java

@@ -74,12 +74,16 @@ public class WoPackagingBoxSubstrate implements Serializable {
 
     private LocalDateTime lastUpdateTime;
 
-    @ApiModelProperty("补偿pmpp")
+    @ApiModelProperty("补偿后的功率，pmpp")
     private Float pmpp;
 
     @ApiModelProperty("订单名")
     private String orderName;
 
+    @ApiModelProperty("真实PMPP")
+    private Float actualPmpp;
+
+
     private Long binclassFl1;
 
     private Long binclassFl2;
@@ -239,5 +243,6 @@ public class WoPackagingBoxSubstrate implements Serializable {
 
     public static final String UOC_FL2 = "UOC_FL2";
 
+    public static final String ACTUAL_PMPP = "ACTUAL_PMPP";
 
 }

ym-packing/src/main/java/com/cnbm/packing/excel/ChangePackagingBoxHistoryExcel.java

@@ -18,23 +18,23 @@ import java.util.Date;
 public class ChangePackagingBoxHistoryExcel {
     @Excel(name = "ID")
     private Long id;
-    @Excel(name = "基板ID或模组id")
+    @Excel(name = "基板ID")
     private String substrateId;
-    @Excel(name = "源包装箱box no, 关联t_wo_packaging_box.box_no 字段")
+    @Excel(name = "源包装箱")
     private String sourceBoxNo;
-    @Excel(name = "源箱slot")
+    @Excel(name = "源位置")
     private Integer sourceSlot;
     @Excel(name = "离开时间")
     private LocalDateTime leaveTime;
-    @Excel(name = "目标箱box no, 关联t_wo_packaging_box.box_no 字段")
+    @Excel(name = "目的包装箱")
     private String targetBoxNo;
-    @Excel(name = "目标箱slot")
+    @Excel(name = "目的位置")
     private Integer targetSlot;
     @Excel(name = "进入时间")
     private LocalDateTime inputTime;
     @Excel(name = "等级")
     private String grade;
-    @Excel(name = "类型，1=加入包装箱；2=移除包装箱；3=换箱")
+    @Excel(name = "操作类型")
     private Integer type;
     @Excel(name = "删除标志，是否有效:1 可用 0不可用")
     private Integer valid;
@@ -42,7 +42,7 @@ public class ChangePackagingBoxHistoryExcel {
     private Long creatorId;
     @Excel(name = "创建人姓名")
     private String creatorName;
-    @Excel(name = "创建时间")
+    @Excel(name = "操作时间")
     private LocalDateTime createTime;
     @Excel(name = "更新人")
     private Long updaterId;

ym-packing/src/main/java/com/cnbm/packing/excel/WoPackagingBoxSubstrateExcel.java

@@ -18,9 +18,9 @@ import java.util.Date;
 public class WoPackagingBoxSubstrateExcel {
     @Excel(name = "ID")
     private Long id;
-    @Excel(name = "包装箱ID，BoxId")
+    @Excel(name = "Box_ID")
     private String packagingBoxId;
-    @Excel(name = "基板ID")
+    @Excel(name = "substrate ID")
     private String woSubstrateId;
     @Excel(name = "创建人")
     private Long creatorId;
@@ -36,7 +36,7 @@ public class WoPackagingBoxSubstrateExcel {
     private LocalDateTime updateTime;
     @Excel(name = "版本号")
     private Integer version;
-    @Excel(name = "箱中位置")
+    @Excel(name = "BOX_SLOT")
     private Integer slot;
     @Excel(name = "进入时间")
     private LocalDateTime inputTime;
@@ -44,15 +44,15 @@ public class WoPackagingBoxSubstrateExcel {
     private Integer valid;
     @Excel(name = "SAP MATERIAL,从t_wo_power_level 对应过来的")
     private String sapMaterial;
-    @Excel(name = "线体,从t_wo_power_level 对应过来的，1=F ; 2=S")
+    @Excel(name = "线体")
     private Integer lineBody;
     @Excel(name = "功率等级")
     private String powerLevel;
     @Excel(name = "")
     private LocalDateTime lastUpdateTime;
-    @Excel(name = "补偿pmpp")
+    @Excel(name = "补偿后的功率，pmpp")
     private Float pmpp;
-    @Excel(name = "订单名")
+    @Excel(name = "订单")
     private String orderName;
     @Excel(name = "")
     private Long binclassFl1;
@@ -114,6 +114,8 @@ public class WoPackagingBoxSubstrateExcel {
     private Float uocFl1;
     @Excel(name = "")
     private Float uocFl2;
+    @Excel(name = "真实PMPP")
+    private Float actualPmpp;
 
 
 }

ym-packing/src/main/java/com/cnbm/packing/mapper/ChangePackagingBoxHistoryMapper.java

@@ -6,6 +6,7 @@ import com.cnbm.packing.entity.ChangePackagingBoxHistory;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 包装箱拆合箱历史表
@@ -16,6 +17,6 @@ import java.util.List;
 @Mapper
 public interface ChangePackagingBoxHistoryMapper extends BaseDao<ChangePackagingBoxHistory> {
 
-    List<ChangePackagingBoxHistoryDTO> list();
+    List<ChangePackagingBoxHistoryDTO> list(Map<String, Object> params);
     
 }

ym-packing/src/main/java/com/cnbm/packing/service/ChangePackagingBoxHistoryServiceBiz.java

@@ -3,9 +3,9 @@ package com.cnbm.packing.service;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.CrudService;
 import com.cnbm.packing.dto.ChangePackagingBoxHistoryDTO;
-import com.cnbm.packing.dto.ChangePackagingBoxHistoryDTO;
 import com.cnbm.packing.entity.ChangePackagingBoxHistory;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -25,5 +25,7 @@ public interface ChangePackagingBoxHistoryServiceBiz extends CrudService<ChangeP
     void update(ChangePackagingBoxHistoryDTO dto);
 
     void delete(Long[] ids);
-    
+
+    List<ChangePackagingBoxHistoryDTO> list(Map<String, Object> params);
+
 }

ym-packing/src/main/java/com/cnbm/packing/service/PrintModelServiceBiz.java

@@ -3,7 +3,6 @@ package com.cnbm.packing.service;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.CrudService;
 import com.cnbm.packing.dto.PrintModelDTO;
-import com.cnbm.packing.dto.PrintModelDTO;
 import com.cnbm.packing.entity.PrintModel;
 
 import java.util.List;

ym-packing/src/main/java/com/cnbm/packing/service/WoCompensationPowerServiceBiz.java

@@ -2,7 +2,6 @@ package com.cnbm.packing.service;
 
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.CrudService;
-import com.cnbm.packing.dto.CompensationPowerXSDTO;
 import com.cnbm.packing.dto.WoCompensationPowerDTO;
 import com.cnbm.packing.entity.WoCompensationPower;
 

ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxSubstrateServiceBiz.java

@@ -32,7 +32,7 @@ public interface WoPackagingBoxSubstrateServiceBiz extends CrudService<WoPackagi
 
     void replaceSubstrate(ChangePackingBoxDTO[] dtos);
 
-    void insertSubstrateManual(ChangePackingBoxDTO dto);
+    void insertSubstrateManual(ChangePackingBoxDTO[] dtos);
 
     WoPackagingBoxSubstrate getBySubId(String subId);
     int updatePackagingBoxIdByWoSubstrateId(String packagingBoxId,String woSubstrateId);

ym-packing/src/main/java/com/cnbm/packing/service/impl/ChangePackagingBoxHistoryServiceBizImpl.java

@@ -3,22 +3,22 @@ package com.cnbm.packing.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.cnbm.admin.utils.BaseSupportUtils;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.impl.CrudServiceImpl;
 import com.cnbm.common.utils.ConvertUtils;
 import com.cnbm.packing.dto.ChangePackagingBoxHistoryDTO;
 import com.cnbm.packing.dto.ChangePackagingBoxHistoryDTO;
 import com.cnbm.packing.entity.ChangePackagingBoxHistory;
-import com.cnbm.packing.entity.ChangePackagingBoxHistory;
-import com.cnbm.packing.entity.WoPowerLevel;
 import com.cnbm.packing.mapper.ChangePackagingBoxHistoryMapper;
 import com.cnbm.packing.service.ChangePackagingBoxHistoryServiceBiz;
-import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -30,14 +30,17 @@ import java.util.Map;
 @Service
 public class ChangePackagingBoxHistoryServiceBizImpl extends CrudServiceImpl<ChangePackagingBoxHistoryMapper, ChangePackagingBoxHistory, ChangePackagingBoxHistoryDTO> implements ChangePackagingBoxHistoryServiceBiz {
 
+    @Autowired
+    private ChangePackagingBoxHistoryMapper mapper;
+
     @Override
     public QueryWrapper<ChangePackagingBoxHistory> getWrapper(Map<String, Object> params){
         LocalDateTime startTime = (LocalDateTime) params.get("startTime");
         LocalDateTime endTime = (LocalDateTime) params.get("endTime");
 
         QueryWrapper<ChangePackagingBoxHistory> wrapper = new QueryWrapper<>();
-        wrapper.between(startTime!=null && endTime!=null,ChangePackagingBoxHistory.INPUT_TIME, startTime, endTime);
-        wrapper.between(startTime!=null && endTime!=null,ChangePackagingBoxHistory.LEAVE_TIME, startTime, endTime);
+        wrapper.between(startTime!=null && endTime!=null,ChangePackagingBoxHistory.CREATE_TIME, startTime, endTime);
+        wrapper.between(startTime!=null && endTime!=null,ChangePackagingBoxHistory.CREATE_TIME, startTime, endTime);
         if(params.get("type")!=null) {
             Integer type = Integer.parseInt( params.get("type").toString());
             wrapper.eq(ObjectUtils.isNotNull(type), ChangePackagingBoxHistory.TYPE, type);
@@ -65,6 +68,7 @@ public class ChangePackagingBoxHistoryServiceBizImpl extends CrudServiceImpl<Cha
     @Transactional(rollbackFor = Exception.class)
     public void save(ChangePackagingBoxHistoryDTO dto) {
         ChangePackagingBoxHistory entity = ConvertUtils.sourceToTarget(dto, ChangePackagingBoxHistory.class);
+        BaseSupportUtils.setCommonField(entity);
         insert(entity);
     }
 
@@ -72,6 +76,7 @@ public class ChangePackagingBoxHistoryServiceBizImpl extends CrudServiceImpl<Cha
     @Transactional(rollbackFor = Exception.class)
     public void update(ChangePackagingBoxHistoryDTO dto) {
         ChangePackagingBoxHistory entity = ConvertUtils.sourceToTarget(dto, ChangePackagingBoxHistory.class);
+        BaseSupportUtils.setUpdateCommonField(entity);
         updateById(entity);
     }
 
@@ -82,4 +87,11 @@ public class ChangePackagingBoxHistoryServiceBizImpl extends CrudServiceImpl<Cha
         deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public List<ChangePackagingBoxHistoryDTO> list(Map<String, Object> params) {
+        List<ChangePackagingBoxHistoryDTO> list = mapper.list(params);
+        return list;
+    }
+
 }

ym-packing/src/main/java/com/cnbm/packing/service/impl/PrintModelServiceBizImpl.java

@@ -3,6 +3,7 @@ package com.cnbm.packing.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.cnbm.admin.utils.BaseSupportUtils;
 import com.cnbm.admin.utils.CodeGeneratorHelper;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.impl.CrudServiceImpl;
@@ -69,6 +70,7 @@ public class PrintModelServiceBizImpl extends CrudServiceImpl<PrintModelMapper,
     @Transactional(rollbackFor = Exception.class)
     public void save(PrintModelDTO dto) {
         PrintModel entity = ConvertUtils.sourceToTarget(dto, PrintModel.class);
+        BaseSupportUtils.setCommonField(entity);
         insert(entity);
     }
 
@@ -76,6 +78,7 @@ public class PrintModelServiceBizImpl extends CrudServiceImpl<PrintModelMapper,
     @Transactional(rollbackFor = Exception.class)
     public void update(PrintModelDTO dto) {
         PrintModel entity = ConvertUtils.sourceToTarget(dto, PrintModel.class);
+        BaseSupportUtils.setUpdateCommonField(entity);
         updateById(entity);
     }
 

ym-packing/src/main/java/com/cnbm/packing/service/impl/WoCompensationPowerServiceBizImpl.java

@@ -3,18 +3,16 @@ package com.cnbm.packing.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.cnbm.admin.utils.BaseSupportUtils;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.impl.CrudServiceImpl;
 import com.cnbm.common.utils.ConvertUtils;
 import com.cnbm.packing.dto.CompensationPowerXSDTO;
 import com.cnbm.packing.dto.WoCompensationPowerDTO;
 import com.cnbm.packing.entity.WoCompensationPower;
-import com.cnbm.packing.entity.WoPowerLevel;
 import com.cnbm.packing.mapper.WoCompensationPowerMapper;
 import com.cnbm.packing.param.CompensationQueryParam;
 import com.cnbm.packing.service.WoCompensationPowerServiceBiz;
-import lombok.var;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -66,6 +64,7 @@ public class WoCompensationPowerServiceBizImpl extends CrudServiceImpl<WoCompens
     @Transactional(rollbackFor = Exception.class)
     public void save(WoCompensationPowerDTO dto) {
         WoCompensationPower entity = ConvertUtils.sourceToTarget(dto, WoCompensationPower.class);
+        BaseSupportUtils.setCommonField(entity);
         insert(entity);
     }
 
@@ -73,6 +72,7 @@ public class WoCompensationPowerServiceBizImpl extends CrudServiceImpl<WoCompens
     @Transactional(rollbackFor = Exception.class)
     public void update(WoCompensationPowerDTO dto) {
         WoCompensationPower entity = ConvertUtils.sourceToTarget(dto, WoCompensationPower.class);
+        BaseSupportUtils.setUpdateCommonField(entity);
         updateById(entity);
     }
 

ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxServiceBizImpl.java

@@ -3,6 +3,7 @@ package com.cnbm.packing.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.cnbm.admin.utils.BaseSupportUtils;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.impl.CrudServiceImpl;
 import com.cnbm.common.utils.ConvertUtils;
@@ -36,6 +37,7 @@ public class WoPackagingBoxServiceBizImpl extends CrudServiceImpl<WoPackagingBox
     private WoPackagingBoxMapper mapper;
     @Autowired
     private WoPackagingBoxSubstrateMapper substrateMapper;
+
     @Override
     public QueryWrapper<WoPackagingBox> getWrapper(Map<String, Object> params){
 
@@ -44,7 +46,7 @@ public class WoPackagingBoxServiceBizImpl extends CrudServiceImpl<WoPackagingBox
         String boxNo = (String) params.get("boxNo");
 
         QueryWrapper<WoPackagingBox> wrapper = new QueryWrapper<>();
-        wrapper.between(startTime!=null && endTime!=null,WoPackagingBox.PACKAGING_TIME, startTime, endTime);
+        wrapper.between(startTime!=null && endTime!=null,WoPackagingBox.CREATE_TIME, startTime, endTime);
         wrapper.like(StringUtils.isNotBlank(boxNo), WoPackagingBox.BOX_NO, boxNo);
         if(params.get("lineBody")!=null) {
             Integer lineBody = Integer.parseInt(params.get("lineBody").toString());
@@ -82,6 +84,7 @@ public class WoPackagingBoxServiceBizImpl extends CrudServiceImpl<WoPackagingBox
     @Transactional(rollbackFor = Exception.class)
     public IdVo add(WoPackagingBoxDTO dto) {
         WoPackagingBox entity = ConvertUtils.sourceToTarget(dto, WoPackagingBox.class);
+        BaseSupportUtils.setCommonField(entity);
         insert(entity);
         return IdVo.builder().id(entity.getId()).build();
     }
@@ -90,6 +93,7 @@ public class WoPackagingBoxServiceBizImpl extends CrudServiceImpl<WoPackagingBox
     @Transactional(rollbackFor = Exception.class)
     public void update(WoPackagingBoxDTO dto) {
         WoPackagingBox entity = ConvertUtils.sourceToTarget(dto, WoPackagingBox.class);
+        BaseSupportUtils.setUpdateCommonField(entity);
         updateById(entity);
     }
 

ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxSubstrateServiceBizImpl.java

@@ -3,6 +3,7 @@ package com.cnbm.packing.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.cnbm.admin.utils.BaseSupportUtils;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.impl.CrudServiceImpl;
 import com.cnbm.common.utils.ConvertUtils;
@@ -75,6 +76,7 @@ public class WoPackagingBoxSubstrateServiceBizImpl extends CrudServiceImpl<WoPac
     @Transactional(rollbackFor = Exception.class)
     public void save(WoPackagingBoxSubstrateDTO dto) {
         WoPackagingBoxSubstrate entity = ConvertUtils.sourceToTarget(dto, WoPackagingBoxSubstrate.class);
+        BaseSupportUtils.setCommonField(entity);
         insert(entity);
     }
 
@@ -82,6 +84,7 @@ public class WoPackagingBoxSubstrateServiceBizImpl extends CrudServiceImpl<WoPac
     @Transactional(rollbackFor = Exception.class)
     public void update(WoPackagingBoxSubstrateDTO dto) {
         WoPackagingBoxSubstrate entity = ConvertUtils.sourceToTarget(dto, WoPackagingBoxSubstrate.class);
+        BaseSupportUtils.setUpdateCommonField(entity);
         updateById(entity);
     }
 
@@ -103,6 +106,7 @@ public class WoPackagingBoxSubstrateServiceBizImpl extends CrudServiceImpl<WoPac
         changePackagingBoxHistory.setSourceSlot(entity.getSlot());
         changePackagingBoxHistory.setLeaveTime(LocalDateTime.now());
         changePackagingBoxHistory.setType(2);
+        BaseSupportUtils.setCommonField(changePackagingBoxHistory);
         changePackagingBoxHistoryService.insert(changePackagingBoxHistory);
         //模组从该包装箱中移出，该模组变为未绑定BoxID的模组
         UpdateWrapper<WoPackagingBoxSubstrate> wrapper = new UpdateWrapper<>();
@@ -126,10 +130,12 @@ public class WoPackagingBoxSubstrateServiceBizImpl extends CrudServiceImpl<WoPac
         changePackagingBoxHistory.setTargetSlot(dto.getSlot());
         changePackagingBoxHistory.setInputTime(LocalDateTime.now());
         changePackagingBoxHistory.setType(1);
+        BaseSupportUtils.setCommonField(changePackagingBoxHistory);
         changePackagingBoxHistoryService.insert(changePackagingBoxHistory);
         //更新
         entity.setPackagingBoxId(dto.getPackagingBoxId());
         entity.setSlot(dto.getSlot());
+        BaseSupportUtils.setUpdateCommonField(entity);
         updateById(entity);
     }
 
@@ -146,34 +152,38 @@ public class WoPackagingBoxSubstrateServiceBizImpl extends CrudServiceImpl<WoPac
             changePackagingBoxHistory.setTargetBoxNo(dto.getPackagingBoxId());
             changePackagingBoxHistory.setTargetSlot(dto.getSlot());
             changePackagingBoxHistory.setType(3);
+            BaseSupportUtils.setCommonField(changePackagingBoxHistory);
             changePackagingBoxHistoryService.insert(changePackagingBoxHistory);
             //更新
             entity.setPackagingBoxId(dto.getPackagingBoxId());
             entity.setSlot(dto.getSlot());
+            BaseSupportUtils.setUpdateCommonField(entity);
             updateById(entity);
         }
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void insertSubstrateManual(ChangePackingBoxDTO dto) {
-
-        QueryWrapper<WoPackagingBoxSubstrate> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(dto.getWoSubstrateId()),WoPackagingBoxSubstrate.WO_SUBSTRATE_ID,dto.getWoSubstrateId());
-        if(mapper.selectCount(wrapper)>0 && StringUtils.isNotBlank(dto.getWoSubstrateId())) {
-            WoPackagingBoxSubstrate substrate = mapper.selectList(wrapper).get(0);
-            substrate.setPackagingBoxId(dto.getPackagingBoxId());
-            updateById(substrate);
-        }
-        else{
-            //模组ID有时为空，用户会输入”无码“
-            if(dto.getWoSubstrateId()==null) {
-                dto.setWoSubstrateId("无码");
+    public void insertSubstrateManual(ChangePackingBoxDTO[] dtos) {
+        for(ChangePackingBoxDTO dto : dtos) {
+            QueryWrapper<WoPackagingBoxSubstrate> wrapper = new QueryWrapper<>();
+            wrapper.eq(StringUtils.isNotBlank(dto.getWoSubstrateId()), WoPackagingBoxSubstrate.WO_SUBSTRATE_ID, dto.getWoSubstrateId());
+            if (mapper.selectCount(wrapper) > 0 && StringUtils.isNotBlank(dto.getWoSubstrateId())) {
+                WoPackagingBoxSubstrate substrate = mapper.selectList(wrapper).get(0);
+                substrate.setPackagingBoxId(dto.getPackagingBoxId());
+                BaseSupportUtils.setUpdateCommonField(substrate);
+                updateById(substrate);
+            } else {
+                //模组ID有时为空，用户会输入”无码“
+                if (dto.getWoSubstrateId() == null) {
+                    dto.setWoSubstrateId("无码");
+                }
+                //效验数据
+                ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+                WoPackagingBoxSubstrate entity = ConvertUtils.sourceToTarget(dto, WoPackagingBoxSubstrate.class);
+                BaseSupportUtils.setCommonField(entity);
+                insert(entity);
             }
-            //效验数据
-            ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-            WoPackagingBoxSubstrate entity = ConvertUtils.sourceToTarget(dto, WoPackagingBoxSubstrate.class);
-            insert(entity);
         }
     }
 

ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingPrintHistoryServiceBizImpl.java

@@ -2,21 +2,13 @@ package com.cnbm.packing.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.cnbm.admin.enums.WhetherEnum;
+import com.cnbm.admin.utils.BaseSupportUtils;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.impl.CrudServiceImpl;
 import com.cnbm.common.utils.ConvertUtils;
-import com.cnbm.common.validator.ValidatorUtils;
-import com.cnbm.common.validator.group.AddGroup;
-import com.cnbm.common.validator.group.DefaultGroup;
 import com.cnbm.packing.dto.WoPackagingBoxDTO;
 import com.cnbm.packing.dto.WoPackagingPrintHistoryDTO;
-import com.cnbm.packing.dto.WoPackagingPrintHistoryDTO;
-import com.cnbm.packing.entity.WoPackagingBox;
 import com.cnbm.packing.entity.WoPackagingPrintHistory;
-import com.cnbm.packing.entity.WoPackagingPrintHistory;
-import com.cnbm.packing.mapper.WoPackagingPrintHistoryMapper;
 import com.cnbm.packing.mapper.WoPackagingPrintHistoryMapper;
 import com.cnbm.packing.service.WoPackagingBoxServiceBiz;
 import com.cnbm.packing.service.WoPackagingPrintHistoryServiceBiz;
@@ -78,6 +70,7 @@ public class WoPackagingPrintHistoryServiceBizImpl extends CrudServiceImpl<WoPac
     @Transactional(rollbackFor = Exception.class)
     public void save(WoPackagingPrintHistoryDTO dto) {
         WoPackagingPrintHistory entity = ConvertUtils.sourceToTarget(dto, WoPackagingPrintHistory.class);
+        BaseSupportUtils.setCommonField(entity);
         insert(entity);
     }
 
@@ -85,6 +78,7 @@ public class WoPackagingPrintHistoryServiceBizImpl extends CrudServiceImpl<WoPac
     @Transactional(rollbackFor = Exception.class)
     public void update(WoPackagingPrintHistoryDTO dto) {
         WoPackagingPrintHistory entity = ConvertUtils.sourceToTarget(dto, WoPackagingPrintHistory.class);
+        BaseSupportUtils.setUpdateCommonField(entity);
         updateById(entity);
     }
 
@@ -112,6 +106,7 @@ public class WoPackagingPrintHistoryServiceBizImpl extends CrudServiceImpl<WoPac
         BeanUtils.copyProperties(woPackagingBox, woPackagingPrintHistory);
         woPackagingPrintHistory.setId(null);
         woPackagingPrintHistory.setPrintTime(LocalDateTime.now());
+        BaseSupportUtils.setCommonField(woPackagingPrintHistory);
         insert(woPackagingPrintHistory);
         //更新包装箱表中打印状态和时间
         woPackagingBox.setPrintTime(woPackagingPrintHistory.getPrintTime());
@@ -122,6 +117,7 @@ public class WoPackagingPrintHistoryServiceBizImpl extends CrudServiceImpl<WoPac
         else{
             woPackagingBox.setPrintCount(woPackagingBox.getPrintCount()+1);
         }
+        BaseSupportUtils.setUpdateCommonField(woPackagingBox);
         woPackagingBoxServiceBiz.update(woPackagingBox);
     }
 

ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPowerLevelServiceBizImpl.java

@@ -3,6 +3,7 @@ package com.cnbm.packing.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.cnbm.admin.utils.BaseSupportUtils;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.impl.CrudServiceImpl;
 import com.cnbm.common.utils.ConvertUtils;
@@ -11,7 +12,6 @@ import com.cnbm.packing.entity.WoPowerLevel;
 import com.cnbm.packing.mapper.WoPowerLevelMapper;
 import com.cnbm.packing.param.CompensationQueryParam;
 import com.cnbm.packing.service.WoPowerLevelServiceBiz;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -64,6 +64,7 @@ public class WoPowerLevelServiceBizImpl extends CrudServiceImpl<WoPowerLevelMapp
     @Transactional(rollbackFor = Exception.class)
     public void save(WoPowerLevelDTO dto) {
         WoPowerLevel entity = ConvertUtils.sourceToTarget(dto, WoPowerLevel.class);
+        BaseSupportUtils.setCommonField(entity);
         insert(entity);
     }
 
@@ -71,6 +72,7 @@ public class WoPowerLevelServiceBizImpl extends CrudServiceImpl<WoPowerLevelMapp
     @Transactional(rollbackFor = Exception.class)
     public void update(WoPowerLevelDTO dto) {
         WoPowerLevel entity = ConvertUtils.sourceToTarget(dto, WoPowerLevel.class);
+        BaseSupportUtils.setUpdateCommonField(entity);
         updateById(entity);
     }
 

ym-packing/src/main/resources/mapper/ChangePackagingBoxHistoryMapper.xml

@@ -24,6 +24,14 @@
 
     <select id="list" resultType="com.cnbm.packing.dto.ChangePackagingBoxHistoryDTO">
         select * from t_change_packaging_box_history
+        <where>
+            <if test="startTime != null and endTime != null">
+                and create_time BETWEEN #{startTime} AND #{endTime}
+            </if>
+            <if test="type != null">
+                and type = #{type}
+            </if>
+        </where>
         order by id asc
     </select>
 

ym-s7/src/main/java/com/cnbm/s7/s7connector/enmuc/S7Client.java

@@ -178,7 +178,7 @@ public enum S7Client {
                             );
                             return type.toObject(read);
                         }
-                    }catch (Exception e) {
+                    }catch (Throwable e) {
                         throw new S7CheckResultException("read errMsg : "+e.getMessage());
                     }
 
@@ -293,7 +293,7 @@ public enum S7Client {
                            );
                        }
                        return null;
-                   }catch (Exception e) {
+                   }catch (Throwable e) {
                        throw new S7CheckResultException("write errMsg : "+e.getMessage());
                    }
                },