Commit ac84da8b4b6724e6855e997c5aa6591d7e21742f
1 parent
c4977f92
出库首选项
Showing
10 changed files
with
902 additions
and
183 deletions
src/main/java/com/huaheng/pc/config/shipmentPreference/controller/ShipmentPreferenceController.java
0 → 100644
1 | +package com.huaheng.pc.config.shipmentPreference.controller; | |
2 | + | |
3 | +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; | |
4 | +import com.baomidou.mybatisplus.core.metadata.IPage; | |
5 | +import com.baomidou.mybatisplus.core.toolkit.Wrappers; | |
6 | +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; | |
7 | +import com.huaheng.common.support.Convert; | |
8 | +import com.huaheng.common.utils.StringUtils; | |
9 | +import com.huaheng.common.utils.security.ShiroUtils; | |
10 | +import com.huaheng.framework.aspectj.lang.annotation.Log; | |
11 | +import com.huaheng.framework.aspectj.lang.constant.BusinessType; | |
12 | +import com.huaheng.framework.web.controller.BaseController; | |
13 | +import com.huaheng.framework.web.domain.AjaxResult; | |
14 | +import com.huaheng.framework.web.page.PageDomain; | |
15 | +import com.huaheng.framework.web.page.TableDataInfo; | |
16 | +import com.huaheng.framework.web.page.TableSupport; | |
17 | +import com.huaheng.pc.config.shipmentPreference.domain.ShipmentPreference; | |
18 | +import com.huaheng.pc.config.shipmentPreference.service.ShipmentPreferenceService; | |
19 | +import io.swagger.annotations.ApiOperation; | |
20 | +import io.swagger.annotations.ApiParam; | |
21 | +import org.apache.shiro.authz.annotation.RequiresPermissions; | |
22 | +import org.springframework.stereotype.Controller; | |
23 | +import org.springframework.ui.ModelMap; | |
24 | +import org.springframework.web.bind.annotation.*; | |
25 | + | |
26 | +import javax.annotation.Resource; | |
27 | +import java.util.ArrayList; | |
28 | +import java.util.List; | |
29 | + | |
30 | +@Controller | |
31 | +@RequestMapping("/config/shipmentPreference") | |
32 | +public class ShipmentPreferenceController extends BaseController { | |
33 | + | |
34 | + private String prefix = "config/shipmentPreference"; | |
35 | + | |
36 | + @Resource | |
37 | + private ShipmentPreferenceService shipmentPreferenceService; | |
38 | + | |
39 | + @RequiresPermissions("config:shipmentPreference:view") | |
40 | + @GetMapping() | |
41 | + public String bomHeader() { | |
42 | + return prefix + "/receiptPreference"; | |
43 | + } | |
44 | + | |
45 | + @ApiOperation(value="查看出库首选项", notes="根据首选项编码、名称、出库流程、 出库类型、创建时间查询出库首选项", httpMethod = "POST") | |
46 | + @RequiresPermissions("config:shipmentPreference:list") | |
47 | + @Log(title = "通用-出库首选项", operating = "查看出库首选项列表", action = BusinessType.GRANT) | |
48 | + @PostMapping("/list") | |
49 | + @ResponseBody | |
50 | + public TableDataInfo list( | |
51 | + @ApiParam(name="carrier",value="首选项编码、名称、出库流程、出库类型") ShipmentPreference shipmentPreference, | |
52 | + @ApiParam(name = "createdBegin", value = "起止时间") String createdBegin, | |
53 | + @ApiParam(name = "createdEnd", value = "结束时间") String createdEnd) { | |
54 | + LambdaQueryWrapper<ShipmentPreference> lambdaQueryWrapper = Wrappers.lambdaQuery(); | |
55 | + PageDomain pageDomain = TableSupport.buildPageRequest(); | |
56 | + Integer pageNum = pageDomain.getPageNum(); | |
57 | + Integer pageSize = pageDomain.getPageSize(); | |
58 | + lambdaQueryWrapper.gt(StringUtils.isNotEmpty(createdBegin), ShipmentPreference::getCreated, createdBegin) | |
59 | + .lt(StringUtils.isNotEmpty(createdEnd), ShipmentPreference::getCreated, createdEnd) | |
60 | + .eq(ShipmentPreference::getWarehouseCode, ShiroUtils.getWarehouseCode()) | |
61 | + .eq(StringUtils.isNotEmpty(shipmentPreference.getCode()), | |
62 | + ShipmentPreference::getCode, shipmentPreference.getCode()) | |
63 | + .eq(StringUtils.isNotEmpty(shipmentPreference.getName()), | |
64 | + ShipmentPreference::getName, shipmentPreference.getName()) | |
65 | + .like(StringUtils.isNotEmpty(shipmentPreference.getShippingFlow()), | |
66 | + ShipmentPreference::getShippingFlow, shipmentPreference.getShippingFlow()); | |
67 | + | |
68 | + if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){ | |
69 | + /*使用分页查询*/ | |
70 | + Page<ShipmentPreference> page = new Page<>(pageNum, pageSize); | |
71 | + IPage<ShipmentPreference> iPage = shipmentPreferenceService.page(page, lambdaQueryWrapper); | |
72 | + return getMpDataTable(iPage.getRecords(), iPage.getTotal()); | |
73 | + } else { | |
74 | + List<ShipmentPreference> list = shipmentPreferenceService.list(lambdaQueryWrapper); | |
75 | + return getDataTable(list); | |
76 | + } | |
77 | + } | |
78 | + | |
79 | + /** | |
80 | + * 新增入库首选项 | |
81 | + */ | |
82 | + @GetMapping("/add") | |
83 | + public String add() { | |
84 | + return prefix + "/add"; | |
85 | + } | |
86 | + | |
87 | + /** | |
88 | + * 新增保存出库首选项 | |
89 | + */ | |
90 | + @ApiOperation(value="新增出库首选项", notes="新增出库首选项", httpMethod = "POST") | |
91 | + @RequiresPermissions("config:shipmentPreference:add") | |
92 | + @Log(title = "配置-出库首选项", operating = "新增出库首选项", action = BusinessType.INSERT) | |
93 | + @PostMapping("/add") | |
94 | + @ResponseBody | |
95 | + public AjaxResult addSave(@ApiParam(name = "containerType", value = "入库首选项", required = true) | |
96 | + ShipmentPreference shipmentPreference) { | |
97 | + shipmentPreference.setWarehouseCode(ShiroUtils.getWarehouseCode()); | |
98 | + shipmentPreference.setCreatedBy(ShiroUtils.getLoginName()); | |
99 | + shipmentPreference.setLastUpdatedBy(ShiroUtils.getLoginName()); | |
100 | + return toAjax(shipmentPreferenceService.save(shipmentPreference)); | |
101 | + } | |
102 | + | |
103 | + /** | |
104 | + * 修改出库首选项 | |
105 | + */ | |
106 | + @GetMapping("/edit/{id}") | |
107 | + public String edit(@PathVariable("id") Integer id, ModelMap mmap) { | |
108 | + mmap.put("shipmentPreference", shipmentPreferenceService.getById(id)); | |
109 | + return prefix + "/edit"; | |
110 | + } | |
111 | + | |
112 | + /** | |
113 | + * 修改保存出库首选项 | |
114 | + */ | |
115 | + @ApiOperation(value="修改出库首选项", notes="修改出库首选项", httpMethod = "POST") | |
116 | + @RequiresPermissions("config:shipmentPreference:edit") | |
117 | + @Log(title = "通用-出库首选项", operating = "修改出库首选项", action = BusinessType.UPDATE) | |
118 | + @PostMapping("/edit") | |
119 | + @ResponseBody | |
120 | + public AjaxResult editSave( | |
121 | + @ApiParam(name = "carrier", value = "出库首选项", required = true)ShipmentPreference shipmentPreference) { | |
122 | + shipmentPreference.setLastUpdatedBy(ShiroUtils.getLoginName()); | |
123 | + return toAjax(shipmentPreferenceService.updateById(shipmentPreference)); | |
124 | + } | |
125 | + | |
126 | + /** | |
127 | + * 删除出库首选项 | |
128 | + */ | |
129 | + @ApiOperation(value="删除出库首选项", notes="根据id批量删除入库首选项,参数示例1,2,3", httpMethod = "POST") | |
130 | + @RequiresPermissions("config:shipmentPreference:remove") | |
131 | + @Log(title = "通用-出库首选项", operating = "删除出库首选项", action = BusinessType.DELETE) | |
132 | + @PostMapping( "/remove") | |
133 | + @ResponseBody | |
134 | + public AjaxResult remove(String ids) { | |
135 | + if (StringUtils.isEmpty(ids)){ | |
136 | + return AjaxResult.error("id不能为空"); | |
137 | + } | |
138 | + List<Integer> list = new ArrayList<>(); | |
139 | + for (Integer id : Convert.toIntArray(ids)) { | |
140 | + list.add(id); | |
141 | + } | |
142 | + return toAjax(shipmentPreferenceService.removeByIds(list)); | |
143 | + } | |
144 | +} | |
... | ... |
src/main/java/com/huaheng/pc/shipment/shipmentPreference/domain/ShipmentPreference.java renamed to src/main/java/com/huaheng/pc/config/shipmentPreference/domain/ShipmentPreference.java
1 | -package com.huaheng.pc.shipment.shipmentPreference.domain; | |
1 | +package com.huaheng.pc.config.shipmentPreference.domain; | |
2 | 2 | |
3 | 3 | import com.baomidou.mybatisplus.annotation.IdType; |
4 | 4 | import com.baomidou.mybatisplus.annotation.TableField; |
... | ... | @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId; |
6 | 6 | import com.baomidou.mybatisplus.annotation.TableName; |
7 | 7 | import io.swagger.annotations.ApiModel; |
8 | 8 | import io.swagger.annotations.ApiModelProperty; |
9 | + | |
9 | 10 | import java.io.Serializable; |
10 | 11 | import java.util.Date; |
11 | 12 | |
... | ... | @@ -48,6 +49,27 @@ public class ShipmentPreference implements Serializable { |
48 | 49 | private String shippingFlow; |
49 | 50 | |
50 | 51 | /** |
52 | + * 拣货库位范围规则 | |
53 | + */ | |
54 | + @TableField(value = "shipmentPickingLocRange") | |
55 | + @ApiModelProperty(value="拣货库位范围规则") | |
56 | + private String shipmentPickingLocRange; | |
57 | + | |
58 | + /** | |
59 | + * 拣货规则 | |
60 | + */ | |
61 | + @TableField(value = "shipmentPickingRule") | |
62 | + @ApiModelProperty(value="拣货规则") | |
63 | + private String shipmentPickingRule; | |
64 | + | |
65 | + /** | |
66 | + * 库存分配规则 | |
67 | + */ | |
68 | + @TableField(value = "allocationRule") | |
69 | + @ApiModelProperty(value="库存分配规则") | |
70 | + private String allocationRule; | |
71 | + | |
72 | + /** | |
51 | 73 | * 自动生成托盘号 |
52 | 74 | */ |
53 | 75 | @TableField(value = "autoAssignLPN") |
... | ... | @@ -75,12 +97,7 @@ public class ShipmentPreference implements Serializable { |
75 | 97 | @ApiModelProperty(value="显示库存数量") |
76 | 98 | private Integer showInventoryQty; |
77 | 99 | |
78 | - /** | |
79 | - * 出库单类型 | |
80 | - */ | |
81 | - @TableField(value = "shipmentTypes") | |
82 | - @ApiModelProperty(value="出库单类型") | |
83 | - private String shipmentTypes; | |
100 | + | |
84 | 101 | |
85 | 102 | /** |
86 | 103 | * RF组车收货 |
... | ... | @@ -97,13 +114,6 @@ public class ShipmentPreference implements Serializable { |
97 | 114 | private Integer manuallyBuildLPN; |
98 | 115 | |
99 | 116 | /** |
100 | - * 库存分配规则动态指派 | |
101 | - */ | |
102 | - @TableField(value = "ruleAssignment") | |
103 | - @ApiModelProperty(value="库存分配规则动态指派") | |
104 | - private String ruleAssignment; | |
105 | - | |
106 | - /** | |
107 | 117 | * RF逐件拣货 |
108 | 118 | */ |
109 | 119 | @TableField(value = "checkinByPiece") |
... | ... | @@ -180,33 +190,6 @@ public class ShipmentPreference implements Serializable { |
180 | 190 | @ApiModelProperty(value="自定义字段4") |
181 | 191 | private String userDef4; |
182 | 192 | |
183 | - /** | |
184 | - * 自定义字段5 | |
185 | - */ | |
186 | - @TableField(value = "userDef5") | |
187 | - @ApiModelProperty(value="自定义字段5") | |
188 | - private String userDef5; | |
189 | - | |
190 | - /** | |
191 | - * 自定义字段6 | |
192 | - */ | |
193 | - @TableField(value = "userDef6") | |
194 | - @ApiModelProperty(value="自定义字段6") | |
195 | - private String userDef6; | |
196 | - | |
197 | - /** | |
198 | - * 自定义字段7 | |
199 | - */ | |
200 | - @TableField(value = "userDef7") | |
201 | - @ApiModelProperty(value="自定义字段7") | |
202 | - private String userDef7; | |
203 | - | |
204 | - /** | |
205 | - * 自定义字段8 | |
206 | - */ | |
207 | - @TableField(value = "userDef8") | |
208 | - @ApiModelProperty(value="自定义字段8") | |
209 | - private String userDef8; | |
210 | 193 | |
211 | 194 | /** |
212 | 195 | * 处理标记 |
... | ... | @@ -225,6 +208,12 @@ public class ShipmentPreference implements Serializable { |
225 | 208 | |
226 | 209 | public static final String COL_SHIPPINGFLOW = "shippingFlow"; |
227 | 210 | |
211 | + public static final String COL_SHIPMENTPICKINGRULE = "shipmentPickingRule"; | |
212 | + | |
213 | + public static final String COL_SHIPMENTPICKINGLOCRANGE= "shipmentPickingLocRange"; | |
214 | + | |
215 | + public static final String COL_ALLOCATIONRULE= "allocationRule"; | |
216 | + | |
228 | 217 | public static final String COL_AUTOASSIGNLPN = "autoAssignLPN"; |
229 | 218 | |
230 | 219 | public static final String COL_ALLOWCROSS = "allowCross"; |
... | ... | @@ -233,14 +222,10 @@ public class ShipmentPreference implements Serializable { |
233 | 222 | |
234 | 223 | public static final String COL_SHOWINVENTORYQTY = "showInventoryQty"; |
235 | 224 | |
236 | - public static final String COL_SHIPMENTTYPES = "shipmentTypes"; | |
237 | - | |
238 | 225 | public static final String COL_GROUPPICKUP = "groupPickup"; |
239 | 226 | |
240 | 227 | public static final String COL_MANUALLYBUILDLPN = "manuallyBuildLPN"; |
241 | 228 | |
242 | - public static final String COL_RULEASSIGNMENT = "ruleAssignment"; | |
243 | - | |
244 | 229 | public static final String COL_CHECKINBYPIECE = "checkinByPiece"; |
245 | 230 | |
246 | 231 | public static final String COL_ALLOWQUICKPICKUP = "allowQuickPickup"; |
... | ... | @@ -263,14 +248,6 @@ public class ShipmentPreference implements Serializable { |
263 | 248 | |
264 | 249 | public static final String COL_USERDEF4 = "userDef4"; |
265 | 250 | |
266 | - public static final String COL_USERDEF5 = "userDef5"; | |
267 | - | |
268 | - public static final String COL_USERDEF6 = "userDef6"; | |
269 | - | |
270 | - public static final String COL_USERDEF7 = "userDef7"; | |
271 | - | |
272 | - public static final String COL_USERDEF8 = "userDef8"; | |
273 | - | |
274 | 251 | public static final String COL_PROCESSSTAMP = "processStamp"; |
275 | 252 | |
276 | 253 | /** |
... | ... | @@ -363,6 +340,30 @@ public class ShipmentPreference implements Serializable { |
363 | 340 | this.shippingFlow = shippingFlow; |
364 | 341 | } |
365 | 342 | |
343 | + public String getShipmentPickingLocRange() { | |
344 | + return shipmentPickingLocRange; | |
345 | + } | |
346 | + | |
347 | + public void setShipmentPickingLocRange(String shipmentPickingLocRange) { | |
348 | + this.shipmentPickingLocRange = shipmentPickingLocRange; | |
349 | + } | |
350 | + | |
351 | + public String getShipmentPickingRule() { | |
352 | + return shipmentPickingRule; | |
353 | + } | |
354 | + | |
355 | + public void setShipmentPickingRule(String shipmentPickingRule) { | |
356 | + this.shipmentPickingRule = shipmentPickingRule; | |
357 | + } | |
358 | + | |
359 | + public String getAllocationRule() { | |
360 | + return allocationRule; | |
361 | + } | |
362 | + | |
363 | + public void setAllocationRule(String allocationRule) { | |
364 | + this.allocationRule = allocationRule; | |
365 | + } | |
366 | + | |
366 | 367 | /** |
367 | 368 | * 获取自动生成托盘号 |
368 | 369 | * |
... | ... | @@ -435,23 +436,6 @@ public class ShipmentPreference implements Serializable { |
435 | 436 | this.showInventoryQty = showInventoryQty; |
436 | 437 | } |
437 | 438 | |
438 | - /** | |
439 | - * 获取出库单类型 | |
440 | - * | |
441 | - * @return shipmentTypes - 出库单类型 | |
442 | - */ | |
443 | - public String getShipmentTypes() { | |
444 | - return shipmentTypes; | |
445 | - } | |
446 | - | |
447 | - /** | |
448 | - * 设置出库单类型 | |
449 | - * | |
450 | - * @param shipmentTypes 出库单类型 | |
451 | - */ | |
452 | - public void setShipmentTypes(String shipmentTypes) { | |
453 | - this.shipmentTypes = shipmentTypes; | |
454 | - } | |
455 | 439 | |
456 | 440 | /** |
457 | 441 | * 获取RF组车收货 |
... | ... | @@ -489,23 +473,6 @@ public class ShipmentPreference implements Serializable { |
489 | 473 | this.manuallyBuildLPN = manuallyBuildLPN; |
490 | 474 | } |
491 | 475 | |
492 | - /** | |
493 | - * 获取库存分配规则动态指派 | |
494 | - * | |
495 | - * @return ruleAssignment - 库存分配规则动态指派 | |
496 | - */ | |
497 | - public String getRuleAssignment() { | |
498 | - return ruleAssignment; | |
499 | - } | |
500 | - | |
501 | - /** | |
502 | - * 设置库存分配规则动态指派 | |
503 | - * | |
504 | - * @param ruleAssignment 库存分配规则动态指派 | |
505 | - */ | |
506 | - public void setRuleAssignment(String ruleAssignment) { | |
507 | - this.ruleAssignment = ruleAssignment; | |
508 | - } | |
509 | 476 | |
510 | 477 | /** |
511 | 478 | * 获取RF逐件拣货 |
... | ... | @@ -705,77 +672,6 @@ public class ShipmentPreference implements Serializable { |
705 | 672 | this.userDef4 = userDef4; |
706 | 673 | } |
707 | 674 | |
708 | - /** | |
709 | - * 获取自定义字段5 | |
710 | - * | |
711 | - * @return userDef5 - 自定义字段5 | |
712 | - */ | |
713 | - public String getUserDef5() { | |
714 | - return userDef5; | |
715 | - } | |
716 | - | |
717 | - /** | |
718 | - * 设置自定义字段5 | |
719 | - * | |
720 | - * @param userDef5 自定义字段5 | |
721 | - */ | |
722 | - public void setUserDef5(String userDef5) { | |
723 | - this.userDef5 = userDef5; | |
724 | - } | |
725 | - | |
726 | - /** | |
727 | - * 获取自定义字段6 | |
728 | - * | |
729 | - * @return userDef6 - 自定义字段6 | |
730 | - */ | |
731 | - public String getUserDef6() { | |
732 | - return userDef6; | |
733 | - } | |
734 | - | |
735 | - /** | |
736 | - * 设置自定义字段6 | |
737 | - * | |
738 | - * @param userDef6 自定义字段6 | |
739 | - */ | |
740 | - public void setUserDef6(String userDef6) { | |
741 | - this.userDef6 = userDef6; | |
742 | - } | |
743 | - | |
744 | - /** | |
745 | - * 获取自定义字段7 | |
746 | - * | |
747 | - * @return userDef7 - 自定义字段7 | |
748 | - */ | |
749 | - public String getUserDef7() { | |
750 | - return userDef7; | |
751 | - } | |
752 | - | |
753 | - /** | |
754 | - * 设置自定义字段7 | |
755 | - * | |
756 | - * @param userDef7 自定义字段7 | |
757 | - */ | |
758 | - public void setUserDef7(String userDef7) { | |
759 | - this.userDef7 = userDef7; | |
760 | - } | |
761 | - | |
762 | - /** | |
763 | - * 获取自定义字段8 | |
764 | - * | |
765 | - * @return userDef8 - 自定义字段8 | |
766 | - */ | |
767 | - public String getUserDef8() { | |
768 | - return userDef8; | |
769 | - } | |
770 | - | |
771 | - /** | |
772 | - * 设置自定义字段8 | |
773 | - * | |
774 | - * @param userDef8 自定义字段8 | |
775 | - */ | |
776 | - public void setUserDef8(String userDef8) { | |
777 | - this.userDef8 = userDef8; | |
778 | - } | |
779 | 675 | |
780 | 676 | /** |
781 | 677 | * 获取处理标记 |
... | ... |
src/main/java/com/huaheng/pc/shipment/shipmentPreference/mapper/ShipmentPreferenceMapper.java renamed to src/main/java/com/huaheng/pc/config/shipmentPreference/mapper/ShipmentPreferenceMapper.java
1 | -package com.huaheng.pc.shipment.shipmentPreference.mapper; | |
1 | +package com.huaheng.pc.config.shipmentPreference.mapper; | |
2 | 2 | |
3 | 3 | import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
4 | -import com.huaheng.pc.shipment.shipmentPreference.domain.ShipmentPreference; | |
4 | +import com.huaheng.pc.config.shipmentPreference.domain.ShipmentPreference; | |
5 | 5 | |
6 | 6 | public interface ShipmentPreferenceMapper extends BaseMapper<ShipmentPreference> { |
7 | 7 | } |
8 | 8 | \ No newline at end of file |
... | ... |
src/main/java/com/huaheng/pc/shipment/shipmentPreference/service/ShipmentPreferenceService.java renamed to src/main/java/com/huaheng/pc/config/shipmentPreference/service/ShipmentPreferenceService.java
1 | -package com.huaheng.pc.shipment.shipmentPreference.service; | |
1 | +package com.huaheng.pc.config.shipmentPreference.service; | |
2 | 2 | |
3 | -import com.huaheng.pc.shipment.shipmentPreference.domain.ShipmentPreference; | |
4 | 3 | import com.baomidou.mybatisplus.extension.service.IService; |
4 | +import com.huaheng.pc.config.shipmentPreference.domain.ShipmentPreference; | |
5 | + | |
5 | 6 | public interface ShipmentPreferenceService extends IService<ShipmentPreference>{ |
6 | 7 | |
7 | 8 | |
... | ... |
src/main/java/com/huaheng/pc/config/shipmentPreference/service/ShipmentPreferenceServiceImpl.java
0 → 100644
1 | +package com.huaheng.pc.config.shipmentPreference.service; | |
2 | + | |
3 | +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; | |
4 | +import com.huaheng.pc.config.shipmentPreference.domain.ShipmentPreference; | |
5 | +import com.huaheng.pc.config.shipmentPreference.mapper.ShipmentPreferenceMapper; | |
6 | +import org.springframework.stereotype.Service; | |
7 | + | |
8 | +@Service | |
9 | +public class ShipmentPreferenceServiceImpl extends ServiceImpl<ShipmentPreferenceMapper, ShipmentPreference> implements ShipmentPreferenceService { | |
10 | + | |
11 | +} | |
... | ... |
src/main/java/com/huaheng/pc/shipment/shipmentPreference/service/ShipmentPreferenceServiceImpl.java deleted
1 | -package com.huaheng.pc.shipment.shipmentPreference.service; | |
2 | - | |
3 | -import org.springframework.stereotype.Service; | |
4 | -import javax.annotation.Resource; | |
5 | -import java.util.List; | |
6 | -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; | |
7 | -import com.huaheng.pc.shipment.shipmentPreference.mapper.ShipmentPreferenceMapper; | |
8 | -import com.huaheng.pc.shipment.shipmentPreference.domain.ShipmentPreference; | |
9 | -import com.huaheng.pc.shipment.shipmentPreference.service.ShipmentPreferenceService; | |
10 | -@Service | |
11 | -public class ShipmentPreferenceServiceImpl extends ServiceImpl<ShipmentPreferenceMapper, ShipmentPreference> implements ShipmentPreferenceService{ | |
12 | - | |
13 | -} |
src/main/resources/mybatis/shipment/ShipmentPreferenceMapper.xml renamed to src/main/resources/mybatis/config/ShipmentPreferenceMapper.xml
1 | 1 | <?xml version="1.0" encoding="UTF-8"?> |
2 | 2 | <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
3 | 3 | <mapper namespace="com.huaheng.pc.shipment.shipmentPreference.mapper.ShipmentPreferenceMapper"> |
4 | - <resultMap id="BaseResultMap" type="com.huaheng.pc.shipment.shipmentPreference.domain.ShipmentPreference"> | |
4 | + <resultMap id="BaseResultMap" type="com.huaheng.pc.config.shipmentPreference.domain.ShipmentPreference"> | |
5 | 5 | <!--@mbg.generated--> |
6 | 6 | <id column="id" jdbcType="INTEGER" property="id" /> |
7 | 7 | <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" /> |
8 | 8 | <result column="code" jdbcType="VARCHAR" property="code" /> |
9 | 9 | <result column="name" jdbcType="VARCHAR" property="name" /> |
10 | 10 | <result column="shippingFlow" jdbcType="VARCHAR" property="shippingFlow" /> |
11 | + <result column="shipmentPickingRule" jdbcType="VARCHAR" property="shipmentPickingRule" /> | |
12 | + <result column="shipmentPickingLocRange" jdbcType="VARCHAR" property="shipmentPickingLocRange" /> | |
13 | + <result column="allocationRule" jdbcType="VARCHAR" property="allocationRule" /> | |
11 | 14 | <result column="autoAssignLPN" jdbcType="INTEGER" property="autoAssignLPN" /> |
12 | 15 | <result column="allowCross" jdbcType="INTEGER" property="allowCross" /> |
13 | 16 | <result column="allowQcCheckResult" jdbcType="INTEGER" property="allowQcCheckResult" /> |
14 | 17 | <result column="showInventoryQty" jdbcType="INTEGER" property="showInventoryQty" /> |
15 | - <result column="shipmentTypes" jdbcType="VARCHAR" property="shipmentTypes" /> | |
16 | 18 | <result column="groupPickup" jdbcType="INTEGER" property="groupPickup" /> |
17 | 19 | <result column="manuallyBuildLPN" jdbcType="INTEGER" property="manuallyBuildLPN" /> |
18 | - <result column="ruleAssignment" jdbcType="VARCHAR" property="ruleAssignment" /> | |
19 | 20 | <result column="checkinByPiece" jdbcType="INTEGER" property="checkinByPiece" /> |
20 | 21 | <result column="allowQuickPickup" jdbcType="INTEGER" property="allowQuickPickup" /> |
21 | 22 | <result column="created" jdbcType="TIMESTAMP" property="created" /> |
... | ... | @@ -27,16 +28,12 @@ |
27 | 28 | <result column="userDef2" jdbcType="VARCHAR" property="userDef2" /> |
28 | 29 | <result column="userDef3" jdbcType="VARCHAR" property="userDef3" /> |
29 | 30 | <result column="userDef4" jdbcType="VARCHAR" property="userDef4" /> |
30 | - <result column="userDef5" jdbcType="VARCHAR" property="userDef5" /> | |
31 | - <result column="userDef6" jdbcType="VARCHAR" property="userDef6" /> | |
32 | - <result column="userDef7" jdbcType="VARCHAR" property="userDef7" /> | |
33 | - <result column="userDef8" jdbcType="VARCHAR" property="userDef8" /> | |
34 | 31 | <result column="processStamp" jdbcType="VARCHAR" property="processStamp" /> |
35 | 32 | </resultMap> |
36 | 33 | <sql id="Base_Column_List"> |
37 | 34 | <!--@mbg.generated--> |
38 | 35 | id, warehouseCode, code, `name`, shippingFlow, autoAssignLPN, allowCross, allowQcCheckResult, |
39 | - showInventoryQty, shipmentTypes, groupPickup, manuallyBuildLPN, ruleAssignment, checkinByPiece, | |
36 | + showInventoryQty, groupPickup, manuallyBuildLPN, ruleAssignment, checkinByPiece, | |
40 | 37 | allowQuickPickup, created, createdBy, lastUpdated, lastUpdatedBy, version, userDef1, |
41 | 38 | userDef2, userDef3, userDef4, userDef5, userDef6, userDef7, userDef8, processStamp |
42 | 39 | </sql> |
... | ... |
src/main/resources/templates/config/shipmentPreference/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-shipmentPreference-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="name" name="name" 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="receiptFlow" name="shippingFlow" 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="autoAssignLPN" name="autoAssignLPN" 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="shipmentPickingRule" name="shipmentPickingRule" 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="shipmentPickingLocRange" name="shipmentPickingLocRange" 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="allocationRule" name="allocationRule" 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 | + <div class="onoffswitch"> | |
54 | + <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="allowCross" name="allowCross"> | |
55 | + <label class="onoffswitch-label" for="allowCross"> | |
56 | + <span class="onoffswitch-inner"></span> | |
57 | + <span class="onoffswitch-switch"></span> | |
58 | + </label> | |
59 | + </div> | |
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="allowQcCheckResult" name="allowQcCheckResult" 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 | + <input id="showInventoryQty" name="showInventoryQty" class="form-control" type="text"> | |
72 | + </div> | |
73 | + </div> | |
74 | + <div class="form-group"> | |
75 | + <label class="col-sm-3 control-label">RF组车收货:</label> | |
76 | + <div class="col-sm-8"> | |
77 | + <input id="groupPutaway" name="groupPutaway" class="form-control" type="text"> | |
78 | + </div> | |
79 | + </div> | |
80 | + <div class="form-group"> | |
81 | + <label class="col-sm-3 control-label">人工组盘:</label> | |
82 | + <div class="col-sm-8"> | |
83 | + <input id="manuallyBuildLPN" name="manuallyBuildLPN" class="form-control" type="text"> | |
84 | + </div> | |
85 | + </div> | |
86 | + <div class="form-group"> | |
87 | + <label class="col-sm-3 control-label">RF逐件拣货:</label> | |
88 | + <div class="col-sm-8"> | |
89 | + <input id="checkinByPiece" name="checkinByPiece" class="form-control" type="text"> | |
90 | + </div> | |
91 | + </div> | |
92 | + <div class="form-group"> | |
93 | + <label class="col-sm-3 control-label">RF快速拣货:</label> | |
94 | + <div class="col-sm-8"> | |
95 | + <input id="allowQuickPickup" name="allowQuickPickup" class="form-control" type="text"> | |
96 | + </div> | |
97 | + </div> | |
98 | + <!--<div class="form-group"> | |
99 | + <label class="col-sm-3 control-label">数据版本:</label> | |
100 | + <div class="col-sm-8"> | |
101 | + <input id="version" name="version" class="form-control" type="text"> | |
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="created" name="created" class="form-control" type="text">--> | |
108 | + <!--</div>--> | |
109 | + <!--</div>--> | |
110 | + <!--<div class="form-group"> --> | |
111 | + <!--<label class="col-sm-3 control-label">创建者:</label>--> | |
112 | + <!--<div class="col-sm-8">--> | |
113 | + <!--<input id="createdBy" name="createdBy" class="form-control" type="text">--> | |
114 | + <!--</div>--> | |
115 | + <!--</div>--> | |
116 | + <!--<div class="form-group"> --> | |
117 | + <!--<label class="col-sm-3 control-label">创建时间:</label>--> | |
118 | + <!--<div class="col-sm-8">--> | |
119 | + <!--<input id="lastUpdated" name="lastUpdated" class="form-control" type="text">--> | |
120 | + <!--</div>--> | |
121 | + <!--</div>--> | |
122 | + <!--<div class="form-group"> --> | |
123 | + <!--<label class="col-sm-3 control-label">更新者:</label>--> | |
124 | + <!--<div class="col-sm-8">--> | |
125 | + <!--<input id="lastUpdatedBy" name="lastUpdatedBy" class="form-control" type="text">--> | |
126 | + <!--</div>--> | |
127 | + <!--</div>--> | |
128 | + <!--<div class="form-group"> --> | |
129 | + <!--<label class="col-sm-3 control-label">是否有效:</label>--> | |
130 | + <!--<div class="col-sm-8">--> | |
131 | + <!--<!–<input id="enable" name="enable" class="form-control" type="text">–>--> | |
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>--> | |
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"> | |
178 | + <div class="form-control-static col-sm-offset-9"> | |
179 | + <button type="submit" class="btn btn-primary">提交</button> | |
180 | + <button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button> | |
181 | + </div> | |
182 | + </div> | |
183 | + </form> | |
184 | +</div> | |
185 | +<div th:include="include::footer"></div> | |
186 | +<script type="text/javascript"> | |
187 | + var prefix = ctx + "config/shipmentPreference"; | |
188 | + $("#form-shipmentPreference-add").validate({ | |
189 | + rules:{ | |
190 | + code:{ | |
191 | + required: true, | |
192 | + }, | |
193 | + name:{ | |
194 | + required: true, | |
195 | + }, | |
196 | + shippingFlow:{ | |
197 | + required: true, | |
198 | + }, | |
199 | + shipmentPickingRule:{ | |
200 | + required: true, | |
201 | + }, | |
202 | + shipmentPickingLocRange:{ | |
203 | + required: true, | |
204 | + }, | |
205 | + allocationRule: { | |
206 | + required: true, | |
207 | + }, | |
208 | + autoAssignLPN: { | |
209 | + required: true, | |
210 | + }, | |
211 | + allowCross: { | |
212 | + required: true, | |
213 | + }, | |
214 | + allowQcCheckResult: { | |
215 | + required: true, | |
216 | + }, | |
217 | + showInventoryQty: { | |
218 | + required: true, | |
219 | + }, | |
220 | + groupPickup: { | |
221 | + required: true, | |
222 | + }, | |
223 | + manuallyBuildLPN: { | |
224 | + required: true, | |
225 | + }, | |
226 | + checkinByPiece: { | |
227 | + required: true, | |
228 | + }, | |
229 | + allowQuickPickup: { | |
230 | + required: true, | |
231 | + } | |
232 | + }, | |
233 | + submitHandler: function(form) { | |
234 | + var tableValue = $.common.getTableValue("#form-shipmentPreference-add"); | |
235 | + tableValue = formValueReplace(tableValue, "allowCross", $("input[name='allowCross']").is(':checked')); | |
236 | + $.operate.save(prefix + "/edit", tableValue); | |
237 | + } | |
238 | + }); | |
239 | +</script> | |
240 | +</body> | |
241 | +</html> | |
... | ... |
src/main/resources/templates/config/shipmentPreference/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="${shipmentPreference}"> | |
7 | + <form class="form-horizontal m" id="form-shipmentPreference-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="name" name="name" class="form-control" type="text" th:field="*{name}"> | |
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="shippingFlow" name="shippingFlow" class="form-control" type="text" th:field="*{shippingFlow}"> | |
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="shipmentPickingRule" name="shipmentPickingRule" class="form-control" type="text" th:field="*{shipmentPickingRule}"> | |
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="shipmentPickingLocRange" name="shipmentPickingLocRange" class="form-control" type="text" th:field="*{shipmentPickingLocRange}"> | |
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="allocationRule" name="allocationRule" class="form-control" type="text" th:field="*{allocationRule}"> | |
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="autoAssignLPN" name="autoAssignLPN" class="form-control" type="text" th:field="*{autoAssignLPN}"> | |
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 | + <div class="onoffswitch"> | |
55 | + <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" | |
56 | + id="allowCross" name="allowCross" th:field="*{allowCross}"> | |
57 | + <label class="onoffswitch-label" for="allowCross"> | |
58 | + <span class="onoffswitch-inner"></span> | |
59 | + <span class="onoffswitch-switch"></span> | |
60 | + </label> | |
61 | + </div> | |
62 | + </div> | |
63 | + </div> | |
64 | + <div class="form-group"> | |
65 | + <label class="col-sm-3 control-label">允许未质检的出库:</label> | |
66 | + <div class="col-sm-8"> | |
67 | + <input id="allowQcCheckResult" name="allowQcCheckResult" class="form-control" | |
68 | + type="text" th:field="*{allowQcCheckResult}"> | |
69 | + </div> | |
70 | + </div> | |
71 | + <div class="form-group"> | |
72 | + <label class="col-sm-3 control-label">显示库存数量:</label> | |
73 | + <div class="col-sm-8"> | |
74 | + <input id="showInventoryQty" name="showInventoryQty" class="form-control" type="text" th:field="*{showInventoryQty}"> | |
75 | + </div> | |
76 | + </div> | |
77 | + <div class="form-group"> | |
78 | + <label class="col-sm-3 control-label">RF组车收货:</label> | |
79 | + <div class="col-sm-8"> | |
80 | + <input id="groupPickup" name="groupPickup" class="form-control" type="text" th:field="*{groupPickup}"> | |
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="manuallyBuildLPN" name="manuallyBuildLPN" class="form-control" type="text" th:field="*{manuallyBuildLPN}"> | |
87 | + </div> | |
88 | + </div> | |
89 | + <div class="form-group"> | |
90 | + <label class="col-sm-3 control-label">RF逐件收货:</label> | |
91 | + <div class="col-sm-8"> | |
92 | + <input id="checkinByPiece" name="checkinByPiece" class="form-control" type="text" th:field="*{checkinByPiece}"> | |
93 | + </div> | |
94 | + </div> | |
95 | + <div class="form-group"> | |
96 | + <label class="col-sm-3 control-label">RF快速上架:</label> | |
97 | + <div class="col-sm-8"> | |
98 | + <input id="allowQuickPickup" name="allowQuickPickup" class="form-control" type="text" th:field="*{allowQuickPickup}"> | |
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="version" name="version" 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="created" name="created" 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="createdBy" name="createdBy" 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 | + <!--<input id="lastUpdated" name="lastUpdated" class="form-control" type="text">--> | |
123 | + <!--</div>--> | |
124 | + <!--</div>--> | |
125 | + <!--<div class="form-group"> --> | |
126 | + <!--<label class="col-sm-3 control-label">更新者:</label>--> | |
127 | + <!--<div class="col-sm-8">--> | |
128 | + <!--<input id="lastUpdatedBy" name="lastUpdatedBy" class="form-control" type="text">--> | |
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="enable" name="enable" class="form-control" type="text">–>--> | |
135 | + <!--<div class="onoffswitch">--> | |
136 | + <!--<input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable">--> | |
137 | + <!--<label class="onoffswitch-label" for="enable">--> | |
138 | + <!--<span class="onoffswitch-inner"></span>--> | |
139 | + <!--<span class="onoffswitch-switch"></span>--> | |
140 | + <!--</label>--> | |
141 | + <!--</div>--> | |
142 | + <!--</div>--> | |
143 | + <!--</div>--> | |
144 | + <!--<div class="form-group"> --> | |
145 | + <!--<label class="col-sm-3 control-label">是否删除:</label>--> | |
146 | + <!--<div class="col-sm-8">--> | |
147 | + <!--<input id="deleted" name="deleted" class="form-control" type="text">--> | |
148 | + <!--</div>--> | |
149 | + <!--</div>--> | |
150 | + <!--<div class="form-group"> --> | |
151 | + <!--<label class="col-sm-3 control-label">自定义字段1:</label>--> | |
152 | + <!--<div class="col-sm-8">--> | |
153 | + <!--<input id="userDef1" name="userDef1" class="form-control" type="text">--> | |
154 | + <!--</div>--> | |
155 | + <!--</div>--> | |
156 | + <!--<div class="form-group"> --> | |
157 | + <!--<label class="col-sm-3 control-label">自定义字段2:</label>--> | |
158 | + <!--<div class="col-sm-8">--> | |
159 | + <!--<input id="userDef2" name="userDef2" class="form-control" type="text">--> | |
160 | + <!--</div>--> | |
161 | + <!--</div>--> | |
162 | + <!--<div class="form-group"> --> | |
163 | + <!--<label class="col-sm-3 control-label">自定义字段3:</label>--> | |
164 | + <!--<div class="col-sm-8">--> | |
165 | + <!--<input id="userDef3" name="userDef3" class="form-control" type="text">--> | |
166 | + <!--</div>--> | |
167 | + <!--</div>--> | |
168 | + <!--<div class="form-group"> --> | |
169 | + <!--<label class="col-sm-3 control-label">自定义字段4:</label>--> | |
170 | + <!--<div class="col-sm-8">--> | |
171 | + <!--<input id="userDef4" name="userDef4" class="form-control" type="text">--> | |
172 | + <!--</div>--> | |
173 | + <!--</div>--> | |
174 | + <!--<div class="form-group"> --> | |
175 | + <!--<label class="col-sm-3 control-label">自定义字段5:</label>--> | |
176 | + <!--<div class="col-sm-8">--> | |
177 | + <!--<input id="userDef5" name="userDef5" class="form-control" type="text">--> | |
178 | + <!--</div>--> | |
179 | + <!--</div>--> | |
180 | + <div class="form-group"> | |
181 | + <div class="form-control-static col-sm-offset-9"> | |
182 | + <button type="submit" class="btn btn-primary">提交</button> | |
183 | + <button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button> | |
184 | + </div> | |
185 | + </div> | |
186 | + </form> | |
187 | +</div> | |
188 | +<div th:include="include::footer"></div> | |
189 | +<script type="text/javascript"> | |
190 | + var prefix = ctx + "config/receiptPreference"; | |
191 | + $("#form-receiptPreference-edit").validate({ | |
192 | + rules:{ | |
193 | + code:{ | |
194 | + required: true, | |
195 | + }, | |
196 | + name:{ | |
197 | + required: true, | |
198 | + }, | |
199 | + shippingFlow:{ | |
200 | + required: true, | |
201 | + }, | |
202 | + shipmentPickingRule:{ | |
203 | + required: true, | |
204 | + }, | |
205 | + shipmentPickingLocRange:{ | |
206 | + required: true, | |
207 | + }, | |
208 | + allocationRule: { | |
209 | + required: true, | |
210 | + }, | |
211 | + autoAssignLPN: { | |
212 | + required: true, | |
213 | + }, | |
214 | + allowCross: { | |
215 | + required: true, | |
216 | + }, | |
217 | + allowQcCheckResult: { | |
218 | + required: true, | |
219 | + }, | |
220 | + showInventoryQty: { | |
221 | + required: true, | |
222 | + }, | |
223 | + groupPickup: { | |
224 | + required: true, | |
225 | + }, | |
226 | + manuallyBuildLPN: { | |
227 | + required: true, | |
228 | + }, | |
229 | + checkinByPiece: { | |
230 | + required: true, | |
231 | + }, | |
232 | + allowQuickPickup: { | |
233 | + required: true, | |
234 | + } | |
235 | + }, | |
236 | + submitHandler: function(form) { | |
237 | + var tableValue = $.common.getTableValue("#form-shipmentPreference-edit"); | |
238 | + $.operate.save(prefix + "/edit", tableValue); | |
239 | + } | |
240 | + }); | |
241 | +</script> | |
242 | +</body> | |
243 | +</html> | |
... | ... |
src/main/resources/templates/config/shipmentPreference/shipmentPreference.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="shipmentPreference-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="name"/> | |
17 | + </li> | |
18 | + <li> | |
19 | + 出库流程:<input type="text" name="shippingFlow"/> | |
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> 搜索</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> 导出</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:shipmentPreference: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:shipmentPreference: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:shipmentPreference:edit')}]]; | |
52 | + var removeFlag = [[${@permission.hasPermi('config:shipmentPreference:remove')}]]; | |
53 | + var prefix = ctx + "config/shipmentPreference"; | |
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 : 'name', | |
76 | + title : '名称' | |
77 | + }, | |
78 | + { | |
79 | + field : 'shippingFlow', | |
80 | + title : '出库流程' | |
81 | + }, | |
82 | + { | |
83 | + field : 'warehouseCode', | |
84 | + title : '仓库编码', | |
85 | + visible : false | |
86 | + }, | |
87 | + { | |
88 | + field : 'shipmentPickingRule', | |
89 | + title : '拣货规则', | |
90 | + visible : false | |
91 | + }, | |
92 | + { | |
93 | + field : 'shipmentPickingLocRange', | |
94 | + title : '拣货库位范围规则', | |
95 | + visible : false | |
96 | + }, | |
97 | + { | |
98 | + field : 'allocationRule', | |
99 | + title : '库存分配规则', | |
100 | + visible : false | |
101 | + }, | |
102 | + { | |
103 | + field : 'autoAssignLPN', | |
104 | + title : '自动生成托盘号' | |
105 | + }, | |
106 | + { | |
107 | + field : 'allowCross', | |
108 | + title : '允许越库' | |
109 | + }, | |
110 | + { | |
111 | + field : 'allowQcCheckResult', | |
112 | + title : '允许未质检的出库' | |
113 | + }, | |
114 | + { | |
115 | + field : 'showInventoryQty', | |
116 | + title : '显示库存数量' | |
117 | + }, | |
118 | + { | |
119 | + field : 'groupPickup', | |
120 | + title : 'RF组车拣货' | |
121 | + }, | |
122 | + { | |
123 | + field : 'manuallyBuildLPN', | |
124 | + title : '人工组盘' | |
125 | + }, | |
126 | + { | |
127 | + field : 'checkinByPiece', | |
128 | + title : 'RF逐件拣货' | |
129 | + }, | |
130 | + { | |
131 | + field : 'allowQuickPickup', | |
132 | + title : 'RF快速拣货' | |
133 | + }, | |
134 | + { | |
135 | + field : 'created', | |
136 | + title : '创建时间', | |
137 | + visible : false | |
138 | + }, | |
139 | + { | |
140 | + field : 'createdBy', | |
141 | + title : '创建用户', | |
142 | + visible : false | |
143 | + }, | |
144 | + { | |
145 | + field : 'lastUpdated', | |
146 | + title : '更新时间', | |
147 | + visible : false | |
148 | + }, | |
149 | + { | |
150 | + field : 'lastUpdatedBy', | |
151 | + title : '更新用户', | |
152 | + visible : false | |
153 | + }, | |
154 | + { | |
155 | + field : 'version', | |
156 | + title : '数据版本', | |
157 | + visible : false | |
158 | + }, | |
159 | + { | |
160 | + field : 'processStamp', | |
161 | + title : '处理标记', | |
162 | + visible : false | |
163 | + }, | |
164 | + { | |
165 | + field : 'userDef1', | |
166 | + title : '自定义字段1' , | |
167 | + visible:false | |
168 | + }, | |
169 | + { | |
170 | + field : 'userDef2', | |
171 | + title : '自定义字段2' , | |
172 | + visible:false | |
173 | + }, | |
174 | + { | |
175 | + field : 'userDef3', | |
176 | + title : '自定义字段3' , | |
177 | + visible:false | |
178 | + }, | |
179 | + { | |
180 | + field : 'userDef4', | |
181 | + title : '自定义字段4' , | |
182 | + visible:false | |
183 | + }, | |
184 | + { | |
185 | + title: '操作', | |
186 | + align: 'center', | |
187 | + formatter: function(value, row, index) { | |
188 | + var actions = []; | |
189 | + actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')" ><i class="fa fa-edit"></i>编辑</a> '); | |
190 | + actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')" ><i class="fa fa-trash-o"></i>删除</a>'); | |
191 | + return actions.join(''); | |
192 | + } | |
193 | + }] | |
194 | + }; | |
195 | + $.table.init(options); | |
196 | + }); | |
197 | + </script> | |
198 | +</body> | |
199 | +</html> | |
0 | 200 | \ No newline at end of file |
... | ... |