产品二维码规则、记录基础代码提交

mes/src/main/java/com/ximai/mes/pro/controller/ProProductQrcodeRecordController.java

+package com.ximai.mes.pro.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ximai.common.annotation.Log;
+import com.ximai.common.core.controller.BaseController;
+import com.ximai.common.core.domain.AjaxResult;
+import com.ximai.common.enums.BusinessType;
+import io.swagger.annotations.ApiOperation;
+import com.ximai.mes.pro.domain.ProProductQrcodeRecord;
+import com.ximai.mes.pro.dto.ProProductQrcodeRecordDto;
+import com.ximai.mes.pro.dto.ProProductQrcodeRecordQuery;
+import com.ximai.mes.pro.dto.ProProductQrcodeRecordCreate;
+import com.ximai.mes.pro.dto.ProProductQrcodeRecordUpdate;
+import com.ximai.mes.pro.dto.ProProductQrcodeRecordExcelExport;
+import com.ximai.mes.pro.service.IProProductQrcodeRecordService;
+import com.ximai.common.utils.poi.ExcelUtil;
+import cn.hutool.core.bean.BeanUtil;
+import com.ximai.common.core.page.TableDataInfo;
+
+/**
+ * 产品序列号打印记录Controller
+ *
+ * @author generator
+ * @date 2024-08-31
+ */
+@RestController
+@RequestMapping("/pro/qrcodeRecord")
+public class ProProductQrcodeRecordController extends BaseController
+{
+    @Autowired
+    private IProProductQrcodeRecordService proProductQrcodeRecordService;
+
+    /**
+     * 查询产品序列号打印记录列表
+     */
+    @ApiOperation("查询产品序列号打印记录列表")
+    @PreAuthorize("@ss.hasPermi('pro:qrcodeRecord:list')")
+    @GetMapping("/list")
+    public TableDataInfo<ProProductQrcodeRecordDto> list(ProProductQrcodeRecordQuery proProductQrcodeRecordQuery) {
+        startPage();
+        QueryWrapper<ProProductQrcodeRecord> query = new QueryWrapper<>();
+        query.eq(proProductQrcodeRecordQuery.getItemId()!=null, "m.item_id", proProductQrcodeRecordQuery.getItemId());
+        query.eq(StringUtils.isNotEmpty(proProductQrcodeRecordQuery.getItemCode()), "m.item_code", proProductQrcodeRecordQuery.getItemCode());
+        query.eq(proProductQrcodeRecordQuery.getWorkOrderId()!=null, "m.work_order_id", proProductQrcodeRecordQuery.getWorkOrderId());
+        query.eq(StringUtils.isNotEmpty(proProductQrcodeRecordQuery.getWorkOrderNo()), "m.work_order_no", proProductQrcodeRecordQuery.getWorkOrderNo());
+        query.eq(proProductQrcodeRecordQuery.getPrintTime()!=null, "m.print_time", proProductQrcodeRecordQuery.getPrintTime());
+        query.eq(StringUtils.isNotEmpty(proProductQrcodeRecordQuery.getQrcode()), "m.qrcode", proProductQrcodeRecordQuery.getQrcode());
+        query.eq(StringUtils.isNotEmpty(proProductQrcodeRecordQuery.getClientCode()), "m.client_code", proProductQrcodeRecordQuery.getClientCode());
+        query.like(StringUtils.isNotEmpty(proProductQrcodeRecordQuery.getClientName()), "m.client_name", "%" + proProductQrcodeRecordQuery.getClientName() + "%");
+        query.eq(StringUtils.isNotEmpty(proProductQrcodeRecordQuery.getItemDesc()), "m.item_desc", proProductQrcodeRecordQuery.getItemDesc());
+        List<ProProductQrcodeRecordDto> list = proProductQrcodeRecordService.selectProProductQrcodeRecordDtoList(query);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出产品序列号打印记录列表
+     */
+    @ApiOperation("导出产品序列号打印记录列表")
+    @PreAuthorize("@ss.hasPermi('pro:qrcodeRecord:export')")
+    @Log(title = "产品序列号打印记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ProProductQrcodeRecord proProductQrcodeRecord) {
+        List<ProProductQrcodeRecordDto> list = proProductQrcodeRecordService.selectProProductQrcodeRecordList(proProductQrcodeRecord);
+        ExcelUtil<ProProductQrcodeRecordExcelExport> util = new ExcelUtil<ProProductQrcodeRecordExcelExport>(ProProductQrcodeRecordExcelExport.class);
+        List<ProProductQrcodeRecordExcelExport> tempList = BeanUtil.copyToList(list, ProProductQrcodeRecordExcelExport.class);
+        util.exportExcel(response, tempList, "产品序列号打印记录数据");
+    }
+
+    /**
+     * 获取产品序列号打印记录详细信息
+     */
+    @ApiOperation("获取产品序列号打印记录详细信息")
+    @PreAuthorize("@ss.hasPermi('pro:qrcodeRecord:query')")
+    @GetMapping(value = "/{recordId}")
+    public AjaxResult<ProProductQrcodeRecordDto> getInfo(@PathVariable("recordId") Long recordId) {
+        return AjaxResult.success(proProductQrcodeRecordService.selectProProductQrcodeRecordDtoByRecordId(recordId));
+    }
+
+    /**
+     * 新增产品序列号打印记录
+     */
+    @ApiOperation("新增产品序列号打印记录")
+    @PreAuthorize("@ss.hasPermi('pro:qrcodeRecord:add')")
+    @Log(title = "产品序列号打印记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ProProductQrcodeRecordCreate proProductQrcodeRecordCreate) {
+        return toAjax(proProductQrcodeRecordService.insertProProductQrcodeRecord(proProductQrcodeRecordCreate));
+    }
+
+    /**
+     * 修改产品序列号打印记录
+     */
+    @ApiOperation("修改产品序列号打印记录")
+    @PreAuthorize("@ss.hasPermi('pro:qrcodeRecord:edit')")
+    @Log(title = "产品序列号打印记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody ProProductQrcodeRecordUpdate proProductQrcodeRecordUpdate) {
+        return toAjax(proProductQrcodeRecordService.updateProProductQrcodeRecord(proProductQrcodeRecordUpdate));
+    }
+
+    /**
+     * 删除产品序列号打印记录
+     */
+    @ApiOperation("删除产品序列号打印记录")
+    @PreAuthorize("@ss.hasPermi('pro:qrcodeRecord:remove')")
+    @Log(title = "产品序列号打印记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{recordIds}")
+    public AjaxResult remove(@PathVariable Long[] recordIds) {
+        return toAjax(proProductQrcodeRecordService.deleteProProductQrcodeRecordByRecordIds(recordIds));
+    }
+}

mes/src/main/java/com/ximai/mes/pro/controller/ProProductQrcodeRuleController.java

+package com.ximai.mes.pro.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ximai.common.annotation.Log;
+import com.ximai.common.core.controller.BaseController;
+import com.ximai.common.core.domain.AjaxResult;
+import com.ximai.common.enums.BusinessType;
+import io.swagger.annotations.ApiOperation;
+import com.ximai.mes.pro.domain.ProProductQrcodeRule;
+import com.ximai.mes.pro.dto.ProProductQrcodeRuleDto;
+import com.ximai.mes.pro.dto.ProProductQrcodeRuleQuery;
+import com.ximai.mes.pro.dto.ProProductQrcodeRuleCreate;
+import com.ximai.mes.pro.dto.ProProductQrcodeRuleUpdate;
+import com.ximai.mes.pro.dto.ProProductQrcodeRuleExcelExport;
+import com.ximai.mes.pro.service.IProProductQrcodeRuleService;
+import com.ximai.common.utils.poi.ExcelUtil;
+import cn.hutool.core.bean.BeanUtil;
+import com.ximai.common.core.page.TableDataInfo;
+
+/**
+ * 产品二维码规则Controller
+ *
+ * @author generator
+ * @date 2024-08-31
+ */
+@RestController
+@RequestMapping("/pro/proQrcodeRule")
+public class ProProductQrcodeRuleController extends BaseController
+{
+    @Autowired
+    private IProProductQrcodeRuleService proProductQrcodeRuleService;
+
+    /**
+     * 查询产品二维码规则列表
+     */
+    @ApiOperation("查询产品二维码规则列表")
+    @PreAuthorize("@ss.hasPermi('pro:proQrcodeRule:list')")
+    @GetMapping("/list")
+    public TableDataInfo<ProProductQrcodeRuleDto> list(ProProductQrcodeRuleQuery proProductQrcodeRuleQuery) {
+        startPage();
+        QueryWrapper<ProProductQrcodeRule> query = new QueryWrapper<>();
+        query.eq(proProductQrcodeRuleQuery.getItemId()!=null, "m.item_id", proProductQrcodeRuleQuery.getItemId());
+        query.eq(StringUtils.isNotEmpty(proProductQrcodeRuleQuery.getItemCode()), "m.item_code", proProductQrcodeRuleQuery.getItemCode());
+        query.eq(StringUtils.isNotEmpty(proProductQrcodeRuleQuery.getPrefix()), "m.prefix", proProductQrcodeRuleQuery.getPrefix());
+        query.eq(StringUtils.isNotEmpty(proProductQrcodeRuleQuery.getDatePattern()), "m.date_pattern", proProductQrcodeRuleQuery.getDatePattern());
+        query.eq(proProductQrcodeRuleQuery.getSerialLen()!=null, "m.serial_len", proProductQrcodeRuleQuery.getSerialLen());
+        query.eq(StringUtils.isNotEmpty(proProductQrcodeRuleQuery.getItemDesc()), "m.item_desc", proProductQrcodeRuleQuery.getItemDesc());
+        query.eq(StringUtils.isNotEmpty(proProductQrcodeRuleQuery.getClientCode()), "m.client_code", proProductQrcodeRuleQuery.getClientCode());
+        query.like(StringUtils.isNotEmpty(proProductQrcodeRuleQuery.getClientName()), "m.client_name", "%" + proProductQrcodeRuleQuery.getClientName() + "%");
+        query.eq(proProductQrcodeRuleQuery.getCurrentSerial()!=null, "m.current_serial", proProductQrcodeRuleQuery.getCurrentSerial());
+        List<ProProductQrcodeRuleDto> list = proProductQrcodeRuleService.selectProProductQrcodeRuleDtoList(query);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出产品二维码规则列表
+     */
+    @ApiOperation("导出产品二维码规则列表")
+    @PreAuthorize("@ss.hasPermi('pro:proQrcodeRule:export')")
+    @Log(title = "产品二维码规则", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ProProductQrcodeRule proProductQrcodeRule) {
+        List<ProProductQrcodeRuleDto> list = proProductQrcodeRuleService.selectProProductQrcodeRuleList(proProductQrcodeRule);
+        ExcelUtil<ProProductQrcodeRuleExcelExport> util = new ExcelUtil<ProProductQrcodeRuleExcelExport>(ProProductQrcodeRuleExcelExport.class);
+        List<ProProductQrcodeRuleExcelExport> tempList = BeanUtil.copyToList(list, ProProductQrcodeRuleExcelExport.class);
+        util.exportExcel(response, tempList, "产品二维码规则数据");
+    }
+
+    /**
+     * 获取产品二维码规则详细信息
+     */
+    @ApiOperation("获取产品二维码规则详细信息")
+    @PreAuthorize("@ss.hasPermi('pro:proQrcodeRule:query')")
+    @GetMapping(value = "/{ruleId}")
+    public AjaxResult<ProProductQrcodeRuleDto> getInfo(@PathVariable("ruleId") Long ruleId) {
+        return AjaxResult.success(proProductQrcodeRuleService.selectProProductQrcodeRuleDtoByRuleId(ruleId));
+    }
+
+    /**
+     * 新增产品二维码规则
+     */
+    @ApiOperation("新增产品二维码规则")
+    @PreAuthorize("@ss.hasPermi('pro:proQrcodeRule:add')")
+    @Log(title = "产品二维码规则", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ProProductQrcodeRuleCreate proProductQrcodeRuleCreate) {
+        return toAjax(proProductQrcodeRuleService.insertProProductQrcodeRule(proProductQrcodeRuleCreate));
+    }
+
+    /**
+     * 修改产品二维码规则
+     */
+    @ApiOperation("修改产品二维码规则")
+    @PreAuthorize("@ss.hasPermi('pro:proQrcodeRule:edit')")
+    @Log(title = "产品二维码规则", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody ProProductQrcodeRuleUpdate proProductQrcodeRuleUpdate) {
+        return toAjax(proProductQrcodeRuleService.updateProProductQrcodeRule(proProductQrcodeRuleUpdate));
+    }
+
+    /**
+     * 删除产品二维码规则
+     */
+    @ApiOperation("删除产品二维码规则")
+    @PreAuthorize("@ss.hasPermi('pro:proQrcodeRule:remove')")
+    @Log(title = "产品二维码规则", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ruleIds}")
+    public AjaxResult remove(@PathVariable Long[] ruleIds) {
+        return toAjax(proProductQrcodeRuleService.deleteProProductQrcodeRuleByRuleIds(ruleIds));
+    }
+}

mes/src/main/java/com/ximai/mes/pro/domain/ProProductQrcodeRecord.java

+package com.ximai.mes.pro.domain;
+
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import com.ximai.common.core.domain.BaseEntity;
+
+/**
+ * 产品序列号打印记录对象 pro_product_qrcode_record
+ *
+ * @author generator
+ * @date 2024-08-31
+ */
+@Data
+public class ProProductQrcodeRecord extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    @TableId
+    private Long recordId;
+
+    /** 产品ID */
+    @ApiModelProperty("产品ID")
+    private Long itemId;
+
+    /** 产品编码 */
+    @ApiModelProperty("产品编码")
+    private String itemCode;
+
+    /** 工单ID */
+    @ApiModelProperty("工单ID")
+    private Long workOrderId;
+
+    /** 工单编号 */
+    @ApiModelProperty("工单编号")
+    private String workOrderNo;
+
+    /** 打印次数 */
+    @ApiModelProperty("打印次数")
+    private Long printTime;
+
+    /** 二维码 */
+    @ApiModelProperty("二维码")
+    private String qrcode;
+
+    /** 客户编码 */
+    @ApiModelProperty("客户编码")
+    private String clientCode;
+
+    /** 客户名称 */
+    @ApiModelProperty("客户名称")
+    private String clientName;
+
+    /** 产品描述 */
+    @ApiModelProperty("产品描述")
+    private String itemDesc;
+
+
+
+}

mes/src/main/java/com/ximai/mes/pro/domain/ProProductQrcodeRule.java

+package com.ximai.mes.pro.domain;
+
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import com.ximai.common.core.domain.BaseEntity;
+
+/**
+ * 产品二维码规则对象 pro_product_qrcode_rule
+ *
+ * @author generator
+ * @date 2024-08-31
+ */
+@Data
+public class ProProductQrcodeRule extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    @TableId
+    private Long ruleId;
+
+    /** 产品ID */
+    @ApiModelProperty("产品ID")
+    private Long itemId;
+
+    /** 产品编码 */
+    @ApiModelProperty("产品编码")
+    private String itemCode;
+
+    /** 编码前缀 */
+    @ApiModelProperty("编码前缀")
+    private String prefix;
+
+    /** 编码时间格式化 */
+    @ApiModelProperty("编码时间格式化")
+    private String datePattern;
+
+    /** 编码流水长度 */
+    @ApiModelProperty("编码流水长度")
+    private Integer serialLen;
+
+    /** 产品描述 */
+    @ApiModelProperty("产品描述")
+    private String itemDesc;
+
+    /** 客户编码 */
+    @ApiModelProperty("客户编码")
+    private String clientCode;
+
+    /** 客户名称 */
+    @ApiModelProperty("客户名称")
+    private String clientName;
+
+    /** 当前流水 */
+    @ApiModelProperty("当前流水")
+    private Integer currentSerial;
+
+
+
+}

