Browse Source

[update]销售管理:

删除之前的开发修改单模块
dev
liuxiaoxu 7 months ago
parent
commit
cdf39aa29e
  1. 148
      ruoyi-admin/src/main/java/com/ruoyi/system/controller/developReviseOrderController.java
  2. 235
      ruoyi-admin/src/main/java/com/ruoyi/system/domain/DevelopReviseOrder.java
  3. 78
      ruoyi-admin/src/main/java/com/ruoyi/system/mapper/DevelopReviseOrderMapper.java
  4. 76
      ruoyi-admin/src/main/java/com/ruoyi/system/service/IDevelopReviseOrderService.java
  5. 65
      ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/DevelopReviseOrderServiceImpl.java
  6. 147
      ruoyi-admin/src/main/resources/mapper/system/DevelopReviseorderMapper.xml
  7. 133
      ruoyi-admin/src/main/resources/templates/system/developReviseOrder/add.html
  8. 164
      ruoyi-admin/src/main/resources/templates/system/developReviseOrder/developReviseOrder.html
  9. 50
      ruoyi-admin/src/main/resources/templates/system/developReviseOrder/edit.html

148
ruoyi-admin/src/main/java/com/ruoyi/system/controller/developReviseOrderController.java

@ -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<DevelopReviseOrder> 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<DevelopReviseOrder> list = developReviseOrderService.selectDevelopReviseOrderList(developReviseOrder);
ExcelUtil<DevelopReviseOrder> util = new ExcelUtil<DevelopReviseOrder>(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));
}
}

235
ruoyi-admin/src/main/java/com/ruoyi/system/domain/DevelopReviseOrder.java

@ -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();
}
}

78
ruoyi-admin/src/main/java/com/ruoyi/system/mapper/DevelopReviseOrderMapper.java

@ -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<DevelopReviseOrder> 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);
}

76
ruoyi-admin/src/main/java/com/ruoyi/system/service/IDevelopReviseOrderService.java

@ -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<DevelopReviseOrder> 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);
}

65
ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/DevelopReviseOrderServiceImpl.java

@ -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<DevelopReviseOrder> 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);
}
}

147
ruoyi-admin/src/main/resources/mapper/system/DevelopReviseorderMapper.xml

