合并信义源码提交入库首选项，方便娟姐改样式

fuxiaohan
1 parent 6c00a325
Showing 5 changed files with 317 additions and 19 deletions
src/main/java/com/huaheng/common/utils/VelocityUtils.java
src/main/java/com/huaheng/pc/config/receiptPreference/controller/ReceiptPreferenceController.java
src/main/resources/static/css/style.css
src/main/resources/templates/config/receiptPreference/list.html
src/main/resources/templates/config/receiptType/receiptType.html
@@ -166,9 +166,9 @@ public class VelocityUtils {
         } else if (template.contains("mapper.xml.vm")) {
             fileName = StringUtils.format("{}/{}Mapper.xml", mybatisPath, className);
         } else if (template.contains("list.html.vm")) {
-            fileName = StringUtils.format("{}/{}.html", htmlPath, businessName);
+            fileName = StringUtils.format("{}/list.html", htmlPath, businessName);
         } else if (template.contains("list-tree.html.vm")) {
-            fileName = StringUtils.format("{}/{}.html", htmlPath, businessName);
+            fileName = StringUtils.format("{}/list.html", htmlPath, businessName);
         } else if (template.contains("tree.html.vm")) {
             fileName = StringUtils.format("{}/tree.html", htmlPath);
         } else if (template.contains("add.html.vm")) {
@@ -40,7 +40,7 @@ public class ReceiptPreferenceController extends BaseController {
     @RequiresPermissions("config:receiptPreference:view")
     @GetMapping()
     public String bomHeader() {
-        return prefix + "/receiptPreference";
+        return prefix + "/list";
     }
  
     //@ApiOperation(value="查看入库首选项", notes="根据首选项编码、名称、入库流程、 入库类型、创建时间查询入库首选项", httpMethod = "POST")
@@ -717,18 +717,17 @@ body.canvas-menu.mini-navbar nav.navbar-static-side {
 }
  
 .btn-primary.disabled, .btn-primary.disabled:hover, .btn-primary.disabled:focus,  .btn-primary.disabled:active, .btn-primary.disabled.active,  .btn-primary[disabled], .btn-primary[disabled]:hover, .btn-primary[disabled]:focus,  .btn-primary[disabled]:active, .btn-primary.active[disabled], fieldset[disabled] .btn-primary,  fieldset[disabled] .btn-primary:hover, fieldset[disabled] .btn-primary:focus,  fieldset[disabled] .btn-primary:active, fieldset[disabled] .btn-primary.active {
-    background-color: #1dc5a3;
     border-color: #1dc5a3;
 }
  
 .btn-success {
-    background-color: #1c84c6;
+
     border-color: #1c84c6;
     color: #FFFFFF;
 }
  
 .btn-success:hover, .btn-success:focus, .btn-success:active,  .btn-success.active, .open .dropdown-toggle.btn-success {
-    background-color: #1a7bb9;
+
     border-color: #1a7bb9;
     color: #FFFFFF;
 }
@@ -738,18 +737,18 @@ body.canvas-menu.mini-navbar nav.navbar-static-side {
 }
  
 .btn-success.disabled, .btn-success.disabled:hover, .btn-success.disabled:focus,  .btn-success.disabled:active, .btn-success.disabled.active,  .btn-success[disabled], .btn-success[disabled]:hover, .btn-success[disabled]:focus,  .btn-success[disabled]:active, .btn-success.active[disabled], fieldset[disabled] .btn-success,  fieldset[disabled] .btn-success:hover, fieldset[disabled] .btn-success:focus,  fieldset[disabled] .btn-success:active, fieldset[disabled] .btn-success.active {
-    background-color: #1f90d8;
+
     border-color: #1f90d8;
 }
  
 .btn-info {
-    background-color: #23c6c8;
+
     border-color: #23c6c8;
     color: #FFFFFF;
 }
  
 .btn-info:hover, .btn-info:focus, .btn-info:active, .btn-info.active,  .open .dropdown-toggle.btn-info {
-    background-color: #21b9bb;
+
     border-color: #21b9bb;
     color: #FFFFFF;
 }
@@ -759,18 +758,18 @@ body.canvas-menu.mini-navbar nav.navbar-static-side {
 }
  
 .btn-info.disabled, .btn-info.disabled:hover, .btn-info.disabled:focus,  .btn-info.disabled:active, .btn-info.disabled.active, .btn-info[disabled],  .btn-info[disabled]:hover, .btn-info[disabled]:focus, .btn-info[disabled]:active,  .btn-info.active[disabled], fieldset[disabled] .btn-info, fieldset[disabled] .btn-info:hover,  fieldset[disabled] .btn-info:focus, fieldset[disabled] .btn-info:active,  fieldset[disabled] .btn-info.active {
-    background-color: #26d7d9;
+
     border-color: #26d7d9;
 }
  
 .btn-default {
-    background-color: #c2c2c2;
+
     border-color: #c2c2c2;
     color: #FFFFFF;
 }
  
 .btn-default:hover, .btn-default:focus, .btn-default:active,  .btn-default.active, .open .dropdown-toggle.btn-default {
-    background-color: #bababa;
+
     border-color: #bababa;
     color: #FFFFFF;
 }
@@ -780,18 +779,18 @@ body.canvas-menu.mini-navbar nav.navbar-static-side {
 }
  
 .btn-default.disabled, .btn-default.disabled:hover, .btn-default.disabled:focus,  .btn-default.disabled:active, .btn-default.disabled.active,  .btn-default[disabled], .btn-default[disabled]:hover, .btn-default[disabled]:focus,  .btn-default[disabled]:active, .btn-default.active[disabled], fieldset[disabled] .btn-default,  fieldset[disabled] .btn-default:hover, fieldset[disabled] .btn-default:focus,  fieldset[disabled] .btn-default:active, fieldset[disabled] .btn-default.active {
-    background-color: #cccccc;
+
     border-color: #cccccc;
 }
  
 .btn-warning {
-    background-color: #f8ac59;
+
     border-color: #f8ac59;
     color: #FFFFFF;
 }
  
 .btn-warning:hover, .btn-warning:focus, .btn-warning:active,  .btn-warning.active, .open .dropdown-toggle.btn-warning {
-    background-color: #f7a54a;
+
     border-color: #f7a54a;
     color: #FFFFFF;
 }
@@ -801,18 +800,18 @@ body.canvas-menu.mini-navbar nav.navbar-static-side {
 }
  
 .btn-warning.disabled, .btn-warning.disabled:hover, .btn-warning.disabled:focus,  .btn-warning.disabled:active, .btn-warning.disabled.active,  .btn-warning[disabled], .btn-warning[disabled]:hover, .btn-warning[disabled]:focus,  .btn-warning[disabled]:active, .btn-warning.active[disabled], fieldset[disabled] .btn-warning,  fieldset[disabled] .btn-warning:hover, fieldset[disabled] .btn-warning:focus,  fieldset[disabled] .btn-warning:active, fieldset[disabled] .btn-warning.active {
-    background-color: #f9b66d;
+
     border-color: #f9b66d;
 }
  
 .btn-danger {
-    background-color: #ed5565;
+
     border-color: #ed5565;
     color: #FFFFFF;
 }
  
 .btn-danger:hover, .btn-danger:focus, .btn-danger:active, .btn-danger.active,  .open .dropdown-toggle.btn-danger {
-    background-color: #ec4758;
+
     border-color: #ec4758;
     color: #FFFFFF;
 }
+<!DOCTYPE HTML>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<meta charset="utf-8">
+<head th:include="include :: header"></head>
+<body class="gray-bg">
+<div class="container-div">
+    <div class="row">
+        <div class="col-sm-12 select-info">
+            <form id="formId">
+                <div class="select-list">
+                    <ul>
+                        <li>
+                            <label>仓库：</label>
+                            <input type="text" name="warehousecode"/>
+                        </li>
+                        <li>
+                            <label>首选项代码：</label>
+                            <input type="text" name="code"/>
+                        </li>
+                        <li>
+                            <label>首选项名字：</label>
+                            <input type="text" name="name"/>
+                        </li>
+                        <li>
+                            <label>入库流程：</label>
+                            <input type="text" name="receivingflow"/>
+                        </li>
+                        <li>
+                            <label>自动生成托盘号：</label>
+                            <input type="text" name="autoassignlpn"/>
+                        </li>
+                        <li>
+                            <label>允许超收：</label>
+                            <select name="allowoverreceiving">
+                                <option value="">所有</option>
+                                <option value="-1">代码生成请选择字典属性</option>
+                            </select>
+                        </li>
+                        <li>
+                            <label>允许超收范围：</label>
+                            <input type="text" name="allowoverreceivingqty"/>
+                        </li>
+                        <li>
+                            <label>自动定位：</label>
+                            <input type="text" name="autolocate"/>
+                        </li>
+                        <li>
+                            <label>RF显示未收数量：</label>
+                            <input type="text" name="showopenqty"/>
+                        </li>
+                        <li>
+                            <label>RF组车收货：</label>
+                            <input type="text" name="groupputaway"/>
+                        </li>
+                        <li>
+                            <label>人工组盘：</label>
+                            <input type="text" name="manuallybuildlpn"/>
+                        </li>
+                        <li>
+                            <label>定位规则：</label>
+                            <input type="text" name="locationrule"/>
+                        </li>
+                        <li>
+                            <label>空库位规则：</label>
+                            <input type="text" name="emptylocrule"/>
+                        </li>
+                        <li>
+                            <label>RF逐件收货：</label>
+                            <input type="text" name="checkinbypiece"/>
+                        </li>
+                        <li>
+                            <label>RF自动提交收货：</label>
+                            <input type="text" name="piececonfirm"/>
+                        </li>
+                        <li>
+                            <label>abc分类 0 否 1是：</label>
+                            <input type="text" name="abcclass"/>
+                        </li>
+                        <li>
+                            <label>保质期：</label>
+                            <input type="text" name="daystoexpire"/>
+                        </li>
+                        <li>
+                            <label>临期预警：</label>
+                            <input type="text" name="expiringdays"/>
+                        </li>
+                        <li>
+                            <label>收货预警(天)：</label>
+                            <input type="text" name="minshelflifedays"/>
+                        </li>
+                        <li>
+                            <label>RF快速上架：</label>
+                            <input type="text" name="allowquickputaway"/>
+                        </li>
+                        <li>
+                            <label>属性模板：</label>
+                            <input type="text" name="attributetemplatecode"/>
+                        </li>
+                        <li>
+                            <label>快速入库：</label>
+                            <input type="text" name="usequickcheckin"/>
+                        </li>
+                        <li class="select-time">
+                            <label>创建时间：</label>
+                            <input type="text" class="time-input" id="startTime" placeholder="开始时间"
+                                   name="params[beginCreated]"/>
+                            <span>-</span>
+                            <input type="text" class="time-input" id="endTime" placeholder="结束时间"
+                                   name="params[endCreated]"/>
+                        </li>
+                        <li>
+                            <label>创建用户：</label>
+                            <input type="text" name="createdby"/>
+                        </li>
+                        <li class="select-time">
+                            <label>创建时间：</label>
+                            <input type="text" class="time-input" id="startTime" placeholder="开始时间"
+                                   name="params[beginLastupdated]"/>
+                            <span>-</span>
+                            <input type="text" class="time-input" id="endTime" placeholder="结束时间"
+                                   name="params[endLastupdated]"/>
+                        </li>
+                        <li>
+                            <label>更新用户：</label>
+                            <input type="text" name="lastupdatedby"/>
+                        </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 hidden-xs" id="toolbar" role="group">
+            <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()"
+               shiro:hasPermission="config:receiptPreference:add">
+                <i class="fa fa-plus"></i> 新增
+            </a>
+            <a class="btn btn-outline btn-primary " onclick="$.operate.editUrl()"
+               shiro:hasPermission="config:receiptPreference:edit">
+                <i class="fa fa-edit"></i> 修改
+            </a>
+            <a class="btn btn-outline btn-danger btn-rounded " onclick="$.operate.batRemove()"
+               shiro:hasPermission="config:receiptPreference:remove">
+                <i class="fa fa-trash-o"></i> 删除
+            </a>
+        </div>
+
+        <div class="col-sm-12 select-info table-striped">
+            <table id="bootstrap-table" data-mobile-responsive="true" class="table table-bordered table-hover"></table>
+        </div>
+    </div>
+
+</div>
+<div th:include="include :: footer"></div>
+<script th:inline="javascript">
+    var editFlag = [[${@permission.hasPermi('task:receiptPreference:edit')}]];
+    var removeFlag = [[${@permission.hasPermi('task:receiptPreference:remove')}]];
+    var prefix = ctx + "config/receiptPreference"
+
+    $(function () {
+        var options = {
+            url: prefix + "/list",
+            createUrl: prefix + "/add",
+            updateUrl: prefix + "/edit/{id}",
+            removeUrl: prefix + "/remove",
+            modalName: "入库首选",
+            columns: [{
+                checkbox: true
+            },
+                {
+                    field: 'id',
+                    title: 'ID',
+                    visible: false
+                },
+                {
+                    field: 'warehousecode',
+                    title: '仓库'
+                },
+                {
+                    field: 'code',
+                    title: '首选项代码'
+                },
+                {
+                    field: 'name',
+                    title: '首选项名字'
+                },
+                {
+                    field: 'receivingflow',
+                    title: '入库流程'
+                },
+                {
+                    field: 'autoassignlpn',
+                    title: '自动生成托盘号'
+                },
+                {
+                    field: 'allowoverreceiving',
+                    title: '允许超收'
+                },
+                {
+                    field: 'allowoverreceivingqty',
+                    title: '允许超收范围'
+                },
+                {
+                    field: 'autolocate',
+                    title: '自动定位'
+                },
+                {
+                    field: 'showopenqty',
+                    title: 'RF显示未收数量'
+                },
+                {
+                    field: 'groupputaway',
+                    title: 'RF组车收货'
+                },
+                {
+                    field: 'manuallybuildlpn',
+                    title: '人工组盘'
+                },
+                {
+                    field: 'locationrule',
+                    title: '定位规则'
+                },
+                {
+                    field: 'emptylocrule',
+                    title: '空库位规则'
+                },
+                {
+                    field: 'checkinbypiece',
+                    title: 'RF逐件收货'
+                },
+                {
+                    field: 'piececonfirm',
+                    title: 'RF自动提交收货'
+                },
+                {
+                    field: 'abcclass',
+                    title: 'abc分类 0 否  1是'
+                },
+                {
+                    field: 'daystoexpire',
+                    title: '保质期'
+                },
+                {
+                    field: 'expiringdays',
+                    title: '临期预警'
+                },
+                {
+                    field: 'minshelflifedays',
+                    title: '收货预警(天)'
+                },
+                {
+                    field: 'allowquickputaway',
+                    title: 'RF快速上架'
+                },
+                {
+                    field: 'attributetemplatecode',
+                    title: '属性模板'
+                },
+                {
+                    field: 'usequickcheckin',
+                    title: '快速入库'
+                },
+                {
+                    field: 'created',
+                    title: '创建时间'
+                },
+                {
+                    field: 'createdby',
+                    title: '创建用户'
+                },
+                {
+                    field: 'lastupdated',
+                    title: '创建时间'
+                },
+                {
+                    field: 'lastupdatedby',
+                    title: '更新用户'
+                },
+
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function (value, row, index) {
+                        var actions = [];
+
+                        return actions.join('');
+                    }
+                }]
+        };
+        $.table.init(options);
+    });
+</script>
+</body>
+</html>
 \ No newline at end of file
@@ -36,7 +36,7 @@
             </a>
         </div>
  
-        <div class="col-sm-12 select-info">
+        <div class="col-sm-12 select-info table-striped">
             <table id="bootstrap-table" data-mobile-responsive="true" class="table table-bordered table-hover"></table>
         </div>
         <div>