mes/src/main/java/com/ximai/mes/pro/dto/ProProductQrcodeRecordCreate.java

+package com.ximai.mes.pro.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+/**
+ * 产品序列号打印记录对象 pro_product_qrcode_record
+ *
+ * @author generator
+ * @date 2024-08-31
+ */
+@Data
+public class ProProductQrcodeRecordCreate {
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    @TableId
+    private Long recordId;
+
+    /** 产品ID */
+    @ApiModelProperty("产品ID")
+    private Long itemId;
+
+    /** 产品编码 */
+    @ApiModelProperty("产品编码")
+    private String itemCode;
+
+    /** 工单ID */
+    @ApiModelProperty("工单ID")
+    private Long workOrderId;
+
+    /** 工单编号 */
+    @ApiModelProperty("工单编号")
+    private String workOrderNo;
+
+    /** 打印次数 */
+    @ApiModelProperty("打印次数")
+    private Long printTime;
+
+    /** 二维码 */
+    @ApiModelProperty("二维码")
+    private String qrcode;
+
+    /** 客户编码 */
+    @ApiModelProperty("客户编码")
+    private String clientCode;
+
+    /** 客户名称 */
+    @ApiModelProperty("客户名称")
+    private String clientName;
+
+    /** 产品描述 */
+    @ApiModelProperty("产品描述")
+    private String itemDesc;
+
+
+
+}