@ -1,147 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.DevelopReviseOrderMapper">
<resultMap type="DevelopReviseOrder" id="DevelopReviseOrderResult">
<result property="oderId" column="oderId" />
<result property="developOderCode" column="develop_oder_code" />
<result property="materialNo" column="materialNo" />
<result property="eceiptStatus" column="eceipt_status" />
<result property="qualityStatus" column="quality_status" />
<result property="auditStatus" column="audit_status" />
<result property="completeStatus" column="complete_status" />
<result property="finshStatus" column="finsh_status" />
<result property="materialName" column="materialName" />
<result property="materialType" column="materialType" />
<result property="unit" column="unit" />
<result property="photoUrl" column="photoUrl" />
<result property="brand" column="brand" />
<result property="describe" column="describe" />
<result property="processMethod" column="processMethod" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
</resultMap>
<sql id="selectDevelopReviseOrderVo">
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
</sql>
<select id="selectDevelopReviseOrderList" parameterType="DevelopReviseOrder" resultMap="DevelopReviseOrderResult">
<include refid="selectDevelopReviseOrderVo"/>
<where>
<if test="developOderCode != null and developOderCode != ''"> and develop_oderCode = #{developOdercode}</if>
<if test="materialNo != null and materialNo != ''"> and materialNo = #{materialNo}</if>
<if test="eceiptStatus != null and eceiptStatus != ''"> and eceipt_status = #{eceiptStatus}</if>
<if test="auditStatus != null and auditStatus != ''"> and audit_status = #{auditStatus}</if>
<if test="completeStatus != null and completeStatus != ''"> and complete_status = #{completeStatus}</if>
<if test="finshStatus != null and finshStatus != ''"> and finsh_status = #{finshStatus}</if>
<if test="materialName != null and materialName != ''"> and materialName like concat('%', #{materialName}, '%')</if>
<if test="materialType != null and materialType != ''"> and materialType = #{materialType}</if>
<if test="photoUrl != null and photoUrl != ''"> and photoUrl = #{photoUrl}</if>
<if test="createBy != null and createBy != ''"> and create_by = #{createBy}</if>
<if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
</where>
</select>
<select id="selectDevelopReviseOrderById" parameterType="Long" resultMap="DevelopReviseOrderResult">
<include refid="selectDevelopReviseOrderVo"/>
where oderId = #{oderId}
</select>
<insert id="insertDevelopReviseOrder" parameterType="DevelopReviseOrder" useGeneratedKeys="true" keyProperty="oderId">
insert into develop_reviseorder
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="developOdercode != null">develop_oderCode,</if>
<if test="materialNo != null">materialNo,</if>
<if test="eceiptStatus != null">eceipt_status,</if>
<if test="qualityStatus != null">quality_status,</if>
<if test="auditStatus != null">audit_status,</if>
<if test="completeStatus != null">complete_status,</if>
<if test="finshStatus != null">finsh_status,</if>
<if test="materialName != null">materialName,</if>
<if test="materialType != null">materialType,</if>
<if test="unit != null">unit,</if>
<if test="photoUrl != null">photoUrl,</if>
<if test="brand != null">brand,</if>
<if test="describe != null">describe,</if>
<if test="processMethod != null">processMethod,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="remark != null">remark,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="developOdercode != null">#{developOdercode},</if>
<if test="materialNo != null">#{materialNo},</if>
<if test="eceiptStatus != null">#{eceiptStatus},</if>
<if test="qualityStatus != null">#{qualityStatus},</if>
<if test="auditStatus != null">#{auditStatus},</if>
<if test="completeStatus != null">#{completeStatus},</if>
<if test="finshStatus != null">#{finshStatus},</if>
<if test="materialName != null">#{materialName},</if>
<if test="materialType != null">#{materialType},</if>
<if test="unit != null">#{unit},</if>
<if test="photoUrl != null">#{photoUrl},</if>
<if test="brand != null">#{brand},</if>
<if test="describe != null">#{describe},</if>
<if test="processMethod != null">#{processMethod},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="remark != null">#{remark},</if>
</trim>
</insert>
<update id="updateDevelopReviseOrder" parameterType="DevelopReviseOrder">
update develop_reviseorder
<trim prefix="SET" suffixOverrides=",">
<if test="developOdercode != null">develop_oderCode = #{developOdercode},</if>
<if test="materialNo != null">materialNo = #{materialNo},</if>
<if test="eceiptStatus != null">eceipt_status = #{eceiptStatus},</if>
<if test="qualityStatus != null">quality_status = #{qualityStatus},</if>
<if test="auditStatus != null">audit_status = #{auditStatus},</if>
<if test="completeStatus != null">complete_status = #{completeStatus},</if>
<if test="finshStatus != null">finsh_status = #{finshStatus},</if>
<if test="materialName != null">materialName = #{materialName},</if>
<if test="materialType != null">materialType = #{materialType},</if>
<if test="unit != null">unit = #{unit},</if>
<if test="photoUrl != null">photoUrl = #{photoUrl},</if>
<if test="brand != null">brand = #{brand},</if>
<if test="describe != null">describe = #{describe},</if>
<if test="processMethod != null">processMethod = #{processMethod},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="remark != null">remark = #{remark},</if>
</trim>
where oderId = #{oderId}
</update>
<delete id="deleteDevelopReviseOrderById" parameterType="Long">
delete from develop_reviseorder where oderId = #{oderId}
</delete>
<delete id="deleteDevelopReviseOrderByIds" parameterType="String">
delete from develop_reviseorder where oderId in
<foreach item="oderId" collection="array" open="(" separator="," close=")">
#{oderId}
</foreach>
</delete>
<update id="cancelDevelopReviseOrderById" parameterType="Long">
update develop_reviseorder set use_status = '1' where oderId = #{oderId}
</update>
<update id="restoreDevelopReviseOrderById" parameterType="Long">
update develop_reviseorder set use_status = '0' where oderId = #{oderId}
</update>
</mapper>

133
ruoyi-admin/src/main/resources/templates/system/developReviseOrder/add.html

@ -1,133 +0,0 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('新增开发修改单')" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-developReviseOrder-add">
<input name="oderId" class="form-control" type="text" hidden="hidden">
<h5>添加开发修改单</h5>
<div class="form-group">
<label class="col-sm-3 control-label is-required" >生产单号:</label>
<div class="col-sm-8">
<input name="developOderCode" class="form-control" type="text" re>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">料号:</label>
<div class="col-sm-8">
<input name="materialNo" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">采购入库状态:</label>
<div class="col-sm-8">
<select name="purchaseStatus" class="form-control m-b select2" th:with="childList=${@dict.getType('purchaseStatus')}"required>
<option th:each="dict : ${childList}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">品质状态:</label>
<div class="col-sm-8">
<select name="qualityStatus" class="form-control m-b select2" th:with="childList=${@dict.getType('qualityStatus')}"required>
<option th:each="dict : ${childList}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">审核状态:</label>
<div class="col-sm-8">
<select name="auditStatus" class="form-control m-b select2" th:with="childList=${@dict.getType('auditStatus')}"required>
<option th:each="dict : ${childList}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">完成状态:</label>
<div class="col-sm-8">
<select name="finishStatus" class="form-control m-b select2" th:with="childList=${@dict.getType('finishStatus')}"required>
<option th:each="dict : ${childList}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">物料名称:</label>
<div class="col-sm-8">
<input name="materialName" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">物料类型:</label>
<select readonly id="selectMaterialType" name="materialType" class="form-control m-b select2-multiple" th:with="childList=${@category.getChildByCode('materialType')}" required>
<optgroup>
<option value=""></option>
</optgroup>
<optgroup th:each="child: ${childList}" th:label="${child.name}">
<option th:each="childSon: ${child.children}" th:value="${childSon.code}" th:text="${#strings.concat(child.name,'-',childSon.name)}"></option>
</optgroup>
</select>
<input type="text" id="materialType" name="materialType" hidden />
</div>
<div class="form-group">
<label class="col-sm-3 control-label">单位:</label>
<div class="col-sm-8">
<input name="unit" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">图片地址:</label>
<div class="col-sm-8">
<input name="photoUrl" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">品牌:</label>
<div class="col-sm-8">
<input name="brand" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">描述:</label>
<div class="col-sm-8">
<input name="describe" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">加工方式:</label>
<div class="col-sm-8">
<select id="selectProcessingMethod" name="processingMethod" class="form-control m-b select2" th:with="childList=${@category.getChildByCode('processingMethod')}" required>
<optgroup>
<option value=""></option>
</optgroup>
<optgroup th:each="child: ${childList}" th:label="${child.name}">
<option th:each="childSon: ${child.children}" th:value="${childSon.code}" th:text="${#strings.concat(child.name,'-',childSon.name)}"></option>
</optgroup>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">备注信息:</label>
<div class="col-sm-8">
<input name="remark" class="form-control" type="text">
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var prefix = ctx + "system/developReviseOrder"
$("#form-developReviseOrder-add").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/add", $('#form-developReviseOrder-add').serialize());
}
}
</script>
</body>
</html>

