提交

src/main/java/cn/ezhizao/framework/task/RyTask.java

@@ -8,12 +8,16 @@ import cn.ezhizao.project.business.carrier.domain.BizCarrier;
 import cn.ezhizao.project.business.carrier.service.IBizCarrierService;
 import cn.ezhizao.project.business.equipment.domain.BizEquipmentDetail;
 import cn.ezhizao.project.business.equipment.service.IBizEquipmentDetailService;
+import cn.ezhizao.project.business.packageResourceGroup.domain.BizPackageResourceGroup;
+import cn.ezhizao.project.business.packageResourceGroup.service.IBizPackageResourceGroupService;
+import cn.hutool.core.date.DateTime;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * 定时任务调度测试
@@ -32,6 +36,9 @@ public class RyTask {
     @Resource
     IBizEquipmentDetailService bizEquipmentDetailService;
 
+    @Resource
+    IBizPackageResourceGroupService bizPackageResourceGroupService;
+
     @Resource
     IBizCarrierService bizCarrierService;
 
@@ -47,6 +54,15 @@ public class RyTask {
         System.out.println("执行无参方法");
     }
 
+    public void resetCurrentCode() {
+        List<BizPackageResourceGroup> groupList =bizPackageResourceGroupService.list();
+        groupList.forEach(l -> {
+            l.setCode("000000");
+            l.setYear(DateTime.now().toString("yy"));
+        });
+        bizPackageResourceGroupService.updateBatchById(groupList);
+    }
+
 
     /**
      * 新生成二维码方法，只生成箱号字符串

src/main/java/cn/ezhizao/project/business/packageResourceGroup/domain/BizPackageResourceGroup.java

@@ -0,0 +1,74 @@
+package cn.ezhizao.project.business.packageResourceGroup.domain;
+
+import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
+import cn.ezhizao.framework.web.domain.BaseEntity;
+import cn.ezhizao.project.system.domain.SysUser;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 包装线对象 biz_package_resource_group
+ *
+ * @author ezhizao
+ * @date 2024-09-03
+ */
+@Data
+@TableName(value = "biz_package_resource_group")
+public class BizPackageResourceGroup extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 工段id */
+    @ApiModelProperty(value = "${comment}")
+    private Long deptId;
+
+    /** 包装线号 */
+    @Excel(name = "包装线号")
+    @ApiModelProperty(value = "包装线号")
+    private Long packageLineNo;
+
+    /** 工段线号 */
+    @Excel(name = "工段线号")
+    @ApiModelProperty(value = "工段线号")
+    private Long deptNo;
+
+    /** 包装线名称 */
+    @Excel(name = "包装线名称")
+    @ApiModelProperty(value = "包装线名称")
+    private String name;
+
+    /** 包装线当前编码 */
+    @Excel(name = "包装线当前编码")
+    @ApiModelProperty(value = "包装线当前编码")
+    private String code;
+
+    /** 年编码 */
+    @Excel(name = "年编码")
+    @ApiModelProperty(value = "年编码")
+    private String year;
+
+    /** 租户id */
+    @ApiModelProperty(value = "年编码")
+    private Long tenantId;
+
+    /** 停用(0:否；1是） */
+    @Excel(name = "停用(0:否；1是）")
+    @ApiModelProperty(value = "停用(0:否；1是）")
+    private Integer isDeactivate;
+
+    @TableField(exist = false)
+    private String deptName;
+    @TableField(exist = false)
+    private String deptCode;
+
+    @TableField(exist = false)
+    private List<SysUser> employees;
+
+    @TableField(exist = false)
+    private List<BizPackageResourceGroupDetail> bizPackageResourceGroupDetails;
+
+}

src/main/java/cn/ezhizao/project/business/packageResourceGroup/domain/BizPackageResourceGroupDetail.java

