Commit 78afa0841c15e580d0fc7e3cf5db2f4f604f6afb

Authored by pengcheng
1 parent b8cd0774

波次界面

src/main/java/com/huaheng/pc/config/wave/domain/Wave.java
... ... @@ -118,14 +118,14 @@ public class Wave implements Serializable {
118 118 */
119 119 @TableField(value = "locked")
120 120 @ApiModelProperty(value="是否锁定")
121   - private Integer locked;
  121 + private Boolean locked;
122 122  
123 123 /**
124 124 * 是否需要补货
125 125 */
126 126 @TableField(value = "replenishmentReqd")
127 127 @ApiModelProperty(value="是否需要补货")
128   - private Integer replenishmentReqd;
  128 + private Boolean replenishmentReqd;
129 129  
130 130 /**
131 131 * 信息编码
... ...
src/main/java/com/huaheng/pc/config/waveMaster/domain/WaveMaster.java
... ... @@ -146,7 +146,7 @@ public class WaveMaster implements Serializable {
146 146 */
147 147 @TableField(value = "needReplenishment")
148 148 @ApiModelProperty(value="是否补货")
149   - private Integer needReplenishment;
  149 + private Boolean needReplenishment;
150 150  
151 151 /**
152 152 * 活动单补货分配规则
... ...
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
... ... @@ -248,6 +248,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
248 248 taskDetail.setWarehouseCode(task.getWarehouseCode());
249 249 taskDetail.setCompanyCode(task.getCompanyCode());
250 250 taskDetail.setTaskType(task.getTaskType());
  251 + taskDetail.setToInventoryId(shipmentContainerDetail.getInventoryId());
251 252 taskDetail.setAllocationId(shipmentContainerDetail.getId());
252 253 taskDetail.setBillCode(shipmentContainerDetail.getShipmentCode());
253 254 taskDetail.setBillDetailId(shipmentContainerDetail.getShipmentDetailId());
... ...
src/main/resources/mybatis/config/WaveMapper.xml
... ... @@ -17,8 +17,8 @@
17 17 <result column="completedAt" jdbcType="TIMESTAMP" property="completedAt" />
18 18 <result column="waveMode" jdbcType="VARCHAR" property="waveMode" />
19 19 <result column="errorMessage" jdbcType="VARCHAR" property="errorMessage" />
20   - <result column="locked" jdbcType="INTEGER" property="locked" />
21   - <result column="replenishmentReqd" jdbcType="INTEGER" property="replenishmentReqd" />
  20 + <result column="locked" jdbcType="BIT" property="locked" />
  21 + <result column="replenishmentReqd" jdbcType="BIT" property="replenishmentReqd" />
22 22 <result column="messageId" jdbcType="VARCHAR" property="messageId" />
23 23 <result column="runBy" jdbcType="VARCHAR" property="runBy" />
24 24 <result column="releasedBy" jdbcType="VARCHAR" property="releasedBy" />
... ...
src/main/resources/mybatis/config/WaveMasterMapper.xml
... ... @@ -21,7 +21,7 @@
21 21 <result column="maxRplnQty" jdbcType="INTEGER" property="maxRplnQty" />
22 22 <result column="groupingOrderBy" jdbcType="VARCHAR" property="groupingOrderBy" />
23 23 <result column="ruleAssignmentCode" jdbcType="VARCHAR" property="ruleAssignmentCode" />
24   - <result column="needReplenishment" jdbcType="INTEGER" property="needReplenishment" />
  24 + <result column="needReplenishment" jdbcType="BIT" property="needReplenishment" />
25 25 <result column="rplnAllocationRule" jdbcType="VARCHAR" property="rplnAllocationRule" />
26 26 <result column="rplnLocatingRule" jdbcType="VARCHAR" property="rplnLocatingRule" />
27 27 <result column="created" jdbcType="TIMESTAMP" property="created" />
... ...
src/main/resources/templates/config/wave/add.html 0 → 100644
  1 +<!DOCTYPE HTML>
  2 +<html lang="zh" xmlns:th="http://www.thymeleaf.org">
  3 +<meta charset="utf-8">
  4 +<head th:include="include :: header"></head>
  5 +<body class="white-bg">
  6 +<div class="wrapper wrapper-content animated fadeInRight ibox-content">
  7 + <form class="form-horizontal m" id="form-wave-add">
  8 + <div class="form-group">
  9 + <label class="col-sm-3 control-label">波次名称:</label>
  10 + <div class="col-sm-8">
  11 + <input id="waveName" name="waveName" class="form-control" type="text">
  12 + </div>
  13 + </div>
  14 + <div class="form-group">
  15 + <label class="col-sm-3 control-label">波次主表:</label>
  16 + <div class="col-sm-8">
  17 + <input id="masterCode" name="masterCode" class="form-control" type="text">
  18 + </div>
  19 + </div>
  20 + <div class="form-group">
  21 + <label class="col-sm-3 control-label">状态:</label>
  22 + <div class="col-sm-8">
  23 + <input id="status" name="status" class="form-control" type="text">
  24 + </div>
  25 + </div>
  26 + <div class="form-group">
  27 + <label class="col-sm-3 control-label">是否锁定:</label>
  28 + <div class="col-sm-8">
  29 + <div class="radio radio-info radio-inline" style="transform: scale(1.1, 1.1);">
  30 + <input type="radio" id="locked1" name="locked" value="true" checked="checked"
  31 + class="radio_select">
  32 + <label for="locked1">是</label>
  33 + </div>
  34 + <div class="radio radio-danger radio-inline " style="transform: scale(1.1, 1.1);">
  35 + <input type="radio" id="locked2" name="locked" value="false">
  36 + <label for="locked2">否</label>
  37 + </div>
  38 + </div>
  39 + </div>
  40 + <div class="form-group">
  41 + <label class="col-sm-3 control-label">是否需要补货:</label>
  42 + <div class="col-sm-8">
  43 + <div class="radio radio-info radio-inline" style="transform: scale(1.1, 1.1);">
  44 + <input type="radio" id="replenishmentReqd1" name="replenishmentReqd" value="true" checked="checked"
  45 + class="radio_select">
  46 + <label for="replenishmentReqd1">是</label>
  47 + </div>
  48 + <div class="radio radio-danger radio-inline " style="transform: scale(1.1, 1.1);">
  49 + <input type="radio" id="replenishmentReqd2" name="replenishmentReqd" value="false">
  50 + <label for="replenishmentReqd2">否</label>
  51 + </div>
  52 + </div>
  53 + </div>
  54 + <div class="form-group">
  55 + <label class="col-sm-3 control-label">波次模式:</label>
  56 + <div class="col-sm-8">
  57 + <input id="waveMode" name="waveMode" class="form-control" type="text">
  58 + </div>
  59 + </div>
  60 + <!--<div class="form-group">
  61 + <label class="col-sm-3 control-label">数据版本:</label>
  62 + <div class="col-sm-8">
  63 + <input id="version" name="version" class="form-control" type="text">
  64 + </div>
  65 + </div>-->
  66 + <!--<div class="form-group"> -->
  67 + <!--<label class="col-sm-3 control-label">创建时间:</label>-->
  68 + <!--<div class="col-sm-8">-->
  69 + <!--<input id="created" name="created" class="form-control" type="text">-->
  70 + <!--</div>-->
  71 + <!--</div>-->
  72 + <!--<div class="form-group"> -->
  73 + <!--<label class="col-sm-3 control-label">创建者:</label>-->
  74 + <!--<div class="col-sm-8">-->
  75 + <!--<input id="createdBy" name="createdBy" class="form-control" type="text">-->
  76 + <!--</div>-->
  77 + <!--</div>-->
  78 + <!--<div class="form-group"> -->
  79 + <!--<label class="col-sm-3 control-label">创建时间:</label>-->
  80 + <!--<div class="col-sm-8">-->
  81 + <!--<input id="lastUpdated" name="lastUpdated" class="form-control" type="text">-->
  82 + <!--</div>-->
  83 + <!--</div>-->
  84 + <!--<div class="form-group"> -->
  85 + <!--<label class="col-sm-3 control-label">更新者:</label>-->
  86 + <!--<div class="col-sm-8">-->
  87 + <!--<input id="lastUpdatedBy" name="lastUpdatedBy" class="form-control" type="text">-->
  88 + <!--</div>-->
  89 + <!--</div>-->
  90 + <!--<div class="form-group"> -->
  91 + <!--<label class="col-sm-3 control-label">是否有效:</label>-->
  92 + <!--<div class="col-sm-8">-->
  93 + <!--&lt;!&ndash;<input id="enable" name="enable" class="form-control" type="text">&ndash;&gt;-->
  94 + <!--<div class="onoffswitch">-->
  95 + <!--<input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable">-->
  96 + <!--<label class="onoffswitch-label" for="enable">-->
  97 + <!--<span class="onoffswitch-inner"></span>-->
  98 + <!--<span class="onoffswitch-switch"></span>-->
  99 + <!--</label>-->
  100 + <!--</div>-->
  101 + <!--</div>-->
  102 + <!--</div>-->
  103 + <!--<div class="form-group"> -->
  104 + <!--<label class="col-sm-3 control-label">是否删除:</label>-->
  105 + <!--<div class="col-sm-8">-->
  106 + <!--<input id="deleted" name="deleted" class="form-control" type="text">-->
  107 + <!--</div>-->
  108 + <!--</div>-->
  109 + <!--<div class="form-group"> -->
  110 + <!--<label class="col-sm-3 control-label">自定义字段1:</label>-->
  111 + <!--<div class="col-sm-8">-->
  112 + <!--<input id="userDef1" name="userDef1" class="form-control" type="text">-->
  113 + <!--</div>-->
  114 + <!--</div>-->
  115 + <!--<div class="form-group"> -->
  116 + <!--<label class="col-sm-3 control-label">自定义字段2:</label>-->
  117 + <!--<div class="col-sm-8">-->
  118 + <!--<input id="userDef2" name="userDef2" class="form-control" type="text">-->
  119 + <!--</div>-->
  120 + <!--</div>-->
  121 + <!--<div class="form-group"> -->
  122 + <!--<label class="col-sm-3 control-label">自定义字段3:</label>-->
  123 + <!--<div class="col-sm-8">-->
  124 + <!--<input id="userDef3" name="userDef3" class="form-control" type="text">-->
  125 + <!--</div>-->
  126 + <!--</div>-->
  127 + <!--<div class="form-group"> -->
  128 + <!--<label class="col-sm-3 control-label">自定义字段4:</label>-->
  129 + <!--<div class="col-sm-8">-->
  130 + <!--<input id="userDef4" name="userDef4" class="form-control" type="text">-->
  131 + <!--</div>-->
  132 + <!--</div>-->
  133 + <!--<div class="form-group"> -->
  134 + <!--<label class="col-sm-3 control-label">自定义字段5:</label>-->
  135 + <!--<div class="col-sm-8">-->
  136 + <!--<input id="userDef5" name="userDef5" class="form-control" type="text">-->
  137 + <!--</div>-->
  138 + <!--</div>-->
  139 + <div class="form-group">
  140 + <div class="form-control-static col-sm-offset-9">
  141 + <button type="submit" class="btn btn-primary">提交</button>
  142 + <button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
  143 + </div>
  144 + </div>
  145 + </form>
  146 +</div>
  147 +<div th:include="include::footer"></div>
  148 +<script type="text/javascript">
  149 + var prefix = ctx + "config/wave";
  150 + $("#form-wave-add").validate({
  151 + rules:{
  152 + waveName:{
  153 + required: true,
  154 + },
  155 + masterCode:{
  156 + required: true,
  157 + },
  158 + status:{
  159 + required: true,
  160 + },
  161 + locked:{
  162 + required: true,
  163 + },
  164 + replenishmentReqd:{
  165 + required: true,
  166 + },
  167 + waveMode: {
  168 + required: true,
  169 + }
  170 + },
  171 + submitHandler: function(form) {
  172 + var tableValue = $.common.getTableValue("#form-wave-add");
  173 + $.operate.save(prefix + "/add", tableValue);
  174 + }
  175 + });
  176 +</script>
  177 +</body>
  178 +</html>
... ...
src/main/resources/templates/config/wave/edit.html 0 → 100644
  1 +<!DOCTYPE HTML>
  2 +<html lang="zh" xmlns:th="http://www.thymeleaf.org">
  3 +<meta charset="utf-8">
  4 +<head th:include="include :: header"></head>
  5 +<body class="white-bg">
  6 +<div class="wrapper wrapper-content animated fadeInRight ibox-content" th:object="${wave}">
  7 + <form class="form-horizontal m" id="form-wave-edit">
  8 + <input name="id" th:field="*{id}">
  9 + <div class="form-group">
  10 + <label class="col-sm-3 control-label">波次名称:</label>
  11 + <div class="col-sm-8">
  12 + <input id="waveName" name="waveName" class="form-control" type="text" th:field="*{waveName}">
  13 + </div>
  14 + </div>
  15 + <div class="form-group">
  16 + <label class="col-sm-3 control-label">波次主表:</label>
  17 + <div class="col-sm-8">
  18 + <input id="masterCode" name="masterCode" class="form-control" type="text" th:field="*{masterCode}">
  19 + </div>
  20 + </div>
  21 + <div class="form-group">
  22 + <label class="col-sm-3 control-label">状态:</label>
  23 + <div class="col-sm-8">
  24 + <input id="status" name="status" class="form-control" type="text" th:field="*{status}">
  25 + </div>
  26 + </div>
  27 + <div class="form-group">
  28 + <label class="col-sm-3 control-label">是否锁定:</label>
  29 + <div class="col-sm-8">
  30 + <div class="radio radio-info radio-inline" style="transform: scale(1.1, 1.1);">
  31 + <input type="radio" id="locked1" name="locked" value="true" th:field="*{locked}"
  32 + class="radio_select">
  33 + <label for="locked1">是</label>
  34 + </div>
  35 + <div class="radio radio-danger radio-inline " style="transform: scale(1.1, 1.1);">
  36 + <input type="radio" id="locked2" name="locked" value="false" th:field="*{locked}">
  37 + <label for="locked2">否</label>
  38 + </div>
  39 + </div>
  40 + </div>
  41 + <div class="form-group">
  42 + <label class="col-sm-3 control-label">是否需要补货:</label>
  43 + <div class="col-sm-8">
  44 + <div class="radio radio-info radio-inline" style="transform: scale(1.1, 1.1);">
  45 + <input type="radio" id="replenishmentReqd1" name="replenishmentReqd" value="true" th:field="*{replenishmentReqd}"
  46 + class="radio_select">
  47 + <label for="replenishmentReqd1">是</label>
  48 + </div>
  49 + <div class="radio radio-danger radio-inline " style="transform: scale(1.1, 1.1);">
  50 + <input type="radio" id="replenishmentReqd2" name="replenishmentReqd" value="false" th:field="*{replenishmentReqd}">
  51 + <label for="replenishmentReqd2">否</label>
  52 + </div>
  53 + </div>
  54 + </div>
  55 + <div class="form-group">
  56 + <label class="col-sm-3 control-label">波次模式:</label>
  57 + <div class="col-sm-8">
  58 + <input id="waveMode" name="waveMode" class="form-control" type="text" th:field="*{waveMode}">
  59 + </div>
  60 + </div>
  61 + <!--<div class="form-group">
  62 + <label class="col-sm-3 control-label">数据版本:</label>
  63 + <div class="col-sm-8">
  64 + <input id="version" name="version" class="form-control" type="text">
  65 + </div>
  66 + </div>-->
  67 + <!--<div class="form-group"> -->
  68 + <!--<label class="col-sm-3 control-label">创建时间:</label>-->
  69 + <!--<div class="col-sm-8">-->
  70 + <!--<input id="created" name="created" class="form-control" type="text">-->
  71 + <!--</div>-->
  72 + <!--</div>-->
  73 + <!--<div class="form-group"> -->
  74 + <!--<label class="col-sm-3 control-label">创建者:</label>-->
  75 + <!--<div class="col-sm-8">-->
  76 + <!--<input id="createdBy" name="createdBy" class="form-control" type="text">-->
  77 + <!--</div>-->
  78 + <!--</div>-->
  79 + <!--<div class="form-group"> -->
  80 + <!--<label class="col-sm-3 control-label">创建时间:</label>-->
  81 + <!--<div class="col-sm-8">-->
  82 + <!--<input id="lastUpdated" name="lastUpdated" class="form-control" type="text">-->
  83 + <!--</div>-->
  84 + <!--</div>-->
  85 + <!--<div class="form-group"> -->
  86 + <!--<label class="col-sm-3 control-label">更新者:</label>-->
  87 + <!--<div class="col-sm-8">-->
  88 + <!--<input id="lastUpdatedBy" name="lastUpdatedBy" class="form-control" type="text">-->
  89 + <!--</div>-->
  90 + <!--</div>-->
  91 + <!--<div class="form-group"> -->
  92 + <!--<label class="col-sm-3 control-label">是否有效:</label>-->
  93 + <!--<div class="col-sm-8">-->
  94 + <!--&lt;!&ndash;<input id="enable" name="enable" class="form-control" type="text">&ndash;&gt;-->
  95 + <!--<div class="onoffswitch">-->
  96 + <!--<input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable">-->
  97 + <!--<label class="onoffswitch-label" for="enable">-->
  98 + <!--<span class="onoffswitch-inner"></span>-->
  99 + <!--<span class="onoffswitch-switch"></span>-->
  100 + <!--</label>-->
  101 + <!--</div>-->
  102 + <!--</div>-->
  103 + <!--</div>-->
  104 + <!--<div class="form-group"> -->
  105 + <!--<label class="col-sm-3 control-label">是否删除:</label>-->
  106 + <!--<div class="col-sm-8">-->
  107 + <!--<input id="deleted" name="deleted" class="form-control" type="text">-->
  108 + <!--</div>-->
  109 + <!--</div>-->
  110 + <!--<div class="form-group"> -->
  111 + <!--<label class="col-sm-3 control-label">自定义字段1:</label>-->
  112 + <!--<div class="col-sm-8">-->
  113 + <!--<input id="userDef1" name="userDef1" class="form-control" type="text">-->
  114 + <!--</div>-->
  115 + <!--</div>-->
  116 + <!--<div class="form-group"> -->
  117 + <!--<label class="col-sm-3 control-label">自定义字段2:</label>-->
  118 + <!--<div class="col-sm-8">-->
  119 + <!--<input id="userDef2" name="userDef2" class="form-control" type="text">-->
  120 + <!--</div>-->
  121 + <!--</div>-->
  122 + <!--<div class="form-group"> -->
  123 + <!--<label class="col-sm-3 control-label">自定义字段3:</label>-->
  124 + <!--<div class="col-sm-8">-->
  125 + <!--<input id="userDef3" name="userDef3" class="form-control" type="text">-->
  126 + <!--</div>-->
  127 + <!--</div>-->
  128 + <!--<div class="form-group"> -->
  129 + <!--<label class="col-sm-3 control-label">自定义字段4:</label>-->
  130 + <!--<div class="col-sm-8">-->
  131 + <!--<input id="userDef4" name="userDef4" class="form-control" type="text">-->
  132 + <!--</div>-->
  133 + <!--</div>-->
  134 + <!--<div class="form-group"> -->
  135 + <!--<label class="col-sm-3 control-label">自定义字段5:</label>-->
  136 + <!--<div class="col-sm-8">-->
  137 + <!--<input id="userDef5" name="userDef5" class="form-control" type="text">-->
  138 + <!--</div>-->
  139 + <!--</div>-->
  140 + <div class="form-group">
  141 + <div class="form-control-static col-sm-offset-9">
  142 + <button type="submit" class="btn btn-primary">提交</button>
  143 + <button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
  144 + </div>
  145 + </div>
  146 + </form>
  147 +</div>
  148 +<div th:include="include::footer"></div>
  149 +<script type="text/javascript">
  150 + var prefix = ctx + "config/wave";
  151 + $("#form-wave-edit").validate({
  152 + rules:{
  153 + waveName:{
  154 + required: true,
  155 + },
  156 + masterCode:{
  157 + required: true,
  158 + },
  159 + status:{
  160 + required: true,
  161 + },
  162 + locked:{
  163 + required: true,
  164 + },
  165 + replenishmentReqd:{
  166 + required: true,
  167 + },
  168 + waveMode: {
  169 + required: true,
  170 + }
  171 + },
  172 + submitHandler: function(form) {
  173 + var tableValue = $.common.getTableValue("#form-wave-edit");
  174 + $.operate.save(prefix + "/edit", tableValue);
  175 + }
  176 + });
  177 +</script>
  178 +</body>
  179 +</html>
... ...
src/main/resources/templates/config/wave/wave.html 0 → 100644
  1 +<!DOCTYPE HTML>
  2 +<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
  3 +<meta charset="utf-8">
  4 +<head th:include="include :: header"></head>
  5 +<body class="gray-bg">
  6 +<div class="container-div">
  7 + <div class="row">
  8 + <div class="col-sm-12 select-info">
  9 + <form id="wave-form">
  10 + <div class="select-list">
  11 + <ul>
  12 + <li>
  13 + 波次名称:<input type="text" name="waveName"/>
  14 + </li>
  15 + <li>
  16 + 波次主表:<input type="text" name="masterCode"/>
  17 + </li>
  18 + <li class="time">
  19 + <label>创建时间: </label>
  20 + <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/>
  21 + <span>-</span>
  22 + <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"/>
  23 + </li>
  24 + <li>
  25 + <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
  26 + <!--<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="system:role:export"><i class="fa fa-download"></i>&nbsp;导出</a>-->
  27 + </li>
  28 + </ul>
  29 + </div>
  30 + </form>
  31 + </div>
  32 + <div class="btn-group hidden-xs" id="toolbar" role="group">
  33 + <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="config:wave:add">
  34 + <i class="fa fa-plus"></i> 新增
  35 + </a>
  36 + <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="config:wave:remove">
  37 + <i class="fa fa-trash-o"></i> 删除
  38 + </a>
  39 + </div>
  40 +
  41 + <div class="col-sm-12 select-info">
  42 + <table id="bootstrap-table" data-mobile-responsive="true" class="table table-bordered table-hover"></table>
  43 + </div>
  44 + <div>
  45 + </div>
  46 + <div th:include="include :: footer"></div>
  47 + <script th:inline="javascript">
  48 + var editFlag = [[${@permission.hasPermi('config:wave:edit')}]];
  49 + var removeFlag = [[${@permission.hasPermi('config:wave:remove')}]];
  50 + var prefix = ctx + "config/wave";
  51 + var datas = [[${@dict.getType('sys_normal_disable')}]];
  52 + $(function() {
  53 + var options = {
  54 + url: prefix + "/list",
  55 + createUrl: prefix + "/add",
  56 + updateUrl: prefix + "/edit/{id}",
  57 + removeUrl: prefix + "/remove",
  58 + modalName: "波次",
  59 + search: false,
  60 + columns: [{
  61 + checkbox: true
  62 + },
  63 + {
  64 + field : 'id',
  65 + title : 'ID'
  66 + },
  67 + {
  68 + field : 'waveName',
  69 + title : '波次名称'
  70 + },
  71 + {
  72 + field : 'masterCode',
  73 + title : '波次主表'
  74 + },
  75 + {
  76 + field : 'status',
  77 + title : '状态'
  78 + },
  79 + {
  80 + field : 'warehouseCode',
  81 + title : '仓库编码',
  82 + visible : false
  83 + },
  84 + {
  85 + field : 'currentWaveStep',
  86 + title : '当前波次步骤',
  87 + },
  88 + {
  89 + field : 'lastWaveStep',
  90 + title : '上一波次步骤',
  91 + },
  92 + {
  93 + field : 'totalShipments',
  94 + title : '总单数',
  95 + },
  96 + {
  97 + field : 'totalLines',
  98 + title : '总行数'
  99 + },
  100 + {
  101 + field : 'totalQty',
  102 + title : '总数量'
  103 + },
  104 + {
  105 + field : 'locked',
  106 + title : '是否锁定',
  107 + formatter: function (value, item, index) {
  108 + if (value==true) {
  109 + return '<span class="badge" style="background-color: #00B83F;color: white;width: 36px;">' + ' 是 ' + '</span>';
  110 + }
  111 + else if (value==false) {
  112 + return '<span class="badge" style="background-color: #ff0000;color: white;width: 36px;">' + ' 否 ' + '</span>';
  113 + }
  114 + }
  115 + },
  116 + {
  117 + field : 'replenishmentReqd',
  118 + title : '是否需要补货',
  119 + formatter: function (value, item, index) {
  120 + if (value==true) {
  121 + return '<span class="badge" style="background-color: #00B83F;color: white;width: 36px;">' + ' 是 ' + '</span>';
  122 + }
  123 + else if (value==false) {
  124 + return '<span class="badge" style="background-color: #ff0000;color: white;width: 36px;">' + ' 否 ' + '</span>';
  125 + }
  126 + }
  127 + },
  128 + {
  129 + field : 'startedAt',
  130 + title : '波次开始时间'
  131 + },
  132 + {
  133 + field : 'completedAt',
  134 + title : '波次结束时间'
  135 + },
  136 + {
  137 + field : 'waveMode',
  138 + title : '波次模式'
  139 + },
  140 + {
  141 + field : 'errorMessage',
  142 + title : '错误信息'
  143 + },
  144 + {
  145 + field : 'runBy',
  146 + title : '信息编码'
  147 + },
  148 + {
  149 + field : 'created',
  150 + title : '创建时间',
  151 + visible : false
  152 + },
  153 + {
  154 + field : 'createdBy',
  155 + title : '创建用户',
  156 + visible : false
  157 + },
  158 + {
  159 + field : 'lastUpdated',
  160 + title : '更新时间',
  161 + visible : false
  162 + },
  163 + {
  164 + field : 'lastUpdatedBy',
  165 + title : '更新用户',
  166 + visible : false
  167 + },
  168 + {
  169 + field : 'version',
  170 + title : '数据版本',
  171 + visible : false
  172 + },
  173 + {
  174 + field : 'processStamp',
  175 + title : '处理标记',
  176 + visible : false
  177 + },
  178 + {
  179 + field : 'userDef1',
  180 + title : '自定义字段1' ,
  181 + visible:false
  182 + },
  183 + {
  184 + field : 'userDef2',
  185 + title : '自定义字段2' ,
  186 + visible:false
  187 + },
  188 + {
  189 + field : 'userDef3',
  190 + title : '自定义字段3' ,
  191 + visible:false
  192 + },
  193 + {
  194 + field : 'userDef4',
  195 + title : '自定义字段4' ,
  196 + visible:false
  197 + },
  198 + {
  199 + title: '操作',
  200 + align: 'center',
  201 + formatter: function(value, row, index) {
  202 + var actions = [];
  203 + actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')" ><i class="fa fa-edit"></i>编辑</a> ');
  204 + actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')" ><i class="fa fa-trash-o"></i>删除</a>');
  205 + return actions.join('');
  206 + }
  207 + }]
  208 + };
  209 + $.table.init(options);
  210 + });
  211 + </script>
  212 +</body>
  213 +</html>
0 214 \ No newline at end of file
... ...
src/main/resources/templates/config/waveFlowDetail/add.html 0 → 100644
  1 +<!DOCTYPE HTML>
  2 +<html lang="zh" xmlns:th="http://www.thymeleaf.org">
  3 +<meta charset="utf-8">
  4 +<head th:include="include :: header"></head>
  5 +<body class="white-bg">
  6 +<div class="wrapper wrapper-content animated fadeInRight ibox-content">
  7 + <form class="form-horizontal m" id="form-filterConfigDetail-add">
  8 + <input name="headerId" type="hidden" th:value="${headerId}">
  9 + <div class="form-group">
  10 + <label class="col-sm-3 control-label">编码:</label>
  11 + <div class="col-sm-8">
  12 + <input id="code" name="code" class="form-control" type="text">
  13 + </div>
  14 + </div>
  15 + <div class="form-group">
  16 + <label class="col-sm-3 control-label">模块:</label>
  17 + <div class="col-sm-8">
  18 + <input id="moduleType" name="moduleType" class="form-control" type="text">
  19 + </div>
  20 + </div>
  21 + <div class="form-group">
  22 + <label class="col-sm-3 control-label">类型:</label>
  23 + <div class="col-sm-8">
  24 + <input id="recordType" name="recordType" class="form-control" type="text">
  25 + </div>
  26 + </div>
  27 + <div class="form-group">
  28 + <label class="col-sm-3 control-label">条件名:</label>
  29 + <div class="col-sm-8">
  30 + <input id="filterCode" name="filterCode" class="form-control" type="text">
  31 + </div>
  32 + </div>
  33 + <div class="form-group">
  34 + <label class="col-sm-3 control-label">描述:</label>
  35 + <div class="col-sm-8">
  36 + <input id="description" name="description" class="form-control" type="text">
  37 + </div>
  38 + </div>
  39 + <div class="form-group">
  40 + <label class="col-sm-3 control-label">全SQL:</label>
  41 + <div class="col-sm-8">
  42 + <input id="statement" name="statement" class="form-control" type="text">
  43 + </div>
  44 + </div>
  45 + <div class="form-group">
  46 + <label class="col-sm-3 control-label">是否系统创建:</label>
  47 + <div class="col-sm-8">
  48 + <div class="radio radio-info radio-inline" style="transform: scale(1.1, 1.1);">
  49 + <input type="radio" id="systemCreated1" name="systemCreated" value="true" checked="checked"
  50 + class="radio_select">
  51 + <label for="systemCreated1">是</label>
  52 + </div>
  53 + <div class="radio radio-danger radio-inline " style="transform: scale(1.1, 1.1);">
  54 + <input type="radio" id="systemCreated2" name="systemCreated" value="false">
  55 + <label for="systemCreated2">否</label>
  56 + </div>
  57 + </div>
  58 + </div>
  59 + <div class="form-group">
  60 + <label class="col-sm-3 control-label">是否自定义SQL:</label>
  61 + <div class="col-sm-8">
  62 + <div class="radio radio-info radio-inline" style="transform: scale(1.1, 1.1);">
  63 + <input type="radio" id="customSql1" name="customSql" value="true" checked="checked"
  64 + class="radio_select">
  65 + <label for="customSql1">是</label>
  66 + </div>
  67 + <div class="radio radio-danger radio-inline " style="transform: scale(1.1, 1.1);">
  68 + <input type="radio" id="customSql2" name="customSql" value="false">
  69 + <label for="customSql2">否</label>
  70 + </div>
  71 + </div>
  72 + </div>
  73 + <div class="form-group">
  74 + <div class="form-control-static col-sm-offset-9">
  75 + <button type="submit" class="btn btn-primary">提交</button>
  76 + <button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
  77 + </div>
  78 + </div>
  79 + </form>
  80 +</div>
  81 +<div th:include="include::footer"></div>
  82 +<script type="text/javascript">
  83 + var prefix = ctx + "config/filterConfigDetail";
  84 + $("#form-filterConfigDetail-add").validate({
  85 + rules:{
  86 + code:{
  87 + required:true,
  88 + },
  89 + moduleType:{
  90 + required:true,
  91 + },
  92 + recordType:{
  93 + required:true,
  94 + },
  95 + filterCode:{
  96 + required:true,
  97 + },
  98 + },
  99 + submitHandler: function(form) {
  100 + // $.operate.save(prefix + "/add", $('#form-locationType-add').serialize());
  101 + var tableValue = $.common.getTableValue("#form-filterConfigDetail-add");
  102 + $.operate.save(prefix + "/add", tableValue);
  103 + }
  104 + });
  105 +</script>
  106 +</body>
  107 +</html>
... ...
src/main/resources/templates/config/waveFlowDetail/edit.html 0 → 100644
  1 +<!DOCTYPE HTML>
  2 +<html lang="zh" xmlns:th="http://www.thymeleaf.org">
  3 +<meta charset="utf-8">
  4 +<head th:include="include :: header"></head>
  5 +<body class="white-bg">
  6 +<div class="wrapper wrapper-content animated fadeInRight ibox-content">
  7 + <form class="form-horizontal m" id="form-filterConfigDetail-edit" th:object="${filterConfigDetail}">
  8 + <input name="id" type="hidden" th:field="*{id}">
  9 + <input name="headerId" type="hidden" th:field="*{headerId}">
  10 + <div class="form-group">
  11 + <label class="col-sm-3 control-label">编码:</label>
  12 + <div class="col-sm-8">
  13 + <input id="code" name="code" class="form-control" type="text" th:field="*{code}">
  14 + </div>
  15 + </div>
  16 + <div class="form-group">
  17 + <label class="col-sm-3 control-label">模块:</label>
  18 + <div class="col-sm-8">
  19 + <input id="moduleType" name="moduleType" class="form-control" type="text" th:field="*{moduleType}">
  20 + </div>
  21 + </div>
  22 + <div class="form-group">
  23 + <label class="col-sm-3 control-label">类型:</label>
  24 + <div class="col-sm-8">
  25 + <input id="recordType" name="recordType" class="form-control" type="text" th:field="*{recordType}">
  26 + </div>
  27 + </div>
  28 + <div class="form-group">
  29 + <label class="col-sm-3 control-label">条件名:</label>
  30 + <div class="col-sm-8">
  31 + <input id="filterCode" name="filterCode" class="form-control" type="text" th:field="*{filterCode}">
  32 + </div>
  33 + </div>
  34 + <div class="form-group">
  35 + <label class="col-sm-3 control-label">描述:</label>
  36 + <div class="col-sm-8">
  37 + <input id="description" name="description" class="form-control" type="text" th:field="*{description}">
  38 + </div>
  39 + </div>
  40 + <div class="form-group">
  41 + <label class="col-sm-3 control-label">全SQL:</label>
  42 + <div class="col-sm-8">
  43 + <input id="statement" name="statement" class="form-control" type="text" th:field="*{statement}">
  44 + </div>
  45 + </div>
  46 + <div class="form-group">
  47 + <label class="col-sm-3 control-label">是否系统创建:</label>
  48 + <div class="col-sm-8">
  49 + <div class="radio radio-info radio-inline" style="transform: scale(1.1, 1.1);">
  50 + <input type="radio" id="systemCreated1" name="systemCreated" value="true" th:field="*{systemCreated}"
  51 + class="radio_select">
  52 + <label for="systemCreated1">是</label>
  53 + </div>
  54 + <div class="radio radio-danger radio-inline " style="transform: scale(1.1, 1.1);">
  55 + <input type="radio" id="systemCreated2" name="systemCreated" value="false" th:field="*{systemCreated}">
  56 + <label for="systemCreated2">否</label>
  57 + </div>
  58 + </div>
  59 + </div>
  60 + <div class="form-group">
  61 + <label class="col-sm-3 control-label">是否自定义SQL:</label>
  62 + <div class="col-sm-8">
  63 + <div class="radio radio-info radio-inline" style="transform: scale(1.1, 1.1);">
  64 + <input type="radio" id="customSql1" name="customSql" value="true" th:field="*{customSql}"
  65 + class="radio_select">
  66 + <label for="customSql1">是</label>
  67 + </div>
  68 + <div class="radio radio-danger radio-inline " style="transform: scale(1.1, 1.1);">
  69 + <input type="radio" id="customSql2" name="customSql" value="false" th:field="*{customSql}">
  70 + <label for="customSql2">否</label>
  71 + </div>
  72 + </div>
  73 + </div>
  74 + <div class="form-group">
  75 + <div class="form-control-static col-sm-offset-9">
  76 + <button type="submit" class="btn btn-primary">提交</button>
  77 + <button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
  78 + </div>
  79 + </div>
  80 + </form>
  81 +</div>
  82 +<div th:include="include::footer"></div>
  83 +<script type="text/javascript">
  84 + var prefix = ctx + "config/filterConfigDetail";
  85 + $("#form-filterConfigDetail-edit").validate({
  86 + rules:{
  87 + code:{
  88 + required:true,
  89 + },
  90 + moduleType:{
  91 + required:true,
  92 + },
  93 + recordType:{
  94 + required:true,
  95 + },
  96 + filterCode:{
  97 + required:true,
  98 + },
  99 + },
  100 + submitHandler: function(form) {
  101 + // $.operate.save(prefix + "/add", $('#form-locationType-add').serialize());
  102 + var tableValue = $.common.getTableValue("#form-filterConfigDetail-edit");
  103 + $.operate.save(prefix + "/edit", tableValue);
  104 + }
  105 + });
  106 +</script>
  107 +</body>
  108 +</html>
... ...
src/main/resources/templates/config/waveFlowDetail/waveFlowDetail.html 0 → 100644
  1 +<!DOCTYPE HTML>
  2 +<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
  3 +<meta charset="utf-8">
  4 +<head th:include="include :: header"></head>
  5 +<body>
  6 +
  7 +<div class="btn-group hidden-xs" id="toolbar" role="group">
  8 + <a class="btn btn-outline btn-success btn-rounded" onclick="add()" shiro:hasPermission="config:waveFlowDetail:add">
  9 + <i class="fa fa-plus"></i> 新增
  10 + </a>
  11 + <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="config:waveFlowDetail:remove">
  12 + <i class="fa fa-trash-o"></i> 删除
  13 + </a>
  14 +</div>
  15 +<div class="col-sm-12">
  16 + <table id="bootstrap-table" data-mobile-responsive="true" class="table table-bordered table-hover"></table>
  17 +</div>
  18 +
  19 +
  20 +<div th:include="include :: footer"></div>
  21 +<script th:inline="javascript">
  22 + var prefix = ctx + "config/waveFlowDetail";
  23 + var editFlag = [[${@permission.hasPermi('config:waveFlowDetail:edit')}]];
  24 + var removeFlag = [[${@permission.hasPermi('config:waveFlowDetail:remove')}]];
  25 + var datas = [[${@dict.getType('sys_normal_disable')}]];
  26 + var nessaryDatas = [[${@dict.getType('nessary')}]];
  27 + $(function() {
  28 + var options = {
  29 + url: prefix + "/list",
  30 + createUrl: prefix + "/add",
  31 + updateUrl: prefix + "/edit/{id}",
  32 + removeUrl: prefix + "/remove",
  33 + modalName: "订单分析明细",
  34 + queryParams:function(params) {
  35 + return {
  36 + // 传递参数查询参数
  37 + headerId: [[${headerId}]],
  38 + pageSize: params.limit,
  39 + pageNum: params.offset / params.limit + 1,
  40 + searchValue: params.search,
  41 + orderByColumn: params.sort,
  42 + isAsc: params.order
  43 + };
  44 + },
  45 + search: false,
  46 + sortName: "id",
  47 + sortOrder: "desc",
  48 + columns: [{
  49 + checkbox: true
  50 + },
  51 + {
  52 + field : 'id',
  53 + title : 'id'
  54 + },
  55 + {
  56 + field : 'headerId',
  57 + title : '头表id',
  58 + visible: false
  59 + },
  60 + {
  61 + field : 'waveFlowCode',
  62 + title : '波次流程'
  63 + },
  64 + {
  65 + field : 'sequence',
  66 + title : '序号'
  67 + },
  68 + {
  69 + field : 'waveStepCode',
  70 + title : '波次步骤'
  71 + },
  72 + {
  73 + field : 'waveStepName',
  74 + title : '描述'
  75 + },
  76 + {
  77 + field : 'value1',
  78 + title : '参数1',
  79 + visible : false
  80 + },
  81 + {
  82 + field : 'value2',
  83 + title : '参数2',
  84 + visible : false
  85 + },
  86 + {
  87 + field : 'value3',
  88 + title : '参数3',
  89 + visible : false
  90 + },
  91 + {
  92 + field : 'created',
  93 + title : '创建时间'
  94 + },
  95 + {
  96 + field : 'createdBy',
  97 + title : '创建用户'
  98 + },
  99 + {
  100 + field : 'lastUpdated',
  101 + title : '更新时间'
  102 + },
  103 + {
  104 + field : 'lastUpdatedBy',
  105 + title : '更新用户'
  106 + },
  107 + {
  108 + field : 'userDef1',
  109 + title : '自定义字段1' ,
  110 + visible:false
  111 + },
  112 + {
  113 + field : 'userDef2',
  114 + title : '自定义字段2' ,
  115 + visible:false
  116 + },
  117 + {
  118 + field : 'userDef3',
  119 + title : '自定义字段3' ,
  120 + visible:false
  121 + },
  122 + {
  123 + title: '操作',
  124 + align: 'center',
  125 + formatter: function(value, row, index) {
  126 + var actions = [];
  127 + actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
  128 + actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a>');
  129 + return actions.join('');
  130 + }
  131 + }]
  132 + };
  133 + $.table.init(options);
  134 + });
  135 +
  136 + function add() {
  137 + var headerId = [[${headerId}]];
  138 + $.modal.open("添加流程明细", prefix + "/add/"+headerId);
  139 + }
  140 +</script>
  141 +</body>
  142 +</html>
0 143 \ No newline at end of file
... ...
src/main/resources/templates/config/waveFlowHeader/add.html 0 → 100644
  1 +<!DOCTYPE HTML>
  2 +<html lang="zh" xmlns:th="http://www.thymeleaf.org">
  3 +<meta charset="utf-8">
  4 +<head th:include="include :: header"></head>
  5 +<body class="white-bg">
  6 +<div class="wrapper wrapper-content animated fadeInRight ibox-content">
  7 + <form class="form-horizontal m" id="form-filterConfigHeader-add">
  8 + <div class="form-group">
  9 + <label class="col-sm-3 control-label">流程名称:</label>
  10 + <div class="col-sm-8">
  11 + <input id="code" name="code" class="form-control" type="text">
  12 + </div>
  13 + </div>
  14 + <div class="form-group">
  15 + <div class="form-control-static col-sm-offset-9">
  16 + <button type="submit" class="btn btn-primary">提交</button>
  17 + <button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
  18 + </div>
  19 + </div>
  20 + </form>
  21 +</div>
  22 +<div th:include="include::footer"></div>
  23 +<script type="text/javascript">
  24 + var prefix = ctx + "config/filterConfigHeader";
  25 + $("#form-filterConfigHeader-add").validate({
  26 + rules: {
  27 + code: {
  28 + required: true,
  29 + }
  30 + },
  31 + submitHandler: function (form) {
  32 + // $.operate.save(prefix + "/add", $('#form-locationType-add').serialize());
  33 + var tableValue = $.common.getTableValue("#form-filterConfigHeader-add");
  34 + $.operate.save(prefix + "/add", tableValue);
  35 + }
  36 + });
  37 +</script>
  38 +</body>
  39 +</html>
... ...
src/main/resources/templates/config/waveFlowHeader/edit.html 0 → 100644
  1 +<!DOCTYPE HTML>
  2 +<html lang="zh" xmlns:th="http://www.thymeleaf.org">
  3 +<meta charset="utf-8">
  4 +<head th:include="include :: header"></head>
  5 +<body class="white-bg">
  6 +<div class="wrapper wrapper-content animated fadeInRight ibox-content">
  7 + <form class="form-horizontal m" id="form-waveFlowHeader-edit" th:object="${waveFlowHeader}">
  8 + <input name="id" th:field="*{id}" type="hidden">
  9 + <div class="form-group">
  10 + <label class="col-sm-3 control-label">流程名称:</label>
  11 + <div class="col-sm-8">
  12 + <input id="code" name="code" class="form-control" type="text" th:field="*{code}">
  13 + </div>
  14 + </div>
  15 + <!--<div class="form-group">-->
  16 + <!--<label class="col-sm-3 control-label">是否系统创建:</label>-->
  17 + <!--<div class="col-sm-8">-->
  18 + <!--<div class="onoffswitch">-->
  19 + <!--<input type="checkbox" th:checked="${systemCreated}" class="onoffswitch-checkbox" id="systemCreated" name="systemCreated">-->
  20 + <!--<label class="onoffswitch-label" for="systemCreated">-->
  21 + <!--<span class="onoffswitch-inner"></span>-->
  22 + <!--<span class="onoffswitch-switch"></span>-->
  23 + <!--</label>-->
  24 + <!--</div>-->
  25 + <!--</div>-->
  26 + <!--</div>-->
  27 + <div class="form-group">
  28 + <div class="form-control-static col-sm-offset-9">
  29 + <button type="submit" class="btn btn-primary">提交</button>
  30 + <button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
  31 + </div>
  32 + </div>
  33 + </form>
  34 +</div>
  35 +<div th:include="include::footer"></div>
  36 +<script type="text/javascript">
  37 + var prefix = ctx + "config/waveFlowHeader";
  38 + $("#form-waveFlowHeader-edit").validate({
  39 + rules:{
  40 + code:{
  41 + required:true,
  42 + }
  43 + },
  44 + submitHandler: function(form) {
  45 + var tableValue = $.common.getTableValue("#form-waveFlowHeader-edit");
  46 + $.operate.save(prefix + "/edit", tableValue);
  47 + }
  48 + });
  49 +</script>
  50 +</body>
  51 +</html>
... ...
src/main/resources/templates/config/waveFlowHeader/waveFlowHeader.html 0 → 100644
  1 +<!DOCTYPE HTML>
  2 +<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
  3 +<meta charset="utf-8">
  4 +<head th:include="include :: header"></head>
  5 +<body class="gray-bg">
  6 +
  7 +<div class="container-div">
  8 + <div class="row">
  9 + <div class="col-sm-12 select-info">
  10 + <ul id="myTab" class="nav nav-tabs">
  11 + <li class="active"><a href="#tabHeader" data-toggle="tab">主表</a></li>
  12 + <li><a href="#tabDetail" data-toggle="tab">明细</a></li>
  13 + </ul>
  14 + <div id="myTabContent" class="tab-content">
  15 + <div class="tab-pane fade in active" id="tabHeader">
  16 + <div class="col-sm-12 select-info">
  17 + <form id="waveFlowHeader-form">
  18 + <div class="select-list">
  19 + <ul>
  20 + <li>
  21 + 流程名称:<input type="text" name="code"/>
  22 + </li>
  23 + <li class="time">
  24 + <label>创建时间: </label>
  25 + <input type="text" class="time-input" id="startTime" placeholder="开始时间"
  26 + name="createdBegin"/>
  27 + <span>-</span>
  28 + <input type="text" class="time-input" id="endTime" placeholder="结束时间"
  29 + name="createdEnd"/>
  30 + </li>
  31 + <li>
  32 + <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
  33 + class="fa fa-search"></i>&nbsp;搜索</a>
  34 + </li>
  35 + </ul>
  36 + </div>
  37 + </form>
  38 + </div>
  39 +
  40 +
  41 + <div class="btn-group hidden-xs" id="toolbar" role="group">
  42 + <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()"
  43 + shiro:hasPermission="config:waveFlowHeader:add">
  44 + <i class="fa fa-plus"></i> 新增
  45 + </a>
  46 + <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()"
  47 + shiro:hasPermission="config:waveFlowHeader:remove">
  48 + <i class="fa fa-trash-o"></i> 删除
  49 + </a>
  50 + </div>
  51 +
  52 + <table id="bootstrap-table" data-mobile-responsive="true" class="table table-bordered table-hover"></table>
  53 + </div>
  54 +
  55 + <div class="tab-pane fade" id="tabDetail">
  56 + <table id="bootstrap-table1" data-mobile-responsive="true"
  57 + class="table table-bordered table-hover"></table>
  58 + </div>
  59 + </div>
  60 + </div>
  61 + </div>
  62 +</div>
  63 +<div th:include="include :: footer"></div>
  64 +<script th:inline="javascript">
  65 + var prefix = ctx + "config/waveFlowHeader";
  66 + var prefix1 = ctx + "config/waveFlowDetail";
  67 + var editFlag = [[${@permission.hasPermi('config:waveFlowHeader:edit')}]];
  68 + var removeFlag = [[${@permission.hasPermi('config:waveFlowHeader:remove')}]];
  69 + var datas = [[${@dict.getType('sys_normal_disable')}]];
  70 +
  71 + $(function() {
  72 + var options = {
  73 + url: prefix + "/list",
  74 + createUrl: prefix + "/add",
  75 + updateUrl: prefix + "/edit/{id}",
  76 + removeUrl: prefix + "/remove",
  77 + modalName: "订单分析主表",
  78 + search: false,
  79 + sortName: "id",
  80 + sortOrder: "desc",
  81 + columns: [{
  82 + checkbox: true
  83 + },
  84 + {
  85 + field : 'id',
  86 + title : 'id'
  87 + },
  88 + {
  89 + field : 'code',
  90 + title : '流程名称'
  91 + },
  92 + {
  93 + field : 'version',
  94 + title : '数据版本',
  95 + visible : false
  96 + },
  97 + {
  98 + field : 'processStamp',
  99 + title : '处理标记',
  100 + visible : false
  101 + },
  102 + {
  103 + field : 'created',
  104 + title : '创建时间',
  105 + visible : false
  106 + },
  107 + {
  108 + field : 'createdBy',
  109 + title : '创建用户',
  110 + visible : false
  111 + },
  112 + {
  113 + field : 'lastUpdated',
  114 + title : '更新时间',
  115 + visible : false
  116 + },
  117 + {
  118 + field : 'lastUpdatedBy',
  119 + title : '更新用户',
  120 + visible : false
  121 + },
  122 + {
  123 + field : 'userDef1',
  124 + title : '自定义字段1' ,
  125 + visible:false
  126 + },
  127 + {
  128 + field : 'userDef2',
  129 + title : '自定义字段2' ,
  130 + visible:false
  131 + },
  132 + {
  133 + field : 'userDef3',
  134 + title : '自定义字段3' ,
  135 + visible:false
  136 + },
  137 + {
  138 + title: '操作',
  139 + align: 'center',
  140 + formatter: function(value, row, index) {
  141 + var actions = [];
  142 + actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
  143 + actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a>');
  144 + return actions.join('');
  145 + }
  146 + }]
  147 + };
  148 + $.table.init(options);
  149 + });
  150 +
  151 + function detail(id, code) {
  152 + var url = prefix1+"/list/" + id;
  153 + createtable(url);
  154 + }
  155 +
  156 + function createtable(url) {
  157 + $("#tabDetail").children().remove();
  158 + $("#myTab li").removeClass("active");
  159 + var height = $(document).height()-100 + 'px';
  160 + var str = '<iframe class="huaheng_iframe" name="iframe" width="100%" height="' + height + '" src="' + url + '" frameborder="0" data-id="' + url + '" seamless></iframe>';
  161 + $("#tabDetail").append(str);
  162 + $(".tab-pane").removeClass("in active");
  163 + $("#myTab li:eq(1)").addClass("active");
  164 + $("#tabDetail").addClass("in active");
  165 + }
  166 +</script>
  167 +</body>
  168 +</html>
0 169 \ No newline at end of file
... ...
src/main/resources/templates/config/waveMaster/add.html 0 → 100644
  1 +<!DOCTYPE HTML>
  2 +<html lang="zh" xmlns:th="http://www.thymeleaf.org">
  3 +<meta charset="utf-8">
  4 +<head th:include="include :: header"></head>
  5 +<body class="white-bg">
  6 +<div class="wrapper wrapper-content animated fadeInRight ibox-content">
  7 + <form class="form-horizontal m" id="form-waveMaster-add">
  8 + <div class="form-group">
  9 + <label class="col-sm-3 control-label">主表名称:</label>
  10 + <div class="col-sm-8">
  11 + <input id="code" name="code" class="form-control" type="text">
  12 + </div>
  13 + </div>
  14 + <div class="form-group">
  15 + <label class="col-sm-3 control-label">排序:</label>
  16 + <div class="col-sm-8">
  17 + <input id="sequence" name="sequence" class="form-control" type="text">
  18 + </div>
  19 + </div>
  20 + <div class="form-group">
  21 + <label class="col-sm-3 control-label">出库单条件:</label>
  22 + <div class="col-sm-8">
  23 + <input id="shipmentFilterCode" name="shipmentFilterCode" class="form-control" type="text">
  24 + </div>
  25 + </div>
  26 + <div class="form-group">
  27 + <label class="col-sm-3 control-label">波次流程:</label>
  28 + <div class="col-sm-8">
  29 + <input id="waveFlowCode" name="waveFlowCode" class="form-control" type="text">
  30 + </div>
  31 + </div>
  32 + <div class="form-group">
  33 + <label class="col-sm-3 control-label">状态流程:</label>
  34 + <div class="col-sm-8">
  35 + <input id="statusFlowCode" name="statusFlowCode" class="form-control" type="text">
  36 + </div>
  37 + </div>
  38 + <div class="form-group">
  39 + <label class="col-sm-3 control-label">缺货模式:</label>
  40 + <div class="col-sm-8">
  41 + <input id="shortMode" name="shortMode" class="form-control" type="text">
  42 + </div>
  43 + </div>
  44 + <div class="form-group">
  45 + <label class="col-sm-3 control-label">订单数限制:</label>
  46 + <div class="col-sm-8">
  47 + <input id="maxShipments" name="maxShipments" class="form-control" type="text">
  48 + </div>
  49 + </div>
  50 + <div class="form-group">
  51 + <label class="col-sm-3 control-label">行数限制数量:</label>
  52 + <div class="col-sm-8">
  53 + <input id="maxLines" name="maxLines" class="form-control" type="text">
  54 + </div>
  55 + </div>
  56 + <div class="form-group">
  57 + <label class="col-sm-3 control-label">默认波次创建数量:</label>
  58 + <div class="col-sm-8">
  59 + <input id="defaultWaveCreateSize" name="defaultWaveCreateSize" class="form-control" type="text">
  60 + </div>
  61 + </div>
  62 + <div class="form-group">
  63 + <label class="col-sm-3 control-label">订单分组大小:</label>
  64 + <div class="col-sm-8">
  65 + <input id="shipmentGroupSize" name="shipmentGroupSize" class="form-control" type="text">
  66 + </div>
  67 + </div>
  68 + <div class="form-group">
  69 + <label class="col-sm-3 control-label">是否补货:</label>
  70 + <div class="col-sm-8">
  71 + <div class="radio radio-info radio-inline" style="transform: scale(1.1, 1.1);">
  72 + <input type="radio" id="needReplenishment1" name="needReplenishment" value="true" checked="checked"
  73 + class="radio_select">
  74 + <label for="needReplenishment1">是</label>
  75 + </div>
  76 + <div class="radio radio-danger radio-inline " style="transform: scale(1.1, 1.1);">
  77 + <input type="radio" id="needReplenishment2" name="needReplenishment" value="false">
  78 + <label for="needReplenishment2">否</label>
  79 + </div>
  80 + </div>
  81 + </div>
  82 + <div class="form-group">
  83 + <label class="col-sm-3 control-label">取消波次时保留补货任务:</label>
  84 + <div class="col-sm-8">
  85 + <input id="holdRplnTask" name="holdRplnTask" class="form-control" type="text">
  86 + </div>
  87 + </div>
  88 + <!--<div class="form-group">
  89 + <label class="col-sm-3 control-label">数据版本:</label>
  90 + <div class="col-sm-8">
  91 + <input id="version" name="version" class="form-control" type="text">
  92 + </div>
  93 + </div>-->
  94 + <!--<div class="form-group"> -->
  95 + <!--<label class="col-sm-3 control-label">创建时间:</label>-->
  96 + <!--<div class="col-sm-8">-->
  97 + <!--<input id="created" name="created" class="form-control" type="text">-->
  98 + <!--</div>-->
  99 + <!--</div>-->
  100 + <!--<div class="form-group"> -->
  101 + <!--<label class="col-sm-3 control-label">创建者:</label>-->
  102 + <!--<div class="col-sm-8">-->
  103 + <!--<input id="createdBy" name="createdBy" class="form-control" type="text">-->
  104 + <!--</div>-->
  105 + <!--</div>-->
  106 + <!--<div class="form-group"> -->
  107 + <!--<label class="col-sm-3 control-label">创建时间:</label>-->
  108 + <!--<div class="col-sm-8">-->
  109 + <!--<input id="lastUpdated" name="lastUpdated" class="form-control" type="text">-->
  110 + <!--</div>-->
  111 + <!--</div>-->
  112 + <!--<div class="form-group"> -->
  113 + <!--<label class="col-sm-3 control-label">更新者:</label>-->
  114 + <!--<div class="col-sm-8">-->
  115 + <!--<input id="lastUpdatedBy" name="lastUpdatedBy" class="form-control" type="text">-->
  116 + <!--</div>-->
  117 + <!--</div>-->
  118 + <!--<div class="form-group"> -->
  119 + <!--<label class="col-sm-3 control-label">是否有效:</label>-->
  120 + <!--<div class="col-sm-8">-->
  121 + <!--&lt;!&ndash;<input id="enable" name="enable" class="form-control" type="text">&ndash;&gt;-->
  122 + <!--<div class="onoffswitch">-->
  123 + <!--<input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable">-->
  124 + <!--<label class="onoffswitch-label" for="enable">-->
  125 + <!--<span class="onoffswitch-inner"></span>-->
  126 + <!--<span class="onoffswitch-switch"></span>-->
  127 + <!--</label>-->
  128 + <!--</div>-->
  129 + <!--</div>-->
  130 + <!--</div>-->
  131 + <!--<div class="form-group"> -->
  132 + <!--<label class="col-sm-3 control-label">是否删除:</label>-->
  133 + <!--<div class="col-sm-8">-->
  134 + <!--<input id="deleted" name="deleted" class="form-control" type="text">-->
  135 + <!--</div>-->
  136 + <!--</div>-->
  137 + <!--<div class="form-group"> -->
  138 + <!--<label class="col-sm-3 control-label">自定义字段1:</label>-->
  139 + <!--<div class="col-sm-8">-->
  140 + <!--<input id="userDef1" name="userDef1" class="form-control" type="text">-->
  141 + <!--</div>-->
  142 + <!--</div>-->
  143 + <!--<div class="form-group"> -->
  144 + <!--<label class="col-sm-3 control-label">自定义字段2:</label>-->
  145 + <!--<div class="col-sm-8">-->
  146 + <!--<input id="userDef2" name="userDef2" class="form-control" type="text">-->
  147 + <!--</div>-->
  148 + <!--</div>-->
  149 + <!--<div class="form-group"> -->
  150 + <!--<label class="col-sm-3 control-label">自定义字段3:</label>-->
  151 + <!--<div class="col-sm-8">-->
  152 + <!--<input id="userDef3" name="userDef3" class="form-control" type="text">-->
  153 + <!--</div>-->
  154 + <!--</div>-->
  155 + <!--<div class="form-group"> -->
  156 + <!--<label class="col-sm-3 control-label">自定义字段4:</label>-->
  157 + <!--<div class="col-sm-8">-->
  158 + <!--<input id="userDef4" name="userDef4" class="form-control" type="text">-->
  159 + <!--</div>-->
  160 + <!--</div>-->
  161 + <!--<div class="form-group"> -->
  162 + <!--<label class="col-sm-3 control-label">自定义字段5:</label>-->
  163 + <!--<div class="col-sm-8">-->
  164 + <!--<input id="userDef5" name="userDef5" class="form-control" type="text">-->
  165 + <!--</div>-->
  166 + <!--</div>-->
  167 + <div class="form-group">
  168 + <div class="form-control-static col-sm-offset-9">
  169 + <button type="submit" class="btn btn-primary">提交</button>
  170 + <button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
  171 + </div>
  172 + </div>
  173 + </form>
  174 +</div>
  175 +<div th:include="include::footer"></div>
  176 +<script type="text/javascript">
  177 + var prefix = ctx + "config/waveMaster";
  178 + $("#form-waveMaster-add").validate({
  179 + rules:{
  180 + code:{
  181 + required: true,
  182 + },
  183 + sequence:{
  184 + required: true,
  185 + },
  186 + shipmentFilterCode:{
  187 + required: true,
  188 + },
  189 + waveFlowCode:{
  190 + required: true,
  191 + },
  192 + statusFlowCode:{
  193 + required: true,
  194 + },
  195 + shortMode: {
  196 + required: true,
  197 + },
  198 + maxShipments: {
  199 + required: true,
  200 + },
  201 + maxLines: {
  202 + required: true,
  203 + },
  204 + defaultWaveCreateSize: {
  205 + required: true,
  206 + },
  207 + shipmentGroupSize: {
  208 + required: true,
  209 + },
  210 + holdRplnTask: {
  211 + required: true,
  212 + },
  213 + needReplenishment: {
  214 + required: true,
  215 + }
  216 + },
  217 + submitHandler: function(form) {
  218 + var tableValue = $.common.getTableValue("#form-waveMaster-add");
  219 + $.operate.save(prefix + "/add", tableValue);
  220 + }
  221 + });
  222 +</script>
  223 +</body>
  224 +</html>
... ...
src/main/resources/templates/config/waveMaster/edit.html 0 → 100644
  1 +<!DOCTYPE HTML>
  2 +<html lang="zh" xmlns:th="http://www.thymeleaf.org">
  3 +<meta charset="utf-8">
  4 +<head th:include="include :: header"></head>
  5 +<body class="white-bg">
  6 +<div class="wrapper wrapper-content animated fadeInRight ibox-content" th:object="${waveMaster}">
  7 + <form class="form-horizontal m" id="form-waveMaster-edit">
  8 + <input name="id" th:field="*{id}">
  9 + <div class="form-group">
  10 + <label class="col-sm-3 control-label">主表名称:</label>
  11 + <div class="col-sm-8">
  12 + <input id="code" name="code" class="form-control" type="text" th:field="*{code}">
  13 + </div>
  14 + </div>
  15 + <div class="form-group">
  16 + <label class="col-sm-3 control-label">排序:</label>
  17 + <div class="col-sm-8">
  18 + <input id="sequence" name="sequence" class="form-control" type="text" th:field="*{sequence}">
  19 + </div>
  20 + </div>
  21 + <div class="form-group">
  22 + <label class="col-sm-3 control-label">出库单条件:</label>
  23 + <div class="col-sm-8">
  24 + <input id="shipmentFilterCode" name="shipmentFilterCode" class="form-control" type="text" th:field="*{shipmentFilterCode}">
  25 + </div>
  26 + </div>
  27 + <div class="form-group">
  28 + <label class="col-sm-3 control-label">波次流程:</label>
  29 + <div class="col-sm-8">
  30 + <input id="waveFlowCode" name="waveFlowCode" class="form-control" type="text" th:field="*{waveFlowCode}">
  31 + </div>
  32 + </div>
  33 + <div class="form-group">
  34 + <label class="col-sm-3 control-label">状态流程:</label>
  35 + <div class="col-sm-8">
  36 + <input id="statusFlowCode" name="statusFlowCode" class="form-control" type="text" th:field="*{statusFlowCode}">
  37 + </div>
  38 + </div>
  39 + <div class="form-group">
  40 + <label class="col-sm-3 control-label">缺货模式:</label>
  41 + <div class="col-sm-8">
  42 + <input id="shortMode" name="shortMode" class="form-control" type="text" th:field="*{shortMode}">
  43 + </div>
  44 + </div>
  45 + <div class="form-group">
  46 + <label class="col-sm-3 control-label">订单数限制:</label>
  47 + <div class="col-sm-8">
  48 + <input id="maxShipments" name="maxShipments" class="form-control" type="text" th:field="*{maxShipments}">
  49 + </div>
  50 + </div>
  51 + <div class="form-group">
  52 + <label class="col-sm-3 control-label">行数限制数量:</label>
  53 + <div class="col-sm-8">
  54 + <input id="maxLines" name="maxLines" class="form-control" type="text" th:field="*{maxLines}">
  55 + </div>
  56 + </div>
  57 + <div class="form-group">
  58 + <label class="col-sm-3 control-label">默认波次创建数量:</label>
  59 + <div class="col-sm-8">
  60 + <input id="defaultWaveCreateSize" name="defaultWaveCreateSize" class="form-control" type="text" th:field="*{defaultWaveCreateSize}">
  61 + </div>
  62 + </div>
  63 + <div class="form-group">
  64 + <label class="col-sm-3 control-label">订单分组大小:</label>
  65 + <div class="col-sm-8">
  66 + <input id="shipmentGroupSize" name="shipmentGroupSize" class="form-control" type="text" th:field="*{shipmentGroupSize}">
  67 + </div>
  68 + </div>
  69 + <div class="form-group">
  70 + <label class="col-sm-3 control-label">是否补货:</label>
  71 + <div class="col-sm-8">
  72 + <div class="radio radio-info radio-inline" style="transform: scale(1.1, 1.1);">
  73 + <input type="radio" id="needReplenishment1" name="needReplenishment" value="true" th:field="*{needReplenishment}"
  74 + class="radio_select">
  75 + <label for="needReplenishment1">是</label>
  76 + </div>
  77 + <div class="radio radio-danger radio-inline " style="transform: scale(1.1, 1.1);">
  78 + <input type="radio" id="needReplenishment2" name="needReplenishment" value="false" th:field="*{needReplenishment}">
  79 + <label for="needReplenishment2">否</label>
  80 + </div>
  81 + </div>
  82 + </div>
  83 + <div class="form-group">
  84 + <label class="col-sm-3 control-label">取消波次时保留补货任务:</label>
  85 + <div class="col-sm-8">
  86 + <input id="holdRplnTask" name="holdRplnTask" class="form-control" type="text" th:field="*{holdRplnTask}">
  87 + </div>
  88 + </div>
  89 + <!--<div class="form-group">
  90 + <label class="col-sm-3 control-label">数据版本:</label>
  91 + <div class="col-sm-8">
  92 + <input id="version" name="version" class="form-control" type="text">
  93 + </div>
  94 + </div>-->
  95 + <!--<div class="form-group"> -->
  96 + <!--<label class="col-sm-3 control-label">创建时间:</label>-->
  97 + <!--<div class="col-sm-8">-->
  98 + <!--<input id="created" name="created" class="form-control" type="text">-->
  99 + <!--</div>-->
  100 + <!--</div>-->
  101 + <!--<div class="form-group"> -->
  102 + <!--<label class="col-sm-3 control-label">创建者:</label>-->
  103 + <!--<div class="col-sm-8">-->
  104 + <!--<input id="createdBy" name="createdBy" class="form-control" type="text">-->
  105 + <!--</div>-->
  106 + <!--</div>-->
  107 + <!--<div class="form-group"> -->
  108 + <!--<label class="col-sm-3 control-label">创建时间:</label>-->
  109 + <!--<div class="col-sm-8">-->
  110 + <!--<input id="lastUpdated" name="lastUpdated" class="form-control" type="text">-->
  111 + <!--</div>-->
  112 + <!--</div>-->
  113 + <!--<div class="form-group"> -->
  114 + <!--<label class="col-sm-3 control-label">更新者:</label>-->
  115 + <!--<div class="col-sm-8">-->
  116 + <!--<input id="lastUpdatedBy" name="lastUpdatedBy" class="form-control" type="text">-->
  117 + <!--</div>-->
  118 + <!--</div>-->
  119 + <!--<div class="form-group"> -->
  120 + <!--<label class="col-sm-3 control-label">是否有效:</label>-->
  121 + <!--<div class="col-sm-8">-->
  122 + <!--&lt;!&ndash;<input id="enable" name="enable" class="form-control" type="text">&ndash;&gt;-->
  123 + <!--<div class="onoffswitch">-->
  124 + <!--<input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable">-->
  125 + <!--<label class="onoffswitch-label" for="enable">-->
  126 + <!--<span class="onoffswitch-inner"></span>-->
  127 + <!--<span class="onoffswitch-switch"></span>-->
  128 + <!--</label>-->
  129 + <!--</div>-->
  130 + <!--</div>-->
  131 + <!--</div>-->
  132 + <!--<div class="form-group"> -->
  133 + <!--<label class="col-sm-3 control-label">是否删除:</label>-->
  134 + <!--<div class="col-sm-8">-->
  135 + <!--<input id="deleted" name="deleted" class="form-control" type="text">-->
  136 + <!--</div>-->
  137 + <!--</div>-->
  138 + <!--<div class="form-group"> -->
  139 + <!--<label class="col-sm-3 control-label">自定义字段1:</label>-->
  140 + <!--<div class="col-sm-8">-->
  141 + <!--<input id="userDef1" name="userDef1" class="form-control" type="text">-->
  142 + <!--</div>-->
  143 + <!--</div>-->
  144 + <!--<div class="form-group"> -->
  145 + <!--<label class="col-sm-3 control-label">自定义字段2:</label>-->
  146 + <!--<div class="col-sm-8">-->
  147 + <!--<input id="userDef2" name="userDef2" class="form-control" type="text">-->
  148 + <!--</div>-->
  149 + <!--</div>-->
  150 + <!--<div class="form-group"> -->
  151 + <!--<label class="col-sm-3 control-label">自定义字段3:</label>-->
  152 + <!--<div class="col-sm-8">-->
  153 + <!--<input id="userDef3" name="userDef3" class="form-control" type="text">-->
  154 + <!--</div>-->
  155 + <!--</div>-->
  156 + <!--<div class="form-group"> -->
  157 + <!--<label class="col-sm-3 control-label">自定义字段4:</label>-->
  158 + <!--<div class="col-sm-8">-->
  159 + <!--<input id="userDef4" name="userDef4" class="form-control" type="text">-->
  160 + <!--</div>-->
  161 + <!--</div>-->
  162 + <!--<div class="form-group"> -->
  163 + <!--<label class="col-sm-3 control-label">自定义字段5:</label>-->
  164 + <!--<div class="col-sm-8">-->
  165 + <!--<input id="userDef5" name="userDef5" class="form-control" type="text">-->
  166 + <!--</div>-->
  167 + <!--</div>-->
  168 + <div class="form-group">
  169 + <div class="form-control-static col-sm-offset-9">
  170 + <button type="submit" class="btn btn-primary">提交</button>
  171 + <button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
  172 + </div>
  173 + </div>
  174 + </form>
  175 +</div>
  176 +<div th:include="include::footer"></div>
  177 +<script type="text/javascript">
  178 + var prefix = ctx + "config/waveMaster";
  179 + $("#form-waveMaster-edit").validate({
  180 + rules:{
  181 + code:{
  182 + required: true,
  183 + },
  184 + sequence:{
  185 + required: true,
  186 + },
  187 + shipmentFilterCode:{
  188 + required: true,
  189 + },
  190 + waveFlowCode:{
  191 + required: true,
  192 + },
  193 + statusFlowCode:{
  194 + required: true,
  195 + },
  196 + shortMode: {
  197 + required: true,
  198 + },
  199 + maxShipments: {
  200 + required: true,
  201 + },
  202 + maxLines: {
  203 + required: true,
  204 + },
  205 + defaultWaveCreateSize: {
  206 + required: true,
  207 + },
  208 + shipmentGroupSize: {
  209 + required: true,
  210 + },
  211 + holdRplnTask: {
  212 + required: true,
  213 + },
  214 + needReplenishment: {
  215 + required: true,
  216 + }
  217 + },
  218 + submitHandler: function(form) {
  219 + var tableValue = $.common.getTableValue("#form-waveMaster-edit");
  220 + $.operate.save(prefix + "/edit", tableValue);
  221 + }
  222 + });
  223 +</script>
  224 +</body>
  225 +</html>
... ...
src/main/resources/templates/config/waveMaster/waveMaster.html 0 → 100644
  1 +<!DOCTYPE HTML>
  2 +<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
  3 +<meta charset="utf-8">
  4 +<head th:include="include :: header"></head>
  5 +<body class="gray-bg">
  6 +<div class="container-div">
  7 + <div class="row">
  8 + <div class="col-sm-12 select-info">
  9 + <form id="waveMaster-form">
  10 + <div class="select-list">
  11 + <ul>
  12 + <li>
  13 + 编码:<input type="text" name="code"/>
  14 + </li>
  15 + <li>
  16 + 出库单条件:<input type="text" name="shipmentFilterCode"/>
  17 + </li>
  18 + <li>
  19 + 波次流程:<input type="text" name="waveFlowCode"/>
  20 + </li>
  21 + <li class="time">
  22 + <label>创建时间: </label>
  23 + <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/>
  24 + <span>-</span>
  25 + <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"/>
  26 + </li>
  27 + <li>
  28 + <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
  29 + <!--<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="system:role:export"><i class="fa fa-download"></i>&nbsp;导出</a>-->
  30 + </li>
  31 + </ul>
  32 + </div>
  33 + </form>
  34 + </div>
  35 + <div class="btn-group hidden-xs" id="toolbar" role="group">
  36 + <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="config:waveMaster:add">
  37 + <i class="fa fa-plus"></i> 新增
  38 + </a>
  39 + <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="config:waveMaster:remove">
  40 + <i class="fa fa-trash-o"></i> 删除
  41 + </a>
  42 + </div>
  43 +
  44 + <div class="col-sm-12 select-info">
  45 + <table id="bootstrap-table" data-mobile-responsive="true" class="table table-bordered table-hover"></table>
  46 + </div>
  47 + <div>
  48 + </div>
  49 + <div th:include="include :: footer"></div>
  50 + <script th:inline="javascript">
  51 + var editFlag = [[${@permission.hasPermi('config:waveMaster:edit')}]];
  52 + var removeFlag = [[${@permission.hasPermi('config:waveMaster:remove')}]];
  53 + var prefix = ctx + "config/waveMaster";
  54 + var datas = [[${@dict.getType('sys_normal_disable')}]];
  55 + $(function() {
  56 + var options = {
  57 + url: prefix + "/list",
  58 + createUrl: prefix + "/add",
  59 + updateUrl: prefix + "/edit/{id}",
  60 + removeUrl: prefix + "/remove",
  61 + modalName: "波次主表",
  62 + search: false,
  63 + columns: [{
  64 + checkbox: true
  65 + },
  66 + {
  67 + field : 'id',
  68 + title : 'ID'
  69 + },
  70 + {
  71 + field : 'code',
  72 + title : '主表名称'
  73 + },
  74 + {
  75 + field : 'sequence',
  76 + title : '排序'
  77 + },
  78 + {
  79 + field : 'shipmentFilterCode',
  80 + title : '出库单条件'
  81 + },
  82 + {
  83 + field : 'warehouseCode',
  84 + title : '仓库编码',
  85 + visible : false
  86 + },
  87 + {
  88 + field : 'waveFlowCode',
  89 + title : '波次流程',
  90 + },
  91 + {
  92 + field : 'statusFlowCode',
  93 + title : '状态流程',
  94 + },
  95 + {
  96 + field : 'shortMode',
  97 + title : '缺货模式',
  98 + },
  99 + {
  100 + field : 'maxShipments',
  101 + title : '缺货模式'
  102 + },
  103 + {
  104 + field : 'needReplenishment',
  105 + title : '是否补货',
  106 + formatter: function (value, item, index) {
  107 + if (value==true) {
  108 + return '<span class="badge" style="background-color: #00B83F;color: white;width: 36px;">' + ' 是 ' + '</span>';
  109 + }
  110 + else if (value==false) {
  111 + return '<span class="badge" style="background-color: #ff0000;color: white;width: 36px;">' + ' 否 ' + '</span>';
  112 + }
  113 + }
  114 + },
  115 + {
  116 + field : 'maxShipments',
  117 + title : '订单数限制'
  118 + },
  119 + {
  120 + field : 'maxLines',
  121 + title : '行数限制数量'
  122 + },
  123 + {
  124 + field : 'defaultWaveCreateSize',
  125 + title : '默认波次创建数量'
  126 + },
  127 + {
  128 + field : 'shipmentGroupSize',
  129 + title : '订单分组大小'
  130 + },
  131 + {
  132 + field : 'holdRplnTask',
  133 + title : '取消波次时保留补货任务'
  134 + },
  135 + {
  136 + field : 'created',
  137 + title : '创建时间',
  138 + visible : false
  139 + },
  140 + {
  141 + field : 'createdBy',
  142 + title : '创建用户',
  143 + visible : false
  144 + },
  145 + {
  146 + field : 'lastUpdated',
  147 + title : '更新时间',
  148 + visible : false
  149 + },
  150 + {
  151 + field : 'lastUpdatedBy',
  152 + title : '更新用户',
  153 + visible : false
  154 + },
  155 + {
  156 + field : 'version',
  157 + title : '数据版本',
  158 + visible : false
  159 + },
  160 + {
  161 + field : 'processStamp',
  162 + title : '处理标记',
  163 + visible : false
  164 + },
  165 + {
  166 + field : 'userDef1',
  167 + title : '自定义字段1' ,
  168 + visible:false
  169 + },
  170 + {
  171 + field : 'userDef2',
  172 + title : '自定义字段2' ,
  173 + visible:false
  174 + },
  175 + {
  176 + field : 'userDef3',
  177 + title : '自定义字段3' ,
  178 + visible:false
  179 + },
  180 + {
  181 + field : 'userDef4',
  182 + title : '自定义字段4' ,
  183 + visible:false
  184 + },
  185 + {
  186 + title: '操作',
  187 + align: 'center',
  188 + formatter: function(value, row, index) {
  189 + var actions = [];
  190 + actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')" ><i class="fa fa-edit"></i>编辑</a> ');
  191 + actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')" ><i class="fa fa-trash-o"></i>删除</a>');
  192 + return actions.join('');
  193 + }
  194 + }]
  195 + };
  196 + $.table.init(options);
  197 + });
  198 + </script>
  199 +</body>
  200 +</html>
0 201 \ No newline at end of file
... ...