164
ruoyi-admin/src/main/resources/templates/system/developReviseOrder/developReviseOrder.html

@ -1,164 +0,0 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
<th:block th:include="include :: header('开发修改单列表')" />
</head>
<body class="gray-bg">
<div class="container-div">
<div class="row">
<div class="col-sm-12 search-collapse">
<form id="formId">
<div class="select-list">
<ul>
<li>
<label>开发修改单单号:</label>
<input type="text" name="developOdercode"/>
</li>
<li>
<label>料号:</label>
<input type="text" name="materialNo"/>
</li>
<li>
<label>物料名称:</label>
<input type="text" name="materialName"/>
</li>
<li>
<label>审核状态:</label>
<select name="auditStatus" th:with="type=${@dict.getType('auditStatus')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</li>
<li>
<label>工程员:</label>
<select name="saleStaff" id="selectsaleStaff" >
</select>
</li>
<li>
<label>完成状态:</label>
<select name="" th:with="type=${@dict.getType('finshStatus')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</li>
<li class="select-time">
<label>录入时间:</label>
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateTime]"/>
<span>-</span>
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endCreateTime]"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
</li>
</ul>
</div>
</form>
</div>
<div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="erp:developReviseOrder:add">
<i class="fa fa-plus"></i> 添加
</a>
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
</div>
</div>
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('erp:developReviseOrder:edit')}]];
var removeFlag = [[${@permission.hasPermi('erp:developReviseOrder:remove')}]];
var cancelFlag = [[${@permission.hasPermi('erp:developReviseOrder:cancel')}]];
var restoreFlag = [[${@permission.hasPermi('erp:developReviseOrder:restore')}]];
var auditStatusDatas = [[${@dict.getType('auditStatus')}]];
var materialTypeDatas = [[${@dict.getType('ck_meterialt_type')}]];
var completeStatusDatas = [[${@dict.getType('completeStatus')}]];
var unitDatas = [[${@dict.getType('sys_unit_class')}]];
var processMethodDatas = [[${@dict.getType('processMethod')}]];
var userName = [[${@permission.getPrincipalProperty('userName')}]];
var prefix = ctx + "system/developReviseOrder";
$(function() {
var options = {
url: prefix + "/list",
createUrl: prefix + "/add",
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
cancelUrl: prefix + "/cancel/{id}",
restoreUrl: prefix + "/restore/{id}",
exportUrl: prefix + "/export",
modalName: "开发修改单",
columns: [{
checkbox: true
},
{
field: 'auditStatus',
title: '审核状态',
formatter: function(value, row, index) {
return $.table.selectDictLabel(auditStatusDatas, value);
}
},
{field: 'finshStatus',title: '完成状态'},
{field: 'oderId', title: '开发修改单编号',visible: false},
{field: 'developOdercode',title: '开发修改单单号'},
{field:'completeStatus',title:'确认状态'},
{field: 'eceiptStatus',title: '采购入库状态'},
{field: 'qualityStatus',title: '品质状态'},
{field: 'staffNo', title: '员工ID', visible: false},
{field: 'saleStaff', title: '工程员'},
{field: 'materialNo',title: '料号'},
{field: 'materialName',title: '物料名称'},
{field: 'materialType',title: '物料类型',
formatter: function(value, row, index) {return $.table.selectDictLabel(materialTypeDatas, value);}
},
{field: 'unit',title: '单位',
formatter: function(value, row, index) {return $.table.selectDictLabel(unitDatas, value);}
},
{field: 'photoUrl',title: '图片地址'},
{field: 'brand',title: '品牌'},
{field: 'describe',title: '描述'},
{field: 'processMethod',title: '加工方式',
formatter: function(value, row, index) {return $.table.selectDictLabel(processMethodDatas, value);}
},
{field: 'createBy',title: '录入人'},
{field: 'createTime',title: '录入时间'},
{field: 'remark',title: '备注信息'},
{title: '操作',align: 'center',
formatter: function(value, row, index) {
var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.oderId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.oderId + '\')"><i class="fa fa-remove"></i>删除</a> ');
if(row.delFlag == '0'){
actions.push('<a class="btn btn-danger btn-xs ' + cancelFlag + '" href="javascript:void(0)" onclick="$.operate.cancel(\'' + row.id + '\')"><i class="fa fa-remove"></i>作废</a> ');
}else{
actions.push('<a class="btn btn-success btn-xs ' + restoreFlag + '" href="javascript:void(0)" onclick="$.operate.restore(\'' + row.id + '\')"><i class="fa fa-window-restore"></i>恢复</a> ');
}
return actions.join('');
}
}]
};
$.table.init(options);
});
$.ajax({
url: ctx + 'system/user/list',
type: 'post',
success: function (res) {
console.log(res)
if (res.rows.length > 0) {
var usertData = res.rows;
//alert(JSON.stringify(data));
for (let i in usertData) {
// console.log(finishProductData[i].finishProductCode)
$("#selectsaleStaff").append(
"<option value='" + usertData[i].userName + "'>" + usertData[i].userName + "</option>");
}
$("#selectsaleStaff").val(userName).trigger("change");
} else {
$.modal.msgError(res.msg);
}
}
});
</script>
</body>
</html>

50
ruoyi-admin/src/main/resources/templates/system/developReviseOrder/edit.html

@ -1,50 +0,0 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('修改开发修改单')" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-developReviseOrder-edit" th:object="${developReviseorder}">
<input name="oderId" th:field="*{oderId}" type="hidden">
<div class="form-group">
<label class="col-sm-3 control-label">开发修改单单号:</label>
<div class="col-sm-8">
<input name="developOderCode" th:field="*{developOderCode}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">料号:</label>
<div class="col-sm-8">
<input name="materialNo" th:field="*{materialNo}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">图片地址:</label>
<div class="col-sm-8">
<input name="photoUrl" th:field="*{photoUrl}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">备注信息:</label>
<div class="col-sm-8">
<input name="remark" th:field="*{remark}" class="form-control" type="text">
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var prefix = ctx + "system/developReviseOrder";
$("#form-developReviseOrder-edit").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/edit", $('#form-developReviseOrder-edit').serialize());
}
}
</script>
</body>
</html>
Loading…
Cancel
Save