From 0230110bae54d8673cbf31cb2be332b7888e5d52 Mon Sep 17 00:00:00 2001
From: vitas <clwangz@qq.com>
Date: Fri, 24 Dec 2021 22:38:34 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E6=B5=81=E6=B0=B4=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E8=AE=A2=E5=8D=95=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/busi/materialperate/add.html    | 29 +++++++++++++++++--
 .../busi/materialperate/materialperate.html   |  3 +-
 sql/tmp.sql                                   |  8 +++++
 3 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/busi/materialperate/add.html b/ruoyi-admin/src/main/resources/templates/busi/materialperate/add.html
index 8cde6899a..a266a63de 100644
--- a/ruoyi-admin/src/main/resources/templates/busi/materialperate/add.html
+++ b/ruoyi-admin/src/main/resources/templates/busi/materialperate/add.html
@@ -8,12 +8,19 @@
         <form class="form-horizontal m" id="form-materialperate-add">
             <div class="form-group">    
                 <label class="col-sm-3 control-label">订单：</label>
+                <div class="col-sm-8">
+                    <input id="treeId" name="orderId"  type="hidden">
+                    <input  id="treeName" name="orderName" readonly="true" onclick="selectOrder(1)"  class="form-control" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">物料选择：</label>
                 <div class="col-sm-8">
                     <input name="materialStockId" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">操作数量：</label>
+                <label class="col-sm-3 control-label is-required">数量：</label>
                 <div class="col-sm-8">
                     <input name="amount" class="form-control" type="text" required>
                 </div>
@@ -23,8 +30,9 @@
                 <div class="col-sm-8">
                     <select name="oprateType" class="form-control m-b">
                         <option value="">所有</option>
+                        <option value="1" selected>入库</option>
+                        <option value="2">出库</option>
                     </select>
-                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
                 </div>
             </div>
             <div class="form-group">
@@ -47,6 +55,23 @@
                 $.operate.save(prefix + "/add", $('#form-materialperate-add').serialize());
             }
         }
+
+        /*订单选择*/
+        function selectOrder(status) {
+            var options = {
+                title: '选择订单',
+                width: "380",
+                height: "400",
+                url: ctx + "busi/order/selectOrder/" + status,
+                callBack: function(index, layero){
+                    var body = $.modal.getChildFrame(index);
+                    $("#treeId").val(body.find('#treeId').val());
+                    $("#treeName").val(body.find('#treeName').val());
+                    $.modal.close(index);
+                }
+            };
+            $.modal.openOptions(options);
+        }
     </script>
 </body>
 </html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/busi/materialperate/materialperate.html b/ruoyi-admin/src/main/resources/templates/busi/materialperate/materialperate.html
index a63425bee..b9ebf012e 100644
--- a/ruoyi-admin/src/main/resources/templates/busi/materialperate/materialperate.html
+++ b/ruoyi-admin/src/main/resources/templates/busi/materialperate/materialperate.html
@@ -18,7 +18,8 @@
                                 <label>操作类型：</label>
                                 <select name="oprateType">
                                     <option value="">所有</option>
-                                    <option value="-1">代码生成请选择字典属性</option>
+                                    <option value="1">入库</option>
+                                    <option value="2">出库</option>
                                 </select>
                             </li>
                             <li>
diff --git a/sql/tmp.sql b/sql/tmp.sql
index 1ec935f34..f63198e7c 100644
--- a/sql/tmp.sql
+++ b/sql/tmp.sql
@@ -145,3 +145,11 @@ values('物料操作流水删除', @parentId, '4',  '#',  'F', '0', 'busi:materi
 
 insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
 values('物料操作流水导出', @parentId, '5',  '#',  'F', '0', 'busi:materialperate:export',       '#', 'admin', sysdate(), '', null, '');
+
+
+select max(A.classify),max(sdd.dict_label),max(sdd2.dict_label),max(A.color), sum(A.amount) from busi_material_require A
+                                                                                                     left join busi_product_require B on A.product_require_id = B.id
+                                                                                                     left join busi_order bo on B.order_id = bo.id
+                                                                                                     left join sys_dict_data sdd on sdd.dict_type='busi_color' and A.color = sdd.dict_value
+                                                                                                     left join sys_dict_data sdd2 on sdd2.dict_type='busi_material_type' and A.classify = sdd2.dict_value
+where order_id = 1 group by (A.color + A.classify)
\ No newline at end of file