From 6dd0f8481c624e61118dd867e4d799a92791d1ca Mon Sep 17 00:00:00 2001 From: liuhanqing Date: Thu, 22 May 2025 08:56:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E4=B8=9Aid=E7=94=9F=E6=88=90=20=20?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1id=E7=94=9F=E6=88=90=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BasJobIdController.java | 123 +++++++ .../ruoyi/bas/basJobId/domain/BasJobId.java | 331 ++++++++++++++++++ .../bas/basJobId/mapper/BasJobIdMapper.java | 80 +++++ .../basJobId/service/IBasJobIdService.java | 70 ++++ .../service/impl/BasJobIdServiceImpl.java | 140 ++++++++ .../controller/BasTaskNoController.java | 117 +++++++ .../ruoyi/bas/taskNo/domain/BasTaskNo.java | 108 ++++++ .../bas/taskNo/mapper/BasTaskNoMapper.java | 78 +++++ .../bas/taskNo/service/IBasTaskNoService.java | 78 +++++ .../service/impl/BasTaskNoServiceImpl.java | 140 ++++++++ .../resources/mapper/bas/BasJobIdMapper.xml | 164 +++++++++ .../resources/mapper/bas/BasTaskNoMapper.xml | 48 +++ 12 files changed, 1477 insertions(+) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/bas/basJobId/controller/BasJobIdController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/bas/basJobId/domain/BasJobId.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/bas/basJobId/mapper/BasJobIdMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/bas/basJobId/service/IBasJobIdService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/bas/basJobId/service/impl/BasJobIdServiceImpl.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/bas/taskNo/controller/BasTaskNoController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/bas/taskNo/domain/BasTaskNo.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/bas/taskNo/mapper/BasTaskNoMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/bas/taskNo/service/IBasTaskNoService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/bas/taskNo/service/impl/BasTaskNoServiceImpl.java create mode 100644 ruoyi-admin/src/main/resources/mapper/bas/BasJobIdMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/bas/BasTaskNoMapper.xml diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/basJobId/controller/BasJobIdController.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/basJobId/controller/BasJobIdController.java new file mode 100644 index 0000000..6ac3446 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/basJobId/controller/BasJobIdController.java @@ -0,0 +1,123 @@ +package com.ruoyi.bas.basJobId.controller; + + +import com.ruoyi.bas.basJobId.domain.BasJobId; +import com.ruoyi.bas.basJobId.service.IBasJobIdService; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * id表Controller + * + * @author wz + * @date 2021-11-05 + */ +@Controller +@RequestMapping("/bas/basJobId") +public class BasJobIdController extends BaseController +{ + private String prefix = "bas/basJobId"; + + @Autowired + private IBasJobIdService basJobIdService; + + //@RequiresPermissions("bas:basJobId:view") + @GetMapping() + public String basJobId() + { + return prefix + "/basJobId"; + } + + /** + * 查询id表列表 + */ + //@RequiresPermissions("bas:basJobId:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(BasJobId basJobId) + { + startPage(); + List list = basJobIdService.selectBasJobIdList(basJobId); + return getDataTable(list); + } + + /** + * 导出id表列表 + */ + //@RequiresPermissions("bas:basJobId:export") + @Log(title = "id表", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(BasJobId basJobId) + { + List list = basJobIdService.selectBasJobIdList(basJobId); + ExcelUtil util = new ExcelUtil(BasJobId.class); + return util.exportExcel(list, "basJobId"); + } + + /** + * 新增id表 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存id表 + */ + //@RequiresPermissions("bas:basJobId:add") + @Log(title = "id表", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(BasJobId basJobId) + { + return toAjax(basJobIdService.insertBasJobId(basJobId)); + } + + /** + * 修改id表 + */ + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") String id, ModelMap mmap) + { + BasJobId basJobId = basJobIdService.selectBasJobIdById(id); + mmap.put("basJobId", basJobId); + return prefix + "/edit"; + } + + /** + * 修改保存id表 + */ + //@RequiresPermissions("bas:basJobId:edit") + @Log(title = "id表", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(BasJobId basJobId) + { + return toAjax(basJobIdService.updateBasJobId(basJobId)); + } + + /** + * 删除id表 + */ + //@RequiresPermissions("bas:basJobId:remove") + @Log(title = "id表", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(basJobIdService.deleteBasJobIdByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/basJobId/domain/BasJobId.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/basJobId/domain/BasJobId.java new file mode 100644 index 0000000..4164a4d --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/basJobId/domain/BasJobId.java @@ -0,0 +1,331 @@ +package com.ruoyi.bas.basJobId.domain; + +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * id表对象 bas_job_id + * + * @author wz + * @date 2021-11-05 + */ +public class BasJobId extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * id + */ + private String id; + + /** + * 类型 + */ + @Excel(name = "类型") + private String type; + + /** + * job_id + */ + @Excel(name = "job_id") + private String jobId; + + /** + * + */ + @Excel(name = "") + private String jobDetail; + + /** + * + */ + @Excel(name = "") + private String stockId; + + /** + * + */ + @Excel(name = "") + private String orderId; + + /** + * + */ + @Excel(name = "") + private String exorderId; + + /** + * + */ + @Excel(name = "") + private String jobIdR; + + /** + * + */ + @Excel(name = "") + private String jobDetailR; + + /** + * + */ + @Excel(name = "") + private String jobIdC; + + /** + * + */ + @Excel(name = "") + private String jobDetailC; + + /** + * + */ + @Excel(name = "") + private String tempOrderId; + + /** + * + */ + @Excel(name = "") + private String lotNo; + + /** + * + */ + @Excel(name = "") + private String stockinId; + + /** + * + */ + @Excel(name = "") + private String stockinDetailId; + + /** + * + */ + @Excel(name = "") + private String stockoutId; + + /** + * + */ + @Excel(name = "") + private String stockoutDetailId; + + /** + * + */ + @Excel(name = "") + private String planId; + + /** + * + */ + @Excel(name = "") + private String jobIdY; + + /** + * + */ + @Excel(name = "") + private String jobIdS; + + + public BasJobId() { + + } + + public BasJobId(String type, String jobId) { + this.type = type; + this.jobId = jobId; + } + + public void setId(String id) { + this.id = id; + } + + public String getId() { + return id; + } + + public void setType(String type) { + this.type = type; + } + + public String getType() { + return type; + } + + public void setJobId(String jobId) { + this.jobId = jobId; + } + + public String getJobId() { + return jobId; + } + + public void setJobDetail(String jobDetail) { + this.jobDetail = jobDetail; + } + + public String getJobDetail() { + return jobDetail; + } + + public void setStockId(String stockId) { + this.stockId = stockId; + } + + public String getStockId() { + return stockId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getOrderId() { + return orderId; + } + + public void setExorderId(String exorderId) { + this.exorderId = exorderId; + } + + public String getExorderId() { + return exorderId; + } + + public void setJobIdR(String jobIdR) { + this.jobIdR = jobIdR; + } + + public String getJobIdR() { + return jobIdR; + } + + public void setJobDetailR(String jobDetailR) { + this.jobDetailR = jobDetailR; + } + + public String getJobDetailR() { + return jobDetailR; + } + + public void setJobIdC(String jobIdC) { + this.jobIdC = jobIdC; + } + + public String getJobIdC() { + return jobIdC; + } + + public void setJobDetailC(String jobDetailC) { + this.jobDetailC = jobDetailC; + } + + public String getJobDetailC() { + return jobDetailC; + } + + public void setTempOrderId(String tempOrderId) { + this.tempOrderId = tempOrderId; + } + + public String getTempOrderId() { + return tempOrderId; + } + + public void setLotNo(String lotNo) { + this.lotNo = lotNo; + } + + public String getLotNo() { + return lotNo; + } + + public void setStockinId(String stockinId) { + this.stockinId = stockinId; + } + + public String getStockinId() { + return stockinId; + } + + public void setStockinDetailId(String stockinDetailId) { + this.stockinDetailId = stockinDetailId; + } + + public String getStockinDetailId() { + return stockinDetailId; + } + + public void setStockoutId(String stockoutId) { + this.stockoutId = stockoutId; + } + + public String getStockoutId() { + return stockoutId; + } + + public void setStockoutDetailId(String stockoutDetailId) { + this.stockoutDetailId = stockoutDetailId; + } + + public String getStockoutDetailId() { + return stockoutDetailId; + } + + public void setPlanId(String planId) { + this.planId = planId; + } + + public String getPlanId() { + return planId; + } + + public void setJobIdY(String jobIdY) { + this.jobIdY = jobIdY; + } + + public String getJobIdY() { + return jobIdY; + } + + public void setJobIdS(String jobIdS) { + this.jobIdS = jobIdS; + } + + public String getJobIdS() { + return jobIdS; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("type", getType()) + .append("jobId", getJobId()) + .append("jobDetail", getJobDetail()) + .append("stockId", getStockId()) + .append("orderId", getOrderId()) + .append("exorderId", getExorderId()) + .append("jobIdR", getJobIdR()) + .append("jobDetailR", getJobDetailR()) + .append("jobIdC", getJobIdC()) + .append("jobDetailC", getJobDetailC()) + .append("tempOrderId", getTempOrderId()) + .append("lotNo", getLotNo()) + .append("stockinId", getStockinId()) + .append("stockinDetailId", getStockinDetailId()) + .append("stockoutId", getStockoutId()) + .append("stockoutDetailId", getStockoutDetailId()) + .append("planId", getPlanId()) + .append("jobIdY", getJobIdY()) + .append("jobIdS", getJobIdS()) + .toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/basJobId/mapper/BasJobIdMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/basJobId/mapper/BasJobIdMapper.java new file mode 100644 index 0000000..207aee3 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/basJobId/mapper/BasJobIdMapper.java @@ -0,0 +1,80 @@ +package com.ruoyi.bas.basJobId.mapper; + + + +import com.ruoyi.bas.basJobId.domain.BasJobId; + +import java.util.List; + +/** + * id表Mapper接口 + * + * @author wz + * @date 2021-11-05 + */ +public interface BasJobIdMapper +{ + /** + * 查询id表 + * + * @param id id表ID + * @return id表 + */ + public BasJobId selectBasJobIdById(String id); + + /** + * 查询id表列表 + * + * @param basJobId id表 + * @return id表集合 + */ + public List selectBasJobIdList(BasJobId basJobId); + + /** + * 新增id表 + * + * @param basJobId id表 + * @return 结果 + */ + public int insertBasJobId(BasJobId basJobId); + + /** + * 修改id表 + * + * @param basJobId id表 + * @return 结果 + */ + public int updateBasJobId(BasJobId basJobId); + + /** + * 删除id表 + * + * @param id id表ID + * @return 结果 + */ + public int deleteBasJobIdById(String id); + + /** + * 批量删除id表 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteBasJobIdByIds(String[] ids); + /** + * 通过日期查询出库单id数量 + */ + public int getoutStockIdByDate(String date); + /** + * 通过日期查询出库单id数量 + */ + public int getIdByDate(BasJobId basJobId); + + /** + * 查询出库单id + * + */ + public String getIdByType(String type); + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/basJobId/service/IBasJobIdService.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/basJobId/service/IBasJobIdService.java new file mode 100644 index 0000000..b24a8e8 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/basJobId/service/IBasJobIdService.java @@ -0,0 +1,70 @@ +package com.ruoyi.bas.basJobId.service; + + + +import com.ruoyi.bas.basJobId.domain.BasJobId; + +import java.util.List; + +/** + * id表Service接口 + * + * @author wz + * @date 2021-11-05 + */ +public interface IBasJobIdService +{ + /** + * 查询id表 + * + * @param id id表ID + * @return id表 + */ + public BasJobId selectBasJobIdById(String id); + + /** + * 查询id表列表 + * + * @param basJobId id表 + * @return id表集合 + */ + public List selectBasJobIdList(BasJobId basJobId); + + /** + * 新增id表 + * + * @param basJobId id表 + * @return 结果 + */ + public int insertBasJobId(BasJobId basJobId); + + /** + * 修改id表 + * + * @param basJobId id表 + * @return 结果 + */ + public int updateBasJobId(BasJobId basJobId); + + /** + * 批量删除id表 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteBasJobIdByIds(String ids); + + /** + * 删除id表信息 + * + * @param id id表ID + * @return 结果 + */ + public int deleteBasJobIdById(String id); + + /** + * 获取出库单id + */ + + public String getJobId(String type); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/basJobId/service/impl/BasJobIdServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/basJobId/service/impl/BasJobIdServiceImpl.java new file mode 100644 index 0000000..9e1d0e2 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/basJobId/service/impl/BasJobIdServiceImpl.java @@ -0,0 +1,140 @@ +package com.ruoyi.bas.basJobId.service.impl; + +import com.ruoyi.bas.basJobId.domain.BasJobId; +import com.ruoyi.bas.basJobId.mapper.BasJobIdMapper; +import com.ruoyi.bas.basJobId.service.IBasJobIdService; +import com.ruoyi.common.core.text.Convert; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.List; + +/** + * id表Service业务层处理 + * + * @author wz + * @date 2021-11-05 + */ +@Service +public class BasJobIdServiceImpl implements IBasJobIdService +{ + @Autowired + private BasJobIdMapper basJobIdMapper; + + /** + * 查询id表 + * + * @param id id表ID + * @return id表 + */ + @Override + public BasJobId selectBasJobIdById(String id) + { + return basJobIdMapper.selectBasJobIdById(id); + } + + /** + * 查询id表列表 + * + * @param basJobId id表 + * @return id表 + */ + @Override + public List selectBasJobIdList(BasJobId basJobId) + { + return basJobIdMapper.selectBasJobIdList(basJobId); + } + + /** + * 新增id表 + * + * @param basJobId id表 + * @return 结果 + */ + @Override + public int insertBasJobId(BasJobId basJobId) + { + return basJobIdMapper.insertBasJobId(basJobId); + } + + /** + * 修改id表 + * + * @param basJobId id表 + * @return 结果 + */ + @Override + public int updateBasJobId(BasJobId basJobId) + { + return basJobIdMapper.updateBasJobId(basJobId); + } + + /** + * 删除id表对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteBasJobIdByIds(String ids) + { + return basJobIdMapper.deleteBasJobIdByIds(Convert.toStrArray(ids)); + } + + /** + * 删除id表信息 + * + * @param id id表ID + * @return 结果 + */ + @Override + public int deleteBasJobIdById(String id) + { + return basJobIdMapper.deleteBasJobIdById(id); + } + + /** + * 获取出库单id + * @return + */ + @Override + public String getJobId(String type) { + SimpleDateFormat format=new SimpleDateFormat("yyyyMMdd"); + String date = format.format(new Date()); + BasJobId basJobId1 = new BasJobId(); + basJobId1.setStockId(date); + basJobId1.setType(type); + int count=basJobIdMapper.getIdByDate(basJobId1); + String outStockId=""; + if(count>0){ + int i=Integer.valueOf(basJobIdMapper.getIdByType(type)); +// String[] split=outStockIdPre.split(date); +// int i=Integer.parseInt(split[1]); + if(i>99999){ + i=1; + } + String num=String.format("%04d",++i); + outStockId=type+date+num; + BasJobId basJobId=new BasJobId(); + basJobId.setJobId(num); + basJobId.setType(type); + basJobId.setStockId(date); + basJobIdMapper.updateBasJobId(basJobId); + + }else{ + + int i=1; + String num=String.format("%04d",i); + outStockId=type+date+num; + BasJobId basJobId=new BasJobId(); + basJobId.setJobId(num); + basJobId.setType(type); + basJobId.setStockId(date); + basJobIdMapper.updateBasJobId(basJobId); + } + return outStockId; + } + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/taskNo/controller/BasTaskNoController.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/taskNo/controller/BasTaskNoController.java new file mode 100644 index 0000000..082376c --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/taskNo/controller/BasTaskNoController.java @@ -0,0 +1,117 @@ +package com.ruoyi.bas.taskNo.controller; + + +import com.ruoyi.bas.taskNo.domain.BasTaskNo; +import com.ruoyi.bas.taskNo.service.IBasTaskNoService; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 任务号Controller + * + * @author qxq + * @date 2021-11-05 + */ +@Controller +@RequestMapping("/任务号/taskNoUtils") +public class BasTaskNoController extends BaseController +{ + private String prefix = "任务号/taskNoUtils"; + + @Autowired + private IBasTaskNoService basTaskNoService; + + @GetMapping() + public String taskNoUtils() + { + return prefix + "/taskNoUtils"; + } + + /** + * 查询任务号列表 + */ + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(BasTaskNo basTaskNo) + { + startPage(); + List list = basTaskNoService.selectBasTaskNoList(basTaskNo); + return getDataTable(list); + } + + /** + * 导出任务号列表 + */ +// @Log(title = "任务号", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(BasTaskNo basTaskNo) + { + List list = basTaskNoService.selectBasTaskNoList(basTaskNo); + ExcelUtil util = new ExcelUtil(BasTaskNo.class); + return util.exportExcel(list, "taskNoUtils"); + } + + /** + * 新增任务号 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存任务号 + */ + @Log(title = "任务号", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(BasTaskNo basTaskNo) + { + return toAjax(basTaskNoService.insertBasTaskNo(basTaskNo)); + } + + /** + * 修改任务号 + */ + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") String id, ModelMap mmap) + { + BasTaskNo basTaskNo = basTaskNoService.selectBasTaskNoById(id); + mmap.put("basTaskNo", basTaskNo); + return prefix + "/edit"; + } + + /** + * 修改保存任务号 + */ + @Log(title = "任务号", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(BasTaskNo basTaskNo) + { + return toAjax(basTaskNoService.updateBasTaskNo(basTaskNo)); + } + + /** + * 删除任务号 + */ + @Log(title = "任务号", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(basTaskNoService.deleteBasTaskNoByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/taskNo/domain/BasTaskNo.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/taskNo/domain/BasTaskNo.java new file mode 100644 index 0000000..6aa75c7 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/taskNo/domain/BasTaskNo.java @@ -0,0 +1,108 @@ +package com.ruoyi.bas.taskNo.domain; + + +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 任务号对象 bas_task_no + * + * @author wz + * @date 2021-11-17 + */ +public class BasTaskNo extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** id */ + private String id; + + /** 任务类型 */ + @Excel(name = "任务类型") + private String taskType; + + /** 任务名称 */ + @Excel(name = "任务名称") + private String typeName; + + /** 任务号 */ + @Excel(name = "任务号") + private Long taskNo; + + /** 最小值 */ + @Excel(name = "最小值") + private Long minNo; + + /** 最大值 */ + @Excel(name = "最大值") + private Long maxNo; + + public void setId(String id) + { + this.id = id; + } + + public String getId() + { + return id; + } + public void setTaskType(String taskType) + { + this.taskType = taskType; + } + + public String getTaskType() + { + return taskType; + } + public void setTypeName(String typeName) + { + this.typeName = typeName; + } + + public String getTypeName() + { + return typeName; + } + public void setTaskNo(Long taskNo) + { + this.taskNo = taskNo; + } + + public Long getTaskNo() + { + return taskNo; + } + public void setMinNo(Long minNo) + { + this.minNo = minNo; + } + + public Long getMinNo() + { + return minNo; + } + public void setMaxNo(Long maxNo) + { + this.maxNo = maxNo; + } + + public Long getMaxNo() + { + return maxNo; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("taskType", getTaskType()) + .append("typeName", getTypeName()) + .append("taskNo", getTaskNo()) + .append("minNo", getMinNo()) + .append("maxNo", getMaxNo()) + .toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/taskNo/mapper/BasTaskNoMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/taskNo/mapper/BasTaskNoMapper.java new file mode 100644 index 0000000..2134685 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/taskNo/mapper/BasTaskNoMapper.java @@ -0,0 +1,78 @@ +package com.ruoyi.bas.taskNo.mapper; + + + + +import com.ruoyi.bas.taskNo.domain.BasTaskNo; + +import java.util.List; + + +/** + * 任务号Mapper接口 + * + * @author qxq + * @date 2021-11-05 + */ +public interface BasTaskNoMapper +{ + /** + * 查询任务号 + * + * @param id 任务号ID + * @return 任务号 + */ + public BasTaskNo selectBasTaskNoById(String id); + + /** + * 查询任务号列表 + * + * @param basTaskNo 任务号 + * @return 任务号集合 + */ + public List selectBasTaskNoList(BasTaskNo basTaskNo); + + /** + * 新增任务号 + * + * @param basTaskNo 任务号 + * @return 结果 + */ + public int insertBasTaskNo(BasTaskNo basTaskNo); + + /** + * 修改任务号 + * + * @param basTaskNo 任务号 + * @return 结果 + */ + public int updateBasTaskNo(BasTaskNo basTaskNo); + + /** + * 删除任务号 + * + * @param id 任务号ID + * @return 结果 + */ + public int deleteBasTaskNoById(String id); + + /** + * 批量删除任务号 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteBasTaskNoByIds(String[] ids); + + /** + * 根据IN_OR_OUT获取任务号 + * @param str + * @return + */ + + BasTaskNo getTaskNo(String str); + + void updateTaskNo(BasTaskNo basTaskNo); + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/taskNo/service/IBasTaskNoService.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/taskNo/service/IBasTaskNoService.java new file mode 100644 index 0000000..6d42e20 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/taskNo/service/IBasTaskNoService.java @@ -0,0 +1,78 @@ +package com.ruoyi.bas.taskNo.service; + + + + + +import com.ruoyi.bas.taskNo.domain.BasTaskNo; + +import java.util.List; + +/** + * 任务号Service接口 + * + * @author qxq + * @date 2021-11-05 + */ +public interface IBasTaskNoService +{ + /** + * 查询任务号 + * + * @param id 任务号ID + * @return 任务号 + */ + public BasTaskNo selectBasTaskNoById(String id); + + /** + * 查询任务号列表 + * + * @param basTaskNo 任务号 + * @return 任务号集合 + */ + public List selectBasTaskNoList(BasTaskNo basTaskNo); + + /** + * 新增任务号 + * + * @param basTaskNo 任务号 + * @return 结果 + */ + public int insertBasTaskNo(BasTaskNo basTaskNo); + + /** + * 修改任务号 + * + * @param basTaskNo 任务号 + * @return 结果 + */ + public int updateBasTaskNo(BasTaskNo basTaskNo); + + /** + * 批量删除任务号 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteBasTaskNoByIds(String ids); + + /** + * 删除任务号信息 + * + * @param id 任务号ID + * @return 结果 + */ + public int deleteBasTaskNoById(String id); + + /** + * 获取任务号 + * @param task_type + * @return + */ + public long getTaskNo(String task_type); + + + + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/taskNo/service/impl/BasTaskNoServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/taskNo/service/impl/BasTaskNoServiceImpl.java new file mode 100644 index 0000000..32cd554 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/taskNo/service/impl/BasTaskNoServiceImpl.java @@ -0,0 +1,140 @@ +package com.ruoyi.bas.taskNo.service.impl; + + + +import com.ruoyi.bas.taskNo.domain.BasTaskNo; +import com.ruoyi.bas.taskNo.mapper.BasTaskNoMapper; +import com.ruoyi.bas.taskNo.service.IBasTaskNoService; +import com.ruoyi.common.core.text.Convert; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.PlatformTransactionManager; +import org.springframework.transaction.TransactionDefinition; +import org.springframework.transaction.TransactionStatus; +import org.springframework.transaction.support.DefaultTransactionDefinition; + +import java.util.List; + +/** + * 任务号Service业务层处理 + * + * @author qxq + * @date 2021-11-05 + */ +@Service +public class BasTaskNoServiceImpl implements IBasTaskNoService +{ + @Autowired + private BasTaskNoMapper basTaskNoMapper; + + + @Autowired + private PlatformTransactionManager transactionManager; + + /** + * 查询任务号 + * + * @param id 任务号ID + * @return 任务号 + */ + @Override + public BasTaskNo selectBasTaskNoById(String id) + { + return basTaskNoMapper.selectBasTaskNoById(id); + } + + /** + * 查询任务号列表 + * + * @param basTaskNo 任务号 + * @return 任务号 + */ + @Override + public List selectBasTaskNoList(BasTaskNo basTaskNo) + { + return basTaskNoMapper.selectBasTaskNoList(basTaskNo); + } + + /** + * 新增任务号 + * + * @param basTaskNo 任务号 + * @return 结果 + */ + @Override + public int insertBasTaskNo(BasTaskNo basTaskNo) + { + return basTaskNoMapper.insertBasTaskNo(basTaskNo); + } + + /** + * 修改任务号 + * + * @param basTaskNo 任务号 + * @return 结果 + */ + @Override + public int updateBasTaskNo(BasTaskNo basTaskNo) + { + return basTaskNoMapper.updateBasTaskNo(basTaskNo); + } + + /** + * 删除任务号对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteBasTaskNoByIds(String ids) + { + return basTaskNoMapper.deleteBasTaskNoByIds(Convert.toStrArray(ids)); + } + + /** + * 删除任务号信息 + * + * @param id 任务号ID + * @return 结果 + */ + @Override + public int deleteBasTaskNoById(String id) + { + return basTaskNoMapper.deleteBasTaskNoById(id); + } + + /** + * 获取任务号 + * @param + * @return + */ + public long getTaskNo(String id){ + //2、获取默认事务定义 + DefaultTransactionDefinition def = new DefaultTransactionDefinition(); + // 设置事务传播行为 不管是否存在事务,都创建一个新的事务,原来的挂起,新的执行完毕,继续执行老的事务 + def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW); + //3、根据事务定义对象设置的属性，获取事务状态 + TransactionStatus status = transactionManager.getTransaction(def); + + BasTaskNo basTask = basTaskNoMapper.getTaskNo(id); + Long taskNo = basTask.getTaskNo(); + Long min = basTask.getMinNo(); + Long max = basTask.getMaxNo(); + Long num =Long.valueOf(0); + if (taskNo > min - 1 && taskNo < max) { + num = taskNo + 1; + } + if (taskNo < min || taskNo >= max) { + num = min; + } + BasTaskNo basTaskNo = new BasTaskNo(); + basTaskNo.setId(id); + basTaskNo.setTaskNo(num); + basTaskNoMapper.updateTaskNo(basTaskNo); + //4 事物提交 + transactionManager.commit(status); + return taskNo; + } + + +} diff --git a/ruoyi-admin/src/main/resources/mapper/bas/BasJobIdMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/BasJobIdMapper.xml new file mode 100644 index 0000000..ba52e38 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/bas/BasJobIdMapper.xml @@ -0,0 +1,164 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, type, job_id, job_detail, stock_id, order_id, Exorder_id, job_id_R, job_detail_R, job_id_C, job_detail_C, temp_order_id, lot_no, stockin_id, stockin_detail_id, stockout_id, stockout_detail_id, plan_id, job_id_y, job_id_s from bas_job_id + + + + + + + + insert into bas_job_id + + id, + type, + job_id, + job_detail, + stock_id, + order_id, + Exorder_id, + job_id_R, + job_detail_R, + job_id_C, + job_detail_C, + temp_order_id, + lot_no, + stockin_id, + stockin_detail_id, + stockout_id, + stockout_detail_id, + plan_id, + job_id_y, + job_id_s, + + + #{id}, + #{type}, + #{jobId}, + #{jobDetail}, + #{stockId}, + #{orderId}, + #{exorderId}, + #{jobIdR}, + #{jobDetailR}, + #{jobIdC}, + #{jobDetailC}, + #{tempOrderId}, + #{lotNo}, + #{stockinId}, + #{stockinDetailId}, + #{stockoutId}, + #{stockoutDetailId}, + #{planId}, + #{jobIdY}, + #{jobIdS}, + + + + + update bas_job_id + + + job_id = #{jobId}, + job_detail = #{jobDetail}, + stock_id = #{stockId}, + order_id = #{orderId}, + Exorder_id = #{exorderId}, + job_id_R = #{jobIdR}, + job_detail_R = #{jobDetailR}, + job_id_C = #{jobIdC}, + job_detail_C = #{jobDetailC}, + temp_order_id = #{tempOrderId}, + lot_no = #{lotNo}, + stockin_id = #{stockinId}, + stockin_detail_id = #{stockinDetailId}, + stockout_id = #{stockoutId}, + stockout_detail_id = #{stockoutDetailId}, + plan_id = #{planId}, + job_id_y = #{jobIdY}, + job_id_s = #{jobIdS}, + + where type = #{type} + + + + delete from bas_job_id where id = #{id} + + + + delete from bas_job_id where id in + + #{id} + + + + + + + + + + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/bas/BasTaskNoMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/BasTaskNoMapper.xml new file mode 100644 index 0000000..f7cd878 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/bas/BasTaskNoMapper.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + select id, task_type, type_name, task_no, min_no, max_no + from bas_task_no + + + + + update bas_task_no + + task_type = #{taskType}, + type_name = #{typeName}, + task_no = #{taskNo}, + min_no = #{minNo}, + max_no = #{maxNo}, + + where id = #{id} + + + + + + update bas_task_no + set task_no=#{taskNo} + where id = #{id} + + +