mes/src/main/java/com/ximai/mes/pro/dto/ProProductQrcodeRecordDto.java

+package com.ximai.mes.pro.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * 产品序列号打印记录对象 pro_product_qrcode_record
+ *
+ * @author generator
+ * @date 2024-08-31
+ */
+@Data
+public class ProProductQrcodeRecordDto {
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    @ApiModelProperty("ID")
+    @TableId
+    private Long recordId;
+
+    /** 产品ID */
+    @ApiModelProperty("产品ID")
+    private Long itemId;
+
+    /** 产品编码 */
+    @ApiModelProperty("产品编码")
+    private String itemCode;
+
+    /** 产品名称 */
+    @ApiModelProperty("产品名称")
+    private String itemName;
+
+    /** 工单ID */
+    @ApiModelProperty("工单ID")
+    private Long workOrderId;
+
+    /** 工单编号 */
+    @ApiModelProperty("工单编号")
+    private String workOrderNo;
+
+    /** 打印次数 */
+    @ApiModelProperty("打印次数")
+    private Long printTime;
+
+    /** 二维码 */
+    @ApiModelProperty("二维码")
+    private String qrcode;
+
+    /** 客户编码 */
+    @ApiModelProperty("客户编码")
+    private String clientCode;
+
+    /** 客户名称 */
+    @ApiModelProperty("客户名称")
+    private String clientName;
+
+    /** 产品描述 */
+    @ApiModelProperty("产品描述")
+    private String itemDesc;
+
+    /** 创建者 */
+    @ApiModelProperty("创建者")
+    private String createBy;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
+    /** 更新者 */
+    @ApiModelProperty("更新者")
+    private String updateBy;
+
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+
+
+}

mes/src/main/java/com/ximai/mes/pro/dto/ProProductQrcodeRecordExcelExport.java

+package com.ximai.mes.pro.dto;
+
+import com.ximai.common.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import com.ximai.common.core.domain.BaseEntity;
+
+/**
+ * 产品序列号打印记录对象 pro_product_qrcode_record
+ *
+ * @author generator
+ * @date 2024-08-31
+ */
+@Data
+public class ProProductQrcodeRecordExcelExport {
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    @TableId
+    private Long recordId;
+
+    /** 产品ID */
+    @ApiModelProperty("产品ID")
+    @Excel(name = "产品ID")
+    private Long itemId;
+
+    /** 产品编码 */
+    @ApiModelProperty("产品编码")
+    @Excel(name = "产品编码")
+    private String itemCode;
+
+    /** 工单ID */
+    @ApiModelProperty("工单ID")
+    @Excel(name = "工单ID")
+    private Long workOrderId;
+
+    /** 工单编号 */
+    @ApiModelProperty("工单编号")
+    @Excel(name = "工单编号")
+    private String workOrderNo;
+
+    /** 打印次数 */
+    @ApiModelProperty("打印次数")
+    @Excel(name = "打印次数")
+    private Long printTime;
+
+    /** 二维码 */
+    @ApiModelProperty("二维码")
+    @Excel(name = "二维码")
+    private String qrcode;
+
+    /** 客户编码 */
+    @ApiModelProperty("客户编码")
+    @Excel(name = "客户编码")
+    private String clientCode;
+
+    /** 客户名称 */
+    @ApiModelProperty("客户名称")
+    @Excel(name = "客户名称")
+    private String clientName;
+
+    /** 产品描述 */
+    @ApiModelProperty("产品描述")
+    @Excel(name = "产品描述")
+    private String itemDesc;
+
+
+
+}

mes/src/main/java/com/ximai/mes/pro/dto/ProProductQrcodeRecordExcelImport.java

+package com.ximai.mes.pro.dto;
+
+import com.ximai.common.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import com.ximai.common.core.domain.BaseEntity;
+
+/**
+ * 产品序列号打印记录对象 pro_product_qrcode_record
+ *
+ * @author generator
+ * @date 2024-08-31
+ */
+@Data
+public class ProProductQrcodeRecordExcelImport {
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    @TableId
+    private Long recordId;
+
+    /** 产品ID */
+    @ApiModelProperty("产品ID")
+    @Excel(name = "产品ID")
+    private Long itemId;
+
+    /** 产品编码 */
+    @ApiModelProperty("产品编码")
+    @Excel(name = "产品编码")
+    private String itemCode;
+
+    /** 工单ID */
+    @ApiModelProperty("工单ID")
+    @Excel(name = "工单ID")
+    private Long workOrderId;
+
+    /** 工单编号 */
+    @ApiModelProperty("工单编号")
+    @Excel(name = "工单编号")
+    private String workOrderNo;
+
+    /** 打印次数 */
+    @ApiModelProperty("打印次数")
+    @Excel(name = "打印次数")
+    private Long printTime;
+
+    /** 二维码 */
+    @ApiModelProperty("二维码")
+    @Excel(name = "二维码")
+    private String qrcode;
+
+    /** 客户编码 */
+    @ApiModelProperty("客户编码")
+    @Excel(name = "客户编码")
+    private String clientCode;
+
+    /** 客户名称 */
+    @ApiModelProperty("客户名称")
+    @Excel(name = "客户名称")
+    private String clientName;
+
+    /** 产品描述 */
+    @ApiModelProperty("产品描述")
+    @Excel(name = "产品描述")
+    private String itemDesc;
+
+
+
+}

mes/src/main/java/com/ximai/mes/pro/dto/ProProductQrcodeRecordQuery.java

+package com.ximai.mes.pro.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * 产品序列号打印记录对象 pro_product_qrcode_record
+ *
+ * @author generator
+ * @date 2024-08-31
+ */
+@Data
+public class ProProductQrcodeRecordQuery {
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    @ApiModelProperty("ID")
+    @TableId
+    private Long recordId;
+
+    /** 产品ID */
+    @ApiModelProperty("产品ID")
+    private Long itemId;
+
+    /** 产品编码 */
+    @ApiModelProperty("产品编码")
+    private String itemCode;
+
+    /** 工单ID */
+    @ApiModelProperty("工单ID")
+    private Long workOrderId;
+
+    /** 工单编号 */
+    @ApiModelProperty("工单编号")
+    private String workOrderNo;
+
+    /** 打印次数 */
+    @ApiModelProperty("打印次数")
+    private Long printTime;
+
+    /** 二维码 */
+    @ApiModelProperty("二维码")
+    private String qrcode;
+
+    /** 客户编码 */
+    @ApiModelProperty("客户编码")
+    private String clientCode;
+
+    /** 客户名称 */
+    @ApiModelProperty("客户名称")
+    private String clientName;
+
+    /** 产品描述 */
+    @ApiModelProperty("产品描述")
+    private String itemDesc;
+
+    /** 创建者 */
+    @ApiModelProperty("创建者")
+    private String createBy;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
+    /** 更新者 */
+    @ApiModelProperty("更新者")
+    private String updateBy;
+
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+
+
+}

mes/src/main/java/com/ximai/mes/pro/dto/ProProductQrcodeRecordUpdate.java

+package com.ximai.mes.pro.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+/**
+ * 产品序列号打印记录对象 pro_product_qrcode_record
+ *
+ * @author generator
+ * @date 2024-08-31
+ */
+@Data
+public class ProProductQrcodeRecordUpdate {
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    @TableId
+    private Long recordId;
+
+    /** 产品ID */
+    @ApiModelProperty("产品ID")
+    private Long itemId;
+
+    /** 产品编码 */
+    @ApiModelProperty("产品编码")
+    private String itemCode;
+
+    /** 工单ID */
+    @ApiModelProperty("工单ID")
+    private Long workOrderId;
+
+    /** 工单编号 */
+    @ApiModelProperty("工单编号")
+    private String workOrderNo;
+
+    /** 打印次数 */
+    @ApiModelProperty("打印次数")
+    private Long printTime;
+
+    /** 二维码 */
+    @ApiModelProperty("二维码")
+    private String qrcode;
+
+    /** 客户编码 */
+    @ApiModelProperty("客户编码")
+    private String clientCode;
+
+    /** 客户名称 */
+    @ApiModelProperty("客户名称")
+    private String clientName;
+
+    /** 产品描述 */
+    @ApiModelProperty("产品描述")
+    private String itemDesc;
+
+
+
+}

