wms / wms_tianjinggelinmei · Commits

Commit 06f991e511d473e039f1c94aff16d8231e4e4353

Authored by pengcheng
2 parents 527d8272 bf18d9cd

Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop

Inline Side-by-side
Showing 7 changed files with 193 additions and 233 deletions
src/main/java/com/huaheng/pc/config/cycleCountPreference/controller/cycleCountPreferenceController.java
  View file @06f991e
@@ -103,12 +103,10 @@ public class cycleCountPreferenceController extends BaseController { @@ -103,12 +103,10 @@ public class cycleCountPreferenceController extends BaseController {
103 @PostMapping("/addSave") 103 @PostMapping("/addSave")
104 @ResponseBody 104 @ResponseBody
105 public AjaxResult addSave(CycleCountPreference cycleCountPreference) { 105 public AjaxResult addSave(CycleCountPreference cycleCountPreference) {
106 - cycleCountPreference.setWarehouseCode(ShiroUtils.getWarehouseCode());  
107 - cycleCountPreference.setCreatedBy(ShiroUtils.getLoginName());  
108 - cycleCountPreference.setCreated(new Date());  
109 - cycleCountPreference.setLastUpdatedBy(ShiroUtils.getLoginName());  
110 -  
111 - return toAjax(cycleCountPreferenceService.save(cycleCountPreference)); 106 + if(cycleCountPreference == null){
  107 + return AjaxResult.error("新增数据不能为空！");
  108 + }
  109 + return cycleCountPreferenceService.addSave(cycleCountPreference);
112 } 110 }
113 111
114 /** 112 /**
src/main/java/com/huaheng/pc/config/cycleCountPreference/domain/CycleCountPreference.java
  View file @06f991e
@@ -81,8 +81,8 @@ public class CycleCountPreference implements Serializable { @@ -81,8 +81,8 @@ public class CycleCountPreference implements Serializable {
81 /** 81 /**
82 * 有效 82 * 有效
83 */ 83 */
84 - @TableField(value = "Enable")  
85 - @ApiModelProperty(value="有效") 84 + @TableField(value = "enable")
  85 + @ApiModelProperty(value="是否有效")
86 private Boolean enable; 86 private Boolean enable;
87 87
88 /** 88 /**
src/main/java/com/huaheng/pc/config/cycleCountPreference/service/CycleCountPreferenceService.java
  View file @06f991e
1 package com.huaheng.pc.config.cycleCountPreference.service; 1 package com.huaheng.pc.config.cycleCountPreference.service;
2 2
  3 +import com.huaheng.common.utils.security.ShiroUtils;
  4 +import com.huaheng.framework.web.domain.AjaxResult;
  5 +import com.huaheng.pc.inventory.cycleCountDetail.domain.CycleCountDetail;
  6 +import com.huaheng.pc.inventory.cycleCountDetail.service.CycleCountDetailService;
3 import org.springframework.stereotype.Service; 7 import org.springframework.stereotype.Service;
4 import javax.annotation.Resource; 8 import javax.annotation.Resource;
  9 +import java.util.Date;
5 import java.util.List; 10 import java.util.List;
6 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 11 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
7 import com.huaheng.pc.config.cycleCountPreference.mapper.CycleCountPreferenceMapper; 12 import com.huaheng.pc.config.cycleCountPreference.mapper.CycleCountPreferenceMapper;
8 import com.huaheng.pc.config.cycleCountPreference.domain.CycleCountPreference; 13 import com.huaheng.pc.config.cycleCountPreference.domain.CycleCountPreference;
  14 +import org.springframework.transaction.annotation.Transactional;
  15 +
9 @Service 16 @Service
10 public class CycleCountPreferenceService extends ServiceImpl<CycleCountPreferenceMapper, CycleCountPreference> { 17 public class CycleCountPreferenceService extends ServiceImpl<CycleCountPreferenceMapper, CycleCountPreference> {
11 18
  19 +
  20 + @Resource
  21 + private CycleCountDetailService cycleCountDetailService;
  22 +
  23 +
  24 +
  25 +
  26 + /**
  27 + *新增盘点首选项
  28 + * @param cycleCountPreference
  29 + * @return
  30 + */
  31 + @Transactional
  32 + public AjaxResult addSave (CycleCountPreference cycleCountPreference){
  33 +
  34 + cycleCountPreference.setWarehouseCode(ShiroUtils.getWarehouseCode());
  35 + cycleCountPreference.setCreatedBy(ShiroUtils.getLoginName());
  36 + cycleCountPreference.setCreated(new Date());
  37 + cycleCountPreference.setLastUpdatedBy(ShiroUtils.getLoginName());
  38 + this.save(cycleCountPreference);
  39 + return AjaxResult.success("新增完成！");
  40 + }
  41 +
  42 +
  43 +
  44 +
  45 +
  46 +
  47 +
  48 +
12 } 49 }
src/main/resources/mybatis/config/CycleCountPreferenceMapper.xml
  View file @06f991e
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 <result column="promptItem" jdbcType="BOOLEAN" property="promptItem" /> 12 <result column="promptItem" jdbcType="BOOLEAN" property="promptItem" />
13 <result column="promptQuantity" jdbcType="BOOLEAN" property="promptQuantity" /> 13 <result column="promptQuantity" jdbcType="BOOLEAN" property="promptQuantity" />
14 <result column="allowAddNewInventory" jdbcType="BOOLEAN" property="allowAddNewInventory" /> 14 <result column="allowAddNewInventory" jdbcType="BOOLEAN" property="allowAddNewInventory" />
15 - <result column="Enable" jdbcType="BOOLEAN" property="enable" /> 15 + <result column="enable" jdbcType="BOOLEAN" property="enable" />
16 <result column="created" jdbcType="TIMESTAMP" property="created" /> 16 <result column="created" jdbcType="TIMESTAMP" property="created" />
17 <result column="createdBy" jdbcType="VARCHAR" property="createdBy" /> 17 <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
18 <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" /> 18 <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
@@ -27,7 +27,7 @@ @@ -27,7 +27,7 @@
27 <sql id="Base_Column_List"> 27 <sql id="Base_Column_List">
28 <!--@mbg.generated--> 28 <!--@mbg.generated-->
29 id, code, `name`, warehouseCode, promptLocation, promptLpn, promptItem, promptQuantity, 29 id, code, `name`, warehouseCode, promptLocation, promptLpn, promptItem, promptQuantity,
30 - allowAddNewInventory, `Enable`, created, createdBy, lastUpdated, lastUpdatedBy, version, 30 + allowAddNewInventory, enable, created, createdBy, lastUpdated, lastUpdatedBy, version,
31 userDef1, userDef2, userDef3, processStamp, countByPiece 31 userDef1, userDef2, userDef3, processStamp, countByPiece
32 </sql> 32 </sql>
33 </mapper> 33 </mapper>
34 \ No newline at end of file 34 \ No newline at end of file
src/main/resources/templates/config/cycleCountPreference/add.html
  View file @06f991e
