From 1f0433c184be50e623ca27b9d7524a6563321567 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com> Date: Wed, 25 Dec 2024 14:21:28 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=20=E5=9F=BA=E7=A1=80=E8=B5=84=E6=96=99?= =?UTF-8?q?=20=E5=91=98=E5=B7=A5=E9=80=80=E6=96=99=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=91=98=E5=B7=A5=E9=80=80=E6=96=99=E5=8D=95=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E7=B1=BB=E3=80=81controller=E3=80=81service=E3=80=81mapper?= =?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BaseReturnOrderController.java | 192 +++++++++++ .../ruoyi/system/domain/BaseReturnOrder.java | 325 ++++++++++++++++++ .../system/mapper/BaseReturnOrderMapper.java | 77 +++++ .../service/IBaseReturnOrderService.java | 75 ++++ .../impl/BaseReturnOrderServiceImpl.java | 174 ++++++++++ .../mapper/system/BaseReturnOrderMapper.xml | 175 ++++++++++ 6 files changed, 1018 insertions(+) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/controller/BaseReturnOrderController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/domain/BaseReturnOrder.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/mapper/BaseReturnOrderMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/service/IBaseReturnOrderService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseReturnOrderServiceImpl.java create mode 100644 ruoyi-admin/src/main/resources/mapper/system/BaseReturnOrderMapper.xml diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/BaseReturnOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/BaseReturnOrderController.java new file mode 100644 index 00000000..87ea65a4 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/BaseReturnOrderController.java @@ -0,0 +1,192 @@ +package com.ruoyi.system.controller; + +import java.util.List; + +import com.ruoyi.system.domain.BaseReturnOrderDetail; +import com.ruoyi.system.domain.OutsourceRequisition; +import com.ruoyi.system.service.IBaseReturnOrderDetailService; +import com.ruoyi.system.service.IOutsourceRequisitionService; +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.system.domain.BaseReturnOrder; +import com.ruoyi.system.service.IBaseReturnOrderService; +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 ruoyi + * @date 2024-12-24 + */ +@Controller +@RequestMapping("/system/baseReturnOrder") +public class BaseReturnOrderController extends BaseController +{ + private String prefix = "system/baseReturnOrder"; + + @Autowired + private IBaseReturnOrderService baseReturnOrderService; + + @Autowired + private IBaseReturnOrderDetailService returnOrderDetailService; + + @Autowired + private IOutsourceRequisitionService requisitionService; + + @RequiresPermissions("system:baseReturnOrder:view") + @GetMapping() + public String baseReturnOrder() + { + return prefix + "/baseReturnOrder"; + } + + /** + * 查询员工退料列表 + */ + @RequiresPermissions("system:baseReturnOrder:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(BaseReturnOrder baseReturnOrder) + { + startPage(); + List list = baseReturnOrderService.selectBaseReturnOrderList(baseReturnOrder); + return getDataTable(list); + } + + /** + * 导出员工退料列表 + */ + @RequiresPermissions("system:baseReturnOrder:export") + @Log(title = "员工退料", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(BaseReturnOrder baseReturnOrder) + { + List list = baseReturnOrderService.selectBaseReturnOrderList(baseReturnOrder); + ExcelUtil util = new ExcelUtil(BaseReturnOrder.class); + return util.exportExcel(list, "员工退料数据"); + } + + /** + * 新增员工退料 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存员工退料 + */ + @RequiresPermissions("system:baseReturnOrder:add") + @Log(title = "员工退料", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(@RequestBody BaseReturnOrder baseReturnOrder) + { + return toAjax(baseReturnOrderService.insertBaseReturnOrder(baseReturnOrder)); + } + + /** + * 修改员工退料 + */ + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) + { + BaseReturnOrder baseReturnOrder = baseReturnOrderService.selectBaseReturnOrderById(id); + mmap.put("baseReturnOrder", baseReturnOrder); + return prefix + "/edit"; + } + + /** + * 修改保存员工退料 + */ + @RequiresPermissions("system:baseReturnOrder:edit") + @Log(title = "员工退料", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(BaseReturnOrder baseReturnOrder) + { + return toAjax(baseReturnOrderService.updateBaseReturnOrder(baseReturnOrder)); + } + + /** + * 删除员工退料 + */ + @RequiresPermissions("system:baseReturnOrder:remove") + @Log(title = "员工退料", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(baseReturnOrderService.deleteBaseReturnOrderByIds(ids)); + } + + /** + * 作废员工退料 + */ + @RequiresPermissions("system:baseReturnOrder:cancel") + @Log(title = "员工退料", businessType = BusinessType.CANCEL) + @GetMapping( "/cancel/{id}") + @ResponseBody + public AjaxResult cancel(@PathVariable("id") Long id){ + return toAjax(baseReturnOrderService.cancelBaseReturnOrderById(id)); + } + + /** + * 恢复员工退料 + */ + @RequiresPermissions("system:baseReturnOrder:restore") + @Log(title = "员工退料", businessType = BusinessType.RESTORE) + @GetMapping( "/restore/{id}") + @ResponseBody + public AjaxResult restore(@PathVariable("id")Long id) + { + return toAjax(baseReturnOrderService.restoreBaseReturnOrderById(id)); + } + + /** + * 修改员工退料 + */ + @GetMapping("/getMaterialList") + public String getMaterialList(@RequestParam("pickNo") String pickNo, ModelMap mmap) + { + OutsourceRequisition requisition = requisitionService.selectOutsourceRequisitionByNo(pickNo); + String pickUser = requisition.getApplyUser(); + mmap.put("pickUser", pickUser); + mmap.put("pickNo", pickNo); + return prefix + "/materialSelect"; + } + + /** + * 查询关联领料单物料列表 + */ + @PostMapping("/relatedMaterialList") + @ResponseBody + public TableDataInfo relatedOrderList(BaseReturnOrder baseReturnOrder) + { + List list = returnOrderDetailService.getRelatedMaterialList(baseReturnOrder.getPickNo()); + return getDataTable(list); + } + + /** + * 员工退料详情 + */ + @GetMapping("/detail/{id}") + public String detail(@PathVariable("id") Long id, ModelMap mmap) + { + BaseReturnOrder baseReturnOrder = baseReturnOrderService.selectBaseReturnOrderById(id); + mmap.put("baseReturnOrder", baseReturnOrder); + return prefix + "/detail"; + } + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/BaseReturnOrder.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/BaseReturnOrder.java new file mode 100644 index 00000000..f58bfe07 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/BaseReturnOrder.java @@ -0,0 +1,325 @@ +package com.ruoyi.system.domain; + +import java.util.Date; +import java.util.List; + +import com.fasterxml.jackson.annotation.JsonFormat; +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; + +/** + * 员工退料对象 base_return_order + * + * @author ruoyi + * @date 2024-12-24 + */ +public class BaseReturnOrder extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** id */ + private Long id; + + /** 退料单号 */ + @Excel(name = "退料单号") + private String baseReturnOrderCode; + + /** 关联领料单号 */ + @Excel(name = "关联领料单号") + private String pickNo; + + /** 退料状态（0待退料，1部分退料，2全部退料） */ + @Excel(name = "退料状态", readConverterExp = "0=待退料，1部分退料，2全部退料") + private String returnStatus; + + /** 物料合计 */ + @Excel(name = "物料合计") + private Integer materialSum; + + /** 退料数量合计 */ + @Excel(name = "退料数量合计") + private Integer returnSum; + + /** 合格数 */ + @Excel(name = "合格数") + private Integer qualifiedNum; + + /** 不良数 */ + @Excel(name = "不良数") + private Integer unqualifiedNum; + + /** 入库数 */ + @Excel(name = "入库数") + private Integer storageNum; + + /** 审核状态（0待审核，1审核通过，2审核拒绝） */ + @Excel(name = "审核状态", readConverterExp = "0=待审核，1审核通过，2审核拒绝") + private String auditStatus; + + /** 使用状态 */ + @Excel(name = "使用状态") + private String useStatus; + + /** 退料单类型*/ + private String returnOrderType; + + /** 退料单详情*/ + private List returnOrderDetails; + + /** 流程实例ID */ + private String instanceId; + + /** 流程实例类型 */ + private String instanceType; + + /** 流程提交实例ID */ + private String submitInstanceId; + + /** 流程作废实例ID */ + private String cancelInstanceId; + + /** 流程恢复实例ID */ + private String restoreInstanceId; + + /** 申请标题 */ + private String applyTitle; + + /** 申请人 */ + @Excel(name = "申请人") + private String applyUser; + + /** 申请时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "申请时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date applyTime; + + /** 领料员 */ + private String pickUser; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setBaseReturnOrderCode(String baseReturnOrderCode) + { + this.baseReturnOrderCode = baseReturnOrderCode; + } + + public String getBaseReturnOrderCode() + { + return baseReturnOrderCode; + } + public void setPickNo(String pickNo) + { + this.pickNo = pickNo; + } + + public String getPickNo() + { + return pickNo; + } + public void setReturnStatus(String returnStatus) + { + this.returnStatus = returnStatus; + } + + public String getReturnStatus() + { + return returnStatus; + } + public void setMaterialSum(Integer materialSum) + { + this.materialSum = materialSum; + } + + public Integer getMaterialSum() + { + return materialSum; + } + public void setReturnSum(Integer returnSum) + { + this.returnSum = returnSum; + } + + public Integer getReturnSum() + { + return returnSum; + } + public void setQualifiedNum(Integer qualifiedNum) + { + this.qualifiedNum = qualifiedNum; + } + + public Integer getQualifiedNum() + { + return qualifiedNum; + } + public void setUnqualifiedNum(Integer unqualifiedNum) + { + this.unqualifiedNum = unqualifiedNum; + } + + public Integer getUnqualifiedNum() + { + return unqualifiedNum; + } + public void setStorageNum(Integer storageNum) + { + this.storageNum = storageNum; + } + + public Integer getStorageNum() + { + return storageNum; + } + public void setAuditStatus(String auditStatus) + { + this.auditStatus = auditStatus; + } + + public String getAuditStatus() + { + return auditStatus; + } + public void setUseStatus(String useStatus) + { + this.useStatus = useStatus; + } + + public String getUseStatus() + { + return useStatus; + } + public void setInstanceId(String instanceId) + { + this.instanceId = instanceId; + } + + public String getInstanceId() + { + return instanceId; + } + public void setInstanceType(String instanceType) + { + this.instanceType = instanceType; + } + + public String getInstanceType() + { + return instanceType; + } + public void setSubmitInstanceId(String submitInstanceId) + { + this.submitInstanceId = submitInstanceId; + } + + public String getSubmitInstanceId() + { + return submitInstanceId; + } + public void setCancelInstanceId(String cancelInstanceId) + { + this.cancelInstanceId = cancelInstanceId; + } + + public String getCancelInstanceId() + { + return cancelInstanceId; + } + public void setRestoreInstanceId(String restoreInstanceId) + { + this.restoreInstanceId = restoreInstanceId; + } + + public String getRestoreInstanceId() + { + return restoreInstanceId; + } + public void setApplyTitle(String applyTitle) + { + this.applyTitle = applyTitle; + } + + public String getApplyTitle() + { + return applyTitle; + } + public void setApplyUser(String applyUser) + { + this.applyUser = applyUser; + } + + public String getApplyUser() + { + return applyUser; + } + public void setApplyTime(Date applyTime) + { + this.applyTime = applyTime; + } + + public Date getApplyTime() + { + return applyTime; + } + + public String getPickUser() { + return pickUser; + } + + public void setPickUser(String pickUser) { + this.pickUser = pickUser; + } + + public String getReturnOrderType() { + return returnOrderType; + } + + public void setReturnOrderType(String returnOrderType) { + this.returnOrderType = returnOrderType; + } + + public List getReturnOrderDetails() { + return returnOrderDetails; + } + + public void setReturnOrderDetails(List returnOrderDetails) { + this.returnOrderDetails = returnOrderDetails; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("baseReturnOrderCode", getBaseReturnOrderCode()) + .append("pickNo", getPickNo()) + .append("returnStatus", getReturnStatus()) + .append("materialSum", getMaterialSum()) + .append("returnSum", getReturnSum()) + .append("qualifiedNum", getQualifiedNum()) + .append("unqualifiedNum", getUnqualifiedNum()) + .append("storageNum", getStorageNum()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("auditStatus", getAuditStatus()) + .append("useStatus", getUseStatus()) + .append("instanceId", getInstanceId()) + .append("instanceType", getInstanceType()) + .append("submitInstanceId", getSubmitInstanceId()) + .append("cancelInstanceId", getCancelInstanceId()) + .append("restoreInstanceId", getRestoreInstanceId()) + .append("applyTitle", getApplyTitle()) + .append("applyUser", getApplyUser()) + .append("applyTime", getApplyTime()) + .toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/BaseReturnOrderMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/BaseReturnOrderMapper.java new file mode 100644 index 00000000..feffcaed --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/BaseReturnOrderMapper.java @@ -0,0 +1,77 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.domain.BaseReturnOrder; + +/** + * 员工退料Mapper接口 + * + * @author ruoyi + * @date 2024-12-24 + */ +public interface BaseReturnOrderMapper +{ + /** + * 查询员工退料 + * + * @param id 员工退料ID + * @return 员工退料 + */ + public BaseReturnOrder selectBaseReturnOrderById(Long id); + + /** + * 查询员工退料列表 + * + * @param baseReturnOrder 员工退料 + * @return 员工退料集合 + */ + public List selectBaseReturnOrderList(BaseReturnOrder baseReturnOrder); + + /** + * 新增员工退料 + * + * @param baseReturnOrder 员工退料 + * @return 结果 + */ + public int insertBaseReturnOrder(BaseReturnOrder baseReturnOrder); + + /** + * 修改员工退料 + * + * @param baseReturnOrder 员工退料 + * @return 结果 + */ + public int updateBaseReturnOrder(BaseReturnOrder baseReturnOrder); + + /** + * 删除员工退料 + * + * @param id 员工退料ID + * @return 结果 + */ + public int deleteBaseReturnOrderById(Long id); + + /** + * 批量删除员工退料 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteBaseReturnOrderByIds(String[] ids); + + /** + * 作废员工退料 + * + * @param id 员工退料ID + * @return 结果 + */ + public int cancelBaseReturnOrderById(Long id); + + /** + * 恢复员工退料 + * + * @param id 员工退料ID + * @return 结果 + */ + public int restoreBaseReturnOrderById(Long id); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/IBaseReturnOrderService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/IBaseReturnOrderService.java new file mode 100644 index 00000000..e80cdbfc --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/IBaseReturnOrderService.java @@ -0,0 +1,75 @@ +package com.ruoyi.system.service; + +import java.util.List; +import com.ruoyi.system.domain.BaseReturnOrder; + +/** + * 员工退料Service接口 + * + * @author ruoyi + * @date 2024-12-24 + */ +public interface IBaseReturnOrderService +{ + /** + * 查询员工退料 + * + * @param id 员工退料ID + * @return 员工退料 + */ + public BaseReturnOrder selectBaseReturnOrderById(Long id); + + /** + * 查询员工退料列表 + * + * @param baseReturnOrder 员工退料 + * @return 员工退料集合 + */ + public List selectBaseReturnOrderList(BaseReturnOrder baseReturnOrder); + + /** + * 新增员工退料 + * + * @param baseReturnOrder 员工退料 + * @return 结果 + */ + public int insertBaseReturnOrder(BaseReturnOrder baseReturnOrder); + + /** + * 修改员工退料 + * + * @param baseReturnOrder 员工退料 + * @return 结果 + */ + public int updateBaseReturnOrder(BaseReturnOrder baseReturnOrder); + + /** + * 批量删除员工退料 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteBaseReturnOrderByIds(String ids); + + /** + * 删除员工退料信息 + * + * @param id 员工退料ID + * @return 结果 + */ + public int deleteBaseReturnOrderById(Long id); + + /** + * 作废员工退料 + * @param id 员工退料ID + * @return + */ + int cancelBaseReturnOrderById(Long id); + + /** + * 恢复员工退料 + * @param id 员工退料ID + * @return + */ + int restoreBaseReturnOrderById(Long id); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseReturnOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseReturnOrderServiceImpl.java new file mode 100644 index 00000000..3d3f07bc --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseReturnOrderServiceImpl.java @@ -0,0 +1,174 @@ +package com.ruoyi.system.service.impl; + +import java.util.List; + +import com.ruoyi.common.core.redis.RedisCache; +import com.ruoyi.common.exception.BusinessException; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.ShiroUtils; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.system.domain.BaseReturnOrderDetail; +import com.ruoyi.system.domain.MakeReturnOrderDetail; +import com.ruoyi.system.mapper.BaseReturnOrderDetailMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.system.mapper.BaseReturnOrderMapper; +import com.ruoyi.system.domain.BaseReturnOrder; +import com.ruoyi.system.service.IBaseReturnOrderService; +import com.ruoyi.common.core.text.Convert; + +/** + * 员工退料Service业务层处理 + * + * @author ruoyi + * @date 2024-12-24 + */ +@Service +public class BaseReturnOrderServiceImpl implements IBaseReturnOrderService +{ + @Autowired + private BaseReturnOrderMapper baseReturnOrderMapper; + + @Autowired + private RedisCache redisCache; + + @Autowired + private BaseReturnOrderDetailMapper returnOrderDetailMapper; + + /** + * 查询员工退料 + * + * @param id 员工退料ID + * @return 员工退料 + */ + @Override + public BaseReturnOrder selectBaseReturnOrderById(Long id) + { + return baseReturnOrderMapper.selectBaseReturnOrderById(id); + } + + /** + * 查询员工退料列表 + * + * @param baseReturnOrder 员工退料 + * @return 员工退料 + */ + @Override + public List selectBaseReturnOrderList(BaseReturnOrder baseReturnOrder) + { + return baseReturnOrderMapper.selectBaseReturnOrderList(baseReturnOrder); + } + + /** + * 新增员工退料 + * + * @param baseReturnOrder 员工退料 + * @return 结果 + */ + @Override + public int insertBaseReturnOrder(BaseReturnOrder baseReturnOrder) + { + String loginName = ShiroUtils.getLoginName(); + int returnSum = 0; + String code = redisCache.generateBillNo("YGTL"); + String pickNo = baseReturnOrder.getPickNo(); + baseReturnOrder.setBaseReturnOrderCode(code); + + List returnOrderDetails = baseReturnOrder.getReturnOrderDetails(); + if(StringUtils.isEmpty(returnOrderDetails)){ + throw new BusinessException("退料详情为空！"); + } + for (BaseReturnOrderDetail detail: returnOrderDetails) { + int hasReturnNum = detail.getHasReturnNum()==null?0:detail.getHasReturnNum(); + int returnNum = detail.getReturnNum() + hasReturnNum; + int hasPickNum = detail.getHasPickNum(); + if(returnNum>hasPickNum){ + throw new BusinessException("物料" +detail.getMaterialNo()+"总退料数超出已领料数，请检查"); + } + detail.setBaseReturnOrderCode(code); + detail.setPickNo(pickNo); + detail.setAuditStatus("0"); + detail.setHasReturnNum(0); + detail.setCreateBy(loginName); + detail.setCreateTime(DateUtils.getNowDate()); + int insertResult = returnOrderDetailMapper.insertBaseReturnOrderDetail(detail); + if(insertResult<=0){ + throw new BusinessException("新增退料单详情失败"); + } + returnSum = returnSum + detail.getReturnNum(); + } + baseReturnOrder.setMaterialSum(returnOrderDetails.size()); + baseReturnOrder.setReturnSum(returnSum); + baseReturnOrder.setReturnStatus("0"); + baseReturnOrder.setAuditStatus("0"); + baseReturnOrder.setQualifiedNum(0); + baseReturnOrder.setUnqualifiedNum(0); + baseReturnOrder.setStorageNum(0); + baseReturnOrder.setCreateBy(loginName); + baseReturnOrder.setCreateTime(DateUtils.getNowDate()); + return baseReturnOrderMapper.insertBaseReturnOrder(baseReturnOrder); + } + + /** + * 修改员工退料 + * + * @param baseReturnOrder 员工退料 + * @return 结果 + */ + @Override + public int updateBaseReturnOrder(BaseReturnOrder baseReturnOrder) + { + String loginName = ShiroUtils.getLoginName(); + baseReturnOrder.setUpdateBy(loginName); + baseReturnOrder.setUpdateTime(DateUtils.getNowDate()); + return baseReturnOrderMapper.updateBaseReturnOrder(baseReturnOrder); + } + + /** + * 删除员工退料对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteBaseReturnOrderByIds(String ids) + { + return baseReturnOrderMapper.deleteBaseReturnOrderByIds(Convert.toStrArray(ids)); + } + + /** + * 删除员工退料信息 + * + * @param id 员工退料ID + * @return 结果 + */ + @Override + public int deleteBaseReturnOrderById(Long id) + { + return baseReturnOrderMapper.deleteBaseReturnOrderById(id); + } + + /** + * 作废员工退料 + * + * @param id 员工退料ID + * @return 结果 + */ + @Override + public int cancelBaseReturnOrderById(Long id) + { + return baseReturnOrderMapper.cancelBaseReturnOrderById(id); + } + + /** + * 恢复员工退料信息 + * + * @param id 员工退料ID + * @return 结果 + */ + @Override + public int restoreBaseReturnOrderById(Long id) + { + return baseReturnOrderMapper.restoreBaseReturnOrderById(id); + } +} diff --git a/ruoyi-admin/src/main/resources/mapper/system/BaseReturnOrderMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/BaseReturnOrderMapper.xml new file mode 100644 index 00000000..6c898cab --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/system/BaseReturnOrderMapper.xml @@ -0,0 +1,175 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, base_return_order_code, pick_no, return_status, material_sum, + return_sum, qualified_num, unqualified_num, storage_num, pick_user, + create_by, create_time, update_by, update_time, audit_status, use_status, + instance_id, instance_type, submit_instance_id, cancel_instance_id, + restore_instance_id, apply_title, apply_user, apply_time + from base_return_order + + + + + + + + insert into base_return_order + + base_return_order_code, + pick_no, + return_status, + material_sum, + return_sum, + qualified_num, + unqualified_num, + storage_num, + pick_user, + create_by, + create_time, + update_by, + update_time, + audit_status, + use_status, + instance_id, + instance_type, + submit_instance_id, + cancel_instance_id, + restore_instance_id, + apply_title, + apply_user, + apply_time, + + + #{baseReturnOrderCode}, + #{pickNo}, + #{returnStatus}, + #{materialSum}, + #{returnSum}, + #{qualifiedNum}, + #{unqualifiedNum}, + #{storageNum}, + #{pickUser}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{auditStatus}, + #{useStatus}, + #{instanceId}, + #{instanceType}, + #{submitInstanceId}, + #{cancelInstanceId}, + #{restoreInstanceId}, + #{applyTitle}, + #{applyUser}, + #{applyTime}, + + + + + update base_return_order + + base_return_order_code = #{baseReturnOrderCode}, + pick_no = #{pickNo}, + return_status = #{returnStatus}, + material_sum = #{materialSum}, + return_sum = #{returnSum}, + qualified_num = #{qualifiedNum}, + unqualified_num = #{unqualifiedNum}, + storage_num = #{storageNum}, + pick_user = #{pickUser}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + audit_status = #{auditStatus}, + use_status = #{useStatus}, + instance_id = #{instanceId}, + instance_type = #{instanceType}, + submit_instance_id = #{submitInstanceId}, + cancel_instance_id = #{cancelInstanceId}, + restore_instance_id = #{restoreInstanceId}, + apply_title = #{applyTitle}, + apply_user = #{applyUser}, + apply_time = #{applyTime}, + + where id = #{id} + + + + delete from base_return_order where id = #{id} + + + + delete from base_return_order where id in + + #{id} + + + + + update base_return_order set del_flag = '1' where id = #{id} + + + + update base_return_order set del_flag = '0' where id = #{id} + + + \ No newline at end of file