From 259970a31721891952005381d471459e7cfdfe00 Mon Sep 17 00:00:00 2001
From: yanyang <rainieyanic@outlook.com>
Date: Wed, 20 Dec 2023 15:03:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E7=AE=B1=E5=8D=95=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-dev.yml    |   32 +-
 .../src/main/resources/application-test.yml   |    2 +-
 ym-gateway/src/main/resources/application.yml |    4 +-
 .../cnbm/generator/build/CodeGenerator.java   |    2 +-
 .../controller/WorkingTimeController.java     |  116 ++
 .../generator/code/dto/WorkingTimeDTO.java    |   65 +
 .../generator/code/entity/WorkingTime.java    |   93 ++
 .../code/excel/WorkingTimeExcel.java          |   46 +
 .../code/mapper/WorkingTimeMapper.java        |   16 +
 .../code/mapper/WorkingTimeMapper.xml         |   20 +
 .../generator/code/mysql/WorkingTimemysql.sql |    7 +
 .../code/service/WorkingTimeServiceBiz.java   |   15 +
 .../impl/WorkingTimeServiceBizImpl.java       |   34 +
 .../com/cnbm/dispatch/KukaJoinThread.java     | 1078 ++++++++---------
 .../controller/PrintModelController.java      |    8 +
 .../controller/WorkingTimeController.java     |  125 ++
 .../com/cnbm/packing/dto/PrintModelDTO.java   |    6 +
 .../com/cnbm/packing/dto/WorkingTimeDTO.java  |   63 +
 .../com/cnbm/packing/entity/PrintModel.java   |   10 +
 .../com/cnbm/packing/entity/WorkingTime.java  |   94 ++
 .../cnbm/packing/excel/WorkingTimeExcel.java  |   43 +
 .../packing/mapper/WorkingTimeMapper.java     |   23 +
 .../packing/service/PrintModelServiceBiz.java |    2 +
 .../service/WorkingTimeServiceBiz.java        |   34 +
 .../impl/PrintModelServiceBizImpl.java        |   13 +
 .../impl/WorkingTimeServiceBizImpl.java       |  122 ++
 .../resources/mapper/PrintModleMapper.xml     |    2 +
 .../resources/mapper/WorkingTimeMapper.xml    |   25 +
 28 files changed, 1541 insertions(+), 559 deletions(-)
 create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/controller/WorkingTimeController.java
 create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/dto/WorkingTimeDTO.java
 create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/entity/WorkingTime.java
 create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/excel/WorkingTimeExcel.java
 create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/mapper/WorkingTimeMapper.java
 create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/mapper/WorkingTimeMapper.xml
 create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/mysql/WorkingTimemysql.sql
 create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/service/WorkingTimeServiceBiz.java
 create mode 100644 ym-generator/src/main/java/com/cnbm/generator/code/service/impl/WorkingTimeServiceBizImpl.java
 create mode 100644 ym-packing/src/main/java/com/cnbm/packing/controller/WorkingTimeController.java
 create mode 100644 ym-packing/src/main/java/com/cnbm/packing/dto/WorkingTimeDTO.java
 create mode 100644 ym-packing/src/main/java/com/cnbm/packing/entity/WorkingTime.java
 create mode 100644 ym-packing/src/main/java/com/cnbm/packing/excel/WorkingTimeExcel.java
 create mode 100644 ym-packing/src/main/java/com/cnbm/packing/mapper/WorkingTimeMapper.java
 create mode 100644 ym-packing/src/main/java/com/cnbm/packing/service/WorkingTimeServiceBiz.java
 create mode 100644 ym-packing/src/main/java/com/cnbm/packing/service/impl/WorkingTimeServiceBizImpl.java
 create mode 100644 ym-packing/src/main/resources/mapper/WorkingTimeMapper.xml

diff --git a/ym-gateway/src/main/resources/application-dev.yml b/ym-gateway/src/main/resources/application-dev.yml
index da8f64c..cc956c6 100644
--- a/ym-gateway/src/main/resources/application-dev.yml
+++ b/ym-gateway/src/main/resources/application-dev.yml
@@ -2,14 +2,14 @@ spring:
   datasource:
       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
+#      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
+      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
       #      driver-class-name: oracle.jdbc.OracleDriver
       #      url: jdbc:oracle:thin:@192.168.10.10:1521:xe
@@ -66,15 +66,15 @@ dynamic:
 #      username: root
 #      password: 1qaz@WSX3edc$RFV
     ## camline系统 - remote
-#    camline:
-#      driver-class-name: com.mysql.cj.jdbc.Driver
-#      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
-#
-    #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
\ No newline at end of file
+      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
+#
+    #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
\ No newline at end of file
diff --git a/ym-gateway/src/main/resources/application-test.yml b/ym-gateway/src/main/resources/application-test.yml
index b443abc..790a254 100644
--- a/ym-gateway/src/main/resources/application-test.yml
+++ b/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
diff --git a/ym-gateway/src/main/resources/application.yml b/ym-gateway/src/main/resources/application.yml
index 209f3fc..bb0ed3e 100644
--- a/ym-gateway/src/main/resources/application.yml
+++ b/ym-gateway/src/main/resources/application.yml
@@ -33,8 +33,8 @@ spring:
       enabled: true
   redis:
     database: 6
-    #host: 127.0.0.1
-    host: 10.0.1.249
+    host: 127.0.0.1
+    #host: 10.0.1.249
     #host: 192.168.0.102
     port: 6379
     password: ''   # 密码（默认为空）