1 <!DOCTYPE HTML> 1 <!DOCTYPE HTML>
2 -<html lang="zh" xmlns:th="http://www.thymeleaf.org"> 2 +<html lang="zh" xmlns:th="http://www.thymeleaf.org">
3 <meta charset="utf-8"> 3 <meta charset="utf-8">
4 <head th:include="include :: header"></head> 4 <head th:include="include :: header"></head>
5 <body class="white-bg"> 5 <body class="white-bg">
@@ -22,7 +22,8 @@ @@ -22,7 +22,8 @@
22 <label class="col-sm-3 control-label">系统提示库位：</label> 22 <label class="col-sm-3 control-label">系统提示库位：</label>
23 <div class="col-sm-8"> 23 <div class="col-sm-8">
24 <div class="onoffswitch"> 24 <div class="onoffswitch">
25 - <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="promptLocation" name="promptLocation"> 25 + <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="promptLocation"
  26 + name="promptLocation">
26 <label class="onoffswitch-label" for="promptLocation"> 27 <label class="onoffswitch-label" for="promptLocation">
27 <span class="onoffswitch-inner"></span> 28 <span class="onoffswitch-inner"></span>
28 <span class="onoffswitch-switch"></span> 29 <span class="onoffswitch-switch"></span>
@@ -35,7 +36,8 @@ @@ -35,7 +36,8 @@
35 <label class="col-sm-3 control-label">系统提示容器：</label> 36 <label class="col-sm-3 control-label">系统提示容器：</label>
36 <div class="col-sm-8"> 37 <div class="col-sm-8">
37 <div class="onoffswitch"> 38 <div class="onoffswitch">
38 - <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="promptLpn" name="promptLpn"> 39 + <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="promptLpn"
  40 + name="promptLpn">
39 <label class="onoffswitch-label" for="promptLpn"> 41 <label class="onoffswitch-label" for="promptLpn">
40 <span class="onoffswitch-inner"></span> 42 <span class="onoffswitch-inner"></span>
41 <span class="onoffswitch-switch"></span> 43 <span class="onoffswitch-switch"></span>
@@ -48,8 +50,9 @@ @@ -48,8 +50,9 @@
48 <label class="col-sm-3 control-label">系统提示物料：</label> 50 <label class="col-sm-3 control-label">系统提示物料：</label>
49 <div class="col-sm-8"> 51 <div class="col-sm-8">
50 <div class="onoffswitch"> 52 <div class="onoffswitch">
51 - <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="promptItem" name="promptItem">  
52 - <label class="onoffswitch-label" for="promptLpn"> 53 + <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="promptItem"
  54 + name="promptItem">
  55 + <label class="onoffswitch-label" for="promptItem">
