Merge remote-tracking branch 'origin/master'

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/accessories/controller/BizAccessoriesController.java

@@ -0,0 +1,116 @@
+package cn.ezhizao.project.business.accessories.controller;
+
+import java.util.List;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+
+import cn.ezhizao.common.utils.poi.ExcelUtil;
+import cn.ezhizao.framework.aspectj.lang.annotation.Log;
+import cn.ezhizao.framework.aspectj.lang.enums.BusinessType;
+import cn.ezhizao.framework.web.controller.BaseController;
+import cn.ezhizao.framework.web.domain.AjaxResult;
+import cn.ezhizao.framework.web.page.TableDataInfo;
+import org.springframework.security.access.prepost.PreAuthorize;
+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 cn.ezhizao.project.business.accessories.domain.BizAccessories;
+import cn.ezhizao.project.business.accessories.service.IBizAccessoriesService;
+
+/**
+ * 辅料管理Controller
+ *
+ * @author ezhizao
+ * @date 2024-09-09
+ */
+@RestController
+@RequestMapping("/business/accessories")
+public class BizAccessoriesController extends BaseController
+{
+    @Resource
+    private IBizAccessoriesService bizAccessoriesService;
+
+    /**
+     * 查询辅料管理列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(BizAccessories bizAccessories) throws NoSuchFieldException, IllegalAccessException
+    {
+        setTenantId(bizAccessories);
+        startPage();
+        List<BizAccessories> list = bizAccessoriesService.getList(bizAccessories);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出辅料管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('business:accessories:export')")
+    @Log(title = "辅料管理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BizAccessories bizAccessories) throws NoSuchFieldException, IllegalAccessException
+    {
+        setTenantId(bizAccessories);
+        List<BizAccessories> list = bizAccessoriesService.getList(bizAccessories);
+        ExcelUtil<BizAccessories> util = new ExcelUtil<BizAccessories>(BizAccessories.class);
+        util.exportExcel(response, list, "辅料管理数据");
+    }
+
+    /**
+     * 获取辅料管理详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(bizAccessoriesService.getById(id));
+    }
+
+    /**
+     * 新增辅料管理
+     */
+    @PreAuthorize("@ss.hasPermi('business:accessories:add')")
+    @Log(title = "辅料管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody BizAccessories bizAccessories) throws NoSuchFieldException, IllegalAccessException
+    {
+        setTenantId(bizAccessories);
+        checkAccessories(bizAccessories);
+        return toAjax(bizAccessoriesService.save(bizAccessories));
+    }
+
+    /**
+     * 修改辅料管理
+     */
+    @PreAuthorize("@ss.hasPermi('business:accessories:edit')")
+    @Log(title = "辅料管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody BizAccessories bizAccessories) throws NoSuchFieldException, IllegalAccessException
+    {
+        setTenantId(bizAccessories);
+        checkAccessories(bizAccessories);
+        return toAjax(bizAccessoriesService.updateById(bizAccessories));
+    }
+
+    private void checkAccessories(BizAccessories bizAccessories) {
+        // 判断是否有重复编码
+        if (bizAccessoriesService.query().eq("accessories_code", bizAccessories.getAccessoriesCode()).ne("id", bizAccessories.getId() == null ? 0L : bizAccessories.getId()).count() > 0) {
+            throw new RuntimeException("辅料编码重复，请输入其他编码");
+        }
+    }
+
+    /**
+     * 删除辅料管理
+     */
+    @PreAuthorize("@ss.hasPermi('business:accessories:remove')")
+    @Log(title = "辅料管理", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable List<Long> ids)
+    {
+        return toAjax(bizAccessoriesService.removeBatchByIds(ids));
+    }
+}

src/main/java/cn/ezhizao/project/business/accessories/domain/BizAccessories.java

@@ -0,0 +1,182 @@
+package cn.ezhizao.project.business.accessories.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
+import cn.ezhizao.framework.web.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 辅料管理对象 biz_accessories
+ *
+ * @author ezhizao
+ * @date 2024-09-09
+ */
+@Data
+@TableName(value = "biz_accessories")
+public class BizAccessories extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 辅料编号 */
+    @Excel(name = "辅料编号")
+    @ApiModelProperty(value = "辅料编号")
+    private String accessoriesCode;
+
+    /** 账号 */
+    @Excel(name = "账号")
+    @ApiModelProperty(value = "账号")
+    private String itype;
+
+    /** 主管部门 */
+    @Excel(name = "主管部门")
+    @ApiModelProperty(value = "主管部门")
+    private String cusven;
+
+    /** 物料描述 */
+    @Excel(name = "物料描述")
+    @ApiModelProperty(value = "物料描述")
+    private String description;
+
+    /** 采购单位 */
+    @Excel(name = "采购单位")
+    @ApiModelProperty(value = "采购单位")
+    private String unit;
+
+    /** 建立者 */
+    @Excel(name = "建立者")
+    @ApiModelProperty(value = "建立者")
+    private String cruser;
+
+    /** 修改日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "修改日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty(value = "修改日期")
+    private Date mddate;
+
+    /** 修改者 */
+    @Excel(name = "修改者")
+    @ApiModelProperty(value = "修改者")
+    private String mduser;
+
+    /** 换算单位 */
+    @Excel(name = "换算单位")
+    @ApiModelProperty(value = "换算单位")
+    private String pouom;
+
+    /** 环保大类码501\502\503\504 */
+    @Excel(name = "环保大类码501\502\503\504")
+    @ApiModelProperty(value = "环保大类码501\502\503\504")
+    private String htype;
+
+    /** 环保大类简称 */
+    @Excel(name = "环保大类简称")
+    @ApiModelProperty(value = "环保大类简称")
+    private String htyna;
+
+    /** 操作者 */
+    @Excel(name = "操作者")
+    @ApiModelProperty(value = "操作者")
+    private String writeruser;
+
+    /** 月用量 */
+    @Excel(name = "月用量")
+    @ApiModelProperty(value = "月用量")
+    private BigDecimal monthUseAmount;
+
+    /** 类别 备库物资 */
+    @Excel(name = "类别 备库物资")
+    @ApiModelProperty(value = "类别 备库物资")
+    private String ltype;
+
+    /** 交货天数 */
+    @Excel(name = "交货天数")
+    @ApiModelProperty(value = "交货天数")
+    private Long deliveryDate;
+
+    /** 安全库存量 */
+    @Excel(name = "安全库存量")
+    @ApiModelProperty(value = "安全库存量")
+    private BigDecimal safetyStock;
+
+    /** 单价 */
+    @Excel(name = "单价")
+    @ApiModelProperty(value = "单价")
+    private BigDecimal price;
+
+    /** NA 正常FM封存 CL 停用 */
+    @Excel(name = "NA 正常FM封存 CL 停用")
+    @ApiModelProperty(value = "NA 正常FM封存 CL 停用")
+    private String status;
+
+    /** 建立日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "建立日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty(value = "建立日期")
+    private Date crdate;
+
+    /** 环保标志Y-有环保要求N-无 */
+    @Excel(name = "环保标志Y-有环保要求N-无")
+    @ApiModelProperty(value = "环保标志Y-有环保要求N-无")
+    private String ecoMark;
+
+    /** 单位换算比例 */
+    @Excel(name = "单位换算比例")
+    @ApiModelProperty(value = "单位换算比例")
+    private BigDecimal conversionRatio;
+
+    /** 更新日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "更新日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty(value = "更新日期")
+    private Date writedate;
+
+    /** 包装箱尺寸 */
+    @Excel(name = "包装箱尺寸")
+    @ApiModelProperty(value = "包装箱尺寸")
+    private String packageStandard;
+
+    /** 美捷原系统物料编码 */
+    @Excel(name = "美捷原系统物料编码")
+    @ApiModelProperty(value = "美捷原系统物料编码")
+    private String ypart;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @ApiModelProperty(value = "${comment}")
+    private BigDecimal yamt;
+
+    /** 当月加权平均单价（未税） */
+    @Excel(name = "当月加权平均单价", readConverterExp = "未=税")
+    @ApiModelProperty(value = "当月加权平均单价")
+    private BigDecimal monthAvgPrice;
+
+    /** 可变费/固定费=K/G */
+    @Excel(name = "可变费/固定费=K/G")
+    @ApiModelProperty(value = "可变费/固定费=K/G")
+    private String ftype;
+
+    /** 领用计费形式整体/天数/产量(Z/T/C)整体就是不可分割领用后全部消耗 */
+    @Excel(name = "领用计费形式整体/天数/产量(Z/T/C)整体就是不可分割领用后全部消耗")
+    @ApiModelProperty(value = "领用计费形式整体/天数/产量(Z/T/C)整体就是不可分割领用后全部消耗")
+    private String ktype;
+
+    /** 标准寿命天数:从领用日起开始计算使用天数(按月计算) */
+    @Excel(name = "标准寿命天数:从领用日起开始计算使用天数(按月计算)")
+    @ApiModelProperty(value = "标准寿命天数:从领用日起开始计算使用天数(按月计算)")
+    private Long ktyts;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    @ApiModelProperty(value = "${comment}")
+    private String facno;
+
+    /** 租户id */
+    @ApiModelProperty(value = "${comment}")
+    private Long tenantId;
+
+}

src/main/java/cn/ezhizao/project/business/accessories/mapper/BizAccessoriesMapper.java

@@ -0,0 +1,29 @@
+package cn.ezhizao.project.business.accessories.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import cn.ezhizao.project.business.accessories.domain.BizAccessories;
+
+/**
+ * 辅料管理Mapper接口
+ *
+ * @author ezhizao
+ * @date 2024-09-09
+ */
+public interface BizAccessoriesMapper extends BaseMapper<BizAccessories>
+{
+    /**
+     * 查询辅料管理列表
+     *
+     * @param bizAccessories 辅料管理
+     * @return 辅料管理集合
+     */
+    public List<BizAccessories> getList(BizAccessories bizAccessories);
+
+    /**
+     * 物理删除
+     * @param bizAccessories
+     * @return 删除结果
+    */
+    public int physicalDelete(BizAccessories bizAccessories);
+}

src/main/java/cn/ezhizao/project/business/accessories/service/IBizAccessoriesService.java

@@ -0,0 +1,30 @@
+package cn.ezhizao.project.business.accessories.service;
+
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
+import cn.ezhizao.project.business.accessories.domain.BizAccessories;
+
+/**
+ * 辅料管理Service接口
+ *
+ * @author ezhizao
+ * @date 2024-09-09
+ */
+public interface IBizAccessoriesService extends IService<BizAccessories>
+{
+    /**
+     * 查询辅料管理列表
+     *
+     * @param bizAccessories 辅料管理
+     * @return 辅料管理集合
+     */
+    public List<BizAccessories> getList(BizAccessories bizAccessories);
+
+    /**
+     * 物理删除
+     * @param bizAccessories
+     * @return 删除结果
+     */
+    public int physicalDelete(BizAccessories bizAccessories);
+
+}

src/main/java/cn/ezhizao/project/business/accessories/service/impl/BizAccessoriesServiceImpl.java

@@ -0,0 +1,43 @@
+package cn.ezhizao.project.business.accessories.service.impl;
+
+import java.util.List;
+import javax.annotation.Resource;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import cn.ezhizao.project.business.accessories.mapper.BizAccessoriesMapper;
+import cn.ezhizao.project.business.accessories.domain.BizAccessories;
+import cn.ezhizao.project.business.accessories.service.IBizAccessoriesService;
+
+/**
+ * 辅料管理Service业务层处理
+ *
+ * @author ezhizao
+ * @date 2024-09-09
+ */
+@Service
+public class BizAccessoriesServiceImpl  extends ServiceImpl<BizAccessoriesMapper, BizAccessories> implements IBizAccessoriesService
+{
+    @Resource
+    private BizAccessoriesMapper bizAccessoriesMapper;
+
+    /**
+     * 查询辅料管理列表
+     *
+     * @param bizAccessories 辅料管理
+     * @return 辅料管理
+     */
+    @Override
+    public List<BizAccessories> getList(BizAccessories bizAccessories)
+    {
+        return bizAccessoriesMapper.getList(bizAccessories);
+    }
+
+    /**
+     * 物理删除
+     * @param bizAccessories
+     * @return 删除结果
+     */
+    @Override
+    public int physicalDelete(BizAccessories bizAccessories){ return bizAccessoriesMapper.physicalDelete(bizAccessories); };
+
+}

src/main/java/cn/ezhizao/project/business/carrier/controller/BizCarrierCategoryController.java

@@ -73,6 +73,8 @@ public class BizCarrierCategoryController extends BaseController {
 //        queryWrapper.eq("tenant_id", Long.valueOf(tenantId));
         List<BizCarrierCategory> categoryList = iBizCarrierCategoryService.list(queryWrapper);
         BizCarrierCategory bizEquipmentDetail = iBizCarrierCategoryService.getById(id);
+
+
         Map<String, Object> map = new HashMap<>(3);
         map.put("formData", bizEquipmentDetail);
         map.put("parentOptions", iBizCarrierCategoryService.getCategoryOptions(categoryList));

src/main/java/cn/ezhizao/project/business/carrier/controller/BizCarrierController.java

@@ -49,6 +49,7 @@ import java.io.File;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -212,6 +213,16 @@ public class BizCarrierController extends BaseController {
         return toAjax(iBizCarrierService.removeBatchByIds(ids));
     }
 
+    @Log(title="载具码pdf", businessType = BusinessType.UPDATE)
+    @GetMapping("/printUpdate/{ids}")
+    public AjaxResult printUpdate(@PathVariable List<Long> ids) {
+        List<BizCarrier> carriers = iBizCarrierService.query().in("id", ids.isEmpty() ? Collections.singletonList(-1) : ids).list();
+        carriers.forEach(l -> {
+            l.setIsPrint(1);
+        });
+        return toAjax(carriers.isEmpty() || iBizCarrierService.updateBatchById(carriers));
+    }
+
     /**
      * 取消废弃
      *

src/main/java/cn/ezhizao/project/business/carrier/domain/BizCarrier.java

@@ -98,4 +98,7 @@ public class BizCarrier extends BaseEntity {
 
     // 是否检查载具
     private Integer isInspection;
+
+    // 是否已打印
+    private Integer isPrint;
 }

src/main/java/cn/ezhizao/project/business/company/controller/BizCompanyController.java

@@ -0,0 +1,108 @@
+package cn.ezhizao.project.business.company.controller;
+
+import java.util.List;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+
+import cn.ezhizao.common.utils.poi.ExcelUtil;
+import cn.ezhizao.framework.aspectj.lang.annotation.Log;
+import cn.ezhizao.framework.aspectj.lang.enums.BusinessType;
+import cn.ezhizao.framework.web.controller.BaseController;
+import cn.ezhizao.framework.web.domain.AjaxResult;
+import cn.ezhizao.framework.web.page.TableDataInfo;
+import org.springframework.security.access.prepost.PreAuthorize;
+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 cn.ezhizao.project.business.company.domain.BizCompany;
+import cn.ezhizao.project.business.company.service.IBizCompanyService;
+
+/**
+ * 客户名称Controller
+ *
+ * @author ezhizao
+ * @date 2024-09-12
+ */
+@RestController
+@RequestMapping("/business/company")
+public class BizCompanyController extends BaseController
+{
+    @Resource
+    private IBizCompanyService bizCompanyService;
+
+    /**
+     * 查询客户名称列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(BizCompany bizCompany) throws NoSuchFieldException, IllegalAccessException
+    {
+        setTenantId(bizCompany);
+        startPage();
+        List<BizCompany> list = bizCompanyService.getList(bizCompany);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出客户名称列表
+     */
+    @PreAuthorize("@ss.hasPermi('business:company:export')")
+    @Log(title = "客户名称", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BizCompany bizCompany) throws NoSuchFieldException, IllegalAccessException
+    {
+        setTenantId(bizCompany);
+        List<BizCompany> list = bizCompanyService.getList(bizCompany);
+        ExcelUtil<BizCompany> util = new ExcelUtil<BizCompany>(BizCompany.class);
+        util.exportExcel(response, list, "客户名称数据");
+    }
+
+    /**
+     * 获取客户名称详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('business:company:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(bizCompanyService.getById(id));
+    }
+
+    /**
+     * 新增客户名称
+     */
+    @PreAuthorize("@ss.hasPermi('business:company:add')")
+    @Log(title = "客户名称", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody BizCompany bizCompany) throws NoSuchFieldException, IllegalAccessException
+    {
+        setTenantId(bizCompany);
+        return toAjax(bizCompanyService.save(bizCompany));
+    }
+
+    /**
+     * 修改客户名称
+     */
+    @PreAuthorize("@ss.hasPermi('business:company:edit')")
+    @Log(title = "客户名称", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody BizCompany bizCompany) throws NoSuchFieldException, IllegalAccessException
+    {
+        setTenantId(bizCompany);
+        return toAjax(bizCompanyService.updateById(bizCompany));
+    }
+
+    /**
+     * 删除客户名称
+     */
+    @PreAuthorize("@ss.hasPermi('business:company:remove')")
+    @Log(title = "客户名称", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable List<Long> ids)
+    {
+        return toAjax(bizCompanyService.removeBatchByIds(ids));
+    }
+}

src/main/java/cn/ezhizao/project/business/company/domain/BizCompany.java

@@ -0,0 +1,59 @@
+package cn.ezhizao.project.business.company.domain;
+
+import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
+import cn.ezhizao.framework.web.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 客户名称对象 biz_company
+ *
+ * @author ezhizao
+ * @date 2024-09-12
+ */
+@Data
+@TableName(value = "biz_company")
+public class BizCompany extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 租户id */
+    @ApiModelProperty(value = "${comment}")
+    private Long tenantId;
+
+    /** 公司编码 */
+    @Excel(name = "公司编码")
+    @ApiModelProperty(value = "公司编码")
+    private String companyCode;
+
+    /** 公司名称 */
+    @Excel(name = "公司名称")
+    @ApiModelProperty(value = "公司名称")
+    private String companyName;
+
+    /** 公司别名 */
+    @Excel(name = "公司别名")
+    @ApiModelProperty(value = "公司别名")
+    private String companyAlias;
+
+    /** 助记码 */
+    @Excel(name = "助记码")
+    @ApiModelProperty(value = "助记码")
+    private String mnemonicCode;
+
+    /** 地区 */
+    @Excel(name = "地区")
+    @ApiModelProperty(value = "地区")
+    private String region;
+
+    /** 业务员id（对应sys_user的id） */
+    @ApiModelProperty(value = "地区")
+    private Long salemanId;
+
+    /** 业务员编码（对应sys_user的user_name） */
+    @Excel(name = "业务员编码", readConverterExp = "对=应sys_user的user_name")
+    @ApiModelProperty(value = "业务员编码")
+    private String salemanCode;
+
+}

src/main/java/cn/ezhizao/project/business/company/mapper/BizCompanyMapper.java

@@ -0,0 +1,29 @@
+package cn.ezhizao.project.business.company.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import cn.ezhizao.project.business.company.domain.BizCompany;
+
+/**
+ * 客户名称Mapper接口
+ *
+ * @author ezhizao
+ * @date 2024-09-12
+ */
+public interface BizCompanyMapper extends BaseMapper<BizCompany>
+{
+    /**
+     * 查询客户名称列表
+     *
+     * @param bizCompany 客户名称
+     * @return 客户名称集合
+     */
+    public List<BizCompany> getList(BizCompany bizCompany);
+
+    /**
+     * 物理删除
+     * @param bizCompany
+     * @return 删除结果
+    */
+    public int physicalDelete(BizCompany bizCompany);
+}

src/main/java/cn/ezhizao/project/business/company/service/IBizCompanyService.java

@@ -0,0 +1,30 @@
+package cn.ezhizao.project.business.company.service;
+
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
+import cn.ezhizao.project.business.company.domain.BizCompany;
+
+/**
+ * 客户名称Service接口
+ *
+ * @author ezhizao
+ * @date 2024-09-12
+ */
+public interface IBizCompanyService extends IService<BizCompany>
+{
+    /**
+     * 查询客户名称列表
+     *
+     * @param bizCompany 客户名称
+     * @return 客户名称集合
+     */
+    public List<BizCompany> getList(BizCompany bizCompany);
+
+    /**
+     * 物理删除
+     * @param bizCompany
+     * @return 删除结果
+     */
+    public int physicalDelete(BizCompany bizCompany);
+
+}

src/main/java/cn/ezhizao/project/business/company/service/impl/BizCompanyServiceImpl.java

@@ -0,0 +1,43 @@
+package cn.ezhizao.project.business.company.service.impl;
+
+import java.util.List;
+import javax.annotation.Resource;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import cn.ezhizao.project.business.company.mapper.BizCompanyMapper;
+import cn.ezhizao.project.business.company.domain.BizCompany;
+import cn.ezhizao.project.business.company.service.IBizCompanyService;
+
+/**
+ * 客户名称Service业务层处理
+ *
+ * @author ezhizao
+ * @date 2024-09-12
+ */
+@Service
+public class BizCompanyServiceImpl  extends ServiceImpl<BizCompanyMapper, BizCompany> implements IBizCompanyService
+{
+    @Resource
+    private BizCompanyMapper bizCompanyMapper;
+
+    /**
+     * 查询客户名称列表
+     *
+     * @param bizCompany 客户名称
+     * @return 客户名称
+     */
+    @Override
+    public List<BizCompany> getList(BizCompany bizCompany)
+    {
+        return bizCompanyMapper.getList(bizCompany);
+    }
+
+    /**
+     * 物理删除
+     * @param bizCompany
+     * @return 删除结果
+     */
+    @Override
+    public int physicalDelete(BizCompany bizCompany){ return bizCompanyMapper.physicalDelete(bizCompany); };
+
+}

src/main/java/cn/ezhizao/project/business/companyProductPackage/controller/BizCompanyProductPackageController.java

@@ -0,0 +1,108 @@
+package cn.ezhizao.project.business.companyProductPackage.controller;
+
+import java.util.List;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+
+import cn.ezhizao.common.utils.poi.ExcelUtil;
+import cn.ezhizao.framework.aspectj.lang.annotation.Log;
+import cn.ezhizao.framework.aspectj.lang.enums.BusinessType;
+import cn.ezhizao.framework.web.controller.BaseController;
+import cn.ezhizao.framework.web.domain.AjaxResult;
+import cn.ezhizao.framework.web.page.TableDataInfo;
+import org.springframework.security.access.prepost.PreAuthorize;
+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 cn.ezhizao.project.business.companyProductPackage.domain.BizCompanyProductPackage;
+import cn.ezhizao.project.business.companyProductPackage.service.IBizCompanyProductPackageService;
+
+/**
+ * 产品包装客户关联Controller
+ *
+ * @author ezhizao
+ * @date 2024-09-10
+ */
+@RestController
+@RequestMapping("/business/companyProductPackage")
+public class BizCompanyProductPackageController extends BaseController
+{
+    @Resource
+    private IBizCompanyProductPackageService bizCompanyProductPackageService;
+
+    /**
+     * 查询产品包装客户关联列表
+     */
+    @PreAuthorize("@ss.hasPermi('business:companyProductPackage:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(BizCompanyProductPackage bizCompanyProductPackage) throws NoSuchFieldException, IllegalAccessException
+    {
+        setTenantId(bizCompanyProductPackage);
+        startPage();
+        List<BizCompanyProductPackage> list = bizCompanyProductPackageService.getList(bizCompanyProductPackage);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出产品包装客户关联列表
+     */
+    @PreAuthorize("@ss.hasPermi('business:companyProductPackage:export')")
+    @Log(title = "产品包装客户关联", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BizCompanyProductPackage bizCompanyProductPackage) throws NoSuchFieldException, IllegalAccessException
+    {
+        setTenantId(bizCompanyProductPackage);
+        List<BizCompanyProductPackage> list = bizCompanyProductPackageService.getList(bizCompanyProductPackage);
+        ExcelUtil<BizCompanyProductPackage> util = new ExcelUtil<BizCompanyProductPackage>(BizCompanyProductPackage.class);
+        util.exportExcel(response, list, "产品包装客户关联数据");
+    }
+
+    /**
+     * 获取产品包装客户关联详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(bizCompanyProductPackageService.getById(id));
+    }
+
+    /**
+     * 新增产品包装客户关联
+     */
+    @PreAuthorize("@ss.hasPermi('business:companyProductPackage:add')")
+    @Log(title = "产品包装客户关联", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody BizCompanyProductPackage bizCompanyProductPackage) throws NoSuchFieldException, IllegalAccessException
+    {
+        setTenantId(bizCompanyProductPackage);
+        return toAjax(bizCompanyProductPackageService.save(bizCompanyProductPackage));
+    }
+
+    /**
+     * 修改产品包装客户关联
+     */
+    @PreAuthorize("@ss.hasPermi('business:companyProductPackage:edit')")
+    @Log(title = "产品包装客户关联", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody BizCompanyProductPackage bizCompanyProductPackage) throws NoSuchFieldException, IllegalAccessException
+    {
+        setTenantId(bizCompanyProductPackage);
+        return toAjax(bizCompanyProductPackageService.updateById(bizCompanyProductPackage));
+    }
+
+    /**
+     * 删除产品包装客户关联
+     */
+    @PreAuthorize("@ss.hasPermi('business:companyProductPackage:remove')")
+    @Log(title = "产品包装客户关联", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable List<Long> ids)
+    {
+        return toAjax(bizCompanyProductPackageService.removeBatchByIds(ids));
+    }
+}

src/main/java/cn/ezhizao/project/business/companyProductPackage/domain/BizCompanyProductPackage.java

@@ -0,0 +1,163 @@
+package cn.ezhizao.project.business.companyProductPackage.domain;
+
+import java.math.BigDecimal;
+
+import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
+import cn.ezhizao.framework.web.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 产品包装客户关联对象 biz_company_product_package
+ *
+ * @author ezhizao
+ * @date 2024-09-10
+ */
+@Data
+@TableName(value = "biz_company_product_package")
+public class BizCompanyProductPackage extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 产品id */
+    @ApiModelProperty(value = "${comment}")
+    private Long productId;
+
+    /** 产品编码 */
+    @Excel(name = "产品编码")
+    @ApiModelProperty(value = "产品编码")
+    private String productCode;
+
+    /** 客户id */
+    @ApiModelProperty(value = "产品编码")
+    private Long companyId;
+
+    /** 客户编码 */
+    @Excel(name = "客户编码")
+    @ApiModelProperty(value = "客户编码")
+    private String companyCode;
+
+    /** 包装形式码 */
+    @Excel(name = "包装形式码")
+    @ApiModelProperty(value = "包装形式码")
+    private String packageTypeCode;
+
+    /** 产品描述 */
+    @Excel(name = "产品描述")
+    @ApiModelProperty(value = "产品描述")
+    private String productDescription;
+
+    /** 客户助记码 */
+    @Excel(name = "客户助记码")
+    @ApiModelProperty(value = "客户助记码")
+    private String mnemonicCode;
+
+    /** 客户简称 */
+    @Excel(name = "客户简称")
+    @ApiModelProperty(value = "客户简称")
+    private String companyAlias;
+
+    @Excel(name = "包装外键")
+    @ApiModelProperty(value = "包装外键")
+    private Long accessoriesId;
+
+    /** 包装箱辅料编码 */
+    @Excel(name = "包装箱辅料编码")
+    @ApiModelProperty(value = "包装箱辅料编码")
+    private String packageCode;
+
+    /** 包装箱号 */
+    @Excel(name = "包装箱号")
+    @ApiModelProperty(value = "包装箱号")
+    private String packageNo;
+
+    /** 包装尺寸 */
+    @Excel(name = "包装尺寸")
+    @ApiModelProperty(value = "包装尺寸")
+    private String packageStandard;
+
+    /** 包装长度 */
+    @Excel(name = "包装长度")
+    @ApiModelProperty(value = "包装长度")
+    private String packageLength;
+
+    /** 包装宽度 */
+    @Excel(name = "包装宽度")
+    @ApiModelProperty(value = "包装宽度")
+    private String packageWidth;
+
+    /** 包装箱高度 */
+    @Excel(name = "包装箱高度")
+    @ApiModelProperty(value = "包装箱高度")
+    private String packageHeight;
+
+    /** 单箱毛重 */
+    @Excel(name = "单箱毛重")
+    @ApiModelProperty(value = "单箱毛重")
+    private BigDecimal singleGrossWeight;
+
+    /** 单箱支数 */
+    @Excel(name = "单箱支数")
+    @ApiModelProperty(value = "单箱支数")
+    private Long singleNumber;
+
+    /** 每层箱数 */
+    @Excel(name = "每层箱数")
+    @ApiModelProperty(value = "每层箱数")
+    private Long perNumber;
+
+    /** 满托最小箱数 */
+    @Excel(name = "满托最小箱数")
+    @ApiModelProperty(value = "满托最小箱数")
+    private Long minNumber;
+
+    /** 满托最大箱数 */
+    @Excel(name = "满托最大箱数")
+    @ApiModelProperty(value = "满托最大箱数")
+    private Long maxNumber;
+
+    /** 满托支数 */
+    @Excel(name = "满托支数")
+    @ApiModelProperty(value = "满托支数")
+    private Long maxBranchNumber;
+
+    /** 托盘规格 */
+    @Excel(name = "托盘规格")
+    @ApiModelProperty(value = "托盘规格")
+    private String palletStandard;
+
+    /** 托盘类型：0川字1田字 */
+    @Excel(name = "托盘类型：0川字1田字")
+    @ApiModelProperty(value = "托盘类型：0川字1田字")
+    private String palletType;
+
+    /** "Manual"字符-- 人工区；Automatic字符代表智能区 */
+    @Excel(name = "Manual字符-- 人工区；Automatic字符代表智能区")
+    @ApiModelProperty(value = "Manual字符-- 人工区；Automatic字符代表智能区")
+    private String areaType;
+
+    /** 库存单位 */
+    @Excel(name = "库存单位")
+    @ApiModelProperty(value = "库存单位")
+    private String unit;
+
+    /** 传送状态 */
+    @Excel(name = "传送状态")
+    @ApiModelProperty(value = "传送状态")
+    private String deliveryStatus;
+
+    /** 外箱高度 */
+    @Excel(name = "外箱高度")
+    @ApiModelProperty(value = "外箱高度")
+    private Long outboxHeight;
+
+    /** 租户id */
+    @ApiModelProperty(value = "外箱高度")
+    private Long tenantId;
+
+    @TableField(exist = true)
+    private String remark;
+
+}

src/main/java/cn/ezhizao/project/business/companyProductPackage/mapper/BizCompanyProductPackageMapper.java

@@ -0,0 +1,29 @@
+package cn.ezhizao.project.business.companyProductPackage.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import cn.ezhizao.project.business.companyProductPackage.domain.BizCompanyProductPackage;
+
+/**
+ * 产品包装客户关联Mapper接口
+ *
+ * @author ezhizao
+ * @date 2024-09-10
+ */
+public interface BizCompanyProductPackageMapper extends BaseMapper<BizCompanyProductPackage>
+{
+    /**
+     * 查询产品包装客户关联列表
+     *
+     * @param bizCompanyProductPackage 产品包装客户关联
+     * @return 产品包装客户关联集合
+     */
+    public List<BizCompanyProductPackage> getList(BizCompanyProductPackage bizCompanyProductPackage);
+
+    /**
+     * 物理删除
+     * @param bizCompanyProductPackage
+     * @return 删除结果
+    */
+    public int physicalDelete(BizCompanyProductPackage bizCompanyProductPackage);
+}

src/main/java/cn/ezhizao/project/business/companyProductPackage/service/IBizCompanyProductPackageService.java

@@ -0,0 +1,30 @@
+package cn.ezhizao.project.business.companyProductPackage.service;
+
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
+import cn.ezhizao.project.business.companyProductPackage.domain.BizCompanyProductPackage;
+
+/**
+ * 产品包装客户关联Service接口
+ *
+ * @author ezhizao
+ * @date 2024-09-10
+ */
+public interface IBizCompanyProductPackageService extends IService<BizCompanyProductPackage>
+{
+    /**
+     * 查询产品包装客户关联列表
+     *
+     * @param bizCompanyProductPackage 产品包装客户关联
+     * @return 产品包装客户关联集合
+     */
+    public List<BizCompanyProductPackage> getList(BizCompanyProductPackage bizCompanyProductPackage);
+
+    /**
+     * 物理删除
+     * @param bizCompanyProductPackage
+     * @return 删除结果
+     */
+    public int physicalDelete(BizCompanyProductPackage bizCompanyProductPackage);
+
+}

src/main/java/cn/ezhizao/project/business/companyProductPackage/service/impl/BizCompanyProductPackageServiceImpl.java

@@ -0,0 +1,43 @@
+package cn.ezhizao.project.business.companyProductPackage.service.impl;
+
+import java.util.List;
+import javax.annotation.Resource;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import cn.ezhizao.project.business.companyProductPackage.mapper.BizCompanyProductPackageMapper;
+import cn.ezhizao.project.business.companyProductPackage.domain.BizCompanyProductPackage;
+import cn.ezhizao.project.business.companyProductPackage.service.IBizCompanyProductPackageService;
+
+/**
+ * 产品包装客户关联Service业务层处理
+ *
+ * @author ezhizao
+ * @date 2024-09-10
+ */
+@Service
+public class BizCompanyProductPackageServiceImpl  extends ServiceImpl<BizCompanyProductPackageMapper, BizCompanyProductPackage> implements IBizCompanyProductPackageService
+{
+    @Resource
+    private BizCompanyProductPackageMapper bizCompanyProductPackageMapper;
+
+    /**
+     * 查询产品包装客户关联列表
+     *
+     * @param bizCompanyProductPackage 产品包装客户关联
+     * @return 产品包装客户关联
+     */
+    @Override
+    public List<BizCompanyProductPackage> getList(BizCompanyProductPackage bizCompanyProductPackage)
+    {
+        return bizCompanyProductPackageMapper.getList(bizCompanyProductPackage);
+    }
+
+    /**
+     * 物理删除
+     * @param bizCompanyProductPackage
+     * @return 删除结果
+     */
+    @Override
+    public int physicalDelete(BizCompanyProductPackage bizCompanyProductPackage){ return bizCompanyProductPackageMapper.physicalDelete(bizCompanyProductPackage); };
+
+}

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/java/cn/ezhizao/project/business/product/controller/BizProductController.java

@@ -38,7 +38,6 @@ public class BizProductController extends BaseController {
     /**
      * 查询产品管理列表
      */
-    @PreAuthorize("@ss.hasPermi('business:product:list')")
     @GetMapping("/list")
     public TableDataInfo list(BizProduct bizProduct) throws NoSuchFieldException, IllegalAccessException {
 //        final String tenantId = request.getHeader("tenantId");

src/main/java/cn/ezhizao/project/business/technologicalProcessDetailDrawing/controller/BizTechnologicalProcessDetailDrawingController.java

@@ -94,7 +94,7 @@ public class BizTechnologicalProcessDetailDrawingController extends BaseControll
         util.exportExcel(response, list, "电子图纸数据");
     }
 
-    @Log(title = "用户管理", businessType = BusinessType.IMPORT)
+    @Log(title = "图纸导入", businessType = BusinessType.IMPORT)
     @PreAuthorize("@ss.hasPermi('business:workpiece:import')")
     @Transactional
     @PostMapping("/importData")

src/main/java/cn/ezhizao/project/system/controller/SysDeptController.java

@@ -61,6 +61,20 @@ public class SysDeptController extends BaseController
         List<SysDept> departments = deptService.selectDeptList(dept);
         return getDataTable(departments);
     }
+
+    @GetMapping("/listForCertificate")
+    public TableDataInfo listForCertificate(SysDept dept) throws NoSuchFieldException, IllegalAccessException {
+        String tenantId = request.getHeader("tenantId");
+        dept.setHasPackageLine(1);
+        dept.setTenantId(Long.valueOf(tenantId));
+        if(dept.getWorkshopId()!=null) {
+            startPage();
+            List<SysDept> departments = deptService.selectDeptList(dept);
+            return getDataTable (departments);
+        }
+        List<SysDept> departments = deptService.selectDeptList(dept);
+        return getDataTable(departments);
+    }
     /**
      * 获取部门名称和id
      */

src/main/java/cn/ezhizao/project/system/domain/SysDept.java

@@ -119,6 +119,9 @@ public class SysDept extends BaseEntity {
         this.isSortPackaging = isSortPackaging;
     }
 
+    @TableField(exist = false)
+    private Integer hasPackageLine;
+
     public String getUserName() {
         return userName;
     }
@@ -432,4 +435,12 @@ public class SysDept extends BaseEntity {
                        .append("updateTime", getUpdateTime())
                        .toString();
     }
+
+    public Integer getHasPackageLine() {
+        return hasPackageLine;
+    }
+
+    public void setHasPackageLine(Integer hasPackageLine) {
+        this.hasPackageLine = hasPackageLine;
+    }
 }

src/main/resources/mybatis/business/accessories/BizAccessoriesMapper.xml

@@ -0,0 +1,58 @@
+<?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.accessories.mapper.BizAccessoriesMapper">
+
+    <resultMap type="cn.ezhizao.project.business.accessories.domain.BizAccessories" id="BizAccessoriesResult">
+        <id column="id" property="id"/>
+    </resultMap>
+
+
+    <select id="getList" parameterType="BizAccessories" resultMap="BizAccessoriesResult">
+        SELECT * FROM biz_accessories
+        <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
+            deleted = 0
+            <if test="accessoriesCode != null  and accessoriesCode != ''"> AND accessories_code like concat('%',#{accessoriesCode},'%')</if>
+            <if test="itype != null  and itype != ''"> AND itype = #{itype}</if>
+            <if test="cusven != null  and cusven != ''"> AND cusven = #{cusven}</if>
+            <if test="description != null  and description != ''"> AND description like concat('%',#{description},'%')</if>
+            <if test="unit != null  and unit != ''"> AND unit = #{unit}</if>
+            <if test="cruser != null  and cruser != ''"> AND cruser = #{cruser}</if>
+            <if test="mddate != null "> AND mddate = #{mddate}</if>
+            <if test="mduser != null  and mduser != ''"> AND mduser = #{mduser}</if>
+            <if test="pouom != null  and pouom != ''"> AND pouom = #{pouom}</if>
+            <if test="htype != null  and htype != ''"> AND htype = #{htype}</if>
+            <if test="htyna != null  and htyna != ''"> AND htyna = #{htyna}</if>
+            <if test="writeruser != null  and writeruser != ''"> AND writeruser = #{writeruser}</if>
+            <if test="monthUseAmount != null "> AND month_use_amount = #{monthUseAmount}</if>
+            <if test="ltype != null  and ltype != ''"> AND ltype = #{ltype}</if>
+            <if test="deliveryDate != null "> AND delivery_date = #{deliveryDate}</if>
+            <if test="safetyStock != null "> AND safety_stock = #{safetyStock}</if>
+            <if test="price != null "> AND price = #{price}</if>
+            <if test="status != null  and status != ''"> AND status = #{status}</if>
+            <if test="crdate != null "> AND crdate = #{crdate}</if>
+            <if test="ecoMark != null  and ecoMark != ''"> AND eco_mark = #{ecoMark}</if>
+            <if test="conversionRatio != null "> AND conversion_ratio = #{conversionRatio}</if>
+            <if test="writedate != null "> AND writedate = #{writedate}</if>
+            <if test="packageStandard != null  and packageStandard != ''"> AND package_standard = #{packageStandard}</if>
+            <if test="ypart != null  and ypart != ''"> AND ypart = #{ypart}</if>
+            <if test="yamt != null "> AND yamt = #{yamt}</if>
+            <if test="monthAvgPrice != null "> AND month_avg_price = #{monthAvgPrice}</if>
+            <if test="ftype != null  and ftype != ''"> AND ftype = #{ftype}</if>
+            <if test="ktype != null  and ktype != ''"> AND ktype = #{ktype}</if>
+            <if test="ktyts != null "> AND ktyts = #{ktyts}</if>
+            <if test="facno != null  and facno != ''"> AND facno = #{facno}</if>
+        </trim>
+    </select>
+
+    <delete id="physicalDelete">
+        DELETE FROM biz_accessories
+        <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
+            <if test="id != null">
+                id = #{id} AND
+            </if>
+       <!-- 删除条件为其他外键可以在这里加 -->
+        </trim>
+    </delete>
+</mapper>

src/main/resources/mybatis/business/carrier/BizCarrierMapper.xml

@@ -9,14 +9,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <select id="getList" resultMap="BizCarrierResult" parameterType="cn.ezhizao.project.business.carrier.domain.BizCarrier">
-        select t1.id,t1.category_id,t1.code,t1.qc_code,t1.remark,t1.tenant_id,t1.is_allow_more,
-               COALESCE((SELECT t2.is_abandoned FROM biz_carrier_reject t2 WHERE t1.id = t2.carrier_id ORDER BY t2.create_time DESC LIMIT 1), 0) AS is_abandoned
+        select t1.id,t1.category_id,t1.code,t1.qc_code,t1.remark,t1.tenant_id,t1.is_allow_more,t1.create_time,
+               COALESCE((SELECT t2.is_abandoned FROM biz_carrier_reject t2 WHERE t1.id = t2.carrier_id ORDER BY t2.create_time DESC LIMIT 1), 0) AS is_abandoned, t1.is_print
         FROM biz_carrier t1
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             deleted = 0
             <if test="categoryId != null  and categoryId != 0"> AND category_id = #{categoryId}</if>
             <if test="tenantId != null  and tenantId != 0"> AND tenant_id = #{tenantId}</if>
             <if test="code != null  and code != ''"> AND code LIKE CONCAT('%', #{code}, '%')</if>
+            <if test="isPrint != null"> AND is_print = #{isPrint}</if>
 
         </trim>
 

src/main/resources/mybatis/business/company/BizCompanyMapper.xml

@@ -0,0 +1,34 @@
+<?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.company.mapper.BizCompanyMapper">
+
+    <resultMap type="cn.ezhizao.project.business.company.domain.BizCompany" id="BizCompanyResult">
+        <id column="id" property="id"/>
+    </resultMap>
+
+
+    <select id="getList" parameterType="BizCompany" resultMap="BizCompanyResult">
+        SELECT * FROM biz_company
+        <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
+            deleted = 0
+            <if test="companyCode != null  and companyCode != ''"> AND company_code = #{companyCode}</if>
+            <if test="companyName != null  and companyName != ''"> AND company_name like concat('%', #{companyName}, '%')</if>
+            <if test="companyAlias != null  and companyAlias != ''"> AND company_alias = #{companyAlias}</if>
+            <if test="mnemonicCode != null  and mnemonicCode != ''"> AND mnemonic_code = #{mnemonicCode}</if>
+            <if test="region != null  and region != ''"> AND region = #{region}</if>
+            <if test="salemanCode != null  and salemanCode != ''"> AND saleman_code = #{salemanCode}</if>
+        </trim>
+    </select>
+
+    <delete id="physicalDelete">
+        DELETE FROM biz_company
+        <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
+            <if test="id != null">
+                id = #{id} AND
+            </if>
+       <!-- 删除条件为其他外键可以在这里加 -->
+        </trim>
+    </delete>
+</mapper>

src/main/resources/mybatis/business/companyProductPackage/BizCompanyProductPackageMapper.xml

@@ -0,0 +1,52 @@
+<?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.companyProductPackage.mapper.BizCompanyProductPackageMapper">
+
+    <resultMap type="cn.ezhizao.project.business.companyProductPackage.domain.BizCompanyProductPackage" id="BizCompanyProductPackageResult">
+        <id column="id" property="id"/>
+    </resultMap>
+
+
+    <select id="getList" parameterType="BizCompanyProductPackage" resultMap="BizCompanyProductPackageResult">
+        SELECT * FROM biz_company_product_package
+        <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
+            deleted = 0
+            <if test="productCode != null  and productCode != ''"> AND product_code = #{productCode}</if>
+            <if test="companyCode != null  and companyCode != ''"> AND company_code like concat('%',#{companyCode},'%') </if>
+            <if test="packageTypeCode != null  and packageTypeCode != ''"> AND package_type_code = #{packageTypeCode}</if>
+            <if test="productDescription != null  and productDescription != ''"> AND product_description like concat('%',#{productDescription}, '%')</if>
+            <if test="mnemonicCode != null  and mnemonicCode != ''"> AND mnemonic_code = #{mnemonicCode}</if>
+            <if test="companyAlias != null  and companyAlias != ''"> AND company_alias = #{companyAlias}</if>
+            <if test="packageCode != null  and packageCode != ''"> AND package_code like concat('%',#{packageCode},'%') </if>
+            <if test="packageNo != null  and packageNo != ''"> AND package_no = #{packageNo}</if>
+            <if test="packageStandard != null  and packageStandard != ''"> AND package_standard = #{packageStandard}</if>
+            <if test="packageLength != null  and packageLength != ''"> AND package_length = #{packageLength}</if>
+            <if test="packageWidth != null  and packageWidth != ''"> AND package_width = #{packageWidth}</if>
+            <if test="packageHeight != null  and packageHeight != ''"> AND package_height = #{packageHeight}</if>
+            <if test="singleGrossWeight != null "> AND single_gross_weight = #{singleGrossWeight}</if>
+            <if test="singleNumber != null "> AND single_number = #{singleNumber}</if>
+            <if test="perNumber != null "> AND per_number = #{perNumber}</if>
+            <if test="minNumber != null "> AND min_number = #{minNumber}</if>
+            <if test="maxNumber != null "> AND max_number = #{maxNumber}</if>
+            <if test="maxBranchNumber != null "> AND max_branch_number = #{maxBranchNumber}</if>
+            <if test="palletStandard != null  and palletStandard != ''"> AND pallet_standard = #{palletStandard}</if>
+            <if test="palletType != null  and palletType != ''"> AND pallet_type = #{palletType}</if>
+            <if test="areaType != null  and areaType != ''"> AND area_type = #{areaType}</if>
+            <if test="unit != null  and unit != ''"> AND unit = #{unit}</if>
+            <if test="deliveryStatus != null  and deliveryStatus != ''"> AND delivery_status = #{deliveryStatus}</if>
+            <if test="outboxHeight != null "> AND outbox_height = #{outboxHeight}</if>
+        </trim>
+    </select>
+
+    <delete id="physicalDelete">
+        DELETE FROM biz_company_product_package
+        <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
+            <if test="id != null">
+                id = #{id} AND
+            </if>
+       <!-- 删除条件为其他外键可以在这里加 -->
+        </trim>
+    </delete>
+</mapper>

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>

src/main/resources/mybatis/system/SysDeptMapper.xml

@@ -70,6 +70,9 @@
 		<if test="workshopId != null  and workshopId != 0">
 			AND d.workshop_id = #{workshopId}
 		</if>
+		<if test="hasPackageLine != null and hasPackageLine == 1">
+			AND exists (select 1 from biz_package_resource_group prg where prg.deleted = 0 and prg.dept_id = d.dept_id)
+		</if>
 		<if test="deptIds != null and deptIds.size() > 0">
 		and d.dept_id in
 		<foreach collection="deptIds" item="id" open="(" separator="," close=")">