mes/src/main/java/com/ximai/mes/pro/dto/ProProductQrcodeRuleCreate.java

+package com.ximai.mes.pro.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+/**
+ * 产品二维码规则对象 pro_product_qrcode_rule
+ *
+ * @author generator
+ * @date 2024-08-31
+ */
+@Data
+public class ProProductQrcodeRuleCreate {
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    @TableId
+    private Long ruleId;
+
+    /** 产品ID */
+    @ApiModelProperty("产品ID")
+    private Long itemId;
+
+    /** 产品编码 */
+    @ApiModelProperty("产品编码")
+    private String itemCode;
+
+    /** 编码前缀 */
+    @ApiModelProperty("编码前缀")
+    private String prefix;
+
+    /** 编码时间格式化 */
+    @ApiModelProperty("编码时间格式化")
+    private String datePattern;
+
+    /** 编码流水长度 */
+    @ApiModelProperty("编码流水长度")
+    private Integer serialLen;
+
+    /** 产品描述 */
+    @ApiModelProperty("产品描述")
+    private String itemDesc;
+
+    /** 客户编码 */
+    @ApiModelProperty("客户编码")
+    private String clientCode;
+
+    /** 客户名称 */
+    @ApiModelProperty("客户名称")
+    private String clientName;
+
+    /** 当前流水 */
+    @ApiModelProperty("当前流水")
+    private Integer currentSerial;
+
+
+
+}

mes/src/main/java/com/ximai/mes/pro/dto/ProProductQrcodeRuleDto.java

+package com.ximai.mes.pro.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * 产品二维码规则对象 pro_product_qrcode_rule
+ *
+ * @author generator
+ * @date 2024-08-31
+ */
+@Data
+public class ProProductQrcodeRuleDto {
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    @ApiModelProperty("ID")
+    @TableId
+    private Long ruleId;
+
+    /** 产品ID */
+    @ApiModelProperty("产品ID")
+    private Long itemId;
+
+    /** 产品编码 */
+    @ApiModelProperty("产品编码")
+    private String itemCode;
+
+    /** 产品名称 */
+    @ApiModelProperty("产品名称")
+    private String itemName;
+
+    /** 编码前缀 */
+    @ApiModelProperty("编码前缀")
+    private String prefix;
+
+    /** 编码时间格式化 */
+    @ApiModelProperty("编码时间格式化")
+    private String datePattern;
+
+    /** 编码流水长度 */
+    @ApiModelProperty("编码流水长度")
+    private Integer serialLen;
+
+    /** 产品描述 */
+    @ApiModelProperty("产品描述")
+    private String itemDesc;
+
+    /** 客户编码 */
+    @ApiModelProperty("客户编码")
+    private String clientCode;
+
+    /** 客户名称 */
+    @ApiModelProperty("客户名称")
+    private String clientName;
+
+    /** 当前流水 */
+    @ApiModelProperty("当前流水")
+    private Integer currentSerial;
+
+    /** 创建者 */
+    @ApiModelProperty("创建者")
+    private String createBy;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
+    /** 更新者 */
+    @ApiModelProperty("更新者")
+    private String updateBy;
+
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+
+
+}

mes/src/main/java/com/ximai/mes/pro/dto/ProProductQrcodeRuleExcelExport.java

+package com.ximai.mes.pro.dto;
+
+import com.ximai.common.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import com.ximai.common.core.domain.BaseEntity;
+
+/**
+ * 产品二维码规则对象 pro_product_qrcode_rule
+ *
+ * @author generator
+ * @date 2024-08-31
+ */
+@Data
+public class ProProductQrcodeRuleExcelExport {
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    @TableId
+    private Long ruleId;
+
+    /** 产品ID */
+    @ApiModelProperty("产品ID")
+    @Excel(name = "产品ID")
+    private Long itemId;
+
+    /** 产品编码 */
+    @ApiModelProperty("产品编码")
+    @Excel(name = "产品编码")
+    private String itemCode;
+
+    /** 编码前缀 */
+    @ApiModelProperty("编码前缀")
+    @Excel(name = "编码前缀")
+    private String prefix;
+
+    /** 编码时间格式化 */
+    @ApiModelProperty("编码时间格式化")
+    @Excel(name = "编码时间格式化")
+    private String datePattern;
+
+    /** 编码流水长度 */
+    @ApiModelProperty("编码流水长度")
+    @Excel(name = "编码流水长度")
+    private Integer serialLen;
+
+    /** 产品描述 */
+    @ApiModelProperty("产品描述")
+    @Excel(name = "产品描述")
+    private String itemDesc;
+
+    /** 客户编码 */
+    @ApiModelProperty("客户编码")
+    @Excel(name = "客户编码")
+    private String clientCode;
+
+    /** 客户名称 */
+    @ApiModelProperty("客户名称")
+    @Excel(name = "客户名称")
+    private String clientName;
+
+    /** 当前流水 */
+    @ApiModelProperty("当前流水")
+    @Excel(name = "当前流水")
+    private Integer currentSerial;
+
+
+
+}

mes/src/main/java/com/ximai/mes/pro/dto/ProProductQrcodeRuleExcelImport.java

+package com.ximai.mes.pro.dto;
+
+import com.ximai.common.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import com.ximai.common.core.domain.BaseEntity;
+
+/**
+ * 产品二维码规则对象 pro_product_qrcode_rule
+ *
+ * @author generator
+ * @date 2024-08-31
+ */
+@Data
+public class ProProductQrcodeRuleExcelImport {
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    @TableId
+    private Long ruleId;
+
+    /** 产品ID */
+    @ApiModelProperty("产品ID")
+    @Excel(name = "产品ID")
+    private Long itemId;
+
+    /** 产品编码 */
+    @ApiModelProperty("产品编码")
+    @Excel(name = "产品编码")
+    private String itemCode;
+
+    /** 编码前缀 */
+    @ApiModelProperty("编码前缀")
+    @Excel(name = "编码前缀")
+    private String prefix;
+
+    /** 编码时间格式化 */
+    @ApiModelProperty("编码时间格式化")
+    @Excel(name = "编码时间格式化")
+    private String datePattern;
+
+    /** 编码流水长度 */
+    @ApiModelProperty("编码流水长度")
+    @Excel(name = "编码流水长度")
+    private Integer serialLen;
+
+    /** 产品描述 */
+    @ApiModelProperty("产品描述")
+    @Excel(name = "产品描述")
+    private String itemDesc;
+
+    /** 客户编码 */
+    @ApiModelProperty("客户编码")
+    @Excel(name = "客户编码")
+    private String clientCode;
+
+    /** 客户名称 */
+    @ApiModelProperty("客户名称")
+    @Excel(name = "客户名称")
+    private String clientName;
+
+    /** 当前流水 */
+    @ApiModelProperty("当前流水")
+    @Excel(name = "当前流水")
+    private Integer currentSerial;
+
+
+
+}

mes/src/main/java/com/ximai/mes/pro/dto/ProProductQrcodeRuleQuery.java

+package com.ximai.mes.pro.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * 产品二维码规则对象 pro_product_qrcode_rule
+ *
+ * @author generator
+ * @date 2024-08-31
+ */
+@Data
+public class ProProductQrcodeRuleQuery {
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    @ApiModelProperty("ID")
+    @TableId
+    private Long ruleId;
+
+    /** 产品ID */
+    @ApiModelProperty("产品ID")
+    private Long itemId;
+
+    /** 产品编码 */
+    @ApiModelProperty("产品编码")
+    private String itemCode;
+
+    /** 编码前缀 */
+    @ApiModelProperty("编码前缀")
+    private String prefix;
+
+    /** 编码时间格式化 */
+    @ApiModelProperty("编码时间格式化")
+    private String datePattern;
+
+    /** 编码流水长度 */
+    @ApiModelProperty("编码流水长度")
+    private Integer serialLen;
+
+    /** 产品描述 */
+    @ApiModelProperty("产品描述")
+    private String itemDesc;
+
+    /** 客户编码 */
+    @ApiModelProperty("客户编码")
+    private String clientCode;
+
+    /** 客户名称 */
+    @ApiModelProperty("客户名称")
+    private String clientName;
+
+    /** 当前流水 */
+    @ApiModelProperty("当前流水")
+    private Integer currentSerial;
+
+    /** 创建者 */
+    @ApiModelProperty("创建者")
+    private String createBy;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
+    /** 更新者 */
+    @ApiModelProperty("更新者")
+    private String updateBy;
+
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+
+
+
+}