53 <span class="onoffswitch-inner"></span> 56 <span class="onoffswitch-inner"></span>
54 <span class="onoffswitch-switch"></span> 57 <span class="onoffswitch-switch"></span>
55 </label> 58 </label>
@@ -60,120 +63,29 @@ @@ -60,120 +63,29 @@
60 <div class="form-group"> 63 <div class="form-group">
61 <label class="col-sm-3 control-label">显示库存数量：</label> 64 <label class="col-sm-3 control-label">显示库存数量：</label>
62 <div class="col-sm-8"> 65 <div class="col-sm-8">
63 - <div class="onoffswitch">  
64 - <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="promptQuantity" name="promptQuantity">  
65 - <label class="onoffswitch-label" for="promptQuantity">  
66 - <span class="onoffswitch-inner"></span>  
67 - <span class="onoffswitch-switch"></span>  
68 - </label>  
69 - </div> 66 + <div class="onoffswitch">
  67 + <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="promptQuantity"
  68 + name="promptQuantity">
  69 + <label class="onoffswitch-label" for="promptQuantity">
  70 + <span class="onoffswitch-inner"></span>
  71 + <span class="onoffswitch-switch"></span>
  72 + </label>
  73 + </div>
70 </div> 74 </div>
71 </div> 75 </div>
72 -  
73 -<!-- <div class="form-group">  
74 - <label class="col-sm-3 control-label">允许添加库存：</label>  
75 - <div class="col-sm-8">  
76 - <div class="onoffswitch">  
77 - <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="allowAddNewInventory" name="allowAddNewInventory">  
78 - <label class="onoffswitch-label" for="allowAddNewInventory">  
79 - <span class="onoffswitch-inner"></span>  
80 - <span class="onoffswitch-switch"></span>  
81 - </label>  
82 - </div>  
83 - </div>  
84 - </div>-->  
85 -  
86 -<!-- <div class="form-group">  
87 - <label class="col-sm-3 control-label">RF逐件盘点：</label> 76 + <div class="form-group">
  77 + <label class="col-sm-3 control-label">是否有效：</label>
88 <div class="col-sm-8"> 78 <div class="col-sm-8">
89 <div class="onoffswitch"> 79 <div class="onoffswitch">
90 - <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="countByPiece" name="countByPiece">  
91 - <label class="onoffswitch-label" for="countByPiece"> 80 + <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable"
  81 + name="enable">
  82 + <label class="onoffswitch-label" for="enable">