@@ -0,0 +1,48 @@
+package cn.ezhizao.project.business.packageResourceGroup.domain;
+
+import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
+import cn.ezhizao.framework.web.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 包装线明细对象 biz_package_resource_group_detail
+ *
+ * @author ezhizao
+ * @date 2024-09-03
+ */
+@Data
+@TableName(value = "biz_package_resource_group_detail")
+public class BizPackageResourceGroupDetail extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    @ApiModelProperty(value = "${comment}")
+    private Long packageResourceGroupId;
+
+    /** 昵称 */
+    @Excel(name = "昵称")
+    @ApiModelProperty(value = "昵称")
+    private String nickName;
+
+    /** 用户名 */
+    @Excel(name = "用户名")
+    @ApiModelProperty(value = "用户名")
+    private String userName;
+
+    /** 用户id */
+    @ApiModelProperty(value = "用户名")
+    private Long userId;
+
+    /** 租户id */
+    @ApiModelProperty(value = "用户名")
+    private Long tenantId;
+
+    /** 停用(0:否；1是） */
+    @Excel(name = "停用(0:否；1是）")
+    @ApiModelProperty(value = "停用(0:否；1是）")
+    private Integer isDeactivate;
+
+}

src/main/java/cn/ezhizao/project/business/packageResourceGroup/mapper/BizPackageResourceGroupDetailMapper.java

@@ -0,0 +1,30 @@
+package cn.ezhizao.project.business.packageResourceGroup.mapper;
+
+import cn.ezhizao.project.business.packageResourceGroup.domain.BizPackageResourceGroupDetail;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+
+/**
+ * 包装线明细Mapper接口
+ *
+ * @author ezhizao
+ * @date 2024-09-03
+ */
+public interface BizPackageResourceGroupDetailMapper extends BaseMapper<BizPackageResourceGroupDetail>
+{
+    /**
+     * 查询包装线明细列表
+     *
+     * @param bizPackageResourceGroupDetail 包装线明细
+     * @return 包装线明细集合
+     */
+    public List<BizPackageResourceGroupDetail> getList(BizPackageResourceGroupDetail bizPackageResourceGroupDetail);
+
+    /**
+     * 物理删除
+     * @param bizPackageResourceGroupDetail
+     * @return 删除结果
+    */
+    public int physicalDelete(BizPackageResourceGroupDetail bizPackageResourceGroupDetail);
+}

src/main/java/cn/ezhizao/project/business/packageResourceGroup/mapper/BizPackageResourceGroupMapper.java

@@ -0,0 +1,30 @@
+package cn.ezhizao.project.business.packageResourceGroup.mapper;
+
+import cn.ezhizao.project.business.packageResourceGroup.domain.BizPackageResourceGroup;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+
+/**
+ * 包装线Mapper接口
+ *
+ * @author ezhizao
+ * @date 2024-09-03
+ */
+public interface BizPackageResourceGroupMapper extends BaseMapper<BizPackageResourceGroup>
+{
+    /**
+     * 查询包装线列表
+     *
+     * @param bizPackageResourceGroup 包装线
+     * @return 包装线集合
+     */
+    public List<BizPackageResourceGroup> getList(BizPackageResourceGroup bizPackageResourceGroup);
+
+    /**
+     * 物理删除
+     * @param bizPackageResourceGroup
+     * @return 删除结果
+    */
+    public int physicalDelete(BizPackageResourceGroup bizPackageResourceGroup);
+}

src/main/java/cn/ezhizao/project/business/packageResourceGroup/service/IBizPackageResourceGroupDetailService.java

@@ -0,0 +1,31 @@
+package cn.ezhizao.project.business.packageResourceGroup.service;
+
+import cn.ezhizao.project.business.packageResourceGroup.domain.BizPackageResourceGroupDetail;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * 包装线明细Service接口
+ *
+ * @author ezhizao
+ * @date 2024-09-03
+ */
+public interface IBizPackageResourceGroupDetailService extends IService<BizPackageResourceGroupDetail>
+{
+    /**
+     * 查询包装线明细列表
+     *
+     * @param bizPackageResourceGroupDetail 包装线明细
+     * @return 包装线明细集合
+     */
+    public List<BizPackageResourceGroupDetail> getList(BizPackageResourceGroupDetail bizPackageResourceGroupDetail);
+
+    /**
+     * 物理删除
+     * @param bizPackageResourceGroupDetail
+     * @return 删除结果
+     */
+    public int physicalDelete(BizPackageResourceGroupDetail bizPackageResourceGroupDetail);
+
+}