mes/src/main/java/com/ximai/mes/pro/dto/ProProductQrcodeRuleUpdate.java

+package com.ximai.mes.pro.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+/**
+ * 产品二维码规则对象 pro_product_qrcode_rule
+ *
+ * @author generator
+ * @date 2024-08-31
+ */
+@Data
+public class ProProductQrcodeRuleUpdate {
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    @TableId
+    private Long ruleId;
+
+    /** 产品ID */
+    @ApiModelProperty("产品ID")
+    private Long itemId;
+
+    /** 产品编码 */
+    @ApiModelProperty("产品编码")
+    private String itemCode;
+
+    /** 编码前缀 */
+    @ApiModelProperty("编码前缀")
+    private String prefix;
+
+    /** 编码时间格式化 */
+    @ApiModelProperty("编码时间格式化")
+    private String datePattern;
+
+    /** 编码流水长度 */
+    @ApiModelProperty("编码流水长度")
+    private Integer serialLen;
+
+    /** 产品描述 */
+    @ApiModelProperty("产品描述")
+    private String itemDesc;
+
+    /** 客户编码 */
+    @ApiModelProperty("客户编码")
+    private String clientCode;
+
+    /** 客户名称 */
+    @ApiModelProperty("客户名称")
+    private String clientName;
+
+    /** 当前流水 */
+    @ApiModelProperty("当前流水")
+    private Integer currentSerial;
+
+
+
+}

mes/src/main/java/com/ximai/mes/pro/dto/productionSolution/ProProductQrcodeRuleQuery.java

+package com.ximai.mes.pro.dto.productionSolution;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 产品二维码规则对象 pro_product_qrcode_rule
+ *
+ * @author generator
+ * @date 2024-08-30
+ */
+@Data
+public class ProProductQrcodeRuleQuery {
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    @ApiModelProperty("当前流水")
+    @TableId
+    private Long ruleId;
+
+    /** 产品物料ID */
+    @ApiModelProperty("当前流水")
+    private Long itemId;
+
+    /** 产品物料编码 */
+    @ApiModelProperty("当前流水")
+    private String itemCode;
+
+    /** 编码前缀 */
+    @ApiModelProperty("当前流水")
+    private String prefix;
+
+    /** 编码时间格式化 */
+    @ApiModelProperty("当前流水")
+    private String datePattern;
+
+    /** 编码流水长度 */
+    @ApiModelProperty("当前流水")
+    private Integer serialLen;
+
+    /** 产品描述 */
+    @ApiModelProperty("当前流水")
+    private String itemDesc;
+
+    /** 客户编码 */
+    @ApiModelProperty("当前流水")
+    private String clientCode;
+
+    /** 客户名称 */
+    @ApiModelProperty("当前流水")
+    private String clientName;
+
+    /** 当前流水 */
+    @ApiModelProperty("当前流水")
+    private Integer currentSerial;
+
+    /** 创建者 */
+    @ApiModelProperty("当前流水")
+    private String createBy;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("当前流水")
+    private Date createTime;
+
+    /** 更新者 */
+    @ApiModelProperty("当前流水")
+    private String updateBy;
+
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("当前流水")
+    private Date updateTime;
+
+
+
+}

mes/src/main/java/com/ximai/mes/pro/mapper/ProProductQrcodeRecordMapper.java