92 <span class="onoffswitch-inner"></span> 83 <span class="onoffswitch-inner"></span>
93 <span class="onoffswitch-switch"></span> 84 <span class="onoffswitch-switch"></span>
94 </label> 85 </label>
95 </div> 86 </div>
96 </div> 87 </div>
97 - </div>-->  
98 -  
99 - <!--<div class="form-group">  
100 - <label class="col-sm-3 control-label">数据版本：</label>  
101 - <div class="col-sm-8">  
102 - <input id="version" name="version" class="form-control" type="text">  
103 - </div>  
104 - </div>-->  
105 - <!--<div class="form-group"> -->  
106 - <!--<label class="col-sm-3 control-label">创建时间：</label>-->  
107 - <!--<div class="col-sm-8">-->  
108 - <!--<input id="created" name="created" class="form-control" type="text">-->  
109 - <!--</div>-->  
110 - <!--</div>-->  
111 - <!--<div class="form-group"> -->  
112 - <!--<label class="col-sm-3 control-label">创建者：</label>-->  
113 - <!--<div class="col-sm-8">-->  
114 - <!--<input id="createdBy" name="createdBy" class="form-control" type="text">-->  
115 - <!--</div>-->  
116 - <!--</div>-->  
117 - <!--<div class="form-group"> -->  
118 - <!--<label class="col-sm-3 control-label">创建时间：</label>-->  
119 - <!--<div class="col-sm-8">-->  
120 - <!--<input id="lastUpdated" name="lastUpdated" class="form-control" type="text">-->  
121 - <!--</div>-->  
122 - <!--</div>-->  
123 - <!--<div class="form-group"> -->  
124 - <!--<label class="col-sm-3 control-label">更新者：</label>-->  
125 - <!--<div class="col-sm-8">-->  
126 - <!--<input id="lastUpdatedBy" name="lastUpdatedBy" class="form-control" type="text">-->  
127 - <!--</div>-->  
128 - <!--</div>-->  
129 - <div class="form-group">  
130 - <label class="col-sm-3 control-label">是否有效：</label>  
131 - <div class="col-sm-8">  
132 - <div class="onoffswitch">  
133 - <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable">  
134 - <label class="onoffswitch-label" for="enable">  
135 - <span class="onoffswitch-inner"></span>  
136 - <span class="onoffswitch-switch"></span>  
137 - </label>  
138 </div> 88 </div>
139 - </div>  
140 - </div>  
141 - <!--<div class="form-group"> -->  
142 - <!--<label class="col-sm-3 control-label">是否删除：</label>-->  
143 - <!--<div class="col-sm-8">-->  
144 - <!--<input id="deleted" name="deleted" class="form-control" type="text">-->  
145 - <!--</div>-->  
146 - <!--</div>-->  
147 - <!--<div class="form-group"> -->  
148 - <!--<label class="col-sm-3 control-label">自定义字段1：</label>-->  
149 - <!--<div class="col-sm-8">-->  
150 - <!--<input id="userDef1" name="userDef1" class="form-control" type="text">-->  
151 - <!--</div>-->  
152 - <!--</div>-->  
153 - <!--<div class="form-group"> -->  
154 - <!--<label class="col-sm-3 control-label">自定义字段2：</label>-->  
155 - <!--<div class="col-sm-8">-->  
156 - <!--<input id="userDef2" name="userDef2" class="form-control" type="text">-->  
157 - <!--</div>-->  
158 - <!--</div>-->  
159 - <!--<div class="form-group"> -->  
160 - <!--<label class="col-sm-3 control-label">自定义字段3：</label>-->  
161 - <!--<div class="col-sm-8">-->  
162 - <!--<input id="userDef3" name="userDef3" class="form-control" type="text">-->  
163 - <!--</div>-->  
164 - <!--</div>-->  
165 - <!--<div class="form-group"> -->  
166 - <!--<label class="col-sm-3 control-label">自定义字段4：</label>-->  
167 - <!--<div class="col-sm-8">-->  
168 - <!--<input id="userDef4" name="userDef4" class="form-control" type="text">-->  
169 - <!--</div>-->  
170 - <!--</div>-->  
171 - <!--<div class="form-group"> -->  
172 - <!--<label class="col-sm-3 control-label">自定义字段5：</label>-->  
173 - <!--<div class="col-sm-8">-->  
174 - <!--<input id="userDef5" name="userDef5" class="form-control" type="text">-->  
175 - <!--</div>-->  
176 - <!--</div>-->  
177 <div class="form-group"> 89 <div class="form-group">
178 <div class="form-control-static col-sm-offset-9"> 90 <div class="form-control-static col-sm-offset-9">
179 <input type="submit" class="btn btn-primary" value="提交"> 91 <input type="submit" class="btn btn-primary" value="提交">
@@ -186,32 +98,22 @@ @@ -186,32 +98,22 @@
186 <script type="text/javascript"> 98 <script type="text/javascript">
187 var prefix = ctx + "config/cycleCountPreference"; 99 var prefix = ctx + "config/cycleCountPreference";
188 $("#form-cycleCountPreference-add").validate({ 100 $("#form-cycleCountPreference-add").validate({
189 - rules:{  
190 - code:{  
191 - required: true,  
192 - },  
193 - name:{ 101 + rules: {
  102 + code: {
194 required: true, 103 required: true,
195 }, 104 },
196 - promptLocation:{ 105 + name: {
197 required: true, 106 required: true,
198 }, 107 },
199 - promptLpn:{  
200 - required: true,  
201 - },  
202 - promptItem:{  
203 - required: true,  
204 - },  
205 - promptQuantity: {  
206 - required: true,  
207 - },  
208 - allowAddNewInventory: {  
209 - required: true,  
210 - } 108 +
211 }, 109 },
212 - submitHandler: function(form) { 110 + submitHandler: function (form) {
213 var tableValue = $.common.getTableValue("#form-cycleCountPreference-add"); 111 var tableValue = $.common.getTableValue("#form-cycleCountPreference-add");
214 - //tableValue = formValueReplace(tableValue, "allowOverReceiving", $("input[name='allowOverReceiving']").is(':checked')); 112 + tableValue = formValueReplace(tableValue, "promptLocation", $("input[name='promptLocation']").is(':checked'));
  113 + tableValue = formValueReplace(tableValue, "promptLpn", $("input[name='promptLpn']").is(':checked'));
  114 + tableValue = formValueReplace(tableValue, "promptItem", $("input[name='promptItem']").is(':checked'));
  115 + tableValue = formValueReplace(tableValue, "promptQuantity", $("input[name='promptQuantity']").is(':checked'));
  116 + tableValue = formValueReplace(tableValue, "enable", $("input[name='enable']").is(':checked'));
215 $.operate.save(prefix + "/addSave", tableValue); 117 $.operate.save(prefix + "/addSave", tableValue);
216 } 118 }
217 }); 119 });
src/main/resources/templates/config/cycleCountPreference/cycleCountPreference.html
  View file @06f991e