src/main/java/cn/ezhizao/project/business/packageResourceGroup/service/IBizPackageResourceGroupService.java

@@ -0,0 +1,31 @@
+package cn.ezhizao.project.business.packageResourceGroup.service;
+
+import cn.ezhizao.project.business.packageResourceGroup.domain.BizPackageResourceGroup;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * 包装线Service接口
+ *
+ * @author ezhizao
+ * @date 2024-09-03
+ */
+public interface IBizPackageResourceGroupService extends IService<BizPackageResourceGroup>
+{
+    /**
+     * 查询包装线列表
+     *
+     * @param bizPackageResourceGroup 包装线
+     * @return 包装线集合
+     */
+    public List<BizPackageResourceGroup> getList(BizPackageResourceGroup bizPackageResourceGroup);
+
+    /**
+     * 物理删除
+     * @param bizPackageResourceGroup
+     * @return 删除结果
+     */
+    public int physicalDelete(BizPackageResourceGroup bizPackageResourceGroup);
+
+}

src/main/java/cn/ezhizao/project/business/packageResourceGroup/service/impl/BizPackageResourceGroupDetailServiceImpl.java

@@ -0,0 +1,44 @@
+package cn.ezhizao.project.business.packageResourceGroup.service.impl;
+
+import cn.ezhizao.project.business.packageResourceGroup.domain.BizPackageResourceGroupDetail;
+import cn.ezhizao.project.business.packageResourceGroup.mapper.BizPackageResourceGroupDetailMapper;
+import cn.ezhizao.project.business.packageResourceGroup.service.IBizPackageResourceGroupDetailService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 包装线明细Service业务层处理
+ *
+ * @author ezhizao
+ * @date 2024-09-03
+ */
+@Service
+public class BizPackageResourceGroupDetailServiceImpl  extends ServiceImpl<BizPackageResourceGroupDetailMapper, BizPackageResourceGroupDetail> implements IBizPackageResourceGroupDetailService
+{
+    @Resource
+    private BizPackageResourceGroupDetailMapper bizPackageResourceGroupDetailMapper;
+
+    /**
+     * 查询包装线明细列表
+     *
+     * @param bizPackageResourceGroupDetail 包装线明细
+     * @return 包装线明细
+     */
+    @Override
+    public List<BizPackageResourceGroupDetail> getList(BizPackageResourceGroupDetail bizPackageResourceGroupDetail)
+    {
+        return bizPackageResourceGroupDetailMapper.getList(bizPackageResourceGroupDetail);
+    }
+
+    /**
+     * 物理删除
+     * @param bizPackageResourceGroupDetail
+     * @return 删除结果
+     */
+    @Override
+    public int physicalDelete(BizPackageResourceGroupDetail bizPackageResourceGroupDetail){ return bizPackageResourceGroupDetailMapper.physicalDelete(bizPackageResourceGroupDetail); };
+
+}

src/main/java/cn/ezhizao/project/business/packageResourceGroup/service/impl/BizPackageResourceGroupServiceImpl.java

@@ -0,0 +1,44 @@
+package cn.ezhizao.project.business.packageResourceGroup.service.impl;
+
+import cn.ezhizao.project.business.packageResourceGroup.domain.BizPackageResourceGroup;
+import cn.ezhizao.project.business.packageResourceGroup.mapper.BizPackageResourceGroupMapper;
+import cn.ezhizao.project.business.packageResourceGroup.service.IBizPackageResourceGroupService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 包装线Service业务层处理
+ *
+ * @author ezhizao
+ * @date 2024-09-03
+ */
+@Service
+public class BizPackageResourceGroupServiceImpl  extends ServiceImpl<BizPackageResourceGroupMapper, BizPackageResourceGroup> implements IBizPackageResourceGroupService
+{
+    @Resource
+    private BizPackageResourceGroupMapper bizPackageResourceGroupMapper;
+
+    /**
+     * 查询包装线列表
+     *
+     * @param bizPackageResourceGroup 包装线
+     * @return 包装线
+     */
+    @Override
+    public List<BizPackageResourceGroup> getList(BizPackageResourceGroup bizPackageResourceGroup)
+    {
+        return bizPackageResourceGroupMapper.getList(bizPackageResourceGroup);
+    }
+
+    /**
+     * 物理删除
+     * @param bizPackageResourceGroup
+     * @return 删除结果
+     */
+    @Override
+    public int physicalDelete(BizPackageResourceGroup bizPackageResourceGroup){ return bizPackageResourceGroupMapper.physicalDelete(bizPackageResourceGroup); };
+
+}