+package com.ximai.mes.pro.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ximai.mes.pro.domain.ProProductQrcodeRecord;
+import com.ximai.mes.pro.dto.ProProductQrcodeRecordDto;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
+/**
+ * 产品序列号打印记录Mapper接口
+ *
+ * @author generator
+ * @date 2024-08-31
+ */
+public interface ProProductQrcodeRecordMapper extends BaseMapper<ProProductQrcodeRecord>
+{
+    /**
+     * 查询产品序列号打印记录
+     *
+     * @param recordId 产品序列号打印记录主键
+     * @return 产品序列号打印记录
+     */
+    public ProProductQrcodeRecordDto selectProProductQrcodeRecordByRecordId(Long recordId);
+
+    /**
+     * 查询产品序列号打印记录列表
+     *
+     * @param proProductQrcodeRecord 产品序列号打印记录
+     * @return 产品序列号打印记录集合
+     */
+    public List<ProProductQrcodeRecordDto> selectProProductQrcodeRecordList(ProProductQrcodeRecord proProductQrcodeRecord);
+
+    /**
+     * 查询产品序列号打印记录列表
+     *
+     * @param proProductQrcodeRecordQuery 产品序列号打印记录
+     * @return 产品序列号打印记录集合
+     */
+    @Select("select m.*,item.item_name from pro_product_qrcode_record m left join md_item item on m.item_id = item.item_id ${ew.customSqlSegment}")
+    public List<ProProductQrcodeRecordDto> selectDtoListByQw(@Param("ew") QueryWrapper<ProProductQrcodeRecord> proProductQrcodeRecordQuery);
+
+    /**
+     * 新增产品序列号打印记录
+     *
+     * @param proProductQrcodeRecord 产品序列号打印记录
+     * @return 结果
+     */
+    public int insertProProductQrcodeRecord(ProProductQrcodeRecord proProductQrcodeRecord);
+
+    /**
+     * 修改产品序列号打印记录
+     *
+     * @param proProductQrcodeRecord 产品序列号打印记录
+     * @return 结果
+     */
+    public int updateProProductQrcodeRecord(ProProductQrcodeRecord proProductQrcodeRecord);
+
+    /**
+     * 删除产品序列号打印记录
+     *
+     * @param recordId 产品序列号打印记录主键
+     * @return 结果
+     */
+    public int deleteProProductQrcodeRecordByRecordId(Long recordId);
+
+    /**
+     * 批量删除产品序列号打印记录
+     *
+     * @param recordIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteProProductQrcodeRecordByRecordIds(Long[] recordIds);
+}

mes/src/main/java/com/ximai/mes/pro/mapper/ProProductQrcodeRuleMapper.java

+package com.ximai.mes.pro.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ximai.mes.pro.domain.ProProductQrcodeRule;
+import com.ximai.mes.pro.dto.ProProductQrcodeRuleDto;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
+/**
+ * 产品二维码规则Mapper接口
+ *
+ * @author generator
+ * @date 2024-08-31
+ */
+public interface ProProductQrcodeRuleMapper extends BaseMapper<ProProductQrcodeRule>
+{
+    /**
+     * 查询产品二维码规则
+     *
+     * @param ruleId 产品二维码规则主键
+     * @return 产品二维码规则
+     */
+    public ProProductQrcodeRuleDto selectProProductQrcodeRuleByRuleId(Long ruleId);
+
+    /**
+     * 查询产品二维码规则列表
+     *
+     * @param proProductQrcodeRule 产品二维码规则
+     * @return 产品二维码规则集合
+     */
+    public List<ProProductQrcodeRuleDto> selectProProductQrcodeRuleList(ProProductQrcodeRule proProductQrcodeRule);
+
+    /**
+     * 查询产品二维码规则列表
+     *
+     * @param proProductQrcodeRuleQuery 产品二维码规则
+     * @return 产品二维码规则集合
+     */
+    @Select("select m.*,item.item_name from pro_product_qrcode_rule m left join md_item item on m.item_id = item.item_id ${ew.customSqlSegment}")
+    public List<ProProductQrcodeRuleDto> selectDtoListByQw(@Param("ew") QueryWrapper<ProProductQrcodeRule> proProductQrcodeRuleQuery);
+
+    /**
+     * 新增产品二维码规则
+     *
+     * @param proProductQrcodeRule 产品二维码规则
+     * @return 结果
+     */
+    public int insertProProductQrcodeRule(ProProductQrcodeRule proProductQrcodeRule);
+
+    /**
+     * 修改产品二维码规则
+     *
+     * @param proProductQrcodeRule 产品二维码规则
+     * @return 结果
+     */
+    public int updateProProductQrcodeRule(ProProductQrcodeRule proProductQrcodeRule);
+
+    /**
+     * 删除产品二维码规则
+     *
+     * @param ruleId 产品二维码规则主键
+     * @return 结果
+     */
+    public int deleteProProductQrcodeRuleByRuleId(Long ruleId);
+
+    /**
+     * 批量删除产品二维码规则
+     *
+     * @param ruleIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteProProductQrcodeRuleByRuleIds(Long[] ruleIds);
+}

mes/src/main/java/com/ximai/mes/pro/service/IProProductQrcodeRecordService.java

+package com.ximai.mes.pro.service;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ximai.mes.pro.domain.ProProductQrcodeRecord;
+import com.ximai.mes.pro.dto.ProProductQrcodeRecordCreate;
+import com.ximai.mes.pro.dto.ProProductQrcodeRecordUpdate;
+import com.ximai.mes.pro.dto.ProProductQrcodeRecordDto;
+
+/**
+ * 产品序列号打印记录Service接口
+ * 
+ * @author generator
+ * @date 2024-08-31
+ */
+public interface IProProductQrcodeRecordService 
+{
+    /**
+     * 查询产品序列号打印记录
+     *
+     * @param recordId 产品序列号打印记录主键
+     * @return 产品序列号打印记录
+     */
+    public ProProductQrcodeRecordDto selectProProductQrcodeRecordDtoByRecordId(Long recordId);
+
+    /**
+     * 查询产品序列号打印记录
+     *
+     * @param recordId 产品序列号打印记录主键
+     * @return 产品序列号打印记录
+     */
+    public ProProductQrcodeRecord selectProProductQrcodeRecordByRecordId(Long recordId);
+
+    /**
+     * 查询产品序列号打印记录列表
+     *
+     * @param proProductQrcodeRecord 产品序列号打印记录
+     * @return 产品序列号打印记录集合
+     */
+    public List<ProProductQrcodeRecordDto> selectProProductQrcodeRecordList(ProProductQrcodeRecord proProductQrcodeRecord);
+
+    /**
+     * 查询产品序列号打印记录列表
+     *
+     * @param proProductQrcodeRecordQuery 产品序列号打印记录
+     * @return 产品序列号打印记录集合
+     */
+    public List<ProProductQrcodeRecord> selectProProductQrcodeRecordList(QueryWrapper<ProProductQrcodeRecord> proProductQrcodeRecordQuery);
+
+    /**
+     * 查询产品序列号打印记录列表
+     *
+     * @param proProductQrcodeRecordQuery 产品序列号打印记录
+     * @return 产品序列号打印记录集合
+     */
+    public List<ProProductQrcodeRecordDto> selectProProductQrcodeRecordDtoList(QueryWrapper<ProProductQrcodeRecord> proProductQrcodeRecordQuery);
+
+    /**
+     * 新增产品序列号打印记录
+     * 
+     * @param proProductQrcodeRecord 产品序列号打印记录
+     * @return 结果
+     */
+    public int insertProProductQrcodeRecord(ProProductQrcodeRecordCreate proProductQrcodeRecord);
+
+    /**
+     * 修改产品序列号打印记录
+     * 
+     * @param proProductQrcodeRecord 产品序列号打印记录
+     * @return 结果
+     */
+    public int updateProProductQrcodeRecord(ProProductQrcodeRecordUpdate proProductQrcodeRecord);
+
+    /**
+     * 批量删除产品序列号打印记录
+     * 
+     * @param recordIds 需要删除的产品序列号打印记录主键集合
+     * @return 结果
+     */
+    public int deleteProProductQrcodeRecordByRecordIds(Long[] recordIds);
+
+    /**
+     * 删除产品序列号打印记录信息
+     * 
+     * @param recordId 产品序列号打印记录主键
+     * @return 结果
+     */
+    public int deleteProProductQrcodeRecordByRecordId(Long recordId);
+}

mes/src/main/java/com/ximai/mes/pro/service/IProProductQrcodeRuleService.java

+package com.ximai.mes.pro.service;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ximai.mes.pro.domain.ProProductQrcodeRule;
+import com.ximai.mes.pro.dto.ProProductQrcodeRuleCreate;
+import com.ximai.mes.pro.dto.ProProductQrcodeRuleUpdate;
+import com.ximai.mes.pro.dto.ProProductQrcodeRuleDto;
+
+/**
+ * 产品二维码规则Service接口
+ * 
+ * @author generator
+ * @date 2024-08-31
+ */
+public interface IProProductQrcodeRuleService 
+{
+    /**
+     * 查询产品二维码规则
+     *
+     * @param ruleId 产品二维码规则主键
+     * @return 产品二维码规则
+     */
+    public ProProductQrcodeRuleDto selectProProductQrcodeRuleDtoByRuleId(Long ruleId);
+
+    /**
+     * 查询产品二维码规则
+     *
+     * @param ruleId 产品二维码规则主键
+     * @return 产品二维码规则
+     */
+    public ProProductQrcodeRule selectProProductQrcodeRuleByRuleId(Long ruleId);
+
+    /**
+     * 查询产品二维码规则列表
+     *
+     * @param proProductQrcodeRule 产品二维码规则
+     * @return 产品二维码规则集合
+     */
+    public List<ProProductQrcodeRuleDto> selectProProductQrcodeRuleList(ProProductQrcodeRule proProductQrcodeRule);
+
+    /**
+     * 查询产品二维码规则列表
+     *
+     * @param proProductQrcodeRuleQuery 产品二维码规则
+     * @return 产品二维码规则集合
+     */
+    public List<ProProductQrcodeRule> selectProProductQrcodeRuleList(QueryWrapper<ProProductQrcodeRule> proProductQrcodeRuleQuery);
+
+    /**
+     * 查询产品二维码规则列表
+     *
+     * @param proProductQrcodeRuleQuery 产品二维码规则
+     * @return 产品二维码规则集合
+     */
+    public List<ProProductQrcodeRuleDto> selectProProductQrcodeRuleDtoList(QueryWrapper<ProProductQrcodeRule> proProductQrcodeRuleQuery);
+
+    /**
+     * 新增产品二维码规则
+     * 
+     * @param proProductQrcodeRule 产品二维码规则
+     * @return 结果
+     */
+    public int insertProProductQrcodeRule(ProProductQrcodeRuleCreate proProductQrcodeRule);
+
+    /**
+     * 修改产品二维码规则
+     * 
+     * @param proProductQrcodeRule 产品二维码规则
+     * @return 结果
+     */
+    public int updateProProductQrcodeRule(ProProductQrcodeRuleUpdate proProductQrcodeRule);
+
+    /**
+     * 批量删除产品二维码规则
+     * 
+     * @param ruleIds 需要删除的产品二维码规则主键集合
+     * @return 结果
+     */
+    public int deleteProProductQrcodeRuleByRuleIds(Long[] ruleIds);
+
+    /**
+     * 删除产品二维码规则信息
+     * 
+     * @param ruleId 产品二维码规则主键
+     * @return 结果
+     */
+    public int deleteProProductQrcodeRuleByRuleId(Long ruleId);
+}

mes/src/main/java/com/ximai/mes/pro/service/impl/ProProductQrcodeRecordServiceImpl.java

+package com.ximai.mes.pro.service.impl;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ximai.common.utils.data.DateUtils;
+import com.ximai.common.utils.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import cn.hutool.core.bean.BeanUtil;
+import com.ximai.mes.pro.mapper.ProProductQrcodeRecordMapper;
+import com.ximai.mes.pro.domain.ProProductQrcodeRecord;
+import com.ximai.mes.pro.dto.ProProductQrcodeRecordCreate;
+import com.ximai.mes.pro.dto.ProProductQrcodeRecordUpdate;
+import com.ximai.mes.pro.dto.ProProductQrcodeRecordDto;
+import com.ximai.mes.pro.service.IProProductQrcodeRecordService;
+
+/**
+ * 产品序列号打印记录Service业务层处理
+ *
+ * @author generator
+ * @date 2024-08-31
+ */
+@Service
+public class ProProductQrcodeRecordServiceImpl implements IProProductQrcodeRecordService
+{
+    @Autowired
+    private ProProductQrcodeRecordMapper proProductQrcodeRecordMapper;
+
+    /**
+     * 查询产品序列号打印记录
+     *
+     * @param recordId 产品序列号打印记录主键
+     * @return 产品序列号打印记录
+     */
+    @Override
+    public ProProductQrcodeRecordDto selectProProductQrcodeRecordDtoByRecordId(Long recordId) {
+        return proProductQrcodeRecordMapper.selectProProductQrcodeRecordByRecordId(recordId);
+    }
+
+    /**
+     * 查询产品序列号打印记录
+     *
+     * @param recordId 产品序列号打印记录主键
+     * @return 产品序列号打印记录
+     */
+    @Override
+    public ProProductQrcodeRecord selectProProductQrcodeRecordByRecordId(Long recordId) {
+        return proProductQrcodeRecordMapper.selectById(recordId);
+    }
+
+    /**
+     * 查询产品序列号打印记录列表
+     *
+     * @param proProductQrcodeRecord 产品序列号打印记录
+     * @return 产品序列号打印记录
+     */
+    @Override
+    public List<ProProductQrcodeRecordDto> selectProProductQrcodeRecordList(ProProductQrcodeRecord proProductQrcodeRecord) {
+        return proProductQrcodeRecordMapper.selectProProductQrcodeRecordList(proProductQrcodeRecord);
+    }
+
+    /**
+     * 查询产品序列号打印记录列表
+     *
+     * @param proProductQrcodeRecordQuery 产品序列号打印记录
+     * @return 产品序列号打印记录
+     */
+    @Override
+    public List<ProProductQrcodeRecord> selectProProductQrcodeRecordList(QueryWrapper<ProProductQrcodeRecord> proProductQrcodeRecordQuery) {
+        return proProductQrcodeRecordMapper.selectList(proProductQrcodeRecordQuery);
+    }
+
+    /**
+     * 查询产品序列号打印记录列表
+     *
+     * @param proProductQrcodeRecordQuery 产品序列号打印记录
+     * @return 产品序列号打印记录
+     */
+    @Override
+    public List<ProProductQrcodeRecordDto> selectProProductQrcodeRecordDtoList(QueryWrapper<ProProductQrcodeRecord> proProductQrcodeRecordQuery) {
+        return proProductQrcodeRecordMapper.selectDtoListByQw(proProductQrcodeRecordQuery);
+    }
+
+    /**
+     * 新增产品序列号打印记录
+     *
+     * @param proProductQrcodeRecordCreate 产品序列号打印记录
+     * @return 结果
+     */
+    @Override
+    public int insertProProductQrcodeRecord(ProProductQrcodeRecordCreate proProductQrcodeRecordCreate) {
+
+        ProProductQrcodeRecord proProductQrcodeRecord = new ProProductQrcodeRecord();
+        BeanUtil.copyProperties(proProductQrcodeRecordCreate, proProductQrcodeRecord);
+        proProductQrcodeRecord.setCreateBy(SecurityUtils.getUsername());
+        proProductQrcodeRecord.setCreateTime(DateUtils.getNowDate());
+        return proProductQrcodeRecordMapper.insertProProductQrcodeRecord(proProductQrcodeRecord);
+    }
+
+    /**
+     * 修改产品序列号打印记录
+     *
+     * @param proProductQrcodeRecordUpdate 产品序列号打印记录
+     * @return 结果
+     */
+    @Override
+    public int updateProProductQrcodeRecord(ProProductQrcodeRecordUpdate proProductQrcodeRecordUpdate) {
+        ProProductQrcodeRecord proProductQrcodeRecord = new ProProductQrcodeRecord();
+        BeanUtil.copyProperties(proProductQrcodeRecordUpdate, proProductQrcodeRecord);
+        proProductQrcodeRecord.setUpdateBy(SecurityUtils.getUsername());
+        proProductQrcodeRecord.setUpdateTime(DateUtils.getNowDate());
+        return proProductQrcodeRecordMapper.updateProProductQrcodeRecord(proProductQrcodeRecord);
+    }
+
+    /**
+     * 批量删除产品序列号打印记录
+     *
+     * @param recordIds 需要删除的产品序列号打印记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteProProductQrcodeRecordByRecordIds(Long[] recordIds) {
+        return proProductQrcodeRecordMapper.deleteProProductQrcodeRecordByRecordIds(recordIds);
+    }
+
+    /**
+     * 删除产品序列号打印记录信息
+     *
+     * @param recordId 产品序列号打印记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteProProductQrcodeRecordByRecordId(Long recordId) {
+        return proProductQrcodeRecordMapper.deleteProProductQrcodeRecordByRecordId(recordId);
+    }
+}

mes/src/main/java/com/ximai/mes/pro/service/impl/ProProductQrcodeRuleServiceImpl.java

+package com.ximai.mes.pro.service.impl;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ximai.common.utils.data.DateUtils;
+import com.ximai.common.utils.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import cn.hutool.core.bean.BeanUtil;
+import com.ximai.mes.pro.mapper.ProProductQrcodeRuleMapper;
+import com.ximai.mes.pro.domain.ProProductQrcodeRule;
+import com.ximai.mes.pro.dto.ProProductQrcodeRuleCreate;
+import com.ximai.mes.pro.dto.ProProductQrcodeRuleUpdate;
+import com.ximai.mes.pro.dto.ProProductQrcodeRuleDto;
+import com.ximai.mes.pro.service.IProProductQrcodeRuleService;
+
+/**
+ * 产品二维码规则Service业务层处理
+ *
+ * @author generator
+ * @date 2024-08-31
+ */
+@Service
+public class ProProductQrcodeRuleServiceImpl implements IProProductQrcodeRuleService
+{
+    @Autowired
+    private ProProductQrcodeRuleMapper proProductQrcodeRuleMapper;
+
+    /**
+     * 查询产品二维码规则
+     *
+     * @param ruleId 产品二维码规则主键
+     * @return 产品二维码规则
+     */
+    @Override
+    public ProProductQrcodeRuleDto selectProProductQrcodeRuleDtoByRuleId(Long ruleId) {
+        return proProductQrcodeRuleMapper.selectProProductQrcodeRuleByRuleId(ruleId);
+    }
+
+    /**
+     * 查询产品二维码规则
+     *
+     * @param ruleId 产品二维码规则主键
+     * @return 产品二维码规则
+     */
+    @Override
+    public ProProductQrcodeRule selectProProductQrcodeRuleByRuleId(Long ruleId) {
+        return proProductQrcodeRuleMapper.selectById(ruleId);
+    }
+
+    /**
+     * 查询产品二维码规则列表
+     *
+     * @param proProductQrcodeRule 产品二维码规则
+     * @return 产品二维码规则
+     */
+    @Override
+    public List<ProProductQrcodeRuleDto> selectProProductQrcodeRuleList(ProProductQrcodeRule proProductQrcodeRule) {
+        return proProductQrcodeRuleMapper.selectProProductQrcodeRuleList(proProductQrcodeRule);
+    }
+
+    /**
+     * 查询产品二维码规则列表
+     *
+     * @param proProductQrcodeRuleQuery 产品二维码规则
+     * @return 产品二维码规则
+     */
+    @Override
+    public List<ProProductQrcodeRule> selectProProductQrcodeRuleList(QueryWrapper<ProProductQrcodeRule> proProductQrcodeRuleQuery) {
+        return proProductQrcodeRuleMapper.selectList(proProductQrcodeRuleQuery);
+    }
+
+    /**
+     * 查询产品二维码规则列表
+     *
+     * @param proProductQrcodeRuleQuery 产品二维码规则
+     * @return 产品二维码规则
+     */
+    @Override
+    public List<ProProductQrcodeRuleDto> selectProProductQrcodeRuleDtoList(QueryWrapper<ProProductQrcodeRule> proProductQrcodeRuleQuery) {
+        return proProductQrcodeRuleMapper.selectDtoListByQw(proProductQrcodeRuleQuery);
+    }
+
+    /**
+     * 新增产品二维码规则
+     *
+     * @param proProductQrcodeRuleCreate 产品二维码规则
+     * @return 结果
+     */
+    @Override
+    public int insertProProductQrcodeRule(ProProductQrcodeRuleCreate proProductQrcodeRuleCreate) {
+
+        ProProductQrcodeRule proProductQrcodeRule = new ProProductQrcodeRule();
+        BeanUtil.copyProperties(proProductQrcodeRuleCreate, proProductQrcodeRule);
+        proProductQrcodeRule.setCreateBy(SecurityUtils.getUsername());
+        proProductQrcodeRule.setCreateTime(DateUtils.getNowDate());
+        return proProductQrcodeRuleMapper.insertProProductQrcodeRule(proProductQrcodeRule);
+    }
+
+    /**
+     * 修改产品二维码规则
+     *
+     * @param proProductQrcodeRuleUpdate 产品二维码规则
+     * @return 结果
+     */
+    @Override
+    public int updateProProductQrcodeRule(ProProductQrcodeRuleUpdate proProductQrcodeRuleUpdate) {
+        ProProductQrcodeRule proProductQrcodeRule = new ProProductQrcodeRule();
+        BeanUtil.copyProperties(proProductQrcodeRuleUpdate, proProductQrcodeRule);
+        proProductQrcodeRule.setUpdateBy(SecurityUtils.getUsername());
+        proProductQrcodeRule.setUpdateTime(DateUtils.getNowDate());
+        return proProductQrcodeRuleMapper.updateProProductQrcodeRule(proProductQrcodeRule);
+    }
+
+    /**
+     * 批量删除产品二维码规则
+     *
+     * @param ruleIds 需要删除的产品二维码规则主键
+     * @return 结果
+     */
+    @Override
+    public int deleteProProductQrcodeRuleByRuleIds(Long[] ruleIds) {
+        return proProductQrcodeRuleMapper.deleteProProductQrcodeRuleByRuleIds(ruleIds);
+    }
+
+    /**
+     * 删除产品二维码规则信息
+     *
+     * @param ruleId 产品二维码规则主键
+     * @return 结果
+     */
+    @Override
+    public int deleteProProductQrcodeRuleByRuleId(Long ruleId) {
+        return proProductQrcodeRuleMapper.deleteProProductQrcodeRuleByRuleId(ruleId);
+    }
+}

mes/src/main/java/com/ximai/mes/pro/service/impl/productionSolution/ProProductionSolutionServiceImpl.java

@@ -344,8 +344,8 @@ public class ProProductionSolutionServiceImpl implements IProProductionSolutionS
                 drawingCreateList.forEach(s->{
                     ProProductionSolutionProcessDrawingCreate create = new ProProductionSolutionProcessDrawingCreate();
                     BeanUtil.copyProperties(s, create);
-                    s.setProductionSolutionId(productionSolutionId);
-                    s.setProductionSolutionProcessId(productionSolutionProcessId);
+                    create.setProductionSolutionId(productionSolutionId);
+                    create.setProductionSolutionProcessId(productionSolutionProcessId);
                     productionSolutionProcessDrawingService.insertProProductionSolutionProcessDrawing(create);
                 });
                 k++;

mes/src/main/resources/mapper/pro/ProProductQrcodeRuleMapper.xml

+<?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.ximai.mes.pro.mapper.ProProductQrcodeRuleMapper">
+
+    <resultMap type="ProProductQrcodeRule" id="ProProductQrcodeRuleResult">
+                    <result property="ruleId"    column="rule_id"    />
+                    <result property="itemId"    column="item_id"    />
+                    <result property="itemCode"    column="item_code"    />
+                    <result property="prefix"    column="prefix"    />
+                    <result property="datePattern"    column="date_pattern"    />
+                    <result property="serialLen"    column="serial_len"    />
+                    <result property="itemDesc"    column="item_desc"    />
+                    <result property="clientCode"    column="client_code"    />
+                    <result property="clientName"    column="client_name"    />
+                    <result property="currentSerial"    column="current_serial"    />
+                    <result property="createBy"    column="create_by"    />
+                    <result property="createTime"    column="create_time"    />
+                    <result property="updateBy"    column="update_by"    />
+                    <result property="updateTime"    column="update_time"    />
+            </resultMap>
+
+    <resultMap type="com.ximai.mes.pro.dto.ProProductQrcodeRuleDto" id="ProProductQrcodeRuleResult2">
+                    <result property="ruleId"    column="rule_id"    />
+                    <result property="itemId"    column="item_id"    />
+                    <result property="itemCode"    column="item_code"    />
+                    <result property="prefix"    column="prefix"    />
+                    <result property="datePattern"    column="date_pattern"    />
+                    <result property="serialLen"    column="serial_len"    />
+                    <result property="itemDesc"    column="item_desc"    />
+                    <result property="clientCode"    column="client_code"    />
+                    <result property="clientName"    column="client_name"    />
+                    <result property="currentSerial"    column="current_serial"    />
+                    <result property="createBy"    column="create_by"    />
+                    <result property="createTime"    column="create_time"    />
+                    <result property="updateBy"    column="update_by"    />
+                    <result property="updateTime"    column="update_time"    />
+            </resultMap>
+
+    <sql id="selectProProductQrcodeRuleVo">
+        select rule_id, item_id, item_code, prefix, date_pattern, serial_len, item_desc, client_code, client_name, current_serial, create_by, create_time, update_by, update_time from pro_product_qrcode_rule
+    </sql>
+
+    <select id="selectProProductQrcodeRuleList" parameterType="ProProductQrcodeRule" resultMap="ProProductQrcodeRuleResult2">
+        <include refid="selectProProductQrcodeRuleVo"/>
+        <where>  
+            <if test="itemId != null "> and item_id = #{itemId}</if>
+            <if test="itemCode != null  and itemCode != ''"> and item_code = #{itemCode}</if>
+            <if test="prefix != null  and prefix != ''"> and prefix = #{prefix}</if>
+            <if test="datePattern != null  and datePattern != ''"> and date_pattern = #{datePattern}</if>
+            <if test="serialLen != null "> and serial_len = #{serialLen}</if>
+            <if test="itemDesc != null  and itemDesc != ''"> and item_desc = #{itemDesc}</if>
+            <if test="clientCode != null  and clientCode != ''"> and client_code = #{clientCode}</if>
+            <if test="clientName != null  and clientName != ''"> and client_name like concat('%', #{clientName}, '%')</if>
+            <if test="currentSerial != null "> and current_serial = #{currentSerial}</if>
+        </where>
+    </select>
+    
+    <select id="selectProProductQrcodeRuleByRuleId" parameterType="Long" resultMap="ProProductQrcodeRuleResult2">
+        <include refid="selectProProductQrcodeRuleVo"/>
+        where rule_id = #{ruleId}
+    </select>
+        
+    <insert id="insertProProductQrcodeRule" parameterType="ProProductQrcodeRule" useGeneratedKeys="true" keyProperty="ruleId">
+        insert into pro_product_qrcode_rule
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="itemId != null">item_id,</if>
+            <if test="itemCode != null and itemCode != ''">item_code,</if>
+            <if test="prefix != null">prefix,</if>
+            <if test="datePattern != null">date_pattern,</if>
+            <if test="serialLen != null">serial_len,</if>
+            <if test="itemDesc != null">item_desc,</if>
+            <if test="clientCode != null">client_code,</if>
+            <if test="clientName != null">client_name,</if>
+            <if test="currentSerial != null">current_serial,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="itemId != null">#{itemId},</if>
+            <if test="itemCode != null and itemCode != ''">#{itemCode},</if>
+            <if test="prefix != null">#{prefix},</if>
+            <if test="datePattern != null">#{datePattern},</if>
+            <if test="serialLen != null">#{serialLen},</if>
+            <if test="itemDesc != null">#{itemDesc},</if>
+            <if test="clientCode != null">#{clientCode},</if>
+            <if test="clientName != null">#{clientName},</if>
+            <if test="currentSerial != null">#{currentSerial},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateProProductQrcodeRule" parameterType="ProProductQrcodeRule">
+        update pro_product_qrcode_rule
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="itemId != null">item_id = #{itemId},</if>
+            <if test="itemCode != null and itemCode != ''">item_code = #{itemCode},</if>
+            <if test="prefix != null">prefix = #{prefix},</if>
+            <if test="datePattern != null">date_pattern = #{datePattern},</if>
+            <if test="serialLen != null">serial_len = #{serialLen},</if>
+            <if test="itemDesc != null">item_desc = #{itemDesc},</if>
+            <if test="clientCode != null">client_code = #{clientCode},</if>
+            <if test="clientName != null">client_name = #{clientName},</if>
+            <if test="currentSerial != null">current_serial = #{currentSerial},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where rule_id = #{ruleId}
+    </update>
+
+    <delete id="deleteProProductQrcodeRuleByRuleId" parameterType="Long">
+        delete from pro_product_qrcode_rule where rule_id = #{ruleId}
+    </delete>
+
+    <delete id="deleteProProductQrcodeRuleByRuleIds" parameterType="String">
+        delete from pro_product_qrcode_rule where rule_id in 
+        <foreach item="ruleId" collection="array" open="(" separator="," close=")">
+            #{ruleId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file