From 90c5ce0e1fbc114668d103a489d2fbbc26a98337 Mon Sep 17 00:00:00 2001
From: zhangsiqi <2825463979@qq.com>
Date: Wed, 21 Feb 2024 08:50:51 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=E7=89=A9=E6=96=99=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=BF=85=E9=80=89=E9=A1=B9=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA=EF=BC=8C=E5=85=B3=E8=81=94=E6=96=99=E5=8F=B7?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E4=B8=8D=E5=8F=AF=E4=BF=AE=E6=94=B9=E3=80=82?=
 =?UTF-8?q?BOM=E6=B7=BB=E5=8A=A0=E6=97=B6=E7=89=A9=E6=96=99=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E6=94=B9=E4=B8=BA=E4=B8=8B=E6=8B=89=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E6=A1=86=EF=BC=8C=E6=8D=9F=E8=80=97=E7=8E=87=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E7=99=BE=E5=88=86=E6=AF=94=E6=A0=87=E9=A2=98=EF=BC=8C=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E4=BF=A1=E6=81=AF=E6=B7=BB=E5=8A=A0=E4=BA=86=E5=B7=A5?=
 =?UTF-8?q?=E7=A8=8B=E5=91=98=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/templates/erp/bom/add.html | 76 +++++++++++++++++--
 .../main/resources/templates/erp/bom/bom.html | 14 +++-
 .../resources/templates/erp/material/add.html | 12 +--
 3 files changed, 89 insertions(+), 13 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/erp/bom/add.html b/ruoyi-admin/src/main/resources/templates/erp/bom/add.html
index 8e52d4a3..660e9b4a 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/bom/add.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/bom/add.html
@@ -22,13 +22,16 @@
             <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" readonly>
+                    <select class="form-control" id="materialName" name="materialName" required>
+
+                    </select>
+<!--                    <input name="materialName" class="form-control" type="text" readonly>-->
                 </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 disabled id="selectMaterialType" name="materialType" class="form-control m-b select2-multiple" th:with="childList=${@category.getChildByCode('materialType')}">
+                    <select disabled id="selectMaterialType" name="materialType" class="form-control m-b select2-multiple" th:with="childList=${@category.getChildByCode('materialType')}" required>
                         <optgroup>
                            <option value=""></option>
                         </optgroup>
@@ -39,9 +42,9 @@
                 </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 disabled id="selectProcessMethod" name="processMethod"  class="form-control m-b"  th:with="type=${@dict.getType('processMethod')}">
+                    <select disabled id="selectProcessMethod" name="processMethod"  class="form-control m-b"  th:with="type=${@dict.getType('processMethod')}" required>
                         <option value="" ></option>
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                     </select>
@@ -68,6 +71,14 @@
                     <textarea name="describe" class="form-control" readonly></textarea>
                 </div>
             </div>
+
+
+            <div class="form-group">
+                <label class="col-sm-3 control-label">工程员：</label>
+                <div class="col-sm-8">
+                    <input type="text" name="createBy" class="form-control" readonly />
+                </div>
+            </div>
         </form>
         <div class="btn-group-sm" id="toolbar" role="group">
             <a class="btn btn-success" onclick="insertRow()">
@@ -162,8 +173,61 @@
                 }
             });
             $('#materialNo').on('select2:select', function (e) {
-                debugger
+                // debugger
+                var data = e.params.data;
+                $("#materialName").val(data.materialName).select2("trigger", "select", {
+                    data: { id: data.materialName, text: data.materialName }
+                })
+                $("input[name='brand']").val(data.brand);
+                $("textarea[name='describe']").val(data.describe);
+                $("#selectMaterialType").val([data.materialType]).trigger("change");
+                $("#selectProcessMethod").val([data.processMethod]).trigger("change");
+                $("#selectUnit").val([data.unit]).trigger("change");
+            });
+            //todo 物料名称下拉框
+            $("#materialName").select2({
+                theme: "bootstrap",
+                allowClear: true,
+                placeholder: "请选择一个料号名称",
+                ajax:{
+                    type: "get",
+                    url:ctx + "erp/material/getMaterialSelList",
+                    dataType:"json",
+                    delay:250,
+                    data:function(params){
+                        var searchVal = params.term;
+                        var obj = {
+                            keyword: searchVal
+                        };
+                        return obj;
+                    },
+                    cache:true,
+                    processResults: function (res, params) {
+                        var options = [];
+                        if(res.code==0){
+                            var resultList = res.data;
+                            console.log(resultList);
+                            for(var i= 0, len=resultList.length;i<len;i++){
+                                var option = resultList[i];
+                                option.id = resultList[i]["materialNo"];
+                                option.text = resultList[i]["materialName"];
+                                options.push(option);
+                            }
+                        }
+                        return {
+                            results: options
+                        };
+                    },
+                    escapeMarkup: function (markup) { return markup; },
+                    minimumInputLength: 1
+                }
+            });
+            $('#materialName').on('select2:select', function (e) {
+                // debugger
                 var data = e.params.data;
+                $("#materialNo").val(data.materialNo).select2("trigger", "select", {
+                    data: { id: data.materialNo, text: data.materialNo }
+                });
                 $("input[name='materialName']").val(data.materialName);
                 $("input[name='brand']").val(data.brand);
                 $("textarea[name='describe']").val(data.describe);
diff --git a/ruoyi-admin/src/main/resources/templates/erp/bom/bom.html b/ruoyi-admin/src/main/resources/templates/erp/bom/bom.html
index d51b3faf..763c2d0c 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/bom/bom.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/bom/bom.html
@@ -65,6 +65,7 @@
                             <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>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>反向BOM</a>
                             </li>
                         </ul>
                     </div>
@@ -161,6 +162,17 @@
                         return $.table.selectDictLabel(useStatusDatas, value);
                     }
                 },
+                {
+                    field: 'createBy',
+                    title: '工程员',
+                    formatter: function(value, row, index) {
+                        if (value == null || value == ''){
+                            return '/';
+                        }else{
+                            return value;
+                        }
+                    }
+                },
                 {
                     field: 'bomNo',
                     title: 'bom号',
@@ -568,7 +580,7 @@
                             if (value == null || value == ''){
                                 return '/';
                             }else{
-                                return value
+                                return value + "%";
                             }
                         }
                     },
diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/add.html b/ruoyi-admin/src/main/resources/templates/erp/material/add.html
index 8877211e..bd0d6347 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/material/add.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/material/add.html
@@ -56,9 +56,9 @@
                 </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 id="selectMaterialType" class="form-control m-b select2-multiple" th:with="childList=${@category.getChildByCode('materialType')}">
+                    <select id="selectMaterialType" class="form-control m-b select2-multiple" th:with="childList=${@category.getChildByCode('materialType')}" required>
                         <optgroup>
                             <option value="">请选择</option>
                         </optgroup>
@@ -70,9 +70,9 @@
                 <input type="text" id="materialType" name="materialType" hidden />
             </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="processMethod" class="form-control m-b" th:with="type=${@dict.getType('processMethod')}">
+                    <select name="processMethod" class="form-control m-b" th:with="type=${@dict.getType('processMethod')}" required>
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                     </select>
                 </div>
@@ -98,9 +98,9 @@
                 </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="warehouseDept" class="form-control m-b" th:with="type=${@dict.getType('warehouseDept')}">
+                    <select name="warehouseDept" class="form-control m-b" th:with="type=${@dict.getType('warehouseDept')}" required>
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                     </select>
                 </div>