From 923c52df79d7049a9c126db16547e936c237fcce Mon Sep 17 00:00:00 2001 From: liuhanqing Date: Mon, 28 Jul 2025 16:56:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=89=93=E5=8D=B0=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BasTraycodeController.java | 104 +++++ .../bas/traycode/domain/BasTraycode.java | 114 +++++ .../traycode/mapper/BasTraycodeMapper.java | 63 +++ .../traycode/service/IBasTraycodeService.java | 63 +++ .../service/impl/BasTraycodeServiceImpl.java | 106 +++++ .../BasTraycodeFormatController.java | 104 +++++ .../domain/BasTraycodeFormat.java | 174 +++++++ .../mapper/BasTraycodeFormatMapper.java | 61 +++ .../service/IBasTraycodeFormatService.java | 61 +++ .../impl/BasTraycodeFormatServiceImpl.java | 120 +++++ .../service/impl/TagTaskServiceImpl.java | 2 - .../mapper/bas/BasTraycodeFormatMapper.xml | 106 +++++ .../mapper/bas/BasTraycodeMapper.xml | 96 ++++ ruoyi-ui/src/api/bas/traycode.js | 44 ++ ruoyi-ui/src/api/bas/traycodeFormat.js | 53 +++ ruoyi-ui/src/views/bas/traycode/index.vue | 351 +++++++++++++++ .../src/views/bas/traycodeFormat/index.vue | 425 ++++++++++++++++++ 17 files changed, 2045 insertions(+), 2 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/controller/BasTraycodeController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/domain/BasTraycode.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/mapper/BasTraycodeMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/service/IBasTraycodeService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/service/impl/BasTraycodeServiceImpl.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/bas/traycodeformat/controller/BasTraycodeFormatController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/bas/traycodeformat/domain/BasTraycodeFormat.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/bas/traycodeformat/mapper/BasTraycodeFormatMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/bas/traycodeformat/service/IBasTraycodeFormatService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/bas/traycodeformat/service/impl/BasTraycodeFormatServiceImpl.java create mode 100644 ruoyi-admin/src/main/resources/mapper/bas/BasTraycodeFormatMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/bas/BasTraycodeMapper.xml create mode 100644 ruoyi-ui/src/api/bas/traycode.js create mode 100644 ruoyi-ui/src/api/bas/traycodeFormat.js create mode 100644 ruoyi-ui/src/views/bas/traycode/index.vue create mode 100644 ruoyi-ui/src/views/bas/traycodeFormat/index.vue diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/controller/BasTraycodeController.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/controller/BasTraycodeController.java new file mode 100644 index 0000000..9950c90 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/controller/BasTraycodeController.java @@ -0,0 +1,104 @@ +package com.ruoyi.bas.traycode.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +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.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.bas.traycode.domain.BasTraycode; +import com.ruoyi.bas.traycode.service.IBasTraycodeService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 条码信息Controller + * + * @author ruoyi + * @date 2025-07-28 + */ +@RestController +@RequestMapping("/bas/traycode") +public class BasTraycodeController extends BaseController +{ + @Autowired + private IBasTraycodeService basTraycodeService; + + /** + * 查询条码信息列表 + */ + @PreAuthorize("@ss.hasPermi('bas:traycode:list')") + @GetMapping("/list") + public TableDataInfo list(BasTraycode basTraycode) + { + startPage(); + List list = basTraycodeService.selectBasTraycodeList(basTraycode); + return getDataTable(list); + } + + /** + * 导出条码信息列表 + */ + @PreAuthorize("@ss.hasPermi('bas:traycode:export')") + @Log(title = "条码信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, BasTraycode basTraycode) + { + List list = basTraycodeService.selectBasTraycodeList(basTraycode); + ExcelUtil util = new ExcelUtil(BasTraycode.class); + util.exportExcel(response, list, "条码信息数据"); + } + + /** + * 获取条码信息详细信息 + */ + @PreAuthorize("@ss.hasPermi('bas:traycode:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(basTraycodeService.selectBasTraycodeById(id)); + } + + /** + * 新增条码信息 + */ + @PreAuthorize("@ss.hasPermi('bas:traycode:add')") + @Log(title = "条码信息", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody BasTraycode basTraycode) + { + return toAjax(basTraycodeService.insertBasTraycode(basTraycode)); + } + + /** + * 修改条码信息 + */ + @PreAuthorize("@ss.hasPermi('bas:traycode:edit')") + @Log(title = "条码信息", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BasTraycode basTraycode) + { + return toAjax(basTraycodeService.updateBasTraycode(basTraycode)); + } + + /** + * 删除条码信息 + */ + @PreAuthorize("@ss.hasPermi('bas:traycode:remove')") + @Log(title = "条码信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(basTraycodeService.deleteBasTraycodeByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/domain/BasTraycode.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/domain/BasTraycode.java new file mode 100644 index 0000000..7fae8bb --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/domain/BasTraycode.java @@ -0,0 +1,114 @@ +package com.ruoyi.bas.traycode.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 条码信息对象 bas_traycode + * + * @author ruoyi + * @date 2025-07-28 + */ +public class BasTraycode extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** id */ + private Long id; + + /** 条码类型id */ + @Excel(name = "条码类型id") + private Long formatId; + + /** 条码 */ + @Excel(name = "条码") + private String trayCode; + + /** 备用字段1 */ + @Excel(name = "备用字段1") + private String spare1; + + /** 备用字段2 */ + @Excel(name = "备用字段2") + private String spare2; + + /** 备用字段3 */ + @Excel(name = "备用字段3") + private String spare3; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + + public void setFormatId(Long formatId) + { + this.formatId = formatId; + } + + public Long getFormatId() + { + return formatId; + } + + public void setTrayCode(String trayCode) + { + this.trayCode = trayCode; + } + + public String getTrayCode() + { + return trayCode; + } + + public void setSpare1(String spare1) + { + this.spare1 = spare1; + } + + public String getSpare1() + { + return spare1; + } + + public void setSpare2(String spare2) + { + this.spare2 = spare2; + } + + public String getSpare2() + { + return spare2; + } + + public void setSpare3(String spare3) + { + this.spare3 = spare3; + } + + public String getSpare3() + { + return spare3; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("formatId", getFormatId()) + .append("trayCode", getTrayCode()) + .append("createTime", getCreateTime()) + .append("updateTime", getUpdateTime()) + .append("spare1", getSpare1()) + .append("spare2", getSpare2()) + .append("spare3", getSpare3()) + .toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/mapper/BasTraycodeMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/mapper/BasTraycodeMapper.java new file mode 100644 index 0000000..c369c74 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/mapper/BasTraycodeMapper.java @@ -0,0 +1,63 @@ +package com.ruoyi.bas.traycode.mapper; + +import java.util.List; +import com.ruoyi.bas.traycode.domain.BasTraycode; + +/** + * 条码信息Mapper接口 + * + * @author ruoyi + * @date 2025-07-28 + */ +public interface BasTraycodeMapper +{ + /** + * 查询条码信息 + * + * @param id 条码信息主键 + * @return 条码信息 + */ + public BasTraycode selectBasTraycodeById(Long id); + + /** + * 查询条码信息列表 + * + * @param basTraycode 条码信息 + * @return 条码信息集合 + */ + public List selectBasTraycodeList(BasTraycode basTraycode); + + /** + * 新增条码信息 + * + * @param basTraycode 条码信息 + * @return 结果 + */ + public int insertBasTraycode(BasTraycode basTraycode); + + /** + * 修改条码信息 + * + * @param basTraycode 条码信息 + * @return 结果 + */ + public int updateBasTraycode(BasTraycode basTraycode); + + /** + * 删除条码信息 + * + * @param id 条码信息主键 + * @return 结果 + */ + public int deleteBasTraycodeById(Long id); + + /** + * 批量删除条码信息 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteBasTraycodeByIds(Long[] ids); + + void insertBasTraycodeList(List list); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/service/IBasTraycodeService.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/service/IBasTraycodeService.java new file mode 100644 index 0000000..8b3d80f --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/service/IBasTraycodeService.java @@ -0,0 +1,63 @@ +package com.ruoyi.bas.traycode.service; + +import java.util.List; +import com.ruoyi.bas.traycode.domain.BasTraycode; + +/** + * 条码信息Service接口 + * + * @author ruoyi + * @date 2025-07-28 + */ +public interface IBasTraycodeService +{ + /** + * 查询条码信息 + * + * @param id 条码信息主键 + * @return 条码信息 + */ + public BasTraycode selectBasTraycodeById(Long id); + + /** + * 查询条码信息列表 + * + * @param basTraycode 条码信息 + * @return 条码信息集合 + */ + public List selectBasTraycodeList(BasTraycode basTraycode); + + /** + * 新增条码信息 + * + * @param basTraycode 条码信息 + * @return 结果 + */ + public int insertBasTraycode(BasTraycode basTraycode); + + /** + * 修改条码信息 + * + * @param basTraycode 条码信息 + * @return 结果 + */ + public int updateBasTraycode(BasTraycode basTraycode); + + /** + * 批量删除条码信息 + * + * @param ids 需要删除的条码信息主键集合 + * @return 结果 + */ + public int deleteBasTraycodeByIds(Long[] ids); + + /** + * 删除条码信息信息 + * + * @param id 条码信息主键 + * @return 结果 + */ + public int deleteBasTraycodeById(Long id); + + void insertBasTraycodeList(List traycodeList); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/service/impl/BasTraycodeServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/service/impl/BasTraycodeServiceImpl.java new file mode 100644 index 0000000..377d371 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/service/impl/BasTraycodeServiceImpl.java @@ -0,0 +1,106 @@ +package com.ruoyi.bas.traycode.service.impl; + +import java.util.List; + +import cn.hutool.core.collection.CollUtil; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.bas.traycode.mapper.BasTraycodeMapper; +import com.ruoyi.bas.traycode.domain.BasTraycode; +import com.ruoyi.bas.traycode.service.IBasTraycodeService; + +/** + * 条码信息Service业务层处理 + * + * @author ruoyi + * @date 2025-07-28 + */ +@Service +public class BasTraycodeServiceImpl implements IBasTraycodeService +{ + @Autowired + private BasTraycodeMapper basTraycodeMapper; + + /** + * 查询条码信息 + * + * @param id 条码信息主键 + * @return 条码信息 + */ + @Override + public BasTraycode selectBasTraycodeById(Long id) + { + return basTraycodeMapper.selectBasTraycodeById(id); + } + + /** + * 查询条码信息列表 + * + * @param basTraycode 条码信息 + * @return 条码信息 + */ + @Override + public List selectBasTraycodeList(BasTraycode basTraycode) + { + return basTraycodeMapper.selectBasTraycodeList(basTraycode); + } + + /** + * 新增条码信息 + * + * @param basTraycode 条码信息 + * @return 结果 + */ + @Override + public int insertBasTraycode(BasTraycode basTraycode) + { + basTraycode.setCreateTime(DateUtils.getNowDate()); + return basTraycodeMapper.insertBasTraycode(basTraycode); + } + + /** + * 修改条码信息 + * + * @param basTraycode 条码信息 + * @return 结果 + */ + @Override + public int updateBasTraycode(BasTraycode basTraycode) + { + basTraycode.setUpdateTime(DateUtils.getNowDate()); + return basTraycodeMapper.updateBasTraycode(basTraycode); + } + + /** + * 批量删除条码信息 + * + * @param ids 需要删除的条码信息主键 + * @return 结果 + */ + @Override + public int deleteBasTraycodeByIds(Long[] ids) + { + return basTraycodeMapper.deleteBasTraycodeByIds(ids); + } + + /** + * 删除条码信息信息 + * + * @param id 条码信息主键 + * @return 结果 + */ + @Override + public int deleteBasTraycodeById(Long id) + { + return basTraycodeMapper.deleteBasTraycodeById(id); + } + + @Override + public void insertBasTraycodeList(List traycodeList) { + List> split = CollUtil.split(traycodeList, 300); + for (List list : split) { + basTraycodeMapper.insertBasTraycodeList(list); + } + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/traycodeformat/controller/BasTraycodeFormatController.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/traycodeformat/controller/BasTraycodeFormatController.java new file mode 100644 index 0000000..5636823 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/traycodeformat/controller/BasTraycodeFormatController.java @@ -0,0 +1,104 @@ +package com.ruoyi.bas.traycodeformat.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +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.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.bas.traycodeformat.domain.BasTraycodeFormat; +import com.ruoyi.bas.traycodeformat.service.IBasTraycodeFormatService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 条码生成规则Controller + * + * @author ruoyi + * @date 2025-07-28 + */ +@RestController +@RequestMapping("/bas/traycodeFormat") +public class BasTraycodeFormatController extends BaseController +{ + @Autowired + private IBasTraycodeFormatService basTraycodeFormatService; + + /** + * 查询条码生成规则列表 + */ + @PreAuthorize("@ss.hasPermi('bas:traycodeFormat:list')") + @GetMapping("/list") + public TableDataInfo list(BasTraycodeFormat basTraycodeFormat) + { + startPage(); + List list = basTraycodeFormatService.selectBasTraycodeFormatList(basTraycodeFormat); + return getDataTable(list); + } + + /** + * 导出条码生成规则列表 + */ + @PreAuthorize("@ss.hasPermi('bas:traycodeFormat:export')") + @Log(title = "条码生成规则", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, BasTraycodeFormat basTraycodeFormat) + { + List list = basTraycodeFormatService.selectBasTraycodeFormatList(basTraycodeFormat); + ExcelUtil util = new ExcelUtil(BasTraycodeFormat.class); + util.exportExcel(response, list, "条码生成规则数据"); + } + + /** + * 获取条码生成规则详细信息 + */ + @PreAuthorize("@ss.hasPermi('bas:traycodeFormat:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(basTraycodeFormatService.selectBasTraycodeFormatById(id)); + } + + /** + * 新增条码生成规则 + */ + @PreAuthorize("@ss.hasPermi('bas:traycodeFormat:add')") + @Log(title = "条码生成规则", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody BasTraycodeFormat basTraycodeFormat) + { + return toAjax(basTraycodeFormatService.insertBasTraycodeFormat(basTraycodeFormat)); + } + + /** + * 修改条码生成规则 + */ + @PreAuthorize("@ss.hasPermi('bas:traycodeFormat:edit')") + @Log(title = "条码生成规则", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BasTraycodeFormat basTraycodeFormat) + { + return toAjax(basTraycodeFormatService.updateBasTraycodeFormat(basTraycodeFormat)); + } + + /** + * 删除条码生成规则 + */ + @PreAuthorize("@ss.hasPermi('bas:traycodeFormat:remove')") + @Log(title = "条码生成规则", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(basTraycodeFormatService.deleteBasTraycodeFormatByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/traycodeformat/domain/BasTraycodeFormat.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/traycodeformat/domain/BasTraycodeFormat.java new file mode 100644 index 0000000..74140de --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/traycodeformat/domain/BasTraycodeFormat.java @@ -0,0 +1,174 @@ +package com.ruoyi.bas.traycodeformat.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 条码生成规则对象 bas_traycode_format + * + * @author ruoyi + * @date 2025-07-28 + */ +public class BasTraycodeFormat extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** id */ + private Long id; + + /** 条码前缀 */ + @Excel(name = "条码前缀") + private String barcodeFormat; + + /** 流水号 */ + @Excel(name = "流水号") + private String serialRule; + + /** 条码样例 */ + @Excel(name = "条码样例") + private String serialExample; + + /** 描述 */ + @Excel(name = "描述") + private String remarks; + + /** 最小流水号 */ + @Excel(name = "最小流水号") + private Long minNum; + + /** 最大流水号 */ + @Excel(name = "最大流水号") + private Long maxNum; + + /** 备用字段1 */ + @Excel(name = "备用字段1") + private String spare1; + + /** 备用字段2 */ + @Excel(name = "备用字段2") + private String spare2; + + /** 备用字段3 */ + @Excel(name = "备用字段3") + private String spare3; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + + public void setBarcodeFormat(String barcodeFormat) + { + this.barcodeFormat = barcodeFormat; + } + + public String getBarcodeFormat() + { + return barcodeFormat; + } + + public void setSerialRule(String serialRule) + { + this.serialRule = serialRule; + } + + public String getSerialRule() + { + return serialRule; + } + + public void setSerialExample(String serialExample) + { + this.serialExample = serialExample; + } + + public String getSerialExample() + { + return serialExample; + } + + public void setRemarks(String remarks) + { + this.remarks = remarks; + } + + public String getRemarks() + { + return remarks; + } + + public void setMinNum(Long minNum) + { + this.minNum = minNum; + } + + public Long getMinNum() + { + return minNum; + } + + public void setMaxNum(Long maxNum) + { + this.maxNum = maxNum; + } + + public Long getMaxNum() + { + return maxNum; + } + + public void setSpare1(String spare1) + { + this.spare1 = spare1; + } + + public String getSpare1() + { + return spare1; + } + + public void setSpare2(String spare2) + { + this.spare2 = spare2; + } + + public String getSpare2() + { + return spare2; + } + + public void setSpare3(String spare3) + { + this.spare3 = spare3; + } + + public String getSpare3() + { + return spare3; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("barcodeFormat", getBarcodeFormat()) + .append("serialRule", getSerialRule()) + .append("serialExample", getSerialExample()) + .append("remarks", getRemarks()) + .append("minNum", getMinNum()) + .append("maxNum", getMaxNum()) + .append("createTime", getCreateTime()) + .append("updateTime", getUpdateTime()) + .append("spare1", getSpare1()) + .append("spare2", getSpare2()) + .append("spare3", getSpare3()) + .toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/traycodeformat/mapper/BasTraycodeFormatMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/traycodeformat/mapper/BasTraycodeFormatMapper.java new file mode 100644 index 0000000..bd05737 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/traycodeformat/mapper/BasTraycodeFormatMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.bas.traycodeformat.mapper; + +import java.util.List; +import com.ruoyi.bas.traycodeformat.domain.BasTraycodeFormat; + +/** + * 条码生成规则Mapper接口 + * + * @author ruoyi + * @date 2025-07-28 + */ +public interface BasTraycodeFormatMapper +{ + /** + * 查询条码生成规则 + * + * @param id 条码生成规则主键 + * @return 条码生成规则 + */ + public BasTraycodeFormat selectBasTraycodeFormatById(Long id); + + /** + * 查询条码生成规则列表 + * + * @param basTraycodeFormat 条码生成规则 + * @return 条码生成规则集合 + */ + public List selectBasTraycodeFormatList(BasTraycodeFormat basTraycodeFormat); + + /** + * 新增条码生成规则 + * + * @param basTraycodeFormat 条码生成规则 + * @return 结果 + */ + public int insertBasTraycodeFormat(BasTraycodeFormat basTraycodeFormat); + + /** + * 修改条码生成规则 + * + * @param basTraycodeFormat 条码生成规则 + * @return 结果 + */ + public int updateBasTraycodeFormat(BasTraycodeFormat basTraycodeFormat); + + /** + * 删除条码生成规则 + * + * @param id 条码生成规则主键 + * @return 结果 + */ + public int deleteBasTraycodeFormatById(Long id); + + /** + * 批量删除条码生成规则 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteBasTraycodeFormatByIds(Long[] ids); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/traycodeformat/service/IBasTraycodeFormatService.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/traycodeformat/service/IBasTraycodeFormatService.java new file mode 100644 index 0000000..b8b3245 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/traycodeformat/service/IBasTraycodeFormatService.java @@ -0,0 +1,61 @@ +package com.ruoyi.bas.traycodeformat.service; + +import java.util.List; +import com.ruoyi.bas.traycodeformat.domain.BasTraycodeFormat; + +/** + * 条码生成规则Service接口 + * + * @author ruoyi + * @date 2025-07-28 + */ +public interface IBasTraycodeFormatService +{ + /** + * 查询条码生成规则 + * + * @param id 条码生成规则主键 + * @return 条码生成规则 + */ + public BasTraycodeFormat selectBasTraycodeFormatById(Long id); + + /** + * 查询条码生成规则列表 + * + * @param basTraycodeFormat 条码生成规则 + * @return 条码生成规则集合 + */ + public List selectBasTraycodeFormatList(BasTraycodeFormat basTraycodeFormat); + + /** + * 新增条码生成规则 + * + * @param basTraycodeFormat 条码生成规则 + * @return 结果 + */ + public int insertBasTraycodeFormat(BasTraycodeFormat basTraycodeFormat); + + /** + * 修改条码生成规则 + * + * @param basTraycodeFormat 条码生成规则 + * @return 结果 + */ + public int updateBasTraycodeFormat(BasTraycodeFormat basTraycodeFormat); + + /** + * 批量删除条码生成规则 + * + * @param ids 需要删除的条码生成规则主键集合 + * @return 结果 + */ + public int deleteBasTraycodeFormatByIds(Long[] ids); + + /** + * 删除条码生成规则信息 + * + * @param id 条码生成规则主键 + * @return 结果 + */ + public int deleteBasTraycodeFormatById(Long id); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/traycodeformat/service/impl/BasTraycodeFormatServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/traycodeformat/service/impl/BasTraycodeFormatServiceImpl.java new file mode 100644 index 0000000..70ab885 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/traycodeformat/service/impl/BasTraycodeFormatServiceImpl.java @@ -0,0 +1,120 @@ +package com.ruoyi.bas.traycodeformat.service.impl; + +import java.util.ArrayList; +import java.util.List; + +import cn.hutool.core.util.NumberUtil; +import cn.hutool.core.util.StrUtil; +import com.ruoyi.bas.traycode.domain.BasTraycode; +import com.ruoyi.bas.traycode.service.IBasTraycodeService; +import com.ruoyi.bas.traycode.service.impl.BasTraycodeServiceImpl; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.bas.traycodeformat.mapper.BasTraycodeFormatMapper; +import com.ruoyi.bas.traycodeformat.domain.BasTraycodeFormat; +import com.ruoyi.bas.traycodeformat.service.IBasTraycodeFormatService; + +/** + * 条码生成规则Service业务层处理 + * + * @author ruoyi + * @date 2025-07-28 + */ +@Service +public class BasTraycodeFormatServiceImpl implements IBasTraycodeFormatService +{ + @Autowired + private BasTraycodeFormatMapper basTraycodeFormatMapper; + @Autowired + private IBasTraycodeService basTraycodeService; + + /** + * 查询条码生成规则 + * + * @param id 条码生成规则主键 + * @return 条码生成规则 + */ + @Override + public BasTraycodeFormat selectBasTraycodeFormatById(Long id) + { + return basTraycodeFormatMapper.selectBasTraycodeFormatById(id); + } + + /** + * 查询条码生成规则列表 + * + * @param basTraycodeFormat 条码生成规则 + * @return 条码生成规则 + */ + @Override + public List selectBasTraycodeFormatList(BasTraycodeFormat basTraycodeFormat) + { + return basTraycodeFormatMapper.selectBasTraycodeFormatList(basTraycodeFormat); + } + + /** + * 新增条码生成规则 + * + * @param basTraycodeFormat 条码生成规则 + * @return 结果 + */ + @Override + public int insertBasTraycodeFormat(BasTraycodeFormat basTraycodeFormat) + { + basTraycodeFormat.setCreateTime(DateUtils.getNowDate()); + return basTraycodeFormatMapper.insertBasTraycodeFormat(basTraycodeFormat); + } + + /** + * 修改条码生成规则 + * + * @param basTraycodeFormat 条码生成规则 + * @return 结果 + */ + @Override + public int updateBasTraycodeFormat(BasTraycodeFormat basTraycodeFormat) + { + BasTraycodeFormat old = selectBasTraycodeFormatById(basTraycodeFormat.getId()); + int oldSerialRule = Convert.toInt(old.getSerialRule()); + int newSerialRule = Convert.toInt(basTraycodeFormat.getSerialRule()); + + List traycodeList = new ArrayList<>(); + for (int i = oldSerialRule; i < newSerialRule; i++) { + BasTraycode basTraycode = new BasTraycode(); + basTraycode.setFormatId(basTraycodeFormat.getId()); + String traycode = old.getBarcodeFormat()+ StrUtil.padPre(Convert.toStr(i),5,'0'); + basTraycode.setTrayCode(traycode); + traycodeList.add(basTraycode); + } + basTraycodeFormat.setUpdateTime(DateUtils.getNowDate()); + //插入条码信息 + basTraycodeService.insertBasTraycodeList(traycodeList); + return basTraycodeFormatMapper.updateBasTraycodeFormat(basTraycodeFormat); + } + + /** + * 批量删除条码生成规则 + * + * @param ids 需要删除的条码生成规则主键 + * @return 结果 + */ + @Override + public int deleteBasTraycodeFormatByIds(Long[] ids) + { + return basTraycodeFormatMapper.deleteBasTraycodeFormatByIds(ids); + } + + /** + * 删除条码生成规则信息 + * + * @param id 条码生成规则主键 + * @return 结果 + */ + @Override + public int deleteBasTraycodeFormatById(Long id) + { + return basTraycodeFormatMapper.deleteBasTraycodeFormatById(id); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/tagTask/service/impl/TagTaskServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/out/tagTask/service/impl/TagTaskServiceImpl.java index fba808a..1113a18 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/out/tagTask/service/impl/TagTaskServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/out/tagTask/service/impl/TagTaskServiceImpl.java @@ -248,8 +248,6 @@ public class TagTaskServiceImpl implements ITagTaskService { trayCodeMsg.setWarehouseId("02"); trayCodeMsg.setEntranceId(basTag.getPickAdd()); pdaService.emptyBoxIn(trayCodeMsg); - //推送空料箱入库作业 生成ctu队列 - } } } diff --git a/ruoyi-admin/src/main/resources/mapper/bas/BasTraycodeFormatMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/BasTraycodeFormatMapper.xml new file mode 100644 index 0000000..d75eea3 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/bas/BasTraycodeFormatMapper.xml @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + select id, barcode_format, serial_rule, serial_example, remarks, min_num, max_num, create_time, update_time, spare1, spare2, spare3 from bas_traycode_format + + + + + + + + insert into bas_traycode_format + + id, + barcode_format, + serial_rule, + serial_example, + remarks, + min_num, + max_num, + create_time, + update_time, + spare1, + spare2, + spare3, + + + #{id}, + #{barcodeFormat}, + #{serialRule}, + #{serialExample}, + #{remarks}, + #{minNum}, + #{maxNum}, + #{createTime}, + #{updateTime}, + #{spare1}, + #{spare2}, + #{spare3}, + + + + + update bas_traycode_format + + barcode_format = #{barcodeFormat}, + serial_rule = #{serialRule}, + serial_example = #{serialExample}, + remarks = #{remarks}, + min_num = #{minNum}, + max_num = #{maxNum}, + create_time = #{createTime}, + update_time = #{updateTime}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare3 = #{spare3}, + + where id = #{id} + + + + delete from bas_traycode_format where id = #{id} + + + + delete from bas_traycode_format where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/bas/BasTraycodeMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/BasTraycodeMapper.xml new file mode 100644 index 0000000..8a208a0 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/bas/BasTraycodeMapper.xml @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + select id, format_id, tray_code, create_time, update_time, spare1, spare2, spare3 from bas_traycode + + + + + + + + insert into bas_traycode + + id, + format_id, + tray_code, + create_time, + update_time, + spare1, + spare2, + spare3, + + + #{id}, + #{formatId}, + #{trayCode}, + #{createTime}, + #{updateTime}, + #{spare1}, + #{spare2}, + #{spare3}, + + + + insert into bas_traycode( format_id, tray_code) values + + ( + + #{item.formatId}, + #{item.trayCode} + ) + + + + + update bas_traycode + + format_id = #{formatId}, + tray_code = #{trayCode}, + create_time = #{createTime}, + update_time = #{updateTime}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare3 = #{spare3}, + + where id = #{id} + + + + delete from bas_traycode where id = #{id} + + + + delete from bas_traycode where id in + + #{id} + + + diff --git a/ruoyi-ui/src/api/bas/traycode.js b/ruoyi-ui/src/api/bas/traycode.js new file mode 100644 index 0000000..21ca672 --- /dev/null +++ b/ruoyi-ui/src/api/bas/traycode.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询条码信息列表 +export function listTraycode(query) { + return request({ + url: '/bas/traycode/list', + method: 'get', + params: query + }) +} + +// 查询条码信息详细 +export function getTraycode(id) { + return request({ + url: '/bas/traycode/' + id, + method: 'get' + }) +} + +// 新增条码信息 +export function addTraycode(data) { + return request({ + url: '/bas/traycode', + method: 'post', + data: data + }) +} + +// 修改条码信息 +export function updateTraycode(data) { + return request({ + url: '/bas/traycode', + method: 'put', + data: data + }) +} + +// 删除条码信息 +export function delTraycode(id) { + return request({ + url: '/bas/traycode/' + id, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/api/bas/traycodeFormat.js b/ruoyi-ui/src/api/bas/traycodeFormat.js new file mode 100644 index 0000000..4bafdf6 --- /dev/null +++ b/ruoyi-ui/src/api/bas/traycodeFormat.js @@ -0,0 +1,53 @@ +import request from '@/utils/request' + +// 查询条码生成规则列表 +export function listTraycodeFormat(query) { + return request({ + url: '/bas/traycodeFormat/list', + method: 'get', + params: query + }) +} + +// 查询条码生成规则详细 +export function getTraycodeFormat(id) { + return request({ + url: '/bas/traycodeFormat/' + id, + method: 'get' + }) +} + +// 新增条码生成规则 +export function addTraycodeFormat(data) { + return request({ + url: '/bas/traycodeFormat', + method: 'post', + data: data + }) +} + +// 修改条码生成规则 +export function updateTraycodeFormat(data) { + return request({ + url: '/bas/traycodeFormat', + method: 'put', + data: data + }) +} + +// 删除条码生成规则 +export function delTraycodeFormat(id) { + return request({ + url: '/bas/traycodeFormat/' + id, + method: 'delete' + }) +} + +// 打印条码 +export function printTraycodeFormat(data) { + return request({ + url: '/bas/traycodeFormat/print', + method: 'post', + data: data + }) +} diff --git a/ruoyi-ui/src/views/bas/traycode/index.vue b/ruoyi-ui/src/views/bas/traycode/index.vue new file mode 100644 index 0000000..474803d --- /dev/null +++ b/ruoyi-ui/src/views/bas/traycode/index.vue @@ -0,0 +1,351 @@ + + + diff --git a/ruoyi-ui/src/views/bas/traycodeFormat/index.vue b/ruoyi-ui/src/views/bas/traycodeFormat/index.vue new file mode 100644 index 0000000..f2e3eff --- /dev/null +++ b/ruoyi-ui/src/views/bas/traycodeFormat/index.vue @@ -0,0 +1,425 @@ + + +