From 83efb84801fc073ee587bd8ae464941816e8fc39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com>
Date: Wed, 4 Dec 2024 14:15:08 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E5=93=81=E8=B4=A8=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E5=88=B6=E7=A8=8B=E5=B7=A5=E5=BA=8F=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=88=B6=E7=A8=8B=E5=B7=A5=E5=BA=8F=E6=B7=BB=E5=8A=A0=E5=92=8C?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=B7=A5=E5=BA=8F?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=94=B9=E4=B8=BA=E8=BE=93=E5=85=A5=E6=A1=86?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=BF=85=E5=A1=AB=E5=B1=9E=E6=80=A7=EF=BC=9B=20=E5=8E=BB?=
 =?UTF-8?q?=E9=99=A4=E5=88=B6=E7=A8=8B=E5=B7=A5=E5=BA=8F=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=90=8D=E7=A7=B0=E5=AD=97=E5=85=B8=EF=BC=9B?=
 =?UTF-8?q?=20=E6=96=B0=E5=A2=9E=E6=9F=A5=E6=89=BE=E4=B8=8E=E5=88=B6?=
 =?UTF-8?q?=E7=A8=8B=E6=A3=80=E9=AA=8C=E6=9C=89=E5=85=B3=E7=9A=84=E5=88=B6?=
 =?UTF-8?q?=E7=A8=8B=E5=B7=A5=E5=BA=8Fcontroller=E3=80=81service=E5=92=8Cm?=
 =?UTF-8?q?apper=E6=96=B9=E6=B3=95=EF=BC=9B=20=E4=BF=AE=E6=94=B9=E5=88=B6?=
 =?UTF-8?q?=E7=A8=8B=E5=B7=A5=E5=BA=8F=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?mapper=E6=96=B9=E6=B3=95=EF=BC=8C=E5=AE=9E=E7=8E=B0=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=A0=8F=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...QualityManufacturingProcessController.java | 16 ++++++---
 .../QualityManufacturingProcessMapper.java    |  4 +++
 .../IQualityManufacturingProcessService.java  |  5 +++
 ...ualityManufacturingProcessServiceImpl.java |  9 +++++
 .../QualityManufacturingProcessMapper.xml     | 15 +++++---
 .../quality/manufacturingProcess/add.html     | 34 +++++++++----------
 .../quality/manufacturingProcess/edit.html    | 34 +++++++++----------
 .../manufacturingProcess.html                 |  8 +----
 .../system/outsource_order/detail.html        |  6 ++++
 9 files changed, 78 insertions(+), 53 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityManufacturingProcessController.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityManufacturingProcessController.java
index 8cfc366c..842c62c6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityManufacturingProcessController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/controller/QualityManufacturingProcessController.java
@@ -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);
+    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityManufacturingProcessMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityManufacturingProcessMapper.java
index 7bef9cc5..cff33319 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityManufacturingProcessMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityManufacturingProcessMapper.java
@@ -101,4 +101,8 @@ public interface QualityManufacturingProcessMapper
      * 查找与制程检验有关的制程工序通过制程工序编号
      * */
     QualityManufacturingProcess selectQualityManufacturingProcessByCode(String manufacturingProcessCode);
+    /*
+     * 查找与制程检验有关的制程工序通过制程工序名称
+     * */
+    QualityManufacturingProcess selectQualityManufacturingProcessByName(String manufacturingProcessName);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/service/IQualityManufacturingProcessService.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/service/IQualityManufacturingProcessService.java
index 3445e0af..725dbde3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/quality/service/IQualityManufacturingProcessService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/service/IQualityManufacturingProcessService.java
@@ -86,4 +86,9 @@ public interface IQualityManufacturingProcessService
     * 查找与制程检验有关的制程工序通过制程工序编号
     * */
     QualityManufacturingProcess selectQualityManufacturingProcessByCode(String manufacturingProcessCode);
+
+    /*
+     * 查找与制程检验有关的制程工序通过制程工序名称
+     * */
+    QualityManufacturingProcess selectQualityManufacturingProcessByName(String manufacturingProcessName);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityManufacturingProcessServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityManufacturingProcessServiceImpl.java
index 2fc49bb0..3e077d69 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityManufacturingProcessServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityManufacturingProcessServiceImpl.java
@@ -200,4 +200,13 @@ public class QualityManufacturingProcessServiceImpl implements IQualityManufactu
 
         return qualityManufacturingProcessMapper.selectQualityManufacturingProcessByCode(manufacturingProcessCode);
     }
+
+    /*
+     * 查找与制程检验有关的制程工序通过制程工序名称
+     * */
+    @Override
+    public QualityManufacturingProcess selectQualityManufacturingProcessByName(String manufacturingProcessName) {
+
+        return qualityManufacturingProcessMapper.selectQualityManufacturingProcessByName(manufacturingProcessName);
+    }
 }
diff --git a/ruoyi-admin/src/main/resources/mapper/quality/QualityManufacturingProcessMapper.xml b/ruoyi-admin/src/main/resources/mapper/quality/QualityManufacturingProcessMapper.xml
index e39ff019..7e0d5d67 100644
--- a/ruoyi-admin/src/main/resources/mapper/quality/QualityManufacturingProcessMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/quality/QualityManufacturingProcessMapper.xml
@@ -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=",">
diff --git a/ruoyi-admin/src/main/resources/templates/quality/manufacturingProcess/add.html b/ruoyi-admin/src/main/resources/templates/quality/manufacturingProcess/add.html
index edd39b19..21bc2c5a 100644
--- a/ruoyi-admin/src/main/resources/templates/quality/manufacturingProcess/add.html
+++ b/ruoyi-admin/src/main/resources/templates/quality/manufacturingProcess/add.html
@@ -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">    
diff --git a/ruoyi-admin/src/main/resources/templates/quality/manufacturingProcess/edit.html b/ruoyi-admin/src/main/resources/templates/quality/manufacturingProcess/edit.html
index 8bd8c8e4..9438bd6d 100644
--- a/ruoyi-admin/src/main/resources/templates/quality/manufacturingProcess/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/quality/manufacturingProcess/edit.html
@@ -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">    
diff --git a/ruoyi-admin/src/main/resources/templates/quality/manufacturingProcess/manufacturingProcess.html b/ruoyi-admin/src/main/resources/templates/quality/manufacturingProcess/manufacturingProcess.html
index c3350593..4f9be6e3 100644
--- a/ruoyi-admin/src/main/resources/templates/quality/manufacturingProcess/manufacturingProcess.html
+++ b/ruoyi-admin/src/main/resources/templates/quality/manufacturingProcess/manufacturingProcess.html
@@ -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: '设备名称',
diff --git a/ruoyi-admin/src/main/resources/templates/system/outsource_order/detail.html b/ruoyi-admin/src/main/resources/templates/system/outsource_order/detail.html
index d032c732..ea515d9f 100644
--- a/ruoyi-admin/src/main/resources/templates/system/outsource_order/detail.html
+++ b/ruoyi-admin/src/main/resources/templates/system/outsource_order/detail.html
@@ -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',