From 0fd63bebaeda0e0dbf9a96dd940665671c36e6d5 Mon Sep 17 00:00:00 2001 From: wangcl Date: Sun, 9 Jan 2022 18:45:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=90=E5=93=81=E5=BA=93=E5=AD=98=E5=92=8C?= =?UTF-8?q?=E6=88=90=E5=93=81=E6=93=8D=E4=BD=9C=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusiProductOperateController.java | 135 +++++++++++++++++ .../BusiProductStockController.java | 126 ++++++++++++++++ .../ruoyi/busi/domain/BusiProductOperate.java | 135 +++++++++++++++++ .../ruoyi/busi/domain/BusiProductStock.java | 97 ++++++++++++ .../busi/mapper/BusiProductOperateMapper.java | 69 +++++++++ .../busi/mapper/BusiProductStockMapper.java | 61 ++++++++ .../service/IBusiProductOperateService.java | 67 +++++++++ .../service/IBusiProductStockService.java | 61 ++++++++ .../impl/BusiProductOperateServiceImpl.java | 110 ++++++++++++++ .../impl/BusiProductStockServiceImpl.java | 97 ++++++++++++ .../mapper/busi/BusiProductOperateMapper.xml | 106 +++++++++++++ .../mapper/busi/BusiProductStockMapper.xml | 87 +++++++++++ .../templates/busi/productOperate/add.html | 140 ++++++++++++++++++ .../templates/busi/productOperate/edit.html | 71 +++++++++ .../busi/productOperate/productOperate.html | 117 +++++++++++++++ .../templates/busi/productStock/add.html | 53 +++++++ .../templates/busi/productStock/edit.html | 54 +++++++ .../busi/productStock/productStock.html | 120 +++++++++++++++ 18 files changed, 1706 insertions(+) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiProductOperateController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiProductStockController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiProductOperate.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiProductStock.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiProductOperateMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiProductStockMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiProductOperateService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiProductStockService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiProductOperateServiceImpl.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiProductStockServiceImpl.java create mode 100644 ruoyi-admin/src/main/resources/mapper/busi/BusiProductOperateMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/busi/BusiProductStockMapper.xml create mode 100644 ruoyi-admin/src/main/resources/templates/busi/productOperate/add.html create mode 100644 ruoyi-admin/src/main/resources/templates/busi/productOperate/edit.html create mode 100644 ruoyi-admin/src/main/resources/templates/busi/productOperate/productOperate.html create mode 100644 ruoyi-admin/src/main/resources/templates/busi/productStock/add.html create mode 100644 ruoyi-admin/src/main/resources/templates/busi/productStock/edit.html create mode 100644 ruoyi-admin/src/main/resources/templates/busi/productStock/productStock.html diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiProductOperateController.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiProductOperateController.java new file mode 100644 index 000000000..e6e24b50b --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiProductOperateController.java @@ -0,0 +1,135 @@ +package com.ruoyi.busi.controller; + +import java.util.List; +import java.util.Map; + +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.*; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.busi.domain.BusiProductOperate; +import com.ruoyi.busi.service.IBusiProductOperateService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 成品操作流水Controller + * + * @author WangCL + * @date 2022-01-08 + */ +@Controller +@RequestMapping("/busi/productOperate") +public class BusiProductOperateController extends BaseController { + private String prefix = "busi/productOperate"; + + @Autowired + private IBusiProductOperateService busiProductOperateService; + + @RequiresPermissions("busi:productOperate:view") + @GetMapping() + public String productOperate() { + return prefix + "/productOperate"; + } + + /** + * 查询成品操作流水列表 + */ + @RequiresPermissions("busi:productOperate:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(BusiProductOperate busiProductOperate) { + startPage(); + List list = busiProductOperateService.selectBusiProductOperateList(busiProductOperate); + return getDataTable(list); + } + + /** + * 导出成品操作流水列表 + */ + @RequiresPermissions("busi:productOperate:export") + @Log(title = "成品操作流水", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(BusiProductOperate busiProductOperate) { + List list = busiProductOperateService.selectBusiProductOperateList(busiProductOperate); + ExcelUtil util = new ExcelUtil(BusiProductOperate.class); + return util.exportExcel(list, "成品操作流水数据"); + } + + /** + * 新增成品操作流水 + */ + @GetMapping("/add") + public String add() { + return prefix + "/add"; + } + + /** + * 新增保存成品操作流水 + */ + @RequiresPermissions("busi:productOperate:add") + @Log(title = "成品操作流水", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(BusiProductOperate busiProductOperate) { + return toAjax(busiProductOperateService.insertBusiProductOperate(busiProductOperate)); + } + + /** + * 修改成品操作流水 + */ + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") String id, ModelMap mmap) { + BusiProductOperate busiProductOperate = busiProductOperateService.selectBusiProductOperateById(id); + mmap.put("busiProductOperate", busiProductOperate); + return prefix + "/edit"; + } + + /** + * 修改保存成品操作流水 + */ + @RequiresPermissions("busi:productOperate:edit") + @Log(title = "成品操作流水", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(BusiProductOperate busiProductOperate) { + return toAjax(busiProductOperateService.updateBusiProductOperate(busiProductOperate)); + } + + /** + * 删除成品操作流水 + */ + @RequiresPermissions("busi:productOperate:remove") + @Log(title = "成品操作流水", businessType = BusinessType.DELETE) + @PostMapping("/remove") + @ResponseBody + public AjaxResult remove(String ids) { + return toAjax(busiProductOperateService.deleteBusiProductOperateByIds(ids)); + } + + /** + * 通过产线ID查询产品任务尺码列表 + */ + @PostMapping("/selProductSizeByLineId") + @ResponseBody + public AjaxResult selProductSizeByLineId(@RequestParam(name = "lineId", required = false) String lineId) { + List> list = busiProductOperateService.selProductSizeByLineId(lineId); + return success(list); + } + + /** + * 通过产线ID和产品尺码查询产品任务颜色列表 + */ + @PostMapping("/selProductColorByLineIdAndSize") + @ResponseBody + public AjaxResult selProductColorByLineIdAndSize(@RequestParam Map queryMap) { + List> list = busiProductOperateService.selProductColorByLineIdAndSize(queryMap); + return success(list); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiProductStockController.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiProductStockController.java new file mode 100644 index 000000000..1a51cd634 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiProductStockController.java @@ -0,0 +1,126 @@ +package com.ruoyi.busi.controller; + +import java.util.List; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.busi.domain.BusiProductStock; +import com.ruoyi.busi.service.IBusiProductStockService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 成品库存Controller + * + * @author WangCL + * @date 2022-01-08 + */ +@Controller +@RequestMapping("/busi/productStock") +public class BusiProductStockController extends BaseController +{ + private String prefix = "busi/productStock"; + + @Autowired + private IBusiProductStockService busiProductStockService; + + @RequiresPermissions("busi:productStock:view") + @GetMapping() + public String productStock() + { + return prefix + "/productStock"; + } + + /** + * 查询成品库存列表 + */ + @RequiresPermissions("busi:productStock:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(BusiProductStock busiProductStock) + { + startPage(); + List list = busiProductStockService.selectBusiProductStockList(busiProductStock); + return getDataTable(list); + } + + /** + * 导出成品库存列表 + */ + @RequiresPermissions("busi:productStock:export") + @Log(title = "成品库存", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(BusiProductStock busiProductStock) + { + List list = busiProductStockService.selectBusiProductStockList(busiProductStock); + ExcelUtil util = new ExcelUtil(BusiProductStock.class); + return util.exportExcel(list, "成品库存数据"); + } + + /** + * 新增成品库存 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存成品库存 + */ + @RequiresPermissions("busi:productStock:add") + @Log(title = "成品库存", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(BusiProductStock busiProductStock) + { + return toAjax(busiProductStockService.insertBusiProductStock(busiProductStock)); + } + + /** + * 修改成品库存 + */ + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") String id, ModelMap mmap) + { + BusiProductStock busiProductStock = busiProductStockService.selectBusiProductStockById(id); + mmap.put("busiProductStock", busiProductStock); + return prefix + "/edit"; + } + + /** + * 修改保存成品库存 + */ + @RequiresPermissions("busi:productStock:edit") + @Log(title = "成品库存", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(BusiProductStock busiProductStock) + { + return toAjax(busiProductStockService.updateBusiProductStock(busiProductStock)); + } + + /** + * 删除成品库存 + */ + @RequiresPermissions("busi:productStock:remove") + @Log(title = "成品库存", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(busiProductStockService.deleteBusiProductStockByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiProductOperate.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiProductOperate.java new file mode 100644 index 000000000..a676e272c --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiProductOperate.java @@ -0,0 +1,135 @@ +package com.ruoyi.busi.domain; + +import java.math.BigDecimal; +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; + +/** + * 成品操作流水对象 busi_product_operate + * + * @author WangCL + * @date 2022-01-08 + */ +public class BusiProductOperate extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** ID主键 */ + private String id; + + /** 成品库存 */ + @Excel(name = "成品库存") + private String productStockId; + + /** 任务 */ + @Excel(name = "任务") + private String taskId; + + + private String orderId; + + /** 操作数量 */ + @Excel(name = "操作数量") + private Long amount; + + /** 价值 */ + @Excel(name = "价值") + private BigDecimal productValue; + + /** 每包数量 */ + private Long amountPerPackage; + + /** 操作类型 */ + @Excel(name = "操作类型") + private String oprateType; + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public void setId(String id) + { + this.id = id; + } + + public String getId() + { + return id; + } + public void setProductStockId(String productStockId) + { + this.productStockId = productStockId; + } + + public String getProductStockId() + { + return productStockId; + } + public void setTaskId(String taskId) + { + this.taskId = taskId; + } + + public String getTaskId() + { + return taskId; + } + public void setAmount(Long amount) + { + this.amount = amount; + } + + public Long getAmount() + { + return amount; + } + public void setProductValue(BigDecimal productValue) + { + this.productValue = productValue; + } + + public BigDecimal getProductValue() + { + return productValue; + } + public void setAmountPerPackage(Long amountPerPackage) + { + this.amountPerPackage = amountPerPackage; + } + + public Long getAmountPerPackage() + { + return amountPerPackage; + } + public void setOprateType(String oprateType) + { + this.oprateType = oprateType; + } + + public String getOprateType() + { + return oprateType; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("productStockId", getProductStockId()) + .append("taskId", getTaskId()) + .append("amount", getAmount()) + .append("productValue", getProductValue()) + .append("amountPerPackage", getAmountPerPackage()) + .append("oprateType", getOprateType()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiProductStock.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiProductStock.java new file mode 100644 index 000000000..21e1639a6 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiProductStock.java @@ -0,0 +1,97 @@ +package com.ruoyi.busi.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; + +/** + * 成品库存对象 busi_product_stock + * + * @author WangCL + * @date 2022-01-08 + */ +public class BusiProductStock extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** ID主键 */ + private String id; + + /** 订单 */ + @Excel(name = "订单") + private String orderId; + + /** 数量 */ + @Excel(name = "数量") + private Long amount; + + /** 尺码 */ + @Excel(name = "尺码") + private String size; + + /** 颜色 */ + @Excel(name = "颜色") + private String color; + + public void setId(String id) + { + this.id = id; + } + + public String getId() + { + return id; + } + public void setOrderId(String orderId) + { + this.orderId = orderId; + } + + public String getOrderId() + { + return orderId; + } + public void setAmount(Long amount) + { + this.amount = amount; + } + + public Long getAmount() + { + return amount; + } + public void setSize(String size) + { + this.size = size; + } + + public String getSize() + { + return size; + } + public void setColor(String color) + { + this.color = color; + } + + public String getColor() + { + return color; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("orderId", getOrderId()) + .append("amount", getAmount()) + .append("size", getSize()) + .append("color", getColor()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiProductOperateMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiProductOperateMapper.java new file mode 100644 index 000000000..66aef7fcf --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiProductOperateMapper.java @@ -0,0 +1,69 @@ +package com.ruoyi.busi.mapper; + +import java.util.List; +import java.util.Map; + +import com.ruoyi.busi.domain.BusiProductOperate; + +/** + * 成品操作流水Mapper接口 + * + * @author WangCL + * @date 2022-01-08 + */ +public interface BusiProductOperateMapper +{ + /** + * 查询成品操作流水 + * + * @param id 成品操作流水主键 + * @return 成品操作流水 + */ + public BusiProductOperate selectBusiProductOperateById(String id); + + /** + * 查询成品操作流水列表 + * + * @param busiProductOperate 成品操作流水 + * @return 成品操作流水集合 + */ + public List selectBusiProductOperateList(BusiProductOperate busiProductOperate); + + /** + * 新增成品操作流水 + * + * @param busiProductOperate 成品操作流水 + * @return 结果 + */ + public int insertBusiProductOperate(BusiProductOperate busiProductOperate); + + /** + * 修改成品操作流水 + * + * @param busiProductOperate 成品操作流水 + * @return 结果 + */ + public int updateBusiProductOperate(BusiProductOperate busiProductOperate); + + /** + * 删除成品操作流水 + * + * @param id 成品操作流水主键 + * @return 结果 + */ + public int deleteBusiProductOperateById(String id); + + /** + * 批量删除成品操作流水 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteBusiProductOperateByIds(String[] ids); + + public List> selProductSizeByLineId(String lineId); + + public List> selProductColorByLineIdAndSize(Map map); + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiProductStockMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiProductStockMapper.java new file mode 100644 index 000000000..ed75284a5 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiProductStockMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.busi.mapper; + +import java.util.List; +import com.ruoyi.busi.domain.BusiProductStock; + +/** + * 成品库存Mapper接口 + * + * @author WangCL + * @date 2022-01-08 + */ +public interface BusiProductStockMapper +{ + /** + * 查询成品库存 + * + * @param id 成品库存主键 + * @return 成品库存 + */ + public BusiProductStock selectBusiProductStockById(String id); + + /** + * 查询成品库存列表 + * + * @param busiProductStock 成品库存 + * @return 成品库存集合 + */ + public List selectBusiProductStockList(BusiProductStock busiProductStock); + + /** + * 新增成品库存 + * + * @param busiProductStock 成品库存 + * @return 结果 + */ + public int insertBusiProductStock(BusiProductStock busiProductStock); + + /** + * 修改成品库存 + * + * @param busiProductStock 成品库存 + * @return 结果 + */ + public int updateBusiProductStock(BusiProductStock busiProductStock); + + /** + * 删除成品库存 + * + * @param id 成品库存主键 + * @return 结果 + */ + public int deleteBusiProductStockById(String id); + + /** + * 批量删除成品库存 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteBusiProductStockByIds(String[] ids); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiProductOperateService.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiProductOperateService.java new file mode 100644 index 000000000..ef775d482 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiProductOperateService.java @@ -0,0 +1,67 @@ +package com.ruoyi.busi.service; + +import java.util.List; +import java.util.Map; + +import com.ruoyi.busi.domain.BusiProductOperate; + +/** + * 成品操作流水Service接口 + * + * @author WangCL + * @date 2022-01-08 + */ +public interface IBusiProductOperateService +{ + /** + * 查询成品操作流水 + * + * @param id 成品操作流水主键 + * @return 成品操作流水 + */ + public BusiProductOperate selectBusiProductOperateById(String id); + + /** + * 查询成品操作流水列表 + * + * @param busiProductOperate 成品操作流水 + * @return 成品操作流水集合 + */ + public List selectBusiProductOperateList(BusiProductOperate busiProductOperate); + + /** + * 新增成品操作流水 + * + * @param busiProductOperate 成品操作流水 + * @return 结果 + */ + public int insertBusiProductOperate(BusiProductOperate busiProductOperate); + + /** + * 修改成品操作流水 + * + * @param busiProductOperate 成品操作流水 + * @return 结果 + */ + public int updateBusiProductOperate(BusiProductOperate busiProductOperate); + + /** + * 批量删除成品操作流水 + * + * @param ids 需要删除的成品操作流水主键集合 + * @return 结果 + */ + public int deleteBusiProductOperateByIds(String ids); + + /** + * 删除成品操作流水信息 + * + * @param id 成品操作流水主键 + * @return 结果 + */ + public int deleteBusiProductOperateById(String id); + + public List> selProductSizeByLineId(String lineId); + + public List> selProductColorByLineIdAndSize(Map map); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiProductStockService.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiProductStockService.java new file mode 100644 index 000000000..f69d61308 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiProductStockService.java @@ -0,0 +1,61 @@ +package com.ruoyi.busi.service; + +import java.util.List; +import com.ruoyi.busi.domain.BusiProductStock; + +/** + * 成品库存Service接口 + * + * @author WangCL + * @date 2022-01-08 + */ +public interface IBusiProductStockService +{ + /** + * 查询成品库存 + * + * @param id 成品库存主键 + * @return 成品库存 + */ + public BusiProductStock selectBusiProductStockById(String id); + + /** + * 查询成品库存列表 + * + * @param busiProductStock 成品库存 + * @return 成品库存集合 + */ + public List selectBusiProductStockList(BusiProductStock busiProductStock); + + /** + * 新增成品库存 + * + * @param busiProductStock 成品库存 + * @return 结果 + */ + public int insertBusiProductStock(BusiProductStock busiProductStock); + + /** + * 修改成品库存 + * + * @param busiProductStock 成品库存 + * @return 结果 + */ + public int updateBusiProductStock(BusiProductStock busiProductStock); + + /** + * 批量删除成品库存 + * + * @param ids 需要删除的成品库存主键集合 + * @return 结果 + */ + public int deleteBusiProductStockByIds(String ids); + + /** + * 删除成品库存信息 + * + * @param id 成品库存主键 + * @return 结果 + */ + public int deleteBusiProductStockById(String id); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiProductOperateServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiProductOperateServiceImpl.java new file mode 100644 index 000000000..c4c64234e --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiProductOperateServiceImpl.java @@ -0,0 +1,110 @@ +package com.ruoyi.busi.service.impl; + +import java.util.List; +import java.util.Map; + +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.busi.mapper.BusiProductOperateMapper; +import com.ruoyi.busi.domain.BusiProductOperate; +import com.ruoyi.busi.service.IBusiProductOperateService; +import com.ruoyi.common.core.text.Convert; + +/** + * 成品操作流水Service业务层处理 + * + * @author WangCL + * @date 2022-01-08 + */ +@Service +public class BusiProductOperateServiceImpl implements IBusiProductOperateService +{ + @Autowired + private BusiProductOperateMapper busiProductOperateMapper; + + /** + * 查询成品操作流水 + * + * @param id 成品操作流水主键 + * @return 成品操作流水 + */ + @Override + public BusiProductOperate selectBusiProductOperateById(String id) + { + return busiProductOperateMapper.selectBusiProductOperateById(id); + } + + /** + * 查询成品操作流水列表 + * + * @param busiProductOperate 成品操作流水 + * @return 成品操作流水 + */ + @Override + public List selectBusiProductOperateList(BusiProductOperate busiProductOperate) + { + return busiProductOperateMapper.selectBusiProductOperateList(busiProductOperate); + } + + /** + * 新增成品操作流水 + * + * @param busiProductOperate 成品操作流水 + * @return 结果 + */ + @Override + public int insertBusiProductOperate(BusiProductOperate busiProductOperate) + { + busiProductOperate.setCreateTime(DateUtils.getNowDate()); + + + return busiProductOperateMapper.insertBusiProductOperate(busiProductOperate); + } + + /** + * 修改成品操作流水 + * + * @param busiProductOperate 成品操作流水 + * @return 结果 + */ + @Override + public int updateBusiProductOperate(BusiProductOperate busiProductOperate) + { + return busiProductOperateMapper.updateBusiProductOperate(busiProductOperate); + } + + /** + * 批量删除成品操作流水 + * + * @param ids 需要删除的成品操作流水主键 + * @return 结果 + */ + @Override + public int deleteBusiProductOperateByIds(String ids) + { + return busiProductOperateMapper.deleteBusiProductOperateByIds(Convert.toStrArray(ids)); + } + + /** + * 删除成品操作流水信息 + * + * @param id 成品操作流水主键 + * @return 结果 + */ + @Override + public int deleteBusiProductOperateById(String id) + { + return busiProductOperateMapper.deleteBusiProductOperateById(id); + } + + @Override + public List> selProductSizeByLineId(String lineId) { + return busiProductOperateMapper.selProductSizeByLineId(lineId); + } + + @Override + public List> selProductColorByLineIdAndSize(Map map) { + return busiProductOperateMapper.selProductColorByLineIdAndSize(map); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiProductStockServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiProductStockServiceImpl.java new file mode 100644 index 000000000..750995114 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiProductStockServiceImpl.java @@ -0,0 +1,97 @@ +package com.ruoyi.busi.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.busi.mapper.BusiProductStockMapper; +import com.ruoyi.busi.domain.BusiProductStock; +import com.ruoyi.busi.service.IBusiProductStockService; +import com.ruoyi.common.core.text.Convert; + +/** + * 成品库存Service业务层处理 + * + * @author WangCL + * @date 2022-01-08 + */ +@Service +public class BusiProductStockServiceImpl implements IBusiProductStockService +{ + @Autowired + private BusiProductStockMapper busiProductStockMapper; + + /** + * 查询成品库存 + * + * @param id 成品库存主键 + * @return 成品库存 + */ + @Override + public BusiProductStock selectBusiProductStockById(String id) + { + return busiProductStockMapper.selectBusiProductStockById(id); + } + + /** + * 查询成品库存列表 + * + * @param busiProductStock 成品库存 + * @return 成品库存 + */ + @Override + public List selectBusiProductStockList(BusiProductStock busiProductStock) + { + return busiProductStockMapper.selectBusiProductStockList(busiProductStock); + } + + /** + * 新增成品库存 + * + * @param busiProductStock 成品库存 + * @return 结果 + */ + @Override + public int insertBusiProductStock(BusiProductStock busiProductStock) + { + busiProductStock.setCreateTime(DateUtils.getNowDate()); + return busiProductStockMapper.insertBusiProductStock(busiProductStock); + } + + /** + * 修改成品库存 + * + * @param busiProductStock 成品库存 + * @return 结果 + */ + @Override + public int updateBusiProductStock(BusiProductStock busiProductStock) + { + busiProductStock.setUpdateTime(DateUtils.getNowDate()); + return busiProductStockMapper.updateBusiProductStock(busiProductStock); + } + + /** + * 批量删除成品库存 + * + * @param ids 需要删除的成品库存主键 + * @return 结果 + */ + @Override + public int deleteBusiProductStockByIds(String ids) + { + return busiProductStockMapper.deleteBusiProductStockByIds(Convert.toStrArray(ids)); + } + + /** + * 删除成品库存信息 + * + * @param id 成品库存主键 + * @return 结果 + */ + @Override + public int deleteBusiProductStockById(String id) + { + return busiProductStockMapper.deleteBusiProductStockById(id); + } +} diff --git a/ruoyi-admin/src/main/resources/mapper/busi/BusiProductOperateMapper.xml b/ruoyi-admin/src/main/resources/mapper/busi/BusiProductOperateMapper.xml new file mode 100644 index 000000000..f4b4455a6 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/busi/BusiProductOperateMapper.xml @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + select id, product_stock_id, task_id, amount, product_value, amount_per_package, oprate_type, create_by, create_time, remark from busi_product_operate + + + + + + + + insert into busi_product_operate + + product_stock_id, + task_id, + amount, + product_value, + amount_per_package, + oprate_type, + create_by, + create_time, + remark, + + + #{productStockId}, + #{taskId}, + #{amount}, + #{productValue}, + #{amountPerPackage}, + #{oprateType}, + #{createBy}, + #{createTime}, + #{remark}, + + + + + update busi_product_operate + + product_stock_id = #{productStockId}, + task_id = #{taskId}, + amount = #{amount}, + product_value = #{productValue}, + amount_per_package = #{amountPerPackage}, + oprate_type = #{oprateType}, + create_by = #{createBy}, + create_time = #{createTime}, + remark = #{remark}, + + where id = #{id} + + + + delete from busi_product_operate where id = #{id} + + + + delete from busi_product_operate where id in + + #{id} + + + + + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/busi/BusiProductStockMapper.xml b/ruoyi-admin/src/main/resources/mapper/busi/BusiProductStockMapper.xml new file mode 100644 index 000000000..0b0bbd048 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/busi/BusiProductStockMapper.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + select id, order_id, amount, size, color, create_by, create_time, update_by, update_time from busi_product_stock + + + + + + + + insert into busi_product_stock + + order_id, + amount, + size, + color, + create_by, + create_time, + update_by, + update_time, + + + #{orderId}, + #{amount}, + #{size}, + #{color}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update busi_product_stock + + order_id = #{orderId}, + amount = #{amount}, + size = #{size}, + color = #{color}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from busi_product_stock where id = #{id} + + + + delete from busi_product_stock where id in + + #{id} + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/busi/productOperate/add.html b/ruoyi-admin/src/main/resources/templates/busi/productOperate/add.html new file mode 100644 index 000000000..644536719 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/busi/productOperate/add.html @@ -0,0 +1,140 @@ + + + + + + +
+
+ + + + +
+ +
+ + +
+
+
+ +
+ +
+
+ +
+
+
+ +
+ +
+
+ + + + + + +
+ +
+ +
+
+ 生成二维码 +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/busi/productOperate/edit.html b/ruoyi-admin/src/main/resources/templates/busi/productOperate/edit.html new file mode 100644 index 000000000..ad67ef673 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/busi/productOperate/edit.html @@ -0,0 +1,71 @@ + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + 代码生成请选择字典属性 +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/busi/productOperate/productOperate.html b/ruoyi-admin/src/main/resources/templates/busi/productOperate/productOperate.html new file mode 100644 index 000000000..1039d01a2 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/busi/productOperate/productOperate.html @@ -0,0 +1,117 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/busi/productStock/add.html b/ruoyi-admin/src/main/resources/templates/busi/productStock/add.html new file mode 100644 index 000000000..a6fb8c37c --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/busi/productStock/add.html @@ -0,0 +1,53 @@ + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/busi/productStock/edit.html b/ruoyi-admin/src/main/resources/templates/busi/productStock/edit.html new file mode 100644 index 000000000..2dcd83520 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/busi/productStock/edit.html @@ -0,0 +1,54 @@ + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/busi/productStock/productStock.html b/ruoyi-admin/src/main/resources/templates/busi/productStock/productStock.html new file mode 100644 index 000000000..d9e127b4f --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/busi/productStock/productStock.html @@ -0,0 +1,120 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file