src/main/resources/mybatis/business/packageResourceGroup/BizPackageResourceGroupDetailMapper.xml

@@ -0,0 +1,32 @@
+<?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="cn.ezhizao.project.business.packageResourceGroup.mapper.BizPackageResourceGroupDetailMapper">
+
+    <resultMap type="cn.ezhizao.project.business.packageResourceGroup.domain.BizPackageResourceGroupDetail" id="BizPackageResourceGroupDetailResult">
+        <id column="id" property="id"/>
+    </resultMap>
+
+
+    <select id="getList" parameterType="BizPackageResourceGroupDetail" resultMap="BizPackageResourceGroupDetailResult">
+        SELECT * FROM biz_package_resource_group_detail
+        <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
+            deleted = 0
+            <if test="packageResourceGroupId != null"> AND package_resource_group_id = #{packageResourceGroupId}</if>
+            <if test="nickName != null  and nickName != ''"> AND nick_name like concat('%', #{nickName}, '%')</if>
+            <if test="userName != null  and userName != ''"> AND user_name like concat('%', #{userName}, '%')</if>
+            <if test="isDeactivate != null "> AND is_deactivate = #{isDeactivate}</if>
+        </trim>
+    </select>
+
+    <delete id="physicalDelete">
+        DELETE FROM biz_package_resource_group_detail
+        <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
+            <if test="id != null">
+                id = #{id} AND
+            </if>
+       <!-- 删除条件为其他外键可以在这里加 -->
+        </trim>
+    </delete>
+</mapper>

src/main/resources/mybatis/business/packageResourceGroup/BizPackageResourceGroupMapper.xml

@@ -0,0 +1,35 @@
+<?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="cn.ezhizao.project.business.packageResourceGroup.mapper.BizPackageResourceGroupMapper">
+
+    <resultMap type="cn.ezhizao.project.business.packageResourceGroup.domain.BizPackageResourceGroup" id="BizPackageResourceGroupResult">
+        <id column="id" property="id"/>
+    </resultMap>
+
+
+    <select id="getList" parameterType="BizPackageResourceGroup" resultMap="BizPackageResourceGroupResult">
+        SELECT t1.*, t2.dept_name, t2.dept_code FROM biz_package_resource_group t1 left join sys_dept t2 on t2.dept_id = t1.dept_id
+        <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
+            t1.deleted = 0
+            <if test="packageLineNo != null "> AND t1.package_line_no = #{packageLineNo}</if>
+            <if test="deptNo != null "> AND t1.dept_no = #{deptNo}</if>
+            <if test="deptId != null "> AND t1.dept_id = #{deptId}</if>
+            <if test="name != null  and name != ''"> AND t1.name like concat('%', #{name}, '%')</if>
+            <if test="code != null  and code != ''"> AND t1.code = #{code}</if>
+            <if test="year != null  and year != ''"> AND t1.year = #{year}</if>
+            <if test="isDeactivate != null "> AND t1.is_deactivate = #{isDeactivate}</if>
+        </trim>
+    </select>
+
+    <delete id="physicalDelete">
+        DELETE FROM biz_package_resource_group
+        <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
+            <if test="id != null">
+                id = #{id} AND
+            </if>
+       <!-- 删除条件为其他外键可以在这里加 -->
+        </trim>
+    </delete>
+</mapper>