@@ -90,29 +90,65 @@ @@ -90,29 +90,65 @@
90 { 90 {
91 field : 'promptLocation', 91 field : 'promptLocation',
92 title : '系统提示库位', 92 title : '系统提示库位',
  93 + formatter: function (value, item, index) {
  94 + if (value==true) {
  95 + return '<span class="badge" style="background-color: #00B83F;color: white;width: 36px;">' + ' 是 ' + '</span>';
  96 + }
  97 + else if (value==false) {
  98 + return '<span class="badge" style="background-color: #ff0000;color: white;width: 36px;">' + ' 否 ' + '</span>';
  99 + }
  100 + }
93 }, 101 },
94 { 102 {
95 field : 'promptLpn', 103 field : 'promptLpn',
96 - title : '系统提示容器' 104 + title : '系统提示容器',
  105 + formatter: function (value, item, index) {
  106 + if (value==true) {
  107 + return '<span class="badge" style="background-color: #00B83F;color: white;width: 36px;">' + ' 是 ' + '</span>';
  108 + }
  109 + else if (value==false) {
  110 + return '<span class="badge" style="background-color: #ff0000;color: white;width: 36px;">' + ' 否 ' + '</span>';
  111 + }
  112 + }
97 }, 113 },
98 { 114 {
99 field : 'promptItem', 115 field : 'promptItem',
100 - title : '系统提示物料' 116 + title : '系统提示物料',
  117 + formatter: function (value, item, index) {
  118 + if (value==true) {
  119 + return '<span class="badge" style="background-color: #00B83F;color: white;width: 36px;">' + ' 是 ' + '</span>';
  120 + }
  121 + else if (value==false) {
  122 + return '<span class="badge" style="background-color: #ff0000;color: white;width: 36px;">' + ' 否 ' + '</span>';
  123 + }
  124 + }
101 }, 125 },
102 { 126 {
103 field : 'promptQuantity', 127 field : 'promptQuantity',
104 - title : '显示库存数量' 128 + title : '显示库存数量',
  129 + formatter: function (value, item, index) {
  130 + if (value==true) {
  131 + return '<span class="badge" style="background-color: #00B83F;color: white;width: 36px;">' + ' 是 ' + '</span>';
  132 + }
  133 + else if (value==false) {
  134 + return '<span class="badge" style="background-color: #ff0000;color: white;width: 36px;">' + ' 否 ' + '</span>';
  135 + }
  136 + }
105 }, 137 },
106 { 138 {
107 field : 'allowAddNewInventory', 139 field : 'allowAddNewInventory',
108 title : '允许添加库存', 140 title : '允许添加库存',
  141 + formatter: function (value, item, index) {
  142 + if (value==true) {
  143 + return '<span class="badge" style="background-color: #00B83F;color: white;width: 36px;">' + ' 是 ' + '</span>';
  144 + }
  145 + else if (value==false) {
  146 + return '<span class="badge" style="background-color: #ff0000;color: white;width: 36px;">' + ' 否 ' + '</span>';
  147 + }
  148 + },
109 visible : false 149 visible : false
110 }, 150 },
111 { 151 {
112 - field : 'Enable',  
113 - title : '有效'  
114 - },  
115 - {  
116 field : 'created', 152 field : 'created',
117 title : '创建时间', 153 title : '创建时间',
118 visible : true 154 visible : true
@@ -132,20 +168,40 @@ @@ -132,20 +168,40 @@
132 title : '更新用户', 168 title : '更新用户',
133 visible : false 169 visible : false
134 }, 170 },
135 - { 171 + /*{
136 field : 'version', 172 field : 'version',
137 title : '数据版本', 173 title : '数据版本',
138 visible : false 174 visible : false
139 - },  
140 - { 175 + },*/
  176 + /*{
141 field : 'processStamp', 177 field : 'processStamp',
142 title : '处理标记', 178 title : '处理标记',
143 visible : false 179 visible : false
144 - }, 180 + },*/
145 { 181 {
146 field : 'countByPiece', 182 field : 'countByPiece',
147 title : 'RF逐件盘点' , 183 title : 'RF逐件盘点' ,
148 - visible : false 184 + visible : false,
  185 + formatter: function (value, item, index) {
  186 + if (value==true) {
  187 + return '<span class="badge" style="background-color: #00B83F;color: white;width: 36px;">' + ' 是 ' + '</span>';
  188 + }
  189 + else if (value==false) {
  190 + return '<span class="badge" style="background-color: #ff0000;color: white;width: 36px;">' + ' 否 ' + '</span>';
  191 + }
  192 + }
  193 + },
  194 + {
  195 + field : 'enable',
  196 + title : '有效',
  197 + formatter: function (value, item, index) {
  198 + if (value==true) {
  199 + return '<span class="badge" style="background-color: #00B83F;color: white;width: 36px;">' + ' 是 ' + '</span>';
  200 + }
  201 + else if (value==false) {
  202 + return '<span class="badge" style="background-color: #ff0000;color: white;width: 36px;">' + ' 否 ' + '</span>';
  203 + }
  204 + }
149 }, 205 },
150 /*{ 206 /*{
151 field : 'userDef1', 207 field : 'userDef1',
@@ -168,7 +224,7 @@ @@ -168,7 +224,7 @@
168 align: 'center', 224 align: 'center',
169 formatter: function(value, row, index) { 225 formatter: function(value, row, index) {
170 var actions = []; 226 var actions = [];
171 - //actions.push('<a class="btn btn-success btn-xs " href="#" onclick="$.operate.edit(\'' + row.id + '\')" ><i class="fa fa-edit"></i>修改</a> '); 227 + actions.push('<a class="btn btn-success btn-xs " href="#" onclick="$.operate.edit(\'' + row.id + '\')" ><i class="fa fa-edit"></i>修改</a> ');
172 actions.push('<a class="btn btn-danger btn-xs " href="#" onclick="$.operate.remove(\'' + row.id + '\')" ><i class="fa fa-trash-o"></i>删除</a>'); 228 actions.push('<a class="btn btn-danger btn-xs " href="#" onclick="$.operate.remove(\'' + row.id + '\')" ><i class="fa fa-trash-o"></i>删除</a>');
173 return actions.join(''); 229 return actions.join('');
174 } 230 }
src/main/resources/templates/config/cycleCountPreference/edit.html
  View file @06f991e
@@ -14,59 +14,74 @@ @@ -14,59 +14,74 @@
14 <div class="form-group"> 14 <div class="form-group">
15 <label class="col-sm-3 control-label">盘点首选项编码：</label> 15 <label class="col-sm-3 control-label">盘点首选项编码：</label>
16 <div class="col-sm-8"> 16 <div class="col-sm-8">
17 - <input id="code" name="code" class="form-control" type="text" th:field="*{code}"> 17 + <input id="code" name="code" class="form-control" type="text" th:field="*{code}" readonly="readonly">
18 </div> 18 </div>
19 </div> 19 </div>
20 <div class="form-group"> 20 <div class="form-group">
21 <label class="col-sm-3 control-label">盘点首选项名称：</label> 21 <label class="col-sm-3 control-label">盘点首选项名称：</label>
22 <div class="col-sm-8"> 22 <div class="col-sm-8">
23 - <input id="name" name="name" class="form-control" type="text" th:field="*{name}"> 23 + <input id="name" name="name" class="form-control" type="text" th:field="*{name}" readonly="readonly">
24 </div> 24 </div>
25 </div> 25 </div>
26 - <div class="form-group"> 26 + <!--<div class="form-group">
27 <label class="col-sm-3 control-label">仓库：</label> 27 <label class="col-sm-3 control-label">仓库：</label>
28 <div class="col-sm-8"> 28 <div class="col-sm-8">
29 <input id="warehouseCode" name="warehouseCode" class="form-control" type="text" th:field="*{warehouseCode}" readonly="readonly"> 29 <input id="warehouseCode" name="warehouseCode" class="form-control" type="text" th:field="*{warehouseCode}" readonly="readonly">
30 </div> 30 </div>
31 - </div> 31 + </div>-->
32 <div class="form-group"> 32 <div class="form-group">
33 <label class="col-sm-3 control-label">系统提示货位：</label> 33 <label class="col-sm-3 control-label">系统提示货位：</label>
34 <div class="col-sm-8"> 34 <div class="col-sm-8">
35 - <input id="promptLocation" name="promptLocation" class="form-control" type="text" th:field="*{promptLocation}"> 35 + <div class="onoffswitch">
  36 + <input type="checkbox" th:checked="*{promptLocation}" class="onoffswitch-checkbox" id="promptLocation"
  37 + name="promptLocation">
  38 + <label class="onoffswitch-label" for="promptLocation">
  39 + <span class="onoffswitch-inner"></span>
  40 + <span class="onoffswitch-switch"></span>
  41 + </label>
  42 + </div>
36 </div> 43 </div>
37 </div> 44 </div>
38 <div class="form-group"> 45 <div class="form-group">
39 - <label class="col-sm-3 control-label">系统提示LPN：</label>  
40 - <div class="col-sm-8">  
41 - <input id="promptLpn" name="promptLpn" class="form-control" type="text" th:field="*{promptLpn}">  
42 - </div>  
43 - </div>  
44 - <!--<div class="form-group">  
45 - <label class="col-sm-3 control-label">系统提示LPN：</label> 46 + <label class="col-sm-3 control-label">系统提示容器：</label>
46 <div class="col-sm-8"> 47 <div class="col-sm-8">
47 <div class="onoffswitch"> 48 <div class="onoffswitch">
48 - <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="promptLpn"  
49 - name="promptLpn" th:field="*{promptLpn}"> 49 + <input type="checkbox" th:checked="*{promptLpn}" class="onoffswitch-checkbox" id="promptLpn"
  50 + name="promptLpn" >
50 <label class="onoffswitch-label" for="promptLpn"> 51 <label class="onoffswitch-label" for="promptLpn">
51 <span class="onoffswitch-inner"></span> 52 <span class="onoffswitch-inner"></span>
52 <span class="onoffswitch-switch"></span> 53 <span class="onoffswitch-switch"></span>
53 </label> 54 </label>
54 </div> 55 </div>
55 </div> 56 </div>
56 - </div>--> 57 + </div>
57 <div class="form-group"> 58 <div class="form-group">
58 <label class="col-sm-3 control-label">系统提示物料：</label> 59 <label class="col-sm-3 control-label">系统提示物料：</label>
59 <div class="col-sm-8"> 60 <div class="col-sm-8">
60 - <input id="promptItem" name="promptItem" class="form-control" type="text" th:field="*{promptItem}"> 61 + <div class="onoffswitch">
  62 + <input type="checkbox" th:checked="*{promptItem}" class="onoffswitch-checkbox" id="promptItem"
  63 + name="promptItem">
  64 + <label class="onoffswitch-label" for="promptItem">
  65 + <span class="onoffswitch-inner"></span>
  66 + <span class="onoffswitch-switch"></span>
  67 + </label>
  68 + </div>
61 </div> 69 </div>
62 </div> 70 </div>
63 <div class="form-group"> 71 <div class="form-group">
64 <label class="col-sm-3 control-label">显示库存数量：</label> 72 <label class="col-sm-3 control-label">显示库存数量：</label>
65 <div class="col-sm-8"> 73 <div class="col-sm-8">
66 - <input id="promptQuantity" name="promptQuantity" class="form-control" type="text" th:field="*{promptQuantity}"> 74 + <div class="onoffswitch">
  75 + <input type="checkbox" th:checked="*{promptQuantity}" class="onoffswitch-checkbox" id="promptQuantity"
  76 + name="promptQuantity">
  77 + <label class="onoffswitch-label" for="promptQuantity">
  78 + <span class="onoffswitch-inner"></span>
  79 + <span class="onoffswitch-switch"></span>
  80 + </label>
  81 + </div>
67 </div> 82 </div>
68 </div> 83 </div>
69 - <div class="form-group"> 84 + <!--<div class="form-group">
70 <label class="col-sm-3 control-label">允许添加库存：</label> 85 <label class="col-sm-3 control-label">允许添加库存：</label>
71 <div class="col-sm-8"> 86 <div class="col-sm-8">
72 <input id="allowAddNewInventory" name="allowAddNewInventory" class="form-control" type="text" th:field="*{allowAddNewInventory}"> 87 <input id="allowAddNewInventory" name="allowAddNewInventory" class="form-control" type="text" th:field="*{allowAddNewInventory}">
@@ -83,7 +98,7 @@ @@ -83,7 +98,7 @@
83 <div class="col-sm-8"> 98 <div class="col-sm-8">
84 <input id="version" name="version" class="form-control" type="text" th:field="*{version}"> 99 <input id="version" name="version" class="form-control" type="text" th:field="*{version}">
85 </div> 100 </div>
86 - </div> 101 + </div>-->
87 <div class="form-group"> 102 <div class="form-group">
88 <label class="col-sm-3 control-label">创建时间：</label> 103 <label class="col-sm-3 control-label">创建时间：</label>
89 <div class="col-sm-8"> 104 <div class="col-sm-8">
@@ -96,73 +111,25 @@ @@ -96,73 +111,25 @@
96 <input id="createdBy" name="createdBy" class="form-control" type="text" th:field="*{createdBy}" readonly="readonly"> 111 <input id="createdBy" name="createdBy" class="form-control" type="text" th:field="*{createdBy}" readonly="readonly">
97 </div> 112 </div>
98 </div> 113 </div>
99 - <!--<div class="form-group"> -->  
100 - <!--<label class="col-sm-3 control-label">更新时间：</label>-->  
101 - <!--<div class="col-sm-8">-->  
102 - <!--<input id="lastUpdated" name="lastUpdated" class="form-control" type="text">-->  
103 - <!--</div>-->  
104 - <!--</div>-->  
105 - <!--<div class="form-group"> -->  
106 - <!--<label class="col-sm-3 control-label">更新者：</label>-->  
107 - <!--<div class="col-sm-8">-->  
108 - <!--<input id="lastUpdatedBy" name="lastUpdatedBy" class="form-control" type="text">-->  
109 - <!--</div>-->  
110 - <!--</div>-->  
111 - <div class="form-group"> 114 + <!--<div class="form-group">
112 <label class="col-sm-3 control-label">处理标记：</label> 115 <label class="col-sm-3 control-label">处理标记：</label>
113 <div class="col-sm-8"> 116 <div class="col-sm-8">
114 <input id="processStamp" name="processStamp" class="form-control" type="text" th:field="*{processStamp}" /> 117 <input id="processStamp" name="processStamp" class="form-control" type="text" th:field="*{processStamp}" />
115 </div> 118 </div>
116 - </div>  
117 - <!--<div class="form-group">  
118 - <label class="col-sm-3 control-label">是否有效：</label>  
119 - <div class="col-sm-8">  
120 - &lt;!&ndash;<input id="enable" name="enable" class="form-control" type="text">&ndash;&gt;  
121 - <div class="onoffswitch">  
122 - <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable">  
123 - <label class="onoffswitch-label" for="enable">  
124 - <span class="onoffswitch-inner"></span>  
125 - <span class="onoffswitch-switch"></span>  
126 - </label>  
127 - </div>  
128 - </div>  
129 </div>--> 119 </div>-->
130 - <!--<div class="form-group"> -->  
131 - <!--<label class="col-sm-3 control-label">是否删除：</label>-->  
132 - <!--<div class="col-sm-8">-->  
133 - <!--<input id="deleted" name="deleted" class="form-control" type="text">-->  
134 - <!--</div>-->  
135 - <!--</div>-->  
136 - <!--<div class="form-group"> -->  
137 - <!--<label class="col-sm-3 control-label">自定义字段1：</label>-->  
138 - <!--<div class="col-sm-8">-->  
139 - <!--<input id="userDef1" name="userDef1" class="form-control" type="text">-->  
140 - <!--</div>-->  
141 - <!--</div>-->  
142 - <!--<div class="form-group"> -->  
143 - <!--<label class="col-sm-3 control-label">自定义字段2：</label>-->  
144 - <!--<div class="col-sm-8">-->  
145 - <!--<input id="userDef2" name="userDef2" class="form-control" type="text">-->  
146 - <!--</div>-->  
147 - <!--</div>-->  
148 - <!--<div class="form-group"> -->  
149 - <!--<label class="col-sm-3 control-label">自定义字段3：</label>-->  
150 - <!--<div class="col-sm-8">-->  
151 - <!--<input id="userDef3" name="userDef3" class="form-control" type="text">-->  
152 - <!--</div>-->  
153 - <!--</div>-->  
154 - <!--<div class="form-group"> -->  
155 - <!--<label class="col-sm-3 control-label">自定义字段4：</label>-->  
156 - <!--<div class="col-sm-8">-->  
157 - <!--<input id="userDef4" name="userDef4" class="form-control" type="text">-->  
158 - <!--</div>-->  
159 - <!--</div>-->  
160 - <!--<div class="form-group"> -->  
161 - <!--<label class="col-sm-3 control-label">自定义字段5：</label>-->  
162 - <!--<div class="col-sm-8">-->  
163 - <!--<input id="userDef5" name="userDef5" class="form-control" type="text">-->  
164 - <!--</div>-->  
165 - <!--</div>--> 120 + <div class="form-group">
  121 + <label class="col-sm-3 control-label">是否有效：</label>
  122 + <div class="col-sm-8">
  123 + <div class="onoffswitch">
  124 + <input type="checkbox" th:checked="*{enable}" class="onoffswitch-checkbox" id="enable"
  125 + name="enable" >
  126 + <label class="onoffswitch-label" for="enable">
  127 + <span class="onoffswitch-inner"></span>
  128 + <span class="onoffswitch-switch"></span>
  129 + </label>
  130 + </div>
  131 + </div>
  132 + </div>
166 <div class="form-group"> 133 <div class="form-group">
167 <div class="form-control-static col-sm-offset-9"> 134 <div class="form-control-static col-sm-offset-9">
168 <input type="submit" class="btn btn-primary" value="提交"> 135 <input type="submit" class="btn btn-primary" value="提交">