diff --git a/ym-generator/src/main/java/com/cnbm/generator/build/CodeGenerator.java b/ym-generator/src/main/java/com/cnbm/generator/build/CodeGenerator.java
index a5dcabc..7a5d922 100644
--- a/ym-generator/src/main/java/com/cnbm/generator/build/CodeGenerator.java
+++ b/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_wo_power_level"});
+        mybatisPlusGenerator(new String[]{"t_working_time"});
     }
 
     public static void mybatisPlusGenerator(String[] include){
diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/controller/WorkingTimeController.java b/ym-generator/src/main/java/com/cnbm/generator/code/controller/WorkingTimeController.java
new file mode 100644
index 0000000..3f686d5
--- /dev/null
+++ b/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-20
+ */
+@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);
+    }
+
+}
\ No newline at end of file
diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/dto/WorkingTimeDTO.java b/ym-generator/src/main/java/com/cnbm/generator/code/dto/WorkingTimeDTO.java
new file mode 100644
index 0000000..1186829
--- /dev/null
+++ b/ym-generator/src/main/java/com/cnbm/generator/code/dto/WorkingTimeDTO.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-20
+ */
+@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;
+
+}
\ No newline at end of file
diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/entity/WorkingTime.java b/ym-generator/src/main/java/com/cnbm/generator/code/entity/WorkingTime.java
new file mode 100644
index 0000000..e6f74bf
--- /dev/null
+++ b/ym-generator/src/main/java/com/cnbm/generator/code/entity/WorkingTime.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-20
+ */
+@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;
+
+
+    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";
+
+}
diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/excel/WorkingTimeExcel.java b/ym-generator/src/main/java/com/cnbm/generator/code/excel/WorkingTimeExcel.java
new file mode 100644
index 0000000..8aaba12
--- /dev/null
+++ b/ym-generator/src/main/java/com/cnbm/generator/code/excel/WorkingTimeExcel.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-20
+ */
+@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;
+
+}
\ No newline at end of file
diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/mapper/WorkingTimeMapper.java b/ym-generator/src/main/java/com/cnbm/generator/code/mapper/WorkingTimeMapper.java
new file mode 100644
index 0000000..e0b908b
--- /dev/null
+++ b/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-20
+ */
+@Mapper
+public interface WorkingTimeMapper extends BaseDao<WorkingTime> {
+	
+}
\ No newline at end of file
diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/mapper/WorkingTimeMapper.xml b/ym-generator/src/main/java/com/cnbm/generator/code/mapper/WorkingTimeMapper.xml
new file mode 100644
index 0000000..e4a0e4c
--- /dev/null
+++ b/ym-generator/src/main/java/com/cnbm/generator/code/mapper/WorkingTimeMapper.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.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" />
+    </resultMap>
+
+</mapper>
diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/mysql/WorkingTimemysql.sql b/ym-generator/src/main/java/com/cnbm/generator/code/mysql/WorkingTimemysql.sql
new file mode 100644
index 0000000..4aa356d
--- /dev/null
+++ b/ym-generator/src/main/java/com/cnbm/generator/code/mysql/WorkingTimemysql.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 (1737360876993064962, 1067246875800000035, '班次时间段 表', 'code/workingTime', 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 (1737360876993064963, 1737360876993064962, '查看', NULL, 'code:workingTime:page,code:workingTime: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 (1737360876993064964, 1737360876993064962, '新增', NULL, 'code:workingTime: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 (1737360876993064965, 1737360876993064962, '修改', NULL, 'code:workingTime: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 (1737360876993064966, 1737360876993064962, '删除', NULL, 'code:workingTime: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 (1737360876993064967, 1737360876993064962, '导出', NULL, 'code:workingTime:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());
diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/service/WorkingTimeServiceBiz.java b/ym-generator/src/main/java/com/cnbm/generator/code/service/WorkingTimeServiceBiz.java
new file mode 100644
index 0000000..7acc6d9
--- /dev/null
+++ b/ym-generator/src/main/java/com/cnbm/generator/code/service/WorkingTimeServiceBiz.java
@@ -0,0 +1,15 @@
+package com.cnbm.generator.code.service;
+
+import com.cnbm.common.service.CrudService;
+import com.cnbm.generator.code.dto.WorkingTimeDTO;
+import com.cnbm.generator.code.entity.WorkingTime;
+
+/**
+ * 班次时间段 表
+ *
+ * @author codeGenerator
+ * @since  2023-12-20
+ */
+public interface WorkingTimeServiceBiz extends CrudService<WorkingTime, WorkingTimeDTO> {
+
+}
\ No newline at end of file
diff --git a/ym-generator/src/main/java/com/cnbm/generator/code/service/impl/WorkingTimeServiceBizImpl.java b/ym-generator/src/main/java/com/cnbm/generator/code/service/impl/WorkingTimeServiceBizImpl.java
new file mode 100644
index 0000000..782020c
--- /dev/null
+++ b/ym-generator/src/main/java/com/cnbm/generator/code/service/impl/WorkingTimeServiceBizImpl.java
@@ -0,0 +1,34 @@
+package com.cnbm.generator.code.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.cnbm.common.service.impl.CrudServiceImpl;
+import com.cnbm.generator.code.dto.WorkingTimeDTO;
+import com.cnbm.generator.code.mapper.WorkingTimeMapper;
+import com.cnbm.generator.code.entity.WorkingTime;
+import com.cnbm.generator.code.service.WorkingTimeServiceBiz;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * 班次时间段 表
+ *
+ * @author codeGenerator
+ * @since 2023-12-20
+ */
+@Service
+public class WorkingTimeServiceBizImpl extends CrudServiceImpl<WorkingTimeMapper, WorkingTime, WorkingTimeDTO> implements WorkingTimeServiceBiz {
+
+    @Override
+    public QueryWrapper<WorkingTime> getWrapper(Map<String, Object> params){
+        String id = (String)params.get("id");
+
+        QueryWrapper<WorkingTime> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), "id", id);
+
+        return wrapper;
+    }
+
+
+}
\ No newline at end of file
diff --git a/ym-packing/src/main/java/com/cnbm/dispatch/KukaJoinThread.java b/ym-packing/src/main/java/com/cnbm/dispatch/KukaJoinThread.java
index a77342f..d498bf1 100644
--- a/ym-packing/src/main/java/com/cnbm/dispatch/KukaJoinThread.java
+++ b/ym-packing/src/main/java/com/cnbm/dispatch/KukaJoinThread.java
@@ -1,539 +1,539 @@
-package com.cnbm.dispatch;
-
-import cn.hutool.core.date.DateUtil;
-import com.cnbm.dispatch.enums.kuka.step1.Step1Mes2PlcVar;
-import com.cnbm.dispatch.enums.kuka.step1.Step1Plc2MesVar;
-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.dto.CamlineSubIdDTO;
-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;
-import io.swagger.models.auth.In;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.ApplicationArguments;
-import org.springframework.boot.ApplicationRunner;
-import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Component;
-
-import java.text.DecimalFormat;
-import java.text.Format;
-import java.time.LocalDateTime;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
-/**
- * @Desc: ""
- * @Author: caixiang
- * @DATE: 2022/12/23 12:33
- */
-@Component
-@Order(value = 1)
-public class KukaJoinThread implements ApplicationRunner {
-    private static final Logger logger = LoggerFactory.getLogger(KukaJoinThread.class);
-
-    @Autowired
-    DynamicDataSourceService service;
-    @Autowired
-    WoPowerLevelServiceBiz levelServiceBiz;
-
-    @Autowired
-    WoCompensationPowerServiceBiz compensationPowerServiceBiz;
-
-    @Autowired
-    WoPackagingBoxSubstrateServiceBiz substrateServiceBiz;
-
-    @Autowired
-    WoPackagingBoxServiceBiz boxServiceBiz;
-
-    public KukaJoinThread(){
-        this.kukaStep1 = Executors.newScheduledThreadPool(1);
-        this.kukaStep2 = Executors.newScheduledThreadPool(1);
-        this.kukaStep3 = Executors.newScheduledThreadPool(1);
-    }
-
-    private ScheduledExecutorService kukaStep1;
-    private ScheduledExecutorService kukaStep2;
-    private ScheduledExecutorService kukaStep3;
-
-
-
-
-    /**
-     * return
-     *          成功： 返回相应的object对象
-     *          失败： 返回null
-     * */
-    private Object read(S7Client s7Client,Step1Plc2MesVar var) {
-        try {
-            return s7Client.read(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getLength(), var.getStrSize(), var.getType());
-        }catch (Exception e){
-            logger.error("host:"+s7Client.getHost()+" ; read 操作出现问题: "+e.getMessage());
-            e.printStackTrace();
-            return null;
-        }
-    }
-    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 Object read(S7Client s7Client, Step2Plc2MesVar var) {
-        try {
-            return s7Client.read(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getLength(), var.getStrSize(), var.getType());
-        }catch (Exception e){
-            logger.error("host:"+s7Client.getHost()+" ; read 操作出现问题: "+e.getMessage());
-            e.printStackTrace();
-            return null;
-        }
-    }
-    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 Object read(S7Client s7Client, Step3Plc2MesVar var) {
-        try {
-            return s7Client.read(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getLength(), var.getStrSize(), var.getType());
-        }catch (Exception e){
-            logger.error("host:"+s7Client.getHost()+" ; read 操作出现问题: "+e.getMessage());
-            e.printStackTrace();
-            return null;
-        }
-    }
-    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);
-        }
-    }
-
-
-    public String getBoxId(String sapMaterial){
-        Integer todayBoxNum = service.getTodayBoxNum()+1;
-        String nowTime = DateUtil.format(new Date(), "yyMMdd");
-
-        todayBoxNum+=500;
-        String res = "301"+sapMaterial+nowTime+formateString(todayBoxNum);
-        return res;
-    }
-
-
-    public String getErrorBoxId(String sapMaterial){
-
-        String nowTime = DateUtil.format(new Date(), "yyMMdd");
-        String mixBoxError = "001";
-        String res = "Err"+sapMaterial+nowTime+mixBoxError;
-        return res;
-    }
-
-    public String removeKG(String str){
-        return str.substring(0,17);
-    }
-
-    public static void main(String[] args) {
-        Integer a = 102;
-        Format f1 = new DecimalFormat("000");
-        System.out.println(f1.format(a));
-    }
-    public String formateString(Integer a){
-        Format f1 = new DecimalFormat("000");
-        return f1.format(a);
-    }
-
-    //return true 出现混档了，return false 没有出现混档
-    private boolean isMixLevel(String[] subIds,Integer size){
-        String correctLevel = substrateServiceBiz.getBySubId(subIds[0]).getPowerLevel();
-        String errMsg = "以下基板ID出现混档：";
-        boolean res = false;
-        for(int i=0;i<size;i++){
-            String powerLevel = substrateServiceBiz.getBySubId(subIds[i]).getPowerLevel();
-
-            if(!powerLevel.equals(correctLevel)){
-                errMsg+="基板ID:"+subIds[i]+" 档位："+powerLevel+", ";
-                res = true;
-            }
-        }
-        if(res){
-            logger.error(errMsg);
-        }
-
-        return res;
-    }
-
-    @Override
-    public void run(ApplicationArguments args) throws Exception {
-
-        kukaStep1.scheduleAtFixedRate(new Runnable() {
-            @Override
-            public void run() {
-                try {
-
-                    //调度开始
-//                logger.info("");
-//                logger.info("=================  现在开始执行 过程一 任务   ==================");
-                    Integer subArrived = waitingForTarget(Step1Plc2MesVar.SubArrivedToMes, true);
-                    if(subArrived != 1){
-                        logger.info("标签打印Event---  失败"+" --- "+" 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);
-                    //把基板ID字符串的空格去掉，因为plc中设置的20位，但实际基板ID就是17位，因为带空格去数据库查询 有问题的。
-                    subId = removeKG(subId);
-
-                    //二. MES 业务
-                    //===============           MES 业务 开始         =================
-                    //1. 从comline数据库中获取 实际pmpp
-                    float pmppActual = service.getPMPPBySubId(subId);
-                    //2. 匹配和计算补偿功率
-                    float pmppCompensation = compensationPowerServiceBiz.calculCompensationPMPP(pmppActual,lineNum);
-                    //3. 依据补偿功率，获取工艺参数，并且把这些工艺参数传给kuka
-                    WoPowerLevel argByPMPP = levelServiceBiz.getArgByPMPP(pmppCompensation, 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("标签打印Event--- 采集到 基板ID: "+subId+", 线边号："+lineNum+"，从camline 获取到实际pmpp"+pmppActual+",计算后 补偿功率："+pmppCompensation+",dLable_Pnom: "+argByPMPP.getPowerClass() +",dLable_Voc: "+argByPMPP.getLableVoc()+",dLable_Isc: "+argByPMPP.getLableIsc()+",dLable_Vmpp: "+argByPMPP.getLableVmpp()+",dLable_Impp: "+argByPMPP.getLableImpp());
-
-
-
-                    //4. 把基板录到数据库
-                    WoPackagingBoxSubstrate woPackagingBoxSubstrate = new WoPackagingBoxSubstrate();
-                    woPackagingBoxSubstrate.setLineBody(lineNum);
-                    woPackagingBoxSubstrate.setPowerLevel(argByPMPP.getPowerClass());
-                    woPackagingBoxSubstrate.setSapMaterial(argByPMPP.getSapMaterialNum());
-                    woPackagingBoxSubstrate.setWoSubstrateId(subId);
-                    woPackagingBoxSubstrate.setActualPmpp(pmppActual);
-                    woPackagingBoxSubstrate.setCreateTime(LocalDateTime.now());
-                    woPackagingBoxSubstrate.setPmpp(pmppCompensation);
-
-
-                    //5. 从camline那里获取可变字段
-                    CamlineExtendArgDTO extendArgFromCamline = service.getExtendArgFromCamline(subId);
-                    logger.info("标签打印Event--- 基板ID: "+subId+", 从camline获取PID16~PID22 的实测数据 成功, 数据内容:"+extendArgFromCamline.toString());
-                    woPackagingBoxSubstrate.setLastUpdateTime(extendArgFromCamline.getLastUpdateTime());
-
-                    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);
-                    logger.info("标签打印Event--- 基板ID: "+subId+", 录入数据库成功");
-                    //===============           MES 业务 结束         =================
-
-                    //三. 当MES完成任务后，把MesToPlc.SubArrivedFinish变量置为true，告诉plc，我操作完成了
-                    write(S7Client.S7_KUKA,Step1Mes2PlcVar.SubArrivedFinish,true);
-                    logger.info("标签打印Event--- 基板ID: "+subId+", SubArrivedFinish，置为true 成功");
-                    //四. mes 监控 到PlcToMes.SubArrived==false，就把MesToPlc.SubArrivedFinish置为false
-                    Integer subArrived2 = waitingForTarget(Step1Plc2MesVar.SubArrivedToMes, false);
-                    if(subArrived2 != 1){
-                        logger.info("标签打印Event--- 失败"+" --- "+"MES监听 Step1Plc2MesVar.SubArrivedToMes 是否 等于 1 失败");
-                    }
-
-                    write(S7Client.S7_KUKA,Step1Mes2PlcVar.SubArrivedFinish,false);
-                    logger.info("标签打印Event--- 基板ID: "+subId+", SubArrivedFinish，置为 false 成功, Event1 成功结束");
-
-                }catch (Throwable e){
-                    e.printStackTrace();
-                    logger.info("标签打印Event--- 出现异常 :"+e.toString());
-                }
-            }
-        },1,1, TimeUnit.SECONDS);
-
-        kukaStep2.scheduleAtFixedRate(new Runnable() {
-            @Override
-            public void run() {
-                try {
-
-                    //调度开始
-                    Integer shelfIsFull = waitingForTarget(Step2Plc2MesVar.ShelfIsFull, true);
-                    if(shelfIsFull != 1){
-                        logger.info("BOXID生成Event-------失败"+" --- "+"MES监听 Step2Plc2MesVar.ShelfIsFull 是否 等于 1 失败");
-                    }
-
-                    //一. 从plc 中获取 subIdList 和 lineNum
-                    String[] subIdList = (String[])read(S7Client.S7_KUKA,Step2Plc2MesVar.SubIdList);
-                    Integer listSize = (Integer)read(S7Client.S7_KUKA,Step2Plc2MesVar.PackageNumberSet)-1;
-
-
-                    //二. MES 业务
-                    //===============           MES 业务 开始         =================
-                    //1.MES 生成BoxId
-                    if(subIdList.length<=0){
-                        logger.info("BOXID生成Event-------失败"+" --- "+"从plc里面获取到的基板列表 为空");
-                        throw new Exception("BOXID生成Event-------kuka机械手 取到了空箱");
-                    }
-                    //真实的基板ID 就是17位的，plc读取过来，有空格，要把后面3位空格去掉就行了。
-                    for(int i=0;i<subIdList.length;i++){
-                        subIdList[i] = removeKG(subIdList[i]);
-                    }
-                    logger.info("BOXID生成Event-------获取到基板列表："+ Arrays.toString(subIdList)+",基板数量:"+listSize);
-
-                    WoPackagingBoxSubstrate bySubId = substrateServiceBiz.getBySubId(subIdList[0]);
-
-                    //如果我们系统中找不到这块基板那么就去camline里面找
-                    if(bySubId == null){
-                        logger.info("我们数据库 依据 subIdList[0] id 查询不到相关信息，现在去camline 数据库查询相关信息。");
-                        //todo
-                        CamlineSubIdDTO subIdByCamline = service.getSubIdByCamline(subIdList[0]);
-                        bySubId = new WoPackagingBoxSubstrate();
-                        bySubId.setPowerLevel(subIdByCamline.getPowerLevel());
-                        bySubId.setSapMaterial(subIdByCamline.getSapMaterial());
-                        bySubId.setLineBody(2);
-                    }
-
-                    //校验是否存在混档位情况
-                    String boxId = "";
-                    if(isMixLevel(subIdList,listSize)){
-                        //出现混档
-                        boxId = getErrorBoxId(bySubId.getSapMaterial());
-                    }else {
-                        //正常情况
-                        boxId = getBoxId(bySubId.getSapMaterial());
-                    }
-
-                    logger.info("BOXID生成Event-------mes 生成的boxId :"+ boxId);
-                    //2. 依次update 基板表，把boxId 赋予这些基板
-                    for(int i=0;i<listSize;i++){
-                        substrateServiceBiz.updatePackagingBoxIdAndSlotByWoSubstrateId(boxId,(i+1),subIdList[i]);
-                    }
-                    //3.去camline数据库 查询此基板ID 对应的订单
-                    String orderNameBySubId = service.getOrderNameBySubId(subIdList[0]);
-                    //4. box信息录入到box表
-                    WoPackagingBox woPackagingBox = new WoPackagingBox();
-                    woPackagingBox.setBoxNo(boxId);
-                    woPackagingBox.setSubstrateQuantity(listSize);
-                    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());
-                    woPackagingBox.setPackagingTime(LocalDateTime.now());
-                    boxServiceBiz.insert(woPackagingBox);
-                    logger.info("BOXID生成Event-------boxId :"+ boxId+"写入数据库成功");
-                    //===============           MES 业务 结束         =================
-
-                    //三. 把生成的BoxId 告诉kuka
-                    write(S7Client.S7_KUKA,Step2Mes2PlcVar.BoxId,boxId);
-                    logger.info("BOXID生成Event-------boxId :"+ boxId+"传给PLC 成功");
-
-                    //四. 当MES完成任务后，把MesToPlc.ShelfIsFullFinish变量置为true，告诉plc，我操作完成了
-                    write(S7Client.S7_KUKA,Step2Mes2PlcVar.ShelfIsFullFinish,true);
-                    logger.info("BOXID生成Event-------boxId :"+ boxId+"ShelfIsFullFinish 置为true 成功");
-                    //四. mes 监控 到PlcToMes.SubArrived==false，就把MesToPlc.SubArrivedFinish置为false
-                    Integer subArrived2 = waitingForTarget(Step2Plc2MesVar.ShelfIsFull, false);
-                    if(subArrived2 != 1){
-                        logger.info("BOXID生成Event-------失败"+" --- "+"步骤1.  MES监听 Step1Plc2MesVar.SubArrivedToMes 是否 等于 1 失败");
-                    }
-                    write(S7Client.S7_KUKA,Step2Mes2PlcVar.ShelfIsFullFinish,false);
-                    logger.info("BOXID生成Event-------boxId :"+ boxId+"ShelfIsFullFinish 置为false 成功,Event2 成功结束");
-                }catch (Throwable e){
-                    e.printStackTrace();
-                    logger.info("BOXID生成Event-------  出现异常:" + e.toString());
-                }
-            }
-        },1,1, TimeUnit.SECONDS);
-
-        kukaStep3.scheduleAtFixedRate(new Runnable() {
-            @Override
-            public void run() {
-                try {
-
-                    //调度开始
-                    Integer shelfIsFull = waitingForTarget(Step3Plc2MesVar.ShelfIsFullArrived, true);
-                    if(shelfIsFull != 1){
-                        logger.info("装箱单打印Event------失败"+" --- "+"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("装箱单打印Event------到达站台的boxId :"+boxId);
-
-                    //二. MES 业务
-                    //===============           MES 业务 开始         =================
-                    //1. box信息录入到box表
-                    boxServiceBiz.updateIsArrivedByBoxNo(1,boxId);
-                    logger.info("装箱单打印Event------boxId :"+boxId+"更新数据库成功");
-                    //===============           MES 业务 结束         =================
-
-
-                    //四. 当MES完成任务后，把MesToPlc.ShelfIsFullArrivedFinish变量置为true，告诉plc，我操作完成了
-                    write(S7Client.S7_KUKA,Step3Mes2PlcVar.ShelfIsFullArrivedFinish,true);
-                    logger.info("装箱单打印Event------boxId :"+boxId+"， ShelfIsFullArrivedFinish置为true 成功");
-                    //四. mes 监控 到PlcToMes.SubArrived==false，就把MesToPlc.SubArrivedFinish置为false
-                    Integer subArrived2 = waitingForTarget(Step3Plc2MesVar.ShelfIsFullArrived, false);
-                    if(subArrived2 != 1){
-                        logger.info("装箱单打印Event------失败"+" --- "+"步骤1.  MES监听 Step3Plc2MesVar.ShelfIsFullArrived 是否 等于 1 失败");
-                    }
-                    logger.info("装箱单打印Event------boxId :"+boxId+"， 监听到subArrived=false 成功");
-                    write(S7Client.S7_KUKA,Step3Mes2PlcVar.ShelfIsFullArrivedFinish,false);
-                    logger.info("装箱单打印Event------boxId :"+boxId+"， Even3 成功");
-                }catch (Throwable e){
-                    e.printStackTrace();
-                    logger.info("装箱单打印Event 出现异常------"+e.toString());
-                }
-
-            }
-        },1,1, TimeUnit.SECONDS);
-
-    }
-
-    /**
-     *
-     * arg:
-     *      Step1Plc2MesVar 参数类型
-     *      targetValue        目的值
-     * return:
-     *      2 s7 访问异常;
-     *      1 成功;
-     * */
-    private Integer waitingForTarget(Step1Plc2MesVar var, Boolean targetValue) {
-        Integer res = 0;
-        while (true){
-            try {
-                Boolean now = (Boolean) read(S7Client.S7_KUKA,var);
-                if(targetValue.equals(now)){
-                    res = 1;
-                    break;
-                }
-                Thread.sleep(200);
-            }catch (Exception e){
-                logger.info("S7 数据采集 异常。");
-                res = 2;
-                break;
-            }
-        }
-        return res;
-    }
-    /**
-     *
-     * arg:
-     *      Step2Plc2MesVar 参数类型
-     *      targetValue        目的值
-     * return:
-     *      2 s7 访问异常;
-     *      1 成功;
-     * */
-    private Integer waitingForTarget(Step2Plc2MesVar var, Boolean targetValue) {
-        Integer res = 0;
-        while (true){
-            try {
-                Boolean now = (Boolean) read(S7Client.S7_KUKA,var);
-                if(targetValue.equals(now)){
-                    res = 1;
-                    break;
-                }
-                Thread.sleep(200);
-            }catch (Exception e){
-                logger.info("S7 数据采集 异常。");
-                res = 2;
-                break;
-            }
-        }
-        return res;
-    }
-    /**
-     *
-     * arg:
-     *      Step3Plc2MesVar 参数类型
-     *      targetValue        目的值
-     * return:
-     *      2 s7 访问异常;
-     *      1 成功;
-     * */
-    private Integer waitingForTarget(Step3Plc2MesVar var, Boolean targetValue) {
-        Integer res = 0;
-        while (true){
-            try {
-                Boolean now = (Boolean) read(S7Client.S7_KUKA,var);
-                if(targetValue.equals(now)){
-                    res = 1;
-                    break;
-                }
-                Thread.sleep(200);
-            }catch (Exception e){
-                logger.info("S7 数据采集 异常。");
-                res = 2;
-                break;
-            }
-        }
-        return res;
-    }
-}
\ No newline at end of file
+//package com.cnbm.dispatch;
+//
+//import cn.hutool.core.date.DateUtil;
+//import com.cnbm.dispatch.enums.kuka.step1.Step1Mes2PlcVar;
+//import com.cnbm.dispatch.enums.kuka.step1.Step1Plc2MesVar;
+//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.dto.CamlineSubIdDTO;
+//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;
+//import io.swagger.models.auth.In;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.boot.ApplicationArguments;
+//import org.springframework.boot.ApplicationRunner;
+//import org.springframework.core.annotation.Order;
+//import org.springframework.stereotype.Component;
+//
+//import java.text.DecimalFormat;
+//import java.text.Format;
+//import java.time.LocalDateTime;
+//import java.util.Arrays;
+//import java.util.Date;
+//import java.util.concurrent.Executors;
+//import java.util.concurrent.ScheduledExecutorService;
+//import java.util.concurrent.TimeUnit;
+//
+///**
+// * @Desc: ""
+// * @Author: caixiang
+// * @DATE: 2022/12/23 12:33
+// */
+//@Component
+//@Order(value = 1)
+//public class KukaJoinThread implements ApplicationRunner {
+//    private static final Logger logger = LoggerFactory.getLogger(KukaJoinThread.class);
+//
+//    @Autowired
+//    DynamicDataSourceService service;
+//    @Autowired
+//    WoPowerLevelServiceBiz levelServiceBiz;
+//
+//    @Autowired
+//    WoCompensationPowerServiceBiz compensationPowerServiceBiz;
+//
+//    @Autowired
+//    WoPackagingBoxSubstrateServiceBiz substrateServiceBiz;
+//
+//    @Autowired
+//    WoPackagingBoxServiceBiz boxServiceBiz;
+//
+//    public KukaJoinThread(){
+//        this.kukaStep1 = Executors.newScheduledThreadPool(1);
+//        this.kukaStep2 = Executors.newScheduledThreadPool(1);
+//        this.kukaStep3 = Executors.newScheduledThreadPool(1);
+//    }
+//
+//    private ScheduledExecutorService kukaStep1;
+//    private ScheduledExecutorService kukaStep2;
+//    private ScheduledExecutorService kukaStep3;
+//
+//
+//
+//
+//    /**
+//     * return
+//     *          成功： 返回相应的object对象
+//     *          失败： 返回null
+//     * */
+//    private Object read(S7Client s7Client,Step1Plc2MesVar var) {
+//        try {
+//            return s7Client.read(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getLength(), var.getStrSize(), var.getType());
+//        }catch (Exception e){
+//            logger.error("host:"+s7Client.getHost()+" ; read 操作出现问题: "+e.getMessage());
+//            e.printStackTrace();
+//            return null;
+//        }
+//    }
+//    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 Object read(S7Client s7Client, Step2Plc2MesVar var) {
+//        try {
+//            return s7Client.read(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getLength(), var.getStrSize(), var.getType());
+//        }catch (Exception e){
+//            logger.error("host:"+s7Client.getHost()+" ; read 操作出现问题: "+e.getMessage());
+//            e.printStackTrace();
+//            return null;
+//        }
+//    }
+//    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 Object read(S7Client s7Client, Step3Plc2MesVar var) {
+//        try {
+//            return s7Client.read(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getLength(), var.getStrSize(), var.getType());
+//        }catch (Exception e){
+//            logger.error("host:"+s7Client.getHost()+" ; read 操作出现问题: "+e.getMessage());
+//            e.printStackTrace();
+//            return null;
+//        }
+//    }
+//    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);
+//        }
+//    }
+//
+//
+//    public String getBoxId(String sapMaterial){
+//        Integer todayBoxNum = service.getTodayBoxNum()+1;
+//        String nowTime = DateUtil.format(new Date(), "yyMMdd");
+//
+//        todayBoxNum+=500;
+//        String res = "301"+sapMaterial+nowTime+formateString(todayBoxNum);
+//        return res;
+//    }
+//
+//
+//    public String getErrorBoxId(String sapMaterial){
+//
+//        String nowTime = DateUtil.format(new Date(), "yyMMdd");
+//        String mixBoxError = "001";
+//        String res = "Err"+sapMaterial+nowTime+mixBoxError;
+//        return res;
+//    }
+//
+//    public String removeKG(String str){
+//        return str.substring(0,17);
+//    }
+//
+//    public static void main(String[] args) {
+//        Integer a = 102;
+//        Format f1 = new DecimalFormat("000");
+//        System.out.println(f1.format(a));
+//    }
+//    public String formateString(Integer a){
+//        Format f1 = new DecimalFormat("000");
+//        return f1.format(a);
+//    }
+//
+//    //return true 出现混档了，return false 没有出现混档
+//    private boolean isMixLevel(String[] subIds,Integer size){
+//        String correctLevel = substrateServiceBiz.getBySubId(subIds[0]).getPowerLevel();
+//        String errMsg = "以下基板ID出现混档：";
+//        boolean res = false;
+//        for(int i=0;i<size;i++){
+//            String powerLevel = substrateServiceBiz.getBySubId(subIds[i]).getPowerLevel();
+//
+//            if(!powerLevel.equals(correctLevel)){
+//                errMsg+="基板ID:"+subIds[i]+" 档位："+powerLevel+", ";
+//                res = true;
+//            }
+//        }
+//        if(res){
+//            logger.error(errMsg);
+//        }
+//
+//        return res;
+//    }
+//
+//    @Override
+//    public void run(ApplicationArguments args) throws Exception {
+//
+//        kukaStep1.scheduleAtFixedRate(new Runnable() {
+//            @Override
+//            public void run() {
+//                try {
+//
+//                    //调度开始
+////                logger.info("");
+////                logger.info("=================  现在开始执行 过程一 任务   ==================");
+//                    Integer subArrived = waitingForTarget(Step1Plc2MesVar.SubArrivedToMes, true);
+//                    if(subArrived != 1){
+//                        logger.info("标签打印Event---  失败"+" --- "+" 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);
+//                    //把基板ID字符串的空格去掉，因为plc中设置的20位，但实际基板ID就是17位，因为带空格去数据库查询 有问题的。
+//                    subId = removeKG(subId);
+//
+//                    //二. MES 业务
+//                    //===============           MES 业务 开始         =================
+//                    //1. 从comline数据库中获取 实际pmpp
+//                    float pmppActual = service.getPMPPBySubId(subId);
+//                    //2. 匹配和计算补偿功率
+//                    float pmppCompensation = compensationPowerServiceBiz.calculCompensationPMPP(pmppActual,lineNum);
+//                    //3. 依据补偿功率，获取工艺参数，并且把这些工艺参数传给kuka
+//                    WoPowerLevel argByPMPP = levelServiceBiz.getArgByPMPP(pmppCompensation, 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("标签打印Event--- 采集到 基板ID: "+subId+", 线边号："+lineNum+"，从camline 获取到实际pmpp"+pmppActual+",计算后 补偿功率："+pmppCompensation+",dLable_Pnom: "+argByPMPP.getPowerClass() +",dLable_Voc: "+argByPMPP.getLableVoc()+",dLable_Isc: "+argByPMPP.getLableIsc()+",dLable_Vmpp: "+argByPMPP.getLableVmpp()+",dLable_Impp: "+argByPMPP.getLableImpp());
+//
+//
+//
+//                    //4. 把基板录到数据库
+//                    WoPackagingBoxSubstrate woPackagingBoxSubstrate = new WoPackagingBoxSubstrate();
+//                    woPackagingBoxSubstrate.setLineBody(lineNum);
+//                    woPackagingBoxSubstrate.setPowerLevel(argByPMPP.getPowerClass());
+//                    woPackagingBoxSubstrate.setSapMaterial(argByPMPP.getSapMaterialNum());
+//                    woPackagingBoxSubstrate.setWoSubstrateId(subId);
+//                    woPackagingBoxSubstrate.setActualPmpp(pmppActual);
+//                    woPackagingBoxSubstrate.setCreateTime(LocalDateTime.now());
+//                    woPackagingBoxSubstrate.setPmpp(pmppCompensation);
+//
+//
+//                    //5. 从camline那里获取可变字段
+//                    CamlineExtendArgDTO extendArgFromCamline = service.getExtendArgFromCamline(subId);
+//                    logger.info("标签打印Event--- 基板ID: "+subId+", 从camline获取PID16~PID22 的实测数据 成功, 数据内容:"+extendArgFromCamline.toString());
+//                    woPackagingBoxSubstrate.setLastUpdateTime(extendArgFromCamline.getLastUpdateTime());
+//
+//                    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);
+//                    logger.info("标签打印Event--- 基板ID: "+subId+", 录入数据库成功");
+//                    //===============           MES 业务 结束         =================
+//
+//                    //三. 当MES完成任务后，把MesToPlc.SubArrivedFinish变量置为true，告诉plc，我操作完成了
+//                    write(S7Client.S7_KUKA,Step1Mes2PlcVar.SubArrivedFinish,true);
+//                    logger.info("标签打印Event--- 基板ID: "+subId+", SubArrivedFinish，置为true 成功");
+//                    //四. mes 监控 到PlcToMes.SubArrived==false，就把MesToPlc.SubArrivedFinish置为false
+//                    Integer subArrived2 = waitingForTarget(Step1Plc2MesVar.SubArrivedToMes, false);
+//                    if(subArrived2 != 1){
+//                        logger.info("标签打印Event--- 失败"+" --- "+"MES监听 Step1Plc2MesVar.SubArrivedToMes 是否 等于 1 失败");
+//                    }
+//
+//                    write(S7Client.S7_KUKA,Step1Mes2PlcVar.SubArrivedFinish,false);
+//                    logger.info("标签打印Event--- 基板ID: "+subId+", SubArrivedFinish，置为 false 成功, Event1 成功结束");
+//
+//                }catch (Throwable e){
+//                    e.printStackTrace();
+//                    logger.info("标签打印Event--- 出现异常 :"+e.toString());
+//                }
+//            }
+//        },1,1, TimeUnit.SECONDS);
+//
+//        kukaStep2.scheduleAtFixedRate(new Runnable() {
+//            @Override
+//            public void run() {
+//                try {
+//
+//                    //调度开始
+//                    Integer shelfIsFull = waitingForTarget(Step2Plc2MesVar.ShelfIsFull, true);
+//                    if(shelfIsFull != 1){
+//                        logger.info("BOXID生成Event-------失败"+" --- "+"MES监听 Step2Plc2MesVar.ShelfIsFull 是否 等于 1 失败");
+//                    }
+//
+//                    //一. 从plc 中获取 subIdList 和 lineNum
+//                    String[] subIdList = (String[])read(S7Client.S7_KUKA,Step2Plc2MesVar.SubIdList);
+//                    Integer listSize = (Integer)read(S7Client.S7_KUKA,Step2Plc2MesVar.PackageNumberSet)-1;
+//
+//
+//                    //二. MES 业务
+//                    //===============           MES 业务 开始         =================
+//                    //1.MES 生成BoxId
+//                    if(subIdList.length<=0){
+//                        logger.info("BOXID生成Event-------失败"+" --- "+"从plc里面获取到的基板列表 为空");
+//                        throw new Exception("BOXID生成Event-------kuka机械手 取到了空箱");
+//                    }
+//                    //真实的基板ID 就是17位的，plc读取过来，有空格，要把后面3位空格去掉就行了。
+//                    for(int i=0;i<subIdList.length;i++){
+//                        subIdList[i] = removeKG(subIdList[i]);
+//                    }
+//                    logger.info("BOXID生成Event-------获取到基板列表："+ Arrays.toString(subIdList)+",基板数量:"+listSize);
+//
+//                    WoPackagingBoxSubstrate bySubId = substrateServiceBiz.getBySubId(subIdList[0]);
+//
+//                    //如果我们系统中找不到这块基板那么就去camline里面找
+//                    if(bySubId == null){
+//                        logger.info("我们数据库 依据 subIdList[0] id 查询不到相关信息，现在去camline 数据库查询相关信息。");
+//                        //todo
+//                        CamlineSubIdDTO subIdByCamline = service.getSubIdByCamline(subIdList[0]);
+//                        bySubId = new WoPackagingBoxSubstrate();
+//                        bySubId.setPowerLevel(subIdByCamline.getPowerLevel());
+//                        bySubId.setSapMaterial(subIdByCamline.getSapMaterial());
+//                        bySubId.setLineBody(2);
+//                    }
+//
+//                    //校验是否存在混档位情况
+//                    String boxId = "";
+//                    if(isMixLevel(subIdList,listSize)){
+//                        //出现混档
+//                        boxId = getErrorBoxId(bySubId.getSapMaterial());
+//                    }else {
+//                        //正常情况
+//                        boxId = getBoxId(bySubId.getSapMaterial());
+//                    }
+//
+//                    logger.info("BOXID生成Event-------mes 生成的boxId :"+ boxId);
+//                    //2. 依次update 基板表，把boxId 赋予这些基板
+//                    for(int i=0;i<listSize;i++){
+//                        substrateServiceBiz.updatePackagingBoxIdAndSlotByWoSubstrateId(boxId,(i+1),subIdList[i]);
+//                    }
+//                    //3.去camline数据库 查询此基板ID 对应的订单
+//                    String orderNameBySubId = service.getOrderNameBySubId(subIdList[0]);
+//                    //4. box信息录入到box表
+//                    WoPackagingBox woPackagingBox = new WoPackagingBox();
+//                    woPackagingBox.setBoxNo(boxId);
+//                    woPackagingBox.setSubstrateQuantity(listSize);
+//                    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());
+//                    woPackagingBox.setPackagingTime(LocalDateTime.now());
+//                    boxServiceBiz.insert(woPackagingBox);
+//                    logger.info("BOXID生成Event-------boxId :"+ boxId+"写入数据库成功");
+//                    //===============           MES 业务 结束         =================
+//
+//                    //三. 把生成的BoxId 告诉kuka
+//                    write(S7Client.S7_KUKA,Step2Mes2PlcVar.BoxId,boxId);
+//                    logger.info("BOXID生成Event-------boxId :"+ boxId+"传给PLC 成功");
+//
+//                    //四. 当MES完成任务后，把MesToPlc.ShelfIsFullFinish变量置为true，告诉plc，我操作完成了
+//                    write(S7Client.S7_KUKA,Step2Mes2PlcVar.ShelfIsFullFinish,true);
+//                    logger.info("BOXID生成Event-------boxId :"+ boxId+"ShelfIsFullFinish 置为true 成功");
+//                    //四. mes 监控 到PlcToMes.SubArrived==false，就把MesToPlc.SubArrivedFinish置为false
+//                    Integer subArrived2 = waitingForTarget(Step2Plc2MesVar.ShelfIsFull, false);
+//                    if(subArrived2 != 1){
+//                        logger.info("BOXID生成Event-------失败"+" --- "+"步骤1.  MES监听 Step1Plc2MesVar.SubArrivedToMes 是否 等于 1 失败");
+//                    }
+//                    write(S7Client.S7_KUKA,Step2Mes2PlcVar.ShelfIsFullFinish,false);
+//                    logger.info("BOXID生成Event-------boxId :"+ boxId+"ShelfIsFullFinish 置为false 成功,Event2 成功结束");
+//                }catch (Throwable e){
+//                    e.printStackTrace();
+//                    logger.info("BOXID生成Event-------  出现异常:" + e.toString());
+//                }
+//            }
+//        },1,1, TimeUnit.SECONDS);
+//
+//        kukaStep3.scheduleAtFixedRate(new Runnable() {
+//            @Override
+//            public void run() {
+//                try {
+//
+//                    //调度开始
+//                    Integer shelfIsFull = waitingForTarget(Step3Plc2MesVar.ShelfIsFullArrived, true);
+//                    if(shelfIsFull != 1){
+//                        logger.info("装箱单打印Event------失败"+" --- "+"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("装箱单打印Event------到达站台的boxId :"+boxId);
+//
+//                    //二. MES 业务
+//                    //===============           MES 业务 开始         =================
+//                    //1. box信息录入到box表
+//                    boxServiceBiz.updateIsArrivedByBoxNo(1,boxId);
+//                    logger.info("装箱单打印Event------boxId :"+boxId+"更新数据库成功");
+//                    //===============           MES 业务 结束         =================
+//
+//
+//                    //四. 当MES完成任务后，把MesToPlc.ShelfIsFullArrivedFinish变量置为true，告诉plc，我操作完成了
+//                    write(S7Client.S7_KUKA,Step3Mes2PlcVar.ShelfIsFullArrivedFinish,true);
+//                    logger.info("装箱单打印Event------boxId :"+boxId+"， ShelfIsFullArrivedFinish置为true 成功");
+//                    //四. mes 监控 到PlcToMes.SubArrived==false，就把MesToPlc.SubArrivedFinish置为false
+//                    Integer subArrived2 = waitingForTarget(Step3Plc2MesVar.ShelfIsFullArrived, false);
+//                    if(subArrived2 != 1){
+//                        logger.info("装箱单打印Event------失败"+" --- "+"步骤1.  MES监听 Step3Plc2MesVar.ShelfIsFullArrived 是否 等于 1 失败");
+//                    }
+//                    logger.info("装箱单打印Event------boxId :"+boxId+"， 监听到subArrived=false 成功");
+//                    write(S7Client.S7_KUKA,Step3Mes2PlcVar.ShelfIsFullArrivedFinish,false);
+//                    logger.info("装箱单打印Event------boxId :"+boxId+"， Even3 成功");
+//                }catch (Throwable e){
+//                    e.printStackTrace();
+//                    logger.info("装箱单打印Event 出现异常------"+e.toString());
+//                }
+//
+//            }
+//        },1,1, TimeUnit.SECONDS);
+//
+//    }
+//
+//    /**
+//     *
+//     * arg:
+//     *      Step1Plc2MesVar 参数类型
+//     *      targetValue        目的值
+//     * return:
+//     *      2 s7 访问异常;
+//     *      1 成功;
+//     * */
+//    private Integer waitingForTarget(Step1Plc2MesVar var, Boolean targetValue) {
+//        Integer res = 0;
+//        while (true){
+//            try {
+//                Boolean now = (Boolean) read(S7Client.S7_KUKA,var);
+//                if(targetValue.equals(now)){
+//                    res = 1;
+//                    break;
+//                }
+//                Thread.sleep(200);
+//            }catch (Exception e){
+//                logger.info("S7 数据采集 异常。");
+//                res = 2;
+//                break;
+//            }
+//        }
+//        return res;
+//    }
+//    /**
+//     *
+//     * arg:
+//     *      Step2Plc2MesVar 参数类型
+//     *      targetValue        目的值
+//     * return:
+//     *      2 s7 访问异常;
+//     *      1 成功;
+//     * */
+//    private Integer waitingForTarget(Step2Plc2MesVar var, Boolean targetValue) {
+//        Integer res = 0;
+//        while (true){
+//            try {
+//                Boolean now = (Boolean) read(S7Client.S7_KUKA,var);
+//                if(targetValue.equals(now)){
+//                    res = 1;
+//                    break;
+//                }
+//                Thread.sleep(200);
+//            }catch (Exception e){
+//                logger.info("S7 数据采集 异常。");
+//                res = 2;
+//                break;
+//            }
+//        }
+//        return res;
+//    }
+//    /**
+//     *
+//     * arg:
+//     *      Step3Plc2MesVar 参数类型
+//     *      targetValue        目的值
+//     * return:
+//     *      2 s7 访问异常;
+//     *      1 成功;
+//     * */
+//    private Integer waitingForTarget(Step3Plc2MesVar var, Boolean targetValue) {
+//        Integer res = 0;
+//        while (true){
+//            try {
+//                Boolean now = (Boolean) read(S7Client.S7_KUKA,var);
+//                if(targetValue.equals(now)){
+//                    res = 1;
+//                    break;
+//                }
+//                Thread.sleep(200);
+//            }catch (Exception e){
+//                logger.info("S7 数据采集 异常。");
+//                res = 2;
+//                break;
+//            }
+//        }
+//        return res;
+//    }
+//}
\ No newline at end of file
diff --git a/ym-packing/src/main/java/com/cnbm/packing/controller/PrintModelController.java b/ym-packing/src/main/java/com/cnbm/packing/controller/PrintModelController.java
index 42c02e5..bd53bc4 100644
--- a/ym-packing/src/main/java/com/cnbm/packing/controller/PrintModelController.java
+++ b/ym-packing/src/main/java/com/cnbm/packing/controller/PrintModelController.java
@@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
 import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
@@ -127,4 +128,11 @@ public class PrintModelController {
         return new Result<String>().ok(code);
     }
 
+    @GetMapping("getByLineBody/{lineBody}")
+    @ApiOperation("依据line_body 查询，is_enable==1 && type==2  limit 1的数据")
+    public Result<PrintModelDTO> getByLineBody(@PathVariable("lineBody") Integer lineBody){
+        PrintModelDTO dto = printModelService.getByLineBody(lineBody);
+        return new Result<PrintModelDTO>().ok(dto);
+    }
+
 }
\ No newline at end of file
diff --git a/ym-packing/src/main/java/com/cnbm/packing/controller/WorkingTimeController.java b/ym-packing/src/main/java/com/cnbm/packing/controller/WorkingTimeController.java
new file mode 100644
index 0000000..3af148d
--- /dev/null
+++ b/ym-packing/src/main/java/com/cnbm/packing/controller/WorkingTimeController.java
@@ -0,0 +1,125 @@
+package com.cnbm.packing.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.packing.dto.WorkingTimeDTO;
+import com.cnbm.packing.excel.WorkingTimeExcel;
+import com.cnbm.packing.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.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 班次时间段 表  前端控制器
+ *
+ * @author packingGenerator
+ * @since  2023-12-19
+ */
+@RestController
+@RequestMapping("/packing/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('packing: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('packing: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('packing: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('packing: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('packing: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('packing: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);
+    }
+
+    @GetMapping("getOrderName")
+    @ApiOperation("查询时间匹配的班次名称")
+    public Result<String> getOrderName(@RequestBody LocalDateTime time){
+        String orderName = workingTimeService.getOrderName(time);
+
+        return new Result<String>().ok(orderName);
+    }
+
+}
\ No newline at end of file
diff --git a/ym-packing/src/main/java/com/cnbm/packing/dto/PrintModelDTO.java b/ym-packing/src/main/java/com/cnbm/packing/dto/PrintModelDTO.java
index f1ff254..1197b11 100644
--- a/ym-packing/src/main/java/com/cnbm/packing/dto/PrintModelDTO.java
+++ b/ym-packing/src/main/java/com/cnbm/packing/dto/PrintModelDTO.java
@@ -80,4 +80,10 @@ public class PrintModelDTO implements Serializable {
 	@ApiModelProperty(value = "是否启用，0 停用；1 启用")
 	private Integer isEnable;
 
+	@ApiModelProperty(value = "场景，前端传字符串过来，目前固定这几个：DZ BIPV")
+	private String scenes;
+
+	@ApiModelProperty(value = "产品等级，目前固定这几个 : A1 A2 A3 A4 NK")
+	private String productGrade;
+
 }
