From 19711246673e697e3ac820116f2c8f75bf63e505 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Fri, 19 Apr 2024 09:43:17 +0800 Subject: [PATCH 1/4] =?UTF-8?q?[refactor]=E5=B7=A5=E7=A8=8B=E7=AE=A1?= =?UTF-8?q?=E7=90=86:=20=E9=87=8D=E6=9E=84=E5=BC=80=E5=8F=91=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=8D=95=EF=BC=9A=20=E5=AE=8C=E6=88=90=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=A1=AB=E5=85=85=EF=BC=8C=E9=A1=B5=E9=9D=A2=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=EF=BC=8C=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2=E6=93=8D?= =?UTF-8?q?=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ErpDevelopModifyorderController.java | 160 ++++++++++ .../erp/domain/ErpDevelopModifyorder.java | 280 ++++++++++++++++++ .../mapper/ErpDevelopModifyorderMapper.java | 77 +++++ .../IErpDevelopModifyorderService.java | 75 +++++ .../ErpDevelopModifyorderServiceImpl.java | 126 ++++++++ .../erp/ErpDevelopModifyorderMapper.xml | 155 ++++++++++ .../templates/erp/developModifyOrder/add.html | 147 +++++++++ .../erp/developModifyOrder/detail.html | 148 +++++++++ .../developModifyOrder.html | 229 ++++++++++++++ .../erp/developModifyOrder/edit.html | 148 +++++++++ 10 files changed, 1545 insertions(+) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpDevelopModifyorderController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpDevelopModifyorder.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/erp/mapper/ErpDevelopModifyorderMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/erp/service/IErpDevelopModifyorderService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpDevelopModifyorderServiceImpl.java create mode 100644 ruoyi-admin/src/main/resources/mapper/erp/ErpDevelopModifyorderMapper.xml create mode 100644 ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/add.html create mode 100644 ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/detail.html create mode 100644 ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html create mode 100644 ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/edit.html diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpDevelopModifyorderController.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpDevelopModifyorderController.java new file mode 100644 index 00000000..9b415c95 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpDevelopModifyorderController.java @@ -0,0 +1,160 @@ +package com.ruoyi.erp.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.erp.domain.ErpDevelopModifyorder; +import com.ruoyi.erp.service.IErpDevelopModifyorderService; +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 刘晓旭 + * @date 2024-04-18 + */ +@Controller +@RequestMapping("/erp/developModifyOrder") +public class ErpDevelopModifyorderController extends BaseController +{ + private String prefix = "erp/developModifyOrder"; + + @Autowired + private IErpDevelopModifyorderService erpDevelopModifyorderService; + + @RequiresPermissions("erp:developModifyOrder:view") + @GetMapping() + public String developModifyOrder() + { + return prefix + "/developModifyOrder"; + } + + /** + * 查询开发修改单列表 + */ + @RequiresPermissions("erp:developModifyOrder:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(ErpDevelopModifyorder erpDevelopModifyorder) + { + startPage(); + List list = erpDevelopModifyorderService.selectErpDevelopModifyorderList(erpDevelopModifyorder); + return getDataTable(list); + } + + /** + * 导出开发修改单列表 + */ + @RequiresPermissions("erp:developModifyOrder:export") + @Log(title = "开发修改单", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(ErpDevelopModifyorder erpDevelopModifyorder) + { + List list = erpDevelopModifyorderService.selectErpDevelopModifyorderList(erpDevelopModifyorder); + ExcelUtil util = new ExcelUtil(ErpDevelopModifyorder.class); + return util.exportExcel(list, "开发修改单数据"); + } + + /** + * 新增开发修改单 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存开发修改单 + */ + @RequiresPermissions("erp:developModifyOrder:add") + @Log(title = "开发修改单", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(ErpDevelopModifyorder erpDevelopModifyorder) + { + return toAjax(erpDevelopModifyorderService.insertErpDevelopModifyorder(erpDevelopModifyorder)); + } + + /** + * 修改开发修改单 + */ + @GetMapping("/edit/{developOrderId}") + public String edit(@PathVariable("developOrderId") Long developOrderId, ModelMap mmap) + { + ErpDevelopModifyorder erpDevelopModifyorder = erpDevelopModifyorderService.selectErpDevelopModifyorderById(developOrderId); + mmap.put("erpDevelopModifyorder", erpDevelopModifyorder); + return prefix + "/edit"; + } + + /** + * 修改保存开发修改单 + */ + @RequiresPermissions("erp:developModifyOrder:edit") + @Log(title = "开发修改单", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(ErpDevelopModifyorder erpDevelopModifyorder) + { + return toAjax(erpDevelopModifyorderService.updateErpDevelopModifyorder(erpDevelopModifyorder)); + } + + /** + * 查看开发修改单详情 + * */ + @GetMapping("/detail/{developOrderId}") + public String detail(@PathVariable("developOrderId") Long developOrderId, ModelMap mmap){ + ErpDevelopModifyorder erpDevelopModifyorder = erpDevelopModifyorderService.selectErpDevelopModifyorderById(developOrderId); + mmap.put("erpDevelopModifyorder",erpDevelopModifyorder); + return prefix+ "/detail"; + } + /** + * 删除开发修改单 + */ + @RequiresPermissions("erp:developModifyOrder:remove") + @Log(title = "开发修改单", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(erpDevelopModifyorderService.deleteErpDevelopModifyorderByIds(ids)); + } + + /** + * 作废开发修改单 + */ + @RequiresPermissions("erp:developModifyOrder:cancel") + @Log(title = "开发修改单", businessType = BusinessType.CANCEL) + @GetMapping( "/cancel/{id}") + @ResponseBody + public AjaxResult cancel(@PathVariable("id") Long id){ + return toAjax(erpDevelopModifyorderService.cancelErpDevelopModifyorderById(id)); + } + + /** + * 恢复开发修改单 + */ + @RequiresPermissions("erp:developModifyOrder:restore") + @Log(title = "开发修改单", businessType = BusinessType.RESTORE) + @GetMapping( "/restore/{id}") + @ResponseBody + public AjaxResult restore(@PathVariable("id")Long id) + { + return toAjax(erpDevelopModifyorderService.restoreErpDevelopModifyorderById(id)); + } + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpDevelopModifyorder.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpDevelopModifyorder.java new file mode 100644 index 00000000..ec6a9776 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpDevelopModifyorder.java @@ -0,0 +1,280 @@ +package com.ruoyi.erp.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; + +/** + * 开发修改单对象 erp_develop_modifyorder + * + * @author 刘晓旭 + * @date 2024-04-18 + */ +public class ErpDevelopModifyorder extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 开发修改单ID */ + private Long developOrderId; + + /** 开发修改单号 */ + @Excel(name = "开发修改单号") + private String developOderCode; + + /** 料号 */ + @Excel(name = "料号") + private String materialNo; + + /** 采购入库状态 */ + @Excel(name = "采购入库状态") + private String purchaseStorageStatus; + + /** 品质状态 */ + @Excel(name = "品质状态") + private String qualityStatus; + + /** 审核状态 */ + @Excel(name = "审核状态") + private String auditStatus; + + /** 确认状态 */ + @Excel(name = "确认状态") + private String completeStatus; + + /** 完成状态 */ + @Excel(name = "完成状态") + private String finshStatus; + + /** 使用状态 */ + @Excel(name = "使用状态") + private String useStatus; + + /** 物料名称 */ + @Excel(name = "物料名称") + private String materialName; + + /** 物料类型 */ + @Excel(name = "物料类型") + private String materialType; + + /** 图片 */ + @Excel(name = "图片") + private String materialPhotoUrl; + + /** 单位 */ + @Excel(name = "单位") + private String materialUnit; + + /** 品牌 */ + @Excel(name = "品牌") + private String materialBrand; + + /** 描述 */ + @Excel(name = "描述") + private String materialDescribe; + + /** 加工方式 */ + @Excel(name = "加工方式") + private String materialProcessMode; + + /** 工程员 */ + @Excel(name = "工程员") + private Long userId; + + /** 工程员姓名 */ + @Excel(name = "工程员姓名") + private String userName; + + public void setDevelopOrderId(Long developOrderId) + { + this.developOrderId = developOrderId; + } + + public Long getDevelopOrderId() + { + return developOrderId; + } + public void setDevelopOderCode(String developOderCode) + { + this.developOderCode = developOderCode; + } + + public String getDevelopOderCode() + { + return developOderCode; + } + public void setMaterialNo(String materialNo) + { + this.materialNo = materialNo; + } + + public String getMaterialNo() + { + return materialNo; + } + public void setPurchaseStorageStatus(String purchaseStorageStatus) + { + this.purchaseStorageStatus = purchaseStorageStatus; + } + + public String getPurchaseStorageStatus() + { + return purchaseStorageStatus; + } + public void setQualityStatus(String qualityStatus) + { + this.qualityStatus = qualityStatus; + } + + public String getQualityStatus() + { + return qualityStatus; + } + public void setAuditStatus(String auditStatus) + { + this.auditStatus = auditStatus; + } + + public String getAuditStatus() + { + return auditStatus; + } + public void setCompleteStatus(String completeStatus) + { + this.completeStatus = completeStatus; + } + + public String getCompleteStatus() + { + return completeStatus; + } + public void setFinshStatus(String finshStatus) + { + this.finshStatus = finshStatus; + } + + public String getFinshStatus() + { + return finshStatus; + } + public void setUseStatus(String useStatus) + { + this.useStatus = useStatus; + } + + public String getUseStatus() + { + return useStatus; + } + public void setMaterialName(String materialName) + { + this.materialName = materialName; + } + + public String getMaterialName() + { + return materialName; + } + public void setMaterialType(String materialType) + { + this.materialType = materialType; + } + + public String getMaterialType() + { + return materialType; + } + public void setMaterialPhotoUrl(String materialPhotoUrl) + { + this.materialPhotoUrl = materialPhotoUrl; + } + + public String getMaterialPhotoUrl() + { + return materialPhotoUrl; + } + public void setMaterialUnit(String materialUnit) + { + this.materialUnit = materialUnit; + } + + public String getMaterialUnit() + { + return materialUnit; + } + public void setMaterialBrand(String materialBrand) + { + this.materialBrand = materialBrand; + } + + public String getMaterialBrand() + { + return materialBrand; + } + public void setMaterialDescribe(String materialDescribe) + { + this.materialDescribe = materialDescribe; + } + + public String getMaterialDescribe() + { + return materialDescribe; + } + public void setMaterialProcessMode(String materialProcessMode) + { + this.materialProcessMode = materialProcessMode; + } + + public String getMaterialProcessMode() + { + return materialProcessMode; + } + public void setUserId(Long userId) + { + this.userId = userId; + } + + public Long getUserId() + { + return userId; + } + public void setUserName(String userName) + { + this.userName = userName; + } + + public String getUserName() + { + return userName; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("developOrderId", getDevelopOrderId()) + .append("developOderCode", getDevelopOderCode()) + .append("materialNo", getMaterialNo()) + .append("purchaseStorageStatus", getPurchaseStorageStatus()) + .append("qualityStatus", getQualityStatus()) + .append("auditStatus", getAuditStatus()) + .append("completeStatus", getCompleteStatus()) + .append("finshStatus", getFinshStatus()) + .append("useStatus", getUseStatus()) + .append("materialName", getMaterialName()) + .append("materialType", getMaterialType()) + .append("materialPhotoUrl", getMaterialPhotoUrl()) + .append("materialUnit", getMaterialUnit()) + .append("materialBrand", getMaterialBrand()) + .append("materialDescribe", getMaterialDescribe()) + .append("materialProcessMode", getMaterialProcessMode()) + .append("userId", getUserId()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("userName", getUserName()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/mapper/ErpDevelopModifyorderMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/mapper/ErpDevelopModifyorderMapper.java new file mode 100644 index 00000000..9520c428 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/mapper/ErpDevelopModifyorderMapper.java @@ -0,0 +1,77 @@ +package com.ruoyi.erp.mapper; + +import java.util.List; +import com.ruoyi.erp.domain.ErpDevelopModifyorder; + +/** + * 开发修改单Mapper接口 + * + * @author 刘晓旭 + * @date 2024-04-18 + */ +public interface ErpDevelopModifyorderMapper +{ + /** + * 查询开发修改单 + * + * @param developOrderId 开发修改单ID + * @return 开发修改单 + */ + public ErpDevelopModifyorder selectErpDevelopModifyorderById(Long developOrderId); + + /** + * 查询开发修改单列表 + * + * @param erpDevelopModifyorder 开发修改单 + * @return 开发修改单集合 + */ + public List selectErpDevelopModifyorderList(ErpDevelopModifyorder erpDevelopModifyorder); + + /** + * 新增开发修改单 + * + * @param erpDevelopModifyorder 开发修改单 + * @return 结果 + */ + public int insertErpDevelopModifyorder(ErpDevelopModifyorder erpDevelopModifyorder); + + /** + * 修改开发修改单 + * + * @param erpDevelopModifyorder 开发修改单 + * @return 结果 + */ + public int updateErpDevelopModifyorder(ErpDevelopModifyorder erpDevelopModifyorder); + + /** + * 删除开发修改单 + * + * @param developOrderId 开发修改单ID + * @return 结果 + */ + public int deleteErpDevelopModifyorderById(Long developOrderId); + + /** + * 批量删除开发修改单 + * + * @param developOrderIds 需要删除的数据ID + * @return 结果 + */ + public int deleteErpDevelopModifyorderByIds(String[] developOrderIds); + + /** + * 作废开发修改单 + * + * @param developOrderId 开发修改单ID + * @return 结果 + */ + public int cancelErpDevelopModifyorderById(Long developOrderId); + + /** + * 恢复开发修改单 + * + * @param developOrderId 开发修改单ID + * @return 结果 + */ + public int restoreErpDevelopModifyorderById(Long developOrderId); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/IErpDevelopModifyorderService.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/IErpDevelopModifyorderService.java new file mode 100644 index 00000000..68fec642 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/IErpDevelopModifyorderService.java @@ -0,0 +1,75 @@ +package com.ruoyi.erp.service; + +import java.util.List; +import com.ruoyi.erp.domain.ErpDevelopModifyorder; + +/** + * 开发修改单Service接口 + * + * @author 刘晓旭 + * @date 2024-04-18 + */ +public interface IErpDevelopModifyorderService +{ + /** + * 查询开发修改单 + * + * @param developOrderId 开发修改单ID + * @return 开发修改单 + */ + public ErpDevelopModifyorder selectErpDevelopModifyorderById(Long developOrderId); + + /** + * 查询开发修改单列表 + * + * @param erpDevelopModifyorder 开发修改单 + * @return 开发修改单集合 + */ + public List selectErpDevelopModifyorderList(ErpDevelopModifyorder erpDevelopModifyorder); + + /** + * 新增开发修改单 + * + * @param erpDevelopModifyorder 开发修改单 + * @return 结果 + */ + public int insertErpDevelopModifyorder(ErpDevelopModifyorder erpDevelopModifyorder); + + /** + * 修改开发修改单 + * + * @param erpDevelopModifyorder 开发修改单 + * @return 结果 + */ + public int updateErpDevelopModifyorder(ErpDevelopModifyorder erpDevelopModifyorder); + + /** + * 批量删除开发修改单 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteErpDevelopModifyorderByIds(String ids); + + /** + * 删除开发修改单信息 + * + * @param developOrderId 开发修改单ID + * @return 结果 + */ + public int deleteErpDevelopModifyorderById(Long developOrderId); + + /** + * 作废开发修改单 + * @param developOrderId 开发修改单ID + * @return + */ + int cancelErpDevelopModifyorderById(Long developOrderId); + + /** + * 恢复开发修改单 + * @param developOrderId 开发修改单ID + * @return + */ + int restoreErpDevelopModifyorderById(Long developOrderId); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpDevelopModifyorderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpDevelopModifyorderServiceImpl.java new file mode 100644 index 00000000..835f78e9 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpDevelopModifyorderServiceImpl.java @@ -0,0 +1,126 @@ +package com.ruoyi.erp.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.ShiroUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.erp.mapper.ErpDevelopModifyorderMapper; +import com.ruoyi.erp.domain.ErpDevelopModifyorder; +import com.ruoyi.erp.service.IErpDevelopModifyorderService; +import com.ruoyi.common.core.text.Convert; + +/** + * 开发修改单Service业务层处理 + * + * @author 刘晓旭 + * @date 2024-04-18 + */ +@Service +public class ErpDevelopModifyorderServiceImpl implements IErpDevelopModifyorderService +{ + @Autowired + private ErpDevelopModifyorderMapper erpDevelopModifyorderMapper; + + /** + * 查询开发修改单 + * + * @param developOrderId 开发修改单ID + * @return 开发修改单 + */ + @Override + public ErpDevelopModifyorder selectErpDevelopModifyorderById(Long developOrderId) + { + return erpDevelopModifyorderMapper.selectErpDevelopModifyorderById(developOrderId); + } + + /** + * 查询开发修改单列表 + * + * @param erpDevelopModifyorder 开发修改单 + * @return 开发修改单 + */ + @Override + public List selectErpDevelopModifyorderList(ErpDevelopModifyorder erpDevelopModifyorder) + { + return erpDevelopModifyorderMapper.selectErpDevelopModifyorderList(erpDevelopModifyorder); + } + + /** + * 新增开发修改单 + * + * @param erpDevelopModifyorder 开发修改单 + * @return 结果 + */ + @Override + public int insertErpDevelopModifyorder(ErpDevelopModifyorder erpDevelopModifyorder) + { + String loginName = ShiroUtils.getLoginName(); + erpDevelopModifyorder.setCreateBy(loginName); + erpDevelopModifyorder.setCreateTime(DateUtils.getNowDate()); + return erpDevelopModifyorderMapper.insertErpDevelopModifyorder(erpDevelopModifyorder); + } + + /** + * 修改开发修改单 + * + * @param erpDevelopModifyorder 开发修改单 + * @return 结果 + */ + @Override + public int updateErpDevelopModifyorder(ErpDevelopModifyorder erpDevelopModifyorder) + { + String loginName = ShiroUtils.getLoginName(); + erpDevelopModifyorder.setUpdateBy(loginName); + erpDevelopModifyorder.setUpdateTime(DateUtils.getNowDate()); + return erpDevelopModifyorderMapper.updateErpDevelopModifyorder(erpDevelopModifyorder); + } + + /** + * 删除开发修改单对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteErpDevelopModifyorderByIds(String ids) + { + return erpDevelopModifyorderMapper.deleteErpDevelopModifyorderByIds(Convert.toStrArray(ids)); + } + + /** + * 删除开发修改单信息 + * + * @param developOrderId 开发修改单ID + * @return 结果 + */ + @Override + public int deleteErpDevelopModifyorderById(Long developOrderId) + { + return erpDevelopModifyorderMapper.deleteErpDevelopModifyorderById(developOrderId); + } + + /** + * 作废开发修改单 + * + * @param developOrderId 开发修改单ID + * @return 结果 + */ + @Override + public int cancelErpDevelopModifyorderById(Long developOrderId) + { + return erpDevelopModifyorderMapper.cancelErpDevelopModifyorderById(developOrderId); + } + + /** + * 恢复开发修改单信息 + * + * @param developOrderId 开发修改单ID + * @return 结果 + */ + @Override + public int restoreErpDevelopModifyorderById(Long developOrderId) + { + return erpDevelopModifyorderMapper.restoreErpDevelopModifyorderById(developOrderId); + } +} diff --git a/ruoyi-admin/src/main/resources/mapper/erp/ErpDevelopModifyorderMapper.xml b/ruoyi-admin/src/main/resources/mapper/erp/ErpDevelopModifyorderMapper.xml new file mode 100644 index 00000000..a9b45312 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/erp/ErpDevelopModifyorderMapper.xml @@ -0,0 +1,155 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select develop_order_id, develop_oder_code, material_no, purchase_storage_status, quality_status, audit_status, complete_status, finsh_status, use_status, material_name, material_type, material_photo_url, material_unit, material_brand, material_describe, material_process_mode, user_id, create_by, create_time, user_name, update_by, update_time, remark from erp_develop_modifyorder + + + + + + + + insert into erp_develop_modifyorder + + develop_oder_code, + material_no, + purchase_storage_status, + quality_status, + audit_status, + complete_status, + finsh_status, + use_status, + material_name, + material_type, + material_photo_url, + material_unit, + material_brand, + material_describe, + material_process_mode, + user_id, + create_by, + create_time, + user_name, + update_by, + update_time, + remark, + + + #{developOderCode}, + #{materialNo}, + #{purchaseStorageStatus}, + #{qualityStatus}, + #{auditStatus}, + #{completeStatus}, + #{finshStatus}, + #{useStatus}, + #{materialName}, + #{materialType}, + #{materialPhotoUrl}, + #{materialUnit}, + #{materialBrand}, + #{materialDescribe}, + #{materialProcessMode}, + #{userId}, + #{createBy}, + #{createTime}, + #{userName}, + #{updateBy}, + #{updateTime}, + #{remark}, + + + + + update erp_develop_modifyorder + + develop_oder_code = #{developOderCode}, + material_no = #{materialNo}, + purchase_storage_status = #{purchaseStorageStatus}, + quality_status = #{qualityStatus}, + audit_status = #{auditStatus}, + complete_status = #{completeStatus}, + finsh_status = #{finshStatus}, + use_status = #{useStatus}, + material_name = #{materialName}, + material_type = #{materialType}, + material_photo_url = #{materialPhotoUrl}, + material_unit = #{materialUnit}, + material_brand = #{materialBrand}, + material_describe = #{materialDescribe}, + material_process_mode = #{materialProcessMode}, + user_id = #{userId}, + create_by = #{createBy}, + create_time = #{createTime}, + user_name = #{userName}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + + where develop_order_id = #{developOrderId} + + + + delete from erp_develop_modifyorder where develop_order_id = #{developOrderId} + + + + delete from erp_develop_modifyorder where develop_order_id in + + #{developOrderId} + + + + + update erp_develop_modifyorder set del_flag = '1' where develop_order_id = #{developOrderId} + + + + update erp_develop_modifyorder set del_flag = '0' where develop_order_id = #{developOrderId} + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/add.html b/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/add.html new file mode 100644 index 00000000..b9b47853 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/add.html @@ -0,0 +1,147 @@ + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/detail.html b/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/detail.html new file mode 100644 index 00000000..b5aae343 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/detail.html @@ -0,0 +1,148 @@ + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html b/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html new file mode 100644 index 00000000..69b643a6 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html @@ -0,0 +1,229 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/edit.html b/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/edit.html new file mode 100644 index 00000000..10abb944 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/edit.html @@ -0,0 +1,148 @@ + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file From 00bf029c09454c7676da2e51d8c2659d00ae31e6 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Fri, 19 Apr 2024 09:46:57 +0800 Subject: [PATCH 2/4] =?UTF-8?q?[fix]=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86:?= =?UTF-8?q?=20=E5=8E=BB=E6=8E=89=E9=94=80=E5=94=AE=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E5=8D=95=E4=B8=AD=E7=9A=84=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E6=8F=90=E5=8D=87=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/templates/sales/afterSalesNotice/add.html | 1 - .../main/resources/templates/sales/afterSalesNotice/edit.html | 1 - 2 files changed, 2 deletions(-) diff --git a/ruoyi-admin/src/main/resources/templates/sales/afterSalesNotice/add.html b/ruoyi-admin/src/main/resources/templates/sales/afterSalesNotice/add.html index d81311cf..7e2e1b0c 100644 --- a/ruoyi-admin/src/main/resources/templates/sales/afterSalesNotice/add.html +++ b/ruoyi-admin/src/main/resources/templates/sales/afterSalesNotice/add.html @@ -115,7 +115,6 @@ - 代码生成请选择字典属性
diff --git a/ruoyi-admin/src/main/resources/templates/sales/afterSalesNotice/edit.html b/ruoyi-admin/src/main/resources/templates/sales/afterSalesNotice/edit.html index 5c87be92..72fa944e 100644 --- a/ruoyi-admin/src/main/resources/templates/sales/afterSalesNotice/edit.html +++ b/ruoyi-admin/src/main/resources/templates/sales/afterSalesNotice/edit.html @@ -116,7 +116,6 @@ - 代码生成请选择字典属性
From cdf39aa29ef2a61415ae6899c57021e41665be26 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Fri, 19 Apr 2024 10:13:42 +0800 Subject: [PATCH 3/4] =?UTF-8?q?[update]=E9=94=80=E5=94=AE=E7=AE=A1?= =?UTF-8?q?=E7=90=86:=20=E5=88=A0=E9=99=A4=E4=B9=8B=E5=89=8D=E7=9A=84?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E4=BF=AE=E6=94=B9=E5=8D=95=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../developReviseOrderController.java | 148 ----------- .../system/domain/DevelopReviseOrder.java | 235 ------------------ .../mapper/DevelopReviseOrderMapper.java | 78 ------ .../service/IDevelopReviseOrderService.java | 76 ------ .../impl/DevelopReviseOrderServiceImpl.java | 65 ----- .../system/DevelopReviseorderMapper.xml | 147 ----------- .../system/developReviseOrder/add.html | 133 ---------- .../developReviseOrder.html | 164 ------------ .../system/developReviseOrder/edit.html | 50 ---- 9 files changed, 1096 deletions(-) delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/controller/developReviseOrderController.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/domain/DevelopReviseOrder.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/mapper/DevelopReviseOrderMapper.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/service/IDevelopReviseOrderService.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/DevelopReviseOrderServiceImpl.java delete mode 100644 ruoyi-admin/src/main/resources/mapper/system/DevelopReviseorderMapper.xml delete mode 100644 ruoyi-admin/src/main/resources/templates/system/developReviseOrder/add.html delete mode 100644 ruoyi-admin/src/main/resources/templates/system/developReviseOrder/developReviseOrder.html delete mode 100644 ruoyi-admin/src/main/resources/templates/system/developReviseOrder/edit.html diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/developReviseOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/developReviseOrderController.java deleted file mode 100644 index 1ac347a5..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/developReviseOrderController.java +++ /dev/null @@ -1,148 +0,0 @@ -package com.ruoyi.system.controller; - -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 com.ruoyi.system.domain.DevelopReviseOrder; -import com.ruoyi.system.service.IDevelopReviseOrderService; -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 java.util.List; - -/** - * 开发修改单Controller - * - * @author ruoyi - * @date 2023-12-12 - */ -@Controller -@RequestMapping("/system/developReviseOrder") -public class developReviseOrderController extends BaseController -{ - private String prefix = "system/developReviseOrder"; - - @Autowired - private IDevelopReviseOrderService developReviseOrderService; - - @RequiresPermissions("erp:developReviseOrder:view") - @GetMapping() - public String developReviseOrder() - { - return prefix + "/developReviseOrder"; - } - - /** - * 查询开发修改单列表 - */ - @RequiresPermissions("erp:developReviseOrder:list") - @PostMapping("/list") - @ResponseBody - public TableDataInfo list(DevelopReviseOrder developReviseOrder) - { - startPage(); - List list = developReviseOrderService.selectDevelopReviseOrderList(developReviseOrder); - return getDataTable(list); - } - - /** - * 导出开发修改单列表 - */ - @RequiresPermissions("erp:developReviseOrder:export") - @Log(title = "开发修改单", businessType = BusinessType.EXPORT) - @PostMapping("/export") - @ResponseBody - public AjaxResult export(DevelopReviseOrder developReviseOrder) - { - List list = developReviseOrderService.selectDevelopReviseOrderList(developReviseOrder); - ExcelUtil util = new ExcelUtil(DevelopReviseOrder.class); - return util.exportExcel(list, "开发修改单数据"); - } - - /** - * 新增开发修改单 - */ - @GetMapping("/add") - public String add() - { - return prefix + "/add"; - } - - /** - * 新增保存开发修改单 - */ - @RequiresPermissions("erp:developReviseOrder:add") - @Log(title = "开发修改单", businessType = BusinessType.INSERT) - @PostMapping("/add") - @ResponseBody - public AjaxResult addSave(DevelopReviseOrder developReviseOrder) - { - return toAjax(developReviseOrderService.insertDevelopReviseOrder(developReviseOrder)); - } - - /** - * 修改开发修改单 - */ - @GetMapping("/edit/{oderId}") - public String edit(@PathVariable("oderId") Long oderId, ModelMap mmap) - { - DevelopReviseOrder developReviseOrder = developReviseOrderService.selectDevelopReviseOrderById(oderId); - mmap.put("developReviseOrder", developReviseOrder); - return prefix + "/edit"; - } - - /** - * 修改保存开发修改单 - */ - @RequiresPermissions("erp:developReviseOrder:edit") - @Log(title = "开发修改单", businessType = BusinessType.UPDATE) - @PostMapping("/edit") - @ResponseBody - public AjaxResult editSave(DevelopReviseOrder developReviseOrder) - { - return toAjax(developReviseOrderService.updateDevelopReviseOrder(developReviseOrder)); - } - - /** - * 删除开发修改单 - */ - @RequiresPermissions("erp:developReviseOrder:remove") - @Log(title = "开发修改单", businessType = BusinessType.DELETE) - @PostMapping( "/remove") - @ResponseBody - public AjaxResult remove(String ids) - { - return toAjax(developReviseOrderService.deleteDevelopReviseOrderByIds(ids)); - } - - /** - * 作废开发修改单 - */ - @RequiresPermissions("erp:developReviseOrder:cancel") - @Log(title = "开发修改单", businessType = BusinessType.CANCEL) - @GetMapping( "/cancel/{id}") - @ResponseBody - public AjaxResult cancel(@PathVariable("id") Long id){ - return toAjax(developReviseOrderService.cancelDevelopReviseOrderById(id)); - } - - /** - * 恢复开发修改单 - */ - @RequiresPermissions("erp:developReviseOrder:restore") - @Log(title = "开发修改单", businessType = BusinessType.RESTORE) - @GetMapping( "/restore/{id}") - @ResponseBody - public AjaxResult restore(@PathVariable("id")Long id) - { - return toAjax(developReviseOrderService.restoreDevelopReviseOrderById(id)); - } - - -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/DevelopReviseOrder.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/DevelopReviseOrder.java deleted file mode 100644 index becce580..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/DevelopReviseOrder.java +++ /dev/null @@ -1,235 +0,0 @@ -package com.ruoyi.system.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; - -/** - * 开发修改单对象 develop_reviseorder - * - * @author ruoyi - * @date 2023-12-12 - */ -public class DevelopReviseOrder extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 开发修改单编号 */ - private Long oderId; - - /** 开发修改单单号 */ - @Excel(name = "开发修改单单号") - private String developOderCode; - - /** 料号 */ - @Excel(name = "料号") - private String materialNo; - - /** 采购入库状态 */ - @Excel(name = "采购入库状态") - private String eceiptStatus; - - /** 品质状态 */ - @Excel(name = "品质状态") - private String qualityStatus; - - /** 审核状态 */ - @Excel(name = "审核状态") - private String auditStatus; - - /** 完成状态 */ - @Excel(name = "确认状态") - private String completeStatus; - - @Excel(name = "完成状态") - private String finshStatus; - /** 物料名称 */ - @Excel(name = "物料名称") - private String materialName; - - /** 物料类型 */ - @Excel(name = "物料类型") - private String materialType; - - /** 单位 */ - @Excel(name = "单位") - private String unit; - - /** 图片地址 */ - @Excel(name = "图片地址") - private String photoUrl; - - /** 品牌 */ - @Excel(name = "品牌") - private String brand; - - /** 描述 */ - @Excel(name = "描述") - private String describe; - - /** 加工方式 */ - @Excel(name = "加工方式") - private String processMethod; - - public void setOderId(Long oderId) - { - this.oderId = oderId; - } - - public Long getOderId() - { - return oderId; - } - public void setDevelopOderCode(String developOderCode) - { - this.developOderCode = developOderCode; - } - - public String getDevelopOderCode() - { - return developOderCode; - } - public void setMaterialNo(String materialNo) - { - this.materialNo = materialNo; - } - - public String getMaterialNo() - { - return materialNo; - } - public void setEceiptStatus(String eceiptStatus) - { - this.eceiptStatus = eceiptStatus; - } - - public String getEceiptStatus() - { - return eceiptStatus; - } - public void setQualityStatus(String qualityStatus) - { - this.qualityStatus = qualityStatus; - } - - public String getQualityStatus() - { - return qualityStatus; - } - public void setAuditStatus(String auditStatus) - { - this.auditStatus = auditStatus; - } - - public String getAuditStatus() - { - return auditStatus; - } - public void setCompleteStatus(String completeStatus) - { - this.completeStatus = completeStatus; - } - - public String getCompleteStatus() - { - return completeStatus; - } - public void setMaterialName(String materialName) - { - this.materialName = materialName; - } - - public String getMaterialName() - { - return materialName; - } - public void setMaterialType(String materialType) - { - this.materialType = materialType; - } - - public String getMaterialType() - { - return materialType; - } - public void setUnit(String unit) - { - this.unit = unit; - } - - public String getUnit() - { - return unit; - } - public void setPhotoUrl(String photoUrl) - { - this.photoUrl = photoUrl; - } - - public String getPhotoUrl() - { - return photoUrl; - } - public void setBrand(String brand) - { - this.brand = brand; - } - - public String getBrand() - { - return brand; - } - public void setDescribe(String describe) - { - this.describe = describe; - } - - public String getDescribe() - { - return describe; - } - public void setProcessMethod(String processMethod) - { - this.processMethod = processMethod; - } - - public String getProcessMethod() - { - return processMethod; - } - - public String getFinshStatus() { - return finshStatus; - } - - public void setFinshStatus(String finshStatus) { - this.finshStatus = finshStatus; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("oderId", getOderId()) - .append("developOderCode", getDevelopOderCode()) - .append("materialNo", getMaterialNo()) - .append("eceiptStatus", getEceiptStatus()) - .append("qualityStatus", getQualityStatus()) - .append("auditStatus", getAuditStatus()) - .append("completeStatus", getCompleteStatus()) - .append("finshStatus", getFinshStatus()) - .append("materialName", getMaterialName()) - .append("materialType", getMaterialType()) - .append("unit", getUnit()) - .append("photoUrl", getPhotoUrl()) - .append("brand", getBrand()) - .append("describe", getDescribe()) - .append("processMethod", getProcessMethod()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/DevelopReviseOrderMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/DevelopReviseOrderMapper.java deleted file mode 100644 index 4ca42de4..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/DevelopReviseOrderMapper.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.ruoyi.system.mapper; - -import com.ruoyi.system.domain.DevelopReviseOrder; - -import java.util.List; - -/** - * 开发修改单Mapper接口 - * - * @author ruoyi - * @date 2023-12-12 - */ -public interface DevelopReviseOrderMapper -{ - /** - * 查询开发修改单 - * - * @param oderId 开发修改单ID - * @return 开发修改单 - */ - public DevelopReviseOrder selectDevelopReviseOrderById(Long oderId); - - /** - * 查询开发修改单列表 - * - * @param developReviseOrder 开发修改单 - * @return 开发修改单集合 - */ - public List selectDevelopReviseOrderList(DevelopReviseOrder developReviseOrder); - - /** - * 新增开发修改单 - * - * @param developReviseOrder 开发修改单 - * @return 结果 - */ - public int insertDevelopReviseOrder(DevelopReviseOrder developReviseOrder); - - /** - * 修改开发修改单 - * - * @param developReviseOrder 开发修改单 - * @return 结果 - */ - public int updateDevelopReviseOrder(DevelopReviseOrder developReviseOrder); - - /** - * 删除开发修改单 - * - * @param oderId 开发修改单ID - * @return 结果 - */ - public int deleteDevelopReviseOrderById(Long oderId); - - /** - * 批量删除开发修改单 - * - * @param oderIds 需要删除的数据ID - * @return 结果 - */ - public int deleteDevelopReviseOrderByIds(String[] oderIds); - - /** - * 作废开发修改单 - * - * @param oderId 开发修改单ID - * @return 结果 - */ - public int cancelDevelopReviseOrderById(Long oderId); - - /** - * 恢复开发修改单 - * - * @param oderId 开发修改单ID - * @return 结果 - */ - public int restoreDevelopReviseOrderById(Long oderId); -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/IDevelopReviseOrderService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/IDevelopReviseOrderService.java deleted file mode 100644 index 436a6f42..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/IDevelopReviseOrderService.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.ruoyi.system.service; - -import com.ruoyi.system.domain.DevelopReviseOrder; - -import java.util.List; - -/** - * 开发修改单Service接口 - * - * @author ruoyi - * @date 2023-12-12 - */ -public interface IDevelopReviseOrderService -{ - /** - * 查询开发修改单 - * - * @param oderId 开发修改单ID - * @return 开发修改单 - */ - public DevelopReviseOrder selectDevelopReviseOrderById(Long oderId); - - /** - * 查询开发修改单列表 - * - * @param developReviseOrder 开发修改单 - * @return 开发修改单集合 - */ - public List selectDevelopReviseOrderList(DevelopReviseOrder developReviseOrder); - - /** - * 新增开发修改单 - * - * @param developReviseOrder 开发修改单 - * @return 结果 - */ - public int insertDevelopReviseOrder(DevelopReviseOrder developReviseOrder); - - /** - * 修改开发修改单 - * - * @param developReviseOrder 开发修改单 - * @return 结果 - */ - public int updateDevelopReviseOrder(DevelopReviseOrder developReviseOrder); - - /** - * 批量删除开发修改单 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - public int deleteDevelopReviseOrderByIds(String ids); - - /** - * 删除开发修改单信息 - * - * @param oderId 开发修改单ID - * @return 结果 - */ - public int deleteDevelopReviseOrderById(Long oderId); - - /** - * 作废开发修改单 - * @param oderId 开发修改单ID - * @return - */ - int cancelDevelopReviseOrderById(Long oderId); - - /** - * 恢复开发修改单 - * @param oderId 开发修改单ID - * @return - */ - int restoreDevelopReviseOrderById(Long oderId); -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/DevelopReviseOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/DevelopReviseOrderServiceImpl.java deleted file mode 100644 index b5473070..00000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/DevelopReviseOrderServiceImpl.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.ruoyi.system.service.impl; - -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.ShiroUtils; -import com.ruoyi.system.domain.DevelopReviseOrder; -import com.ruoyi.system.mapper.DevelopReviseOrderMapper; -import com.ruoyi.system.service.IDevelopReviseOrderService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 开发修改单Service业务层处理 - * - * @author ruoyi - * @date 2023-12-12 - */ -@Service -public class DevelopReviseOrderServiceImpl implements IDevelopReviseOrderService -{ - @Autowired - private DevelopReviseOrderMapper developReviseOrderMapper; - - @Override - public DevelopReviseOrder selectDevelopReviseOrderById(Long oderId) { - return developReviseOrderMapper.selectDevelopReviseOrderById(oderId); - } - - @Override - public List selectDevelopReviseOrderList(DevelopReviseOrder developReviseOrder) { - return developReviseOrderMapper.selectDevelopReviseOrderList(developReviseOrder); - } - - @Override - public int insertDevelopReviseOrder(DevelopReviseOrder developReviseOrder) { - return developReviseOrderMapper.insertDevelopReviseOrder(developReviseOrder); - } - - @Override - public int updateDevelopReviseOrder(DevelopReviseOrder developReviseOrder) { - return developReviseOrderMapper.updateDevelopReviseOrder(developReviseOrder); - } - - @Override - public int deleteDevelopReviseOrderByIds(String ids) { - return developReviseOrderMapper.deleteDevelopReviseOrderByIds(Convert.toStrArray(ids)); - } - - @Override - public int deleteDevelopReviseOrderById(Long oderId) { - return developReviseOrderMapper.deleteDevelopReviseOrderById(oderId); - } - - @Override - public int cancelDevelopReviseOrderById(Long oderId) { - return developReviseOrderMapper.cancelDevelopReviseOrderById(oderId); - } - - @Override - public int restoreDevelopReviseOrderById(Long oderId) { - return developReviseOrderMapper.restoreDevelopReviseOrderById(oderId); - } -} diff --git a/ruoyi-admin/src/main/resources/mapper/system/DevelopReviseorderMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/DevelopReviseorderMapper.xml deleted file mode 100644 index bd43615e..00000000 --- a/ruoyi-admin/src/main/resources/mapper/system/DevelopReviseorderMapper.xml +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select oderId, develop_oder_code, materialNo, eceipt_status, quality_status, audit_status, complete_status,finsh_status, materialName, materialType, unit, photoUrl, brand, describe, processMethod, create_by, create_time, update_by, update_time, remark from develop_reviseorder - - - - - - - - insert into develop_reviseorder - - develop_oderCode, - materialNo, - eceipt_status, - quality_status, - audit_status, - complete_status, - finsh_status, - materialName, - materialType, - unit, - photoUrl, - brand, - describe, - processMethod, - create_by, - create_time, - update_by, - update_time, - remark, - - - #{developOdercode}, - #{materialNo}, - #{eceiptStatus}, - #{qualityStatus}, - #{auditStatus}, - #{completeStatus}, - #{finshStatus}, - #{materialName}, - #{materialType}, - #{unit}, - #{photoUrl}, - #{brand}, - #{describe}, - #{processMethod}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{remark}, - - - - - update develop_reviseorder - - develop_oderCode = #{developOdercode}, - materialNo = #{materialNo}, - eceipt_status = #{eceiptStatus}, - quality_status = #{qualityStatus}, - audit_status = #{auditStatus}, - complete_status = #{completeStatus}, - finsh_status = #{finshStatus}, - materialName = #{materialName}, - materialType = #{materialType}, - unit = #{unit}, - photoUrl = #{photoUrl}, - brand = #{brand}, - describe = #{describe}, - processMethod = #{processMethod}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - remark = #{remark}, - - where oderId = #{oderId} - - - - delete from develop_reviseorder where oderId = #{oderId} - - - - delete from develop_reviseorder where oderId in - - #{oderId} - - - - - update develop_reviseorder set use_status = '1' where oderId = #{oderId} - - - - update develop_reviseorder set use_status = '0' where oderId = #{oderId} - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/developReviseOrder/add.html b/ruoyi-admin/src/main/resources/templates/system/developReviseOrder/add.html deleted file mode 100644 index edc63042..00000000 --- a/ruoyi-admin/src/main/resources/templates/system/developReviseOrder/add.html +++ /dev/null @@ -1,133 +0,0 @@ - - - - - - -
- -
- -
添加开发修改单
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- - - -
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
- - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/developReviseOrder/developReviseOrder.html b/ruoyi-admin/src/main/resources/templates/system/developReviseOrder/developReviseOrder.html deleted file mode 100644 index 9bc08c00..00000000 --- a/ruoyi-admin/src/main/resources/templates/system/developReviseOrder/developReviseOrder.html +++ /dev/null @@ -1,164 +0,0 @@ - - - - - - -
-
-
-
-
-
    -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - - - - -
    • -
  • -  搜索 -  重置 -
    • -
-
-
-
- - -
-
-
-
-
- - - - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/developReviseOrder/edit.html b/ruoyi-admin/src/main/resources/templates/system/developReviseOrder/edit.html deleted file mode 100644 index 4baac0e3..00000000 --- a/ruoyi-admin/src/main/resources/templates/system/developReviseOrder/edit.html +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - -
-
- -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
- - - - \ No newline at end of file From 8ee0f637f45ce6f752422448b6b933e89cc037bd Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Fri, 19 Apr 2024 15:55:29 +0800 Subject: [PATCH 4/4] =?UTF-8?q?[fix]=E5=B7=A5=E7=A8=8B=E7=AE=A1=E7=90=86:?= =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E5=BC=80=E5=8F=91=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=8D=95=E7=9A=84=E5=B7=A5=E7=A8=8B=E5=91=98=E7=9A=84=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=96=B9=E5=BC=8F=E3=80=82=E5=86=99=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E9=80=9A=E7=94=A8=E6=9F=A5=E8=AF=A2=EF=BC=8C=E9=80=9A=E8=BF=87?= =?UTF-8?q?=E6=8C=87=E5=AE=9AroleKey=E6=9F=A5=E8=AF=A2=E7=89=B9=E5=AE=9A?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=9A=84=E7=94=A8=E6=88=B7=E9=9B=86=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ErpDevelopModifyorderController.java | 17 ++++++++++ .../erp/ErpDevelopModifyorderMapper.xml | 23 +++++++------ .../templates/erp/developModifyOrder/add.html | 33 +++++++++++++++---- .../developModifyOrder.html | 2 +- .../ruoyi/system/mapper/SysUserMapper.java | 6 ++++ .../ruoyi/system/service/ISysUserService.java | 7 ++++ .../service/impl/SysUserServiceImpl.java | 11 +++++++ .../resources/mapper/system/SysUserMapper.xml | 8 +++++ 8 files changed, 89 insertions(+), 18 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpDevelopModifyorderController.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpDevelopModifyorderController.java index 9b415c95..fc12d071 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpDevelopModifyorderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpDevelopModifyorderController.java @@ -1,6 +1,9 @@ package com.ruoyi.erp.controller; import java.util.List; + +import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.system.service.ISysUserService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -31,6 +34,9 @@ public class ErpDevelopModifyorderController extends BaseController { private String prefix = "erp/developModifyOrder"; + @Autowired + private ISysUserService sysUserService; + @Autowired private IErpDevelopModifyorderService erpDevelopModifyorderService; @@ -54,6 +60,17 @@ public class ErpDevelopModifyorderController extends BaseController return getDataTable(list); } + + /** + * 查找所有的工程员 + * */ + @ResponseBody + @PostMapping("/getEngineerList") + public AjaxResult getEngineerList(String roleKey){ + List engineerList = sysUserService.getSpecificRoleList(roleKey); + return AjaxResult.success(engineerList); + } + /** * 导出开发修改单列表 */ diff --git a/ruoyi-admin/src/main/resources/mapper/erp/ErpDevelopModifyorderMapper.xml b/ruoyi-admin/src/main/resources/mapper/erp/ErpDevelopModifyorderMapper.xml index a9b45312..1494981f 100644 --- a/ruoyi-admin/src/main/resources/mapper/erp/ErpDevelopModifyorderMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/erp/ErpDevelopModifyorderMapper.xml @@ -32,18 +32,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select develop_order_id, develop_oder_code, material_no, purchase_storage_status, quality_status, audit_status, complete_status, finsh_status, use_status, material_name, material_type, material_photo_url, material_unit, material_brand, material_describe, material_process_mode, user_id, create_by, create_time, user_name, update_by, update_time, remark from erp_develop_modifyorder - + + diff --git a/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/add.html b/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/add.html index b9b47853..8749cee5 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/add.html +++ b/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/add.html @@ -111,17 +111,11 @@
-
-
- -
- -
-
@@ -137,6 +131,31 @@ focusCleanup: true }); + + + $(function () { + $.ajax({ + url: ctx + 'erp/developModifyOrder/getEngineerList', + type: 'post', + data: { roleKey: 'gcwyRole' }, + success: function (res) { + if (res.data.length > 0) { + var userData = res.data; + for (let i in userData) { + $("#userId_add").append( + "" // 显示用户姓名 + ); + } + $("userId_add").val(userData[i].userId).trigger("change"); + } else { + $.modal.msgError(res.msg); + } + } + }); + }) + + + function submitHandler() { if ($.validate.form()) { $.operate.save(prefix + "/add", $('#form-developModifyOrder-add').serialize()); diff --git a/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html b/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html index 69b643a6..deee2227 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html +++ b/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html @@ -150,7 +150,7 @@ }, { title: '工程员', - field: 'userId', + field: 'userName', }, { title: '料号', diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java index 1d88bd23..5f2d8abe 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java @@ -127,6 +127,12 @@ public interface SysUserMapper public List selectAllUser(); + /** + * 查找所有工程员 + * */ + public List selectSpecificRoleList(String roleKey); + + @MapKey("id") List> selectUserSelList(String userName); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java index bc0eb107..85acd93d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java @@ -77,6 +77,13 @@ public interface ISysUserService */ public List selectUserRoleByUserId(Long userId); + /** + * 查找所有工程员 + * + * @return 工程员列表 + */ + public List getSpecificRoleList(String roleKey); + /** * 通过用户ID删除用户 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java index 786d7139..345b5230 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -151,6 +151,17 @@ public class SysUserServiceImpl implements ISysUserService return userRoleMapper.selectUserRoleByUserId(userId); } + /** + * 查找所有工程员 + * + * @return 工程员列表 + */ + @Override + public List getSpecificRoleList(String roleKey) { + List sysUsers = userMapper.selectSpecificRoleList(roleKey); + return sysUsers; + } + /** * 通过用户ID删除用户 * diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index 7b16c3c3..d1fdd476 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -228,6 +228,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + +