root
/
smart-erp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

[fix] 

品质管理 制程工序
修改制程工序添加和编辑页面，工序名称改为输入框输入，添加字段必填属性；
去除制程工序列表页面名称字典；
新增查找与制程检验有关的制程工序controller、service和mapper方法；
修改制程工序列表查询mapper方法，实现搜索栏搜索功能；
dev
王晓迪 3 months ago
parent
97a109a3af
commit
83efb84801
9 changed files with 78 additions and 53 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityManufacturingProcessController.java
  2. 4
      ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityManufacturingProcessMapper.java
  3. 5
      ruoyi-admin/src/main/java/com/ruoyi/quality/service/IQualityManufacturingProcessService.java
  4. 9
      ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityManufacturingProcessServiceImpl.java
  5. 15
      ruoyi-admin/src/main/resources/mapper/quality/QualityManufacturingProcessMapper.xml
  6. 34
      ruoyi-admin/src/main/resources/templates/quality/manufacturingProcess/add.html
  7. 34
      ruoyi-admin/src/main/resources/templates/quality/manufacturingProcess/edit.html
  8. 8
      ruoyi-admin/src/main/resources/templates/quality/manufacturingProcess/manufacturingProcess.html
  9. 6
      ruoyi-admin/src/main/resources/templates/system/outsource_order/detail.html

16
ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityManufacturingProcessController.java
View File

@ -5,11 +5,7 @@ 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 org.springframework.web.bind.annotation.*;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.quality.domain.QualityManufacturingProcess;
@ -183,4 +179,14 @@ public class QualityManufacturingProcessController extends BaseController
return AjaxResult.success(qualityManufacturingProcess);
}
/*
* 查找与制程检验有关的制程工序通过制程工序编号
* */
@GetMapping("/getProcessByName")
@ResponseBody
public AjaxResult getProcessByName(@RequestParam("manufacturingProcessName") String manufacturingProcessName)
{
QualityManufacturingProcess qualityManufacturingProcess = qualityManufacturingProcessService.selectQualityManufacturingProcessByName(manufacturingProcessName);
return AjaxResult.success(qualityManufacturingProcess);
}
}

4
ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityManufacturingProcessMapper.java
View File

@ -101,4 +101,8 @@ public interface QualityManufacturingProcessMapper
* 查找与制程检验有关的制程工序通过制程工序编号
* */
QualityManufacturingProcess selectQualityManufacturingProcessByCode(String manufacturingProcessCode);
/*
* 查找与制程检验有关的制程工序通过制程工序名称
* */
QualityManufacturingProcess selectQualityManufacturingProcessByName(String manufacturingProcessName);
}

5
ruoyi-admin/src/main/java/com/ruoyi/quality/service/IQualityManufacturingProcessService.java
View File

@ -86,4 +86,9 @@ public interface IQualityManufacturingProcessService
* 查找与制程检验有关的制程工序通过制程工序编号
* */
QualityManufacturingProcess selectQualityManufacturingProcessByCode(String manufacturingProcessCode);
/*
* 查找与制程检验有关的制程工序通过制程工序名称
* */
QualityManufacturingProcess selectQualityManufacturingProcessByName(String manufacturingProcessName);
}

9
ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityManufacturingProcessServiceImpl.java
View File

@ -200,4 +200,13 @@ public class QualityManufacturingProcessServiceImpl implements IQualityManufactu
return qualityManufacturingProcessMapper.selectQualityManufacturingProcessByCode(manufacturingProcessCode);
}
/*
* 查找与制程检验有关的制程工序通过制程工序名称
* */
@Override
public QualityManufacturingProcess selectQualityManufacturingProcessByName(String manufacturingProcessName) {
return qualityManufacturingProcessMapper.selectQualityManufacturingProcessByName(manufacturingProcessName);
}
}

15
ruoyi-admin/src/main/resources/mapper/quality/QualityManufacturingProcessMapper.xml
View File

@ -29,12 +29,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectQualityManufacturingProcessList" parameterType="QualityManufacturingProcess" resultMap="QualityManufacturingProcessResult">
<include refid="selectQualityManufacturingProcessVo"/>
<where>
<if test="manufacturingProcessId != null and manufacturingProcessId != ''"> and manufacturing_process_id = #{manufacturingProcessId}</if>
<if test="manufacturingProcessCode != null and manufacturingProcessCode != ''"> and manufacturing_process_code = #{manufacturingProcessCode}</if>
<if test="manufacturingProcessName != null and manufacturingProcessName != ''"> and manufacturing_process_name = #{manufacturingProcessName}</if>
<if test="manufacturingProcessId != null and manufacturingProcessId != ''"> and manufacturing_process_id like concat('%', #{manufacturingProcessId}, '%')</if>
<if test="manufacturingProcessCode != null and manufacturingProcessCode != ''"> and manufacturing_process_code like concat('%', #{manufacturingProcessCode}, '%')</if>
<if test="manufacturingProcessName != null and manufacturingProcessName != ''"> and manufacturing_process_name like concat('%', #{manufacturingProcessName}, '%')</if>
<if test="deviceName != null and deviceName != ''"> and device_name like concat('%', #{deviceName}, '%')</if>
<if test="deviceModelCode != null and deviceModelCode != ''"> and device_model_code = #{deviceModelCode}</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>
<if test="deviceModelCode != null and deviceModelCode != ''"> and device_model_code like concat('%', #{deviceModelCode}, '%')</if>
<if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and Date(create_time) between #{params.beginCreateTime} and #{params.endCreateTime}</if>
</where>
</select>
@ -54,6 +54,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where manufacturing_process_code = #{manufacturingProcessCode}
</select>
<select id="selectQualityManufacturingProcessByName" parameterType="String" resultMap="QualityManufacturingProcessResult">
<include refid="selectQualityManufacturingProcessVo"/>
where manufacturing_process_name = #{manufacturingProcessName}
</select>
<insert id="insertQualityManufacturingProcess" parameterType="QualityManufacturingProcess" useGeneratedKeys="true" keyProperty="manufacturingProcessAutoid">
insert into quality_manufacturing_process
<trim prefix="(" suffix=")" suffixOverrides=",">

34
ruoyi-admin/src/main/resources/templates/quality/manufacturingProcess/add.html
View File

@ -7,53 +7,51 @@
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-manufacturingProcess-add">
<div class="form-group">
<label class="col-sm-3 control-label">制程工序编号：</label>
<label class="col-sm-3 control-label is-required">制程工序编号：</label>
<div class="col-sm-8">
<input name="manufacturingProcessCode" class="form-control" type="text">
<input required name="manufacturingProcessCode" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">制程工序名称：</label>
<label class="col-sm-3 control-label is-required">制程工序名称：</label>
<div class="col-sm-8">
<select name="manufacturingProcessName" class="form-control m-b" th:with="type=${@dict.getType('manufacturing_process_name')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
<input required name="manufacturingProcessName" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">设备名称：</label>
<label class="col-sm-3 control-label is-required">设备名称：</label>
<div class="col-sm-8">
<input name="deviceName" class="form-control" type="text">
<input required name="deviceName" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">设备型号：</label>
<label class="col-sm-3 control-label is-required">设备型号：</label>
<div class="col-sm-8">
<input name="deviceModelCode" class="form-control" type="text">
<input required name="deviceModelCode" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">工序顺序：</label>
<label class="col-sm-3 control-label is-required">工序顺序：</label>
<div class="col-sm-8">
<input name="processSequence" class="form-control" type="text">
<input required name="processSequence" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">车间名称：</label>
<label class="col-sm-3 control-label is-required">车间名称：</label>
<div class="col-sm-8">
<input name="workshopName" class="form-control" type="text">
<input required name="workshopName" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">零件名称：</label>
<label class="col-sm-3 control-label is-required">零件名称：</label>
<div class="col-sm-8">
<input name="modName" class="form-control" type="text">
<input required name="modName" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">工序检验项目：</label>
<label class="col-sm-3 control-label is-required">工序检验项目：</label>
<div class="col-sm-8">
<input name="processInspectionItem" class="form-control" type="text">
<input required name="processInspectionItem" class="form-control" type="text">
</div>
</div>
<div class="form-group">

34
ruoyi-admin/src/main/resources/templates/quality/manufacturingProcess/edit.html
View File

@ -8,53 +8,51 @@
<form class="form-horizontal m" id="form-manufacturingProcess-edit" th:object="${qualityManufacturingProcess}">
<input name="manufacturingProcessAutoid" th:field="*{manufacturingProcessAutoid}" type="hidden">
<div class="form-group">
<label class="col-sm-3 control-label">制程工序编号：</label>
<label class="col-sm-3 control-label is-required">制程工序编号：</label>
<div class="col-sm-8">
<input name="manufacturingProcessCode" th:field="*{manufacturingProcessCode}" class="form-control" type="text">
<input required name="manufacturingProcessCode" th:field="*{manufacturingProcessCode}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">制程工序名称：</label>
<label class="col-sm-3 control-label is-required">制程工序名称：</label>
<div class="col-sm-8">
<select name="manufacturingProcessName" class="form-control m-b" th:with="type=${@dict.getType('manufacturing_process_name')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{manufacturingProcessName}"></option>
</select>
<input required name="manufacturingProcessName" th:field="*{manufacturingProcessName}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">设备名称：</label>
<label class="col-sm-3 control-label is-required">设备名称：</label>
<div class="col-sm-8">
<input name="deviceName" th:field="*{deviceName}" class="form-control" type="text">
<input required name="deviceName" th:field="*{deviceName}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">设备型号：</label>
<label class="col-sm-3 control-label is-required">设备型号：</label>
<div class="col-sm-8">
<input name="deviceModelCode" th:field="*{deviceModelCode}" class="form-control" type="text">
<input required name="deviceModelCode" th:field="*{deviceModelCode}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">工序顺序：</label>
<label class="col-sm-3 control-label" is-required>工序顺序：</label>
<div class="col-sm-8">
<input name="processSequence" th:field="*{processSequence}" class="form-control" type="text">
<input required name="processSequence" th:field="*{processSequence}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">车间名称：</label>
<label class="col-sm-3 control-label" is-required>车间名称：</label>
<div class="col-sm-8">
<input name="workshopName" th:field="*{workshopName}" class="form-control" type="text">
<input required name="workshopName" th:field="*{workshopName}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">零件名称：</label>
<label class="col-sm-3 control-label" is-required>零件名称：</label>
<div class="col-sm-8">
<input name="modName" th:field="*{modName}" class="form-control" type="text">
<input required name="modName" th:field="*{modName}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">工序检验项目：</label>
<label class="col-sm-3 control-label" is-required>工序检验项目：</label>
<div class="col-sm-8">
<input name="processInspectionItem" th:field="*{processInspectionItem}" class="form-control" type="text">
<input required name="processInspectionItem" th:field="*{processInspectionItem}" class="form-control" type="text">
</div>
</div>
<div class="form-group">

8
ruoyi-admin/src/main/resources/templates/quality/manufacturingProcess/manufacturingProcess.html
View File

@ -20,10 +20,7 @@
</li>
<li>
<label>制程工序名称：</label>
<select name="manufacturingProcessName" th:with="type=${@dict.getType('manufacturing_process_name')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
<input type="text" name="manufacturingProcessName"/>
</li>
<li>
<label>设备名称：</label>
@ -95,9 +92,6 @@
{
title: '制程工序名称',
field: 'manufacturingProcessName',
formatter: function(value, row, index) {
return $.table.selectDictLabel(manufacturingProcessNameDatas, value);
}
},
{
title: '设备名称',

6
ruoyi-admin/src/main/resources/templates/system/outsource_order/detail.html
View File

@ -124,6 +124,7 @@
<script th:inline="javascript">
var prefix = ctx + "system/outsource_order";
var processMethodDatas = [[${@dict.getType('processMethod')}]];
var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
$("#form-outsourceOrder-detail").validate({focusCleanup: true});
var outsourceOrder = [[${outsourceOrder}]];
var outsourcePlanDetailList = [];
@ -601,6 +602,11 @@
},
{title: '物料名称', field: 'materialName'},
{title: '物料描述', field: 'description'},
{title: '物料类型', field: 'materialType',
formatter: function(value, row, index) {
return $.table.selectCategoryLabel(materialTypeDatas, value);
}
},
{title: '品牌', field: 'brand'},
{title: '单位', field: 'unit', align: 'center', },
{title: '加工方式', field: 'processMethod', align: 'center',

Write Preview
Loading…
Cancel
Save