\ No newline at end of file
diff --git a/ym-packing/src/main/java/com/cnbm/packing/dto/WorkingTimeDTO.java b/ym-packing/src/main/java/com/cnbm/packing/dto/WorkingTimeDTO.java
new file mode 100644
index 0000000..23ac5e8
--- /dev/null
+++ b/ym-packing/src/main/java/com/cnbm/packing/dto/WorkingTimeDTO.java
@@ -0,0 +1,63 @@
+package com.cnbm.packing.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+
+/**
+ * 班次时间段 表
+ *
+ * @author codeGenerator
+ * @since  2023-12-19
+ */
+@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;
+
+}
\ No newline at end of file
diff --git a/ym-packing/src/main/java/com/cnbm/packing/entity/PrintModel.java b/ym-packing/src/main/java/com/cnbm/packing/entity/PrintModel.java
index 94fdec2..223f022 100644
--- a/ym-packing/src/main/java/com/cnbm/packing/entity/PrintModel.java
+++ b/ym-packing/src/main/java/com/cnbm/packing/entity/PrintModel.java
@@ -81,6 +81,12 @@ public class PrintModel implements Serializable {
     @ApiModelProperty("是否启用，0 停用；1 启用")
     private Integer isEnable;
 
+    @ApiModelProperty("场景，前端传字符串过来，目前固定这几个：DZ BIPV")
+    private String scenes;
+
+    @ApiModelProperty("产品等级，目前固定这几个 : A1 A2 A3 A4 NK")
+    private String productGrade;
+
 
     public static final String ID = "ID";
 
@@ -120,4 +126,8 @@ public class PrintModel implements Serializable {
 
     public static final String IS_ENABLE = "is_enable";
 
+    public static final String SCENES = "scenes";
+
+    public static final String PRODUCT_GRADE = "product_grade";
+
 }
diff --git a/ym-packing/src/main/java/com/cnbm/packing/entity/WorkingTime.java b/ym-packing/src/main/java/com/cnbm/packing/entity/WorkingTime.java
new file mode 100644
index 0000000..216027c
--- /dev/null
+++ b/ym-packing/src/main/java/com/cnbm/packing/entity/WorkingTime.java
@@ -0,0 +1,94 @@
+package com.cnbm.packing.entity;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 班次时间段 表
+ * </p>
+ *
+ * @author codeGenerator
+ * @since 2023-12-19
+ */
+@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;
+
+
+    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";
+
+}
diff --git a/ym-packing/src/main/java/com/cnbm/packing/excel/WorkingTimeExcel.java b/ym-packing/src/main/java/com/cnbm/packing/excel/WorkingTimeExcel.java
new file mode 100644
index 0000000..42243aa
--- /dev/null
+++ b/ym-packing/src/main/java/com/cnbm/packing/excel/WorkingTimeExcel.java
@@ -0,0 +1,43 @@
+package com.cnbm.packing.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 班次时间段 表
+ *
+ * @author codeGenerator
+ * @since  2023-12-19
+ */
+@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;
+
+}
\ No newline at end of file
diff --git a/ym-packing/src/main/java/com/cnbm/packing/mapper/WorkingTimeMapper.java b/ym-packing/src/main/java/com/cnbm/packing/mapper/WorkingTimeMapper.java
new file mode 100644
index 0000000..7009991
--- /dev/null
+++ b/ym-packing/src/main/java/com/cnbm/packing/mapper/WorkingTimeMapper.java
@@ -0,0 +1,23 @@
+package com.cnbm.packing.mapper;
+
+import com.cnbm.common.dao.BaseDao;
+import com.cnbm.packing.dto.WoPowerLevelDTO;
+import com.cnbm.packing.dto.WorkingTimeDTO;
+import com.cnbm.packing.entity.WorkingTime;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 打印标签模板表
+ *
+ * @author codeGenerator
+ * @since 2023-02-15
+ */
+@Mapper
+public interface WorkingTimeMapper extends BaseDao<WorkingTime> {
+
+    List<WorkingTimeDTO> list();
+
+}
\ No newline at end of file
diff --git a/ym-packing/src/main/java/com/cnbm/packing/service/PrintModelServiceBiz.java b/ym-packing/src/main/java/com/cnbm/packing/service/PrintModelServiceBiz.java
index 441df6c..212b302 100644
--- a/ym-packing/src/main/java/com/cnbm/packing/service/PrintModelServiceBiz.java
+++ b/ym-packing/src/main/java/com/cnbm/packing/service/PrintModelServiceBiz.java
@@ -30,4 +30,6 @@ public interface PrintModelServiceBiz extends CrudService<PrintModel, PrintModel
     List<PrintModelDTO> list();
 
     String getCode();
+
+    PrintModelDTO getByLineBody(Integer lineBody);
 }
\ No newline at end of file
diff --git a/ym-packing/src/main/java/com/cnbm/packing/service/WorkingTimeServiceBiz.java b/ym-packing/src/main/java/com/cnbm/packing/service/WorkingTimeServiceBiz.java
new file mode 100644
index 0000000..eac4247
--- /dev/null
+++ b/ym-packing/src/main/java/com/cnbm/packing/service/WorkingTimeServiceBiz.java
@@ -0,0 +1,34 @@
+package com.cnbm.packing.service;
+
+import com.cnbm.common.page.PageData;
+import com.cnbm.common.service.CrudService;
+import com.cnbm.packing.dto.WorkingTimeDTO;
+import com.cnbm.packing.dto.WorkingTimeDTO;
+import com.cnbm.packing.entity.WorkingTime;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 班次时间段 表
+ *
+ * @author codeGenerator
+ * @since  2023-12-19
+ */
+public interface WorkingTimeServiceBiz extends CrudService<WorkingTime, WorkingTimeDTO> {
+
+    PageData<WorkingTimeDTO> page (Map<String, Object> params);
+
+    WorkingTimeDTO get(Long id);
+
+    void save(WorkingTimeDTO dto);
+
+    void update(WorkingTimeDTO dto);
+
+    void delete(Long[] ids);
+
+    List<WorkingTimeDTO> list();
+
+    String getOrderName(LocalDateTime time);
+}
\ No newline at end of file
diff --git a/ym-packing/src/main/java/com/cnbm/packing/service/impl/PrintModelServiceBizImpl.java b/ym-packing/src/main/java/com/cnbm/packing/service/impl/PrintModelServiceBizImpl.java
index 1d02586..629241e 100644
--- a/ym-packing/src/main/java/com/cnbm/packing/service/impl/PrintModelServiceBizImpl.java
+++ b/ym-packing/src/main/java/com/cnbm/packing/service/impl/PrintModelServiceBizImpl.java
@@ -107,5 +107,18 @@ public class PrintModelServiceBizImpl extends CrudServiceImpl<PrintModelMapper,
         return CodeGeneratorHelper.getPrintModelCode();
     }
 
+    @Override
+    public PrintModelDTO getByLineBody(Integer lineBody){
+        QueryWrapper<PrintModel> wrapper = new QueryWrapper<>();
+        wrapper.eq(ObjectUtils.isNotNull(lineBody), PrintModel.LINE_BODY, lineBody);
+        wrapper.eq(PrintModel.IS_ENABLE,1);
+        wrapper.eq(PrintModel.TYPE,2);
+        List<PrintModel> list = mapper.selectList(wrapper);
+        PrintModel entity = new PrintModel();
+        if(list.size()>0){
+            entity = list.get(0);
+        }
+        return ConvertUtils.sourceToTarget(entity, PrintModelDTO.class);
+    }
 
 }
\ No newline at end of file
diff --git a/ym-packing/src/main/java/com/cnbm/packing/service/impl/WorkingTimeServiceBizImpl.java b/ym-packing/src/main/java/com/cnbm/packing/service/impl/WorkingTimeServiceBizImpl.java
new file mode 100644
index 0000000..389c244
--- /dev/null
+++ b/ym-packing/src/main/java/com/cnbm/packing/service/impl/WorkingTimeServiceBizImpl.java
@@ -0,0 +1,122 @@
+package com.cnbm.packing.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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;
+import com.cnbm.packing.dto.WorkingTimeDTO;
+import com.cnbm.packing.entity.WorkingTime;
+import com.cnbm.packing.mapper.WorkingTimeMapper;
+import com.cnbm.packing.service.WorkingTimeServiceBiz;
+import org.apache.commons.lang3.ObjectUtils;
+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.time.LocalTime;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 班次时间段 表
+ *
+ * @author codeGenerator
+ * @since 2023-12-19
+ */
+@Service
+public class WorkingTimeServiceBizImpl extends CrudServiceImpl<WorkingTimeMapper, WorkingTime, WorkingTimeDTO> implements WorkingTimeServiceBiz {
+
+    @Autowired
+    private WorkingTimeMapper mapper;
+
+    @Override
+    public QueryWrapper<WorkingTime> getWrapper(Map<String, Object> params){
+        String id = (String)params.get("id");
+
+        QueryWrapper<WorkingTime> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), "id", id);
+
+        return wrapper;
+    }
+
+    @Override
+    public PageData<WorkingTimeDTO> page (Map<String, Object> params){
+        IPage<WorkingTime> page = baseDao.selectPage(
+                getPage(params, WorkingTime.CREATE_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, WorkingTimeDTO.class);
+    }
+
+    @Override
+    public WorkingTimeDTO get(Long id) {
+        WorkingTime entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, WorkingTimeDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(WorkingTimeDTO dto) {
+        WorkingTime entity = ConvertUtils.sourceToTarget(dto, WorkingTime.class);
+        BaseSupportUtils.setCommonField(entity);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(WorkingTimeDTO dto) {
+        WorkingTime entity = ConvertUtils.sourceToTarget(dto, WorkingTime.class);
+        BaseSupportUtils.setUpdateCommonField(entity);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(Long[] ids) {
+        //删除
+        deleteBatchIds(Arrays.asList(ids));
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public List<WorkingTimeDTO> list() {
+        List<WorkingTimeDTO> list = mapper.list();
+        return list;
+    }
+
+    @Override
+    public String getOrderName(LocalDateTime time) {
+
+        LocalTime localTime = time.toLocalTime();
+        List<WorkingTimeDTO> resultList = new ArrayList<>();
+        List<WorkingTimeDTO> listAll = mapper.list();
+        for(WorkingTimeDTO dto : listAll){
+            LocalTime beginTime = dto.getBeginTime().toLocalTime();
+            LocalTime endTime = dto.getEndTime().toLocalTime();
+            if(beginTime.isBefore(endTime)) {
+                if (localTime.isBefore(endTime) && localTime.isAfter(beginTime)) {
+                    resultList.add(dto);
+                }
+            }
+            else if(localTime.isAfter(endTime)||localTime.isBefore(beginTime)){
+                resultList.add(dto);
+            }
+        }
+        String orderName = null;
+        if(resultList.size()>0){
+            orderName = resultList.get(0).getOrderName();
+        }
+        return orderName;
+    }
+
+
+
+}
\ No newline at end of file
diff --git a/ym-packing/src/main/resources/mapper/PrintModleMapper.xml b/ym-packing/src/main/resources/mapper/PrintModleMapper.xml
index cb01df3..9573d50 100644
--- a/ym-packing/src/main/resources/mapper/PrintModleMapper.xml
+++ b/ym-packing/src/main/resources/mapper/PrintModleMapper.xml
@@ -22,6 +22,8 @@
         <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" />
     </resultMap>
 
     <select id="list" resultType="com.cnbm.packing.dto.PrintModelDTO">
diff --git a/ym-packing/src/main/resources/mapper/WorkingTimeMapper.xml b/ym-packing/src/main/resources/mapper/WorkingTimeMapper.xml
new file mode 100644
index 0000000..d8704e4
--- /dev/null
+++ b/ym-packing/src/main/resources/mapper/WorkingTimeMapper.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.packing.mapper.WorkingTimeMapper">
+    <resultMap type="com.cnbm.packing.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" />
+    </resultMap>
+
+    <select id="list" resultType="com.cnbm.packing.dto.WorkingTimeDTO">
+        select * from t_working_time
+        order by id asc
+    </select>
+
+</mapper>