wms / wms_shanghaijiaoda · Commits

Commit 4f1475abd56bfe8b8a7dc9d0578b860f6c23418d

Authored by xqs
2 parents 049bcef8 6b1ad920
develop

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

Inline Side-by-side
Showing 42 changed files with 1826 additions and 984 deletions
src/main/java/com/huaheng/pc/config/alarmLevel/controller/AlarmLevelController.java
  View file @4f1475a
... ... @@ -41,7 +41,7 @@ public class AlarmLevelController extends BaseController {
41 41  
42 42 private String prefix = "config/alarmLevel";
43 43  
44   - @RequiresPermissions("config:containerCapacity:view")
  44 + @RequiresPermissions("config:alarmLevel:view")
45 45 @GetMapping()
46 46 public String containerCapacity()
47 47 {
... ... @@ -125,7 +125,7 @@ public class AlarmLevelController extends BaseController {
125 125 * 修改保存预警等级
126 126 */
127 127 @ApiOperation(value="修改预警等级信息", notes="修改预警等级信息", httpMethod = "POST")
128   - @RequiresPermissions("config:warehouse:edit")
  128 + @RequiresPermissions("config:alarmLevel:edit")
129 129 @Log(title = "配置-预警等级 ",operating = "修改预警等级 ", action = BusinessType.UPDATE)
130 130 @PostMapping("/edit")
131 131 @ResponseBody
... ... @@ -138,7 +138,7 @@ public class AlarmLevelController extends BaseController {
138 138 * 删除预警等级
139 139 */
140 140 @ApiOperation(value="删除预警等级 ", notes="单条删除或批量删除预警等级 ，示例1或1,2,3", httpMethod = "POST")
141   - @RequiresPermissions("config:receiptType:remove")
  141 + @RequiresPermissions("config:alarmLevel:remove")
142 142 @Log(title = "配置-预警等级 ",operating = "删除预警等级 ", action = BusinessType.DELETE)
143 143 @PostMapping( "/remove")
144 144 @ResponseBody
... ...
src/main/java/com/huaheng/pc/config/receiptPreference/controller/ReceiptPreferenceController.java
  View file @4f1475a
... ... @@ -64,9 +64,7 @@ public class ReceiptPreferenceController extends BaseController {
64 64 .eq(StringUtils.isNotEmpty(receiptPreference.getName()),
65 65 ReceiptPreference::getName, receiptPreference.getName())
66 66 .like(StringUtils.isNotEmpty(receiptPreference.getReceivingFlow()),
67   - ReceiptPreference::getReceivingFlow, receiptPreference.getReceivingFlow())
68   - .eq(StringUtils.isNotEmpty(receiptPreference.getReceiptTypes()),
69   - ReceiptPreference::getReceiptTypes, receiptPreference.getReceiptTypes());
  67 + ReceiptPreference::getReceivingFlow, receiptPreference.getReceivingFlow());
70 68  
71 69 if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
72 70 /*使用分页查询*/
... ...
src/main/java/com/huaheng/pc/config/receiptPreference/domain/ReceiptPreference.java
  View file @4f1475a
... ... @@ -6,23 +6,29 @@ 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   -import lombok.Data;
10   -
11 9 import java.io.Serializable;
12 10 import java.util.Date;
  11 +import lombok.Data;
13 12  
14   -@ApiModel(value="com.huaheng.pc.config.receiptPreference.domain.ReceiptPreference",description="入库首选项")
15   -@TableName(value = "receipt_preference")
  13 +@ApiModel(value="com.huaheng.pc.config.receiptPreference.domain.ReceiptPreference")
16 14 @Data
  15 +@TableName(value = "receipt_preference")
17 16 public class ReceiptPreference implements Serializable {
18 17 /**
19 18 * ID
20 19 */
21   - @TableId(value = "id", type = IdType.AUTO)
  20 + @TableId(value = "id", type = IdType.AUTO)
22 21 @ApiModelProperty(value="ID")
23 22 private Integer id;
24 23  
25 24 /**
  25 + * 仓库
  26 + */
  27 + @TableField(value = "warehouseCode")
  28 + @ApiModelProperty(value="仓库")
  29 + private String warehouseCode;
  30 +
  31 + /**
26 32 * 首选项代码
27 33 */
28 34 @TableField(value = "code")
... ... @@ -41,13 +47,6 @@ public class ReceiptPreference implements Serializable {
41 47 private String receivingFlow;
42 48  
43 49 /**
44   - * 仓库
45   - */
46   - @TableField(value = "warehouseCode")
47   - @ApiModelProperty(value="仓库")
48   - private String warehouseCode;
49   -
50   - /**
51 50 * 自动生成托盘号
52 51 */
53 52 @TableField(value = "autoAssignLPN")
... ... @@ -83,13 +82,6 @@ public class ReceiptPreference implements Serializable {
83 82 private Integer showOpenQty;
84 83  
85 84 /**
86   - * 入库单类型
87   - */
88   - @TableField(value = "receiptTypes")
89   - @ApiModelProperty(value="入库单类型")
90   - private String receiptTypes;
91   -
92   - /**
93 85 * RF组车收货
94 86 */
95 87 @TableField(value = "groupPutaway")
... ... @@ -104,11 +96,18 @@ public class ReceiptPreference implements Serializable {
104 96 private Integer manuallyBuildLPN;
105 97  
106 98 /**
107   - * 定位规则动态指派
  99 + * 定位规则
  100 + */
  101 + @TableField(value = "locationRule")
  102 + @ApiModelProperty(value="定位规则")
  103 + private String locationRule;
  104 +
  105 + /**
  106 + * 空库位规则
108 107 */
109   - @TableField(value = "ruleAssignment")
110   - @ApiModelProperty(value="定位规则动态指派")
111   - private String ruleAssignment;
  108 + @TableField(value = "emptyLocRule")
  109 + @ApiModelProperty(value="空库位规则")
  110 + private String emptyLocRule;
112 111  
113 112 /**
114 113 * RF逐件收货
... ... @@ -125,6 +124,34 @@ public class ReceiptPreference implements Serializable {
125 124 private Integer pieceConfirm;
126 125  
127 126 /**
  127 + * abc分类 0 否 1是
  128 + */
  129 + @TableField(value = "abcClass")
  130 + @ApiModelProperty(value="abc分类 0 否 1是")
  131 + private String abcClass;
  132 +
  133 + /**
  134 + * 保质期（天）
  135 + */
  136 + @TableField(value = "daysToExpire")
  137 + @ApiModelProperty(value="保质期（天）")
  138 + private Integer daysToExpire;
  139 +
  140 + /**
  141 + * 临期预警（天）
  142 + */
  143 + @TableField(value = "expiringDays")
  144 + @ApiModelProperty(value="临期预警（天）")
  145 + private Integer expiringDays;
  146 +
  147 + /**
  148 + * 收货预警(天)
  149 + */
  150 + @TableField(value = "minShelfLifeDays")
  151 + @ApiModelProperty(value="收货预警(天)")
  152 + private Integer minShelfLifeDays;
  153 +
  154 + /**
128 155 * RF快速上架
129 156 */
130 157 @TableField(value = "allowQuickPutaway")
... ... @@ -132,6 +159,13 @@ public class ReceiptPreference implements Serializable {
132 159 private Integer allowQuickPutaway;
133 160  
134 161 /**
  162 + * 属性模板
  163 + */
  164 + @TableField(value = "attributeTemplateCode")
  165 + @ApiModelProperty(value="属性模板")
  166 + private String attributeTemplateCode;
  167 +
  168 + /**
135 169 * 快速入库
136 170 */
137 171 @TableField(value = "useQuickCheckIn")
... ... @@ -236,4 +270,5 @@ public class ReceiptPreference implements Serializable {
236 270 @ApiModelProperty(value="处理标记")
237 271 private String processStamp;
238 272  
  273 + private static final long serialVersionUID = 1L;
239 274 }
240 275 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/config/receiptPreference/service/ReceiptPreferenceService.java
  View file @4f1475a
1 1 package com.huaheng.pc.config.receiptPreference.service;
2 2  
3   -import com.baomidou.mybatisplus.extension.service.IService;
4 3 import org.springframework.stereotype.Service;
  4 +import javax.annotation.Resource;
  5 +import java.util.List;
5 6 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
6 7 import com.huaheng.pc.config.receiptPreference.mapper.ReceiptPreferenceMapper;
7 8 import com.huaheng.pc.config.receiptPreference.domain.ReceiptPreference;
8   -
9 9 @Service
10   -public class ReceiptPreferenceService extends ServiceImpl<ReceiptPreferenceMapper, ReceiptPreference> implements IService<ReceiptPreference> {
  10 +public class ReceiptPreferenceService extends ServiceImpl<ReceiptPreferenceMapper, ReceiptPreference> {
11 11  
12 12 }
... ...
src/main/java/com/huaheng/pc/config/shipmentPreference/controller/ShipmentPreferenceController.java 0 → 100644
  View file @4f1475a
  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 + "/shipmentPreference";
  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
  View file @4f1475a
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
  View file @4f1475a
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
  View file @4f1475a
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
  View file @4f1475a
  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/config/warehouseConfig/domain/WarehouseConfig.java deleted
View file @049bcef
1   -package com.huaheng.pc.config.warehouseConfig.domain;
2   -
3   -import com.baomidou.mybatisplus.annotation.IdType;
4   -import com.baomidou.mybatisplus.annotation.TableField;
5   -import com.baomidou.mybatisplus.annotation.TableId;
6   -import com.baomidou.mybatisplus.annotation.TableName;
7   -import io.swagger.annotations.ApiModel;
8   -import io.swagger.annotations.ApiModelProperty;
9   -import java.io.Serializable;
10   -import java.util.Date;
11   -import lombok.Data;
12   -
13   -@ApiModel(value="com.huaheng.pc.config.warehouseConfig.domain.WarehouseConfig")
14   -@Data
15   -@TableName(value = "warehouse_config")
16   -public class WarehouseConfig implements Serializable {
17   - /**
18   - * 编码
19   - */
20   - @TableId(value = "code", type = IdType.INPUT)
21   - @ApiModelProperty(value="编码")
22   - private String code;
23   -
24   - /**
25   - * 仓库编码
26   - */
27   - @TableField(value = "warehouseCode")
28   - @ApiModelProperty(value="仓库编码")
29   - private String warehouseCode;
30   -
31   - /**
32   - * 名称
33   - */
34   - @TableField(value = "name")
35   - @ApiModelProperty(value="名称")
36   - private String name;
37   -
38   - /**
39   - * ABC分类
40   - */
41   - @TableField(value = "abcClass")
42   - @ApiModelProperty(value="ABC分类")
43   - private String abcClass;
44   -
45   - /**
46   - * 保质期（天）
47   - */
48   - @TableField(value = "daysToExpire")
49   - @ApiModelProperty(value="保质期（天）")
50   - private Integer daysToExpire;
51   -
52   - /**
53   - * 定位规则
54   - */
55   - @TableField(value = "locatingRule")
56   - @ApiModelProperty(value="定位规则")
57   - private String locatingRule;
58   -
59   - /**
60   - * 分配规则
61   - */
62   - @TableField(value = "allocationRule")
63   - @ApiModelProperty(value="分配规则")
64   - private String allocationRule;
65   -
66   - /**
67   - * 补货规则
68   - */
69   - @TableField(value = "replenishmentRule")
70   - @ApiModelProperty(value="补货规则")
71   - private String replenishmentRule;
72   -
73   - /**
74   - * 空货位规则
75   - */
76   - @TableField(value = "emptyLocRule")
77   - @ApiModelProperty(value="空货位规则")
78   - private String emptyLocRule;
79   -
80   - /**
81   - * 入库流程
82   - */
83   - @TableField(value = "receivingFlow")
84   - @ApiModelProperty(value="入库流程")
85   - private String receivingFlow;
86   -
87   - /**
88   - * 出库流程
89   - */
90   - @TableField(value = "shippingFlow")
91   - @ApiModelProperty(value="出库流程")
92   - private String shippingFlow;
93   -
94   - /**
95   - * 属性模版
96   - */
97   - @TableField(value = "attributeTemplateCode")
98   - @ApiModelProperty(value="属性模版")
99   - private String attributeTemplateCode;
100   -
101   - /**
102   - * 记录序列号
103   - */
104   - @TableField(value = "trackSerialNum")
105   - @ApiModelProperty(value="记录序列号")
106   - private Integer trackSerialNum;
107   -
108   - /**
109   - * 自动生成序列号
110   - */
111   - @TableField(value = "autoGenSerialNum")
112   - @ApiModelProperty(value="自动生成序列号")
113   - private Integer autoGenSerialNum;
114   -
115   - /**
116   - * 自动生成序列号表达式
117   - */
118   - @TableField(value = "autoGenSerialNumFormat")
119   - @ApiModelProperty(value="自动生成序列号表达式")
120   - private String autoGenSerialNumFormat;
121   -
122   - /**
123   - * 序列号模版
124   - */
125   - @TableField(value = "snTemplateCode")
126   - @ApiModelProperty(value="序列号模版")
127   - private String snTemplateCode;
128   -
129   - /**
130   - * 临期预警天数
131   - */
132   - @TableField(value = "expiringDays")
133   - @ApiModelProperty(value="临期预警天数")
134   - private Integer expiringDays;
135   -
136   - /**
137   - * 收货预警天数
138   - */
139   - @TableField(value = "minShelfLifeDays")
140   - @ApiModelProperty(value="收货预警天数")
141   - private Integer minShelfLifeDays;
142   -
143   - /**
144   - * 状态
145   - */
146   - @TableField(value = "enable")
147   - @ApiModelProperty(value="状态")
148   - private Integer enable;
149   -
150   - /**
151   - * 创建时间
152   - */
153   - @TableField(value = "created")
154   - @ApiModelProperty(value="创建时间")
155   - private Date created;
156   -
157   - /**
158   - * 创建用户
159   - */
160   - @TableField(value = "createdBy")
161   - @ApiModelProperty(value="创建用户")
162   - private String createdBy;
163   -
164   - /**
165   - * 创建时间
166   - */
167   - @TableField(value = "lastUpdated")
168   - @ApiModelProperty(value="创建时间")
169   - private Date lastUpdated;
170   -
171   - /**
172   - * 更新用户
173   - */
174   - @TableField(value = "lastUpdatedBy")
175   - @ApiModelProperty(value="更新用户")
176   - private String lastUpdatedBy;
177   -
178   - /**
179   - * 数据版本
180   - */
181   - @TableField(value = "version")
182   - @ApiModelProperty(value="数据版本")
183   - private Integer version;
184   -
185   - /**
186   - * 自定义字段1
187   - */
188   - @TableField(value = "userDef1")
189   - @ApiModelProperty(value="自定义字段1")
190   - private String userDef1;
191   -
192   - /**
193   - * 自定义字段2
194   - */
195   - @TableField(value = "userDef2")
196   - @ApiModelProperty(value="自定义字段2")
197   - private String userDef2;
198   -
199   - /**
200   - * 自定义字段3
201   - */
202   - @TableField(value = "userDef3")
203   - @ApiModelProperty(value="自定义字段3")
204   - private String userDef3;
205   -
206   - /**
207   - * 自定义字段4
208   - */
209   - @TableField(value = "userDef4")
210   - @ApiModelProperty(value="自定义字段4")
211   - private String userDef4;
212   -
213   - /**
214   - * 自定义字段5
215   - */
216   - @TableField(value = "userDef5")
217   - @ApiModelProperty(value="自定义字段5")
218   - private String userDef5;
219   -
220   - /**
221   - * 自定义字段6
222   - */
223   - @TableField(value = "userDef6")
224   - @ApiModelProperty(value="自定义字段6")
225   - private String userDef6;
226   -
227   - /**
228   - * 自定义字段7
229   - */
230   - @TableField(value = "userDef7")
231   - @ApiModelProperty(value="自定义字段7")
232   - private String userDef7;
233   -
234   - /**
235   - * 自定义字段8
236   - */
237   - @TableField(value = "userDef8")
238   - @ApiModelProperty(value="自定义字段8")
239   - private String userDef8;
240   -
241   - private static final long serialVersionUID = 1L;
242   -}
243 0 \ No newline at end of file
src/main/java/com/huaheng/pc/config/warehouseConfig/mapper/WarehouseConfigMapper.java deleted
View file @049bcef
1   -package com.huaheng.pc.config.warehouseConfig.mapper;
2   -
3   -import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4   -import com.huaheng.pc.config.warehouseConfig.domain.WarehouseConfig;
5   -
6   -public interface WarehouseConfigMapper extends BaseMapper<WarehouseConfig> {
7   -}
8 0 \ No newline at end of file
src/main/java/com/huaheng/pc/config/warehouseConfig/service/WarehouseConfigService.java deleted
View file @049bcef
1   -package com.huaheng.pc.config.warehouseConfig.service;
2   -
3   -import com.huaheng.pc.config.warehouseConfig.domain.WarehouseConfig;
4   -import com.baomidou.mybatisplus.extension.service.IService;
5   -public interface WarehouseConfigService extends IService<WarehouseConfig>{
6   -
7   -
8   -}
src/main/java/com/huaheng/pc/receipt/receiptDetail/controller/ReceiptDetailController.java 0 → 100644
  View file @4f1475a
  1 +package com.huaheng.pc.receipt.receiptDetail.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.utils.StringUtils;
  8 +import com.huaheng.framework.aspectj.lang.annotation.Log;
  9 +import com.huaheng.framework.aspectj.lang.constant.BusinessType;
  10 +import com.huaheng.framework.web.controller.BaseController;
  11 +import com.huaheng.framework.web.page.PageDomain;
  12 +import com.huaheng.framework.web.page.TableDataInfo;
  13 +import com.huaheng.framework.web.page.TableSupport;
  14 +import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail;
  15 +import com.huaheng.pc.receipt.receiptDetail.service.ReceiptDetailService;
  16 +import io.swagger.annotations.Api;
  17 +import io.swagger.annotations.ApiOperation;
  18 +import io.swagger.annotations.ApiParam;
  19 +import org.apache.shiro.authz.annotation.RequiresPermissions;
  20 +import org.springframework.stereotype.Controller;
  21 +import org.springframework.ui.ModelMap;
  22 +import org.springframework.web.bind.annotation.*;
  23 +
  24 +import javax.annotation.Resource;
  25 +import java.util.List;
  26 +
  27 +@Api(tags = "入库明细")
  28 +@Controller
  29 +@RequestMapping("/receipt/receiptDetail")
  30 +public class ReceiptDetailController extends BaseController {
  31 +
  32 + @Resource
  33 + private ReceiptDetailService receiptDetailService;
  34 +
  35 + private String prefix = "receipt/receiptDetail";
  36 +
  37 + @RequiresPermissions("config:receiptDetail:view")
  38 + @Log(title = "入库-入库详情列表", operating = "入库详情列表", action = BusinessType.GRANT)
  39 + @GetMapping("/list/{id}")
  40 + public String list(@PathVariable("id")Integer id, ModelMap mmap) {
  41 + mmap.put("receiptDetail",id);
  42 + return prefix+"/receiptDetail";
  43 + }
  44 +
  45 + /**
  46 + * 查询入库详情
  47 + */
  48 + @ApiOperation(value="查看入库详情", notes="根据头表id获取入库单明细信息", httpMethod = "POST")
  49 + @RequiresPermissions("config:receiptDetail:list")
  50 + @Log(title = "入库-入库单明细管理", operating = "查看入库单明细", action = BusinessType.GRANT)
  51 + @PostMapping("/list")
  52 + @ResponseBody
  53 + public TableDataInfo list(@ApiParam(name="receiptDetail",value="入库详情") ReceiptDetail receiptDetail,
  54 + @ApiParam(name = "createdBegin", value = "起止时间") String createdBegin,
  55 + @ApiParam(name = "createdEnd", value = "结束时间") String createdEnd) {
  56 + LambdaQueryWrapper<ReceiptDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
  57 + PageDomain pageDomain = TableSupport.buildPageRequest();
  58 + Integer pageNum = pageDomain.getPageNum();
  59 + Integer pageSize = pageDomain.getPageSize();
  60 + lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin), ReceiptDetail::getCreated, createdBegin)
  61 + .le(StringUtils.isNotEmpty(createdEnd), ReceiptDetail::getCreated, createdEnd)
  62 + .eq(ReceiptDetail::getReceiptId, receiptDetail.getReceiptId());
  63 + if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
  64 + /*使用分页查询*/
  65 + Page<ReceiptDetail> page = new Page<>(pageNum, pageSize);
  66 + IPage<ReceiptDetail> iPage = receiptDetailService.page(page, lambdaQueryWrapper);
  67 + return getMpDataTable(iPage.getRecords(), iPage.getTotal());
  68 + } else {
  69 + List<ReceiptDetail> list = receiptDetailService.list(lambdaQueryWrapper);
  70 + return getDataTable(list);
  71 + }
  72 + }
  73 +}
... ...
src/main/java/com/huaheng/pc/config/warehouseConfig/controller/WarehouseConfigController.java renamed to src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java
  View file @4f1475a
1   -package com.huaheng.pc.config.warehouseConfig.controller;
  1 +package com.huaheng.pc.receipt.receiptHeader.controller;
2 2  
3 3 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4 4 import com.baomidou.mybatisplus.core.metadata.IPage;
... ... @@ -13,10 +13,10 @@ import com.huaheng.framework.web.domain.AjaxResult;
13 13 import com.huaheng.framework.web.page.PageDomain;
14 14 import com.huaheng.framework.web.page.TableDataInfo;
15 15 import com.huaheng.framework.web.page.TableSupport;
16   -import com.huaheng.pc.config.warehouseConfig.domain.WarehouseConfig;
17   -import com.huaheng.pc.config.warehouseConfig.service.WarehouseConfigService;
  16 +import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
  17 +import com.huaheng.pc.receipt.receiptHeader.service.ReceiptHeaderService;
  18 +import io.swagger.annotations.Api;
18 19 import io.swagger.annotations.ApiOperation;
19   -import io.swagger.annotations.ApiParam;
20 20 import org.apache.shiro.authz.annotation.RequiresPermissions;
21 21 import org.springframework.stereotype.Controller;
22 22 import org.springframework.ui.ModelMap;
... ... @@ -25,50 +25,58 @@ import org.springframework.web.bind.annotation.*;
25 25 import javax.annotation.Resource;
26 26 import java.util.List;
27 27  
  28 +@Api(tags = "入库单")
28 29 @Controller
29   -@RequestMapping("/config/warehouseConfig")
30   -public class WarehouseConfigController extends BaseController {
  30 +@RequestMapping("/receipt/receiptHeader")
  31 +public class ReceiptHeaderController extends BaseController {
31 32  
32   - private String prefix = "config/warehouseConfig";
  33 + private String prefix="receipt/receiptHeader";
33 34  
34 35 @Resource
35   - private WarehouseConfigService warehouseConfigService;
  36 + private ReceiptHeaderService receiptHeaderService;
36 37  
37   - @RequiresPermissions("config:warehouseConfig:view")
  38 + @RequiresPermissions("config:receiptHeader:view")
38 39 @GetMapping()
39   - public String receiptDetailHistory() {
40   - return prefix + "/warehouse";
  40 + public String containerCapacity()
  41 + {
  42 + return prefix + "/receiptHeader";
41 43 }
42 44  
43 45 /**
44   - * 查询仓库配置
  46 + * 查询入库单
45 47 */
46   - @ApiOperation(value="查看仓库配置", notes="根据编码获取仓库配置", httpMethod = "POST")
47   - @RequiresPermissions("config:warehouseConfig:list")
48   - @Log(title = "配置-仓库配置",operating = "仓库配置列表", action = BusinessType.GRANT)
  48 + @RequiresPermissions("config:receiptHeader:list")
  49 + @Log(title = "入库-入库单头表", operating = "查看入库单列表", action = BusinessType.GRANT)
49 50 @PostMapping("/list")
50 51 @ResponseBody
51   - public TableDataInfo list(@ApiParam(name="WarehouseConfig",value="编码") WarehouseConfig warehouseConfig) {
52   - LambdaQueryWrapper<WarehouseConfig> lambda = Wrappers.lambdaQuery();
  52 + public TableDataInfo list(ReceiptHeader receiptHeader, String createdBegin, String createdEnd) {
  53 + LambdaQueryWrapper<ReceiptHeader> lambdaQueryWrapper = Wrappers.lambdaQuery();
53 54 PageDomain pageDomain = TableSupport.buildPageRequest();
54 55 Integer pageNum = pageDomain.getPageNum();
55 56 Integer pageSize = pageDomain.getPageSize();
56   - lambda.eq(StringUtils.isNotEmpty(warehouseConfig.getWarehouseCode()), WarehouseConfig::getWarehouseCode
57   - , warehouseConfig.getWarehouseCode());
  57 +
  58 + lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin), ReceiptHeader::getCreated, createdBegin)
  59 + .le(StringUtils.isNotEmpty(createdEnd), ReceiptHeader::getCreated, createdEnd)
  60 + .in(ReceiptHeader::getCompanyCode, ShiroUtils.getCompanyCodeList())
  61 + .eq(ReceiptHeader::getWarehouseCode, ShiroUtils.getWarehouseCode())
  62 + .eq(StringUtils.isNotEmpty(receiptHeader.getReceiptType()),
  63 + ReceiptHeader::getReceiptType, receiptHeader.getReceiptType());
58 64  
59 65 if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
60   - /*使用分页查询*/
61   - Page<WarehouseConfig> page = new Page<>(pageNum, pageSize);
62   - IPage<WarehouseConfig> iPage = warehouseConfigService.page(page, lambda);
63   - return getMpDataTable(iPage.getRecords(), iPage.getTotal());
  66 + /**
  67 + * 使用分页查询
  68 + */
  69 + Page<ReceiptHeader> page = new Page<>(pageNum, pageSize);
  70 + IPage<ReceiptHeader> iPage = receiptHeaderService.page(page, lambdaQueryWrapper);
  71 + return getMpDataTable(iPage.getRecords(),iPage.getTotal());
64 72 } else {
65   - List<WarehouseConfig> list = warehouseConfigService.list(lambda);
  73 + List<ReceiptHeader> list = receiptHeaderService.list(lambdaQueryWrapper);
66 74 return getDataTable(list);
67 75 }
68 76 }
69 77  
70 78 /**
71   - * 新增仓库配置
  79 + * 新增入库单
72 80 */
73 81 @GetMapping("/add")
74 82 public String add() {
... ... @@ -76,45 +84,42 @@ public class WarehouseConfigController extends BaseController {
76 84 }
77 85  
78 86 /**
79   - * 新增保存仓库配置
  87 + * 新增保存入库单
80 88 */
81   - @ApiOperation(value="新增仓库配置", notes="新增仓库配置", httpMethod = "POST")
82   - @RequiresPermissions("config:warehouseConfig:add")
83   - @Log(title = "配置-仓库配置",operating = "新增仓库配置", action = BusinessType.INSERT)
  89 + @ApiOperation(value="新增入库单 ", notes="新增入库单 ", httpMethod = "POST")
  90 + @RequiresPermissions("config:receiptHeader:add")
  91 + @Log(title = "入库-入库单 ",operating = "新增入库单 ", action = BusinessType.INSERT)
84 92 @PostMapping("/add")
85 93 @ResponseBody
86   - public AjaxResult addSave(WarehouseConfig warehouseConfig) {
87   - LambdaQueryWrapper<WarehouseConfig> lambda = Wrappers.lambdaQuery();
88   - lambda.eq(WarehouseConfig::getWarehouseCode, warehouseConfig.getWarehouseCode());
89   - if (warehouseConfigService.getOne(lambda) != null){
90   - return AjaxResult.error("当前仓库已存在配置");
91   - }
92   - warehouseConfig.setCreatedBy(ShiroUtils.getLoginName());
93   - warehouseConfig.setLastUpdatedBy(ShiroUtils.getLoginName());
94   - return toAjax(warehouseConfigService.save(warehouseConfig));
  94 + public AjaxResult addSave(ReceiptHeader receiptHeader) {
  95 + receiptHeader.setWarehouseCode(ShiroUtils.getWarehouseCode());
  96 + receiptHeader.setFirstStatus(0);
  97 + receiptHeader.setLastStatus(0);
  98 + receiptHeader.setCreatedBy(ShiroUtils.getLoginName());
  99 + receiptHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
  100 + return toAjax(receiptHeaderService.save(receiptHeader));
95 101 }
96 102  
97 103 /**
98   - * 修改仓库配置
  104 + * 修改入库单
99 105 */
100 106 @GetMapping("/edit/{id}")
101 107 public String edit(@PathVariable("id") Integer id, ModelMap mmap) {
102   - WarehouseConfig warehouseConfig = warehouseConfigService.getById(id);
103   - mmap.put("warehouseConfig", warehouseConfig);
  108 + ReceiptHeader receiptHeader = receiptHeaderService.getById(id);
  109 + mmap.put("receiptHeader", receiptHeader);
104 110 return prefix + "/edit";
105 111 }
106 112  
107 113 /**
108   - * 修改保存仓库配置
  114 + * 修改保存入库单
109 115 */
110   - @ApiOperation(value="修改仓库配置信息", notes="修改仓库配置信息", httpMethod = "POST")
111   - @RequiresPermissions("config:warehouseConfig:edit")
112   - @Log(title = "配置-仓库配置",operating = "修改仓库配置", action = BusinessType.UPDATE)
  116 + @ApiOperation(value="修改入库单", notes="修改入库单", httpMethod = "POST")
  117 + @RequiresPermissions("config:receiptHeader:edit")
  118 + @Log(title = "入库-入库单 ",operating = "修改入库单 ", action = BusinessType.UPDATE)
113 119 @PostMapping("/edit")
114 120 @ResponseBody
115   - public AjaxResult editSave(WarehouseConfig warehouseConfig) {
116   - warehouseConfig.setLastUpdatedBy(ShiroUtils.getLoginName());
117   - return toAjax(warehouseConfigService.updateById(warehouseConfig));
  121 + public AjaxResult editSave(ReceiptHeader receiptHeader) {
  122 + receiptHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
  123 + return toAjax(receiptHeaderService.updateById(receiptHeader));
118 124 }
119   -
120 125 }
... ...
src/main/java/com/huaheng/pc/receipt/receiptHeader/domain/ReceiptHeader.java
  View file @4f1475a
... ... @@ -4,329 +4,296 @@ import com.baomidou.mybatisplus.annotation.IdType;
4 4 import com.baomidou.mybatisplus.annotation.TableField;
5 5 import com.baomidou.mybatisplus.annotation.TableId;
6 6 import com.baomidou.mybatisplus.annotation.TableName;
  7 +import io.swagger.annotations.ApiModel;
  8 +import io.swagger.annotations.ApiModelProperty;
7 9 import java.io.Serializable;
8 10 import java.math.BigDecimal;
9 11 import java.util.Date;
10 12 import lombok.Data;
11 13  
12   -/**
13   - * 入库头表
14   - */
  14 +@ApiModel(value="com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader")
15 15 @Data
16 16 @TableName(value = "receipt_header")
17 17 public class ReceiptHeader implements Serializable {
18 18 /**
19 19 * 入库单内部号
20 20 */
21   - @TableId(value = "id", type = IdType.AUTO)
  21 + @TableId(value = "id", type = IdType.AUTO)
  22 + @ApiModelProperty(value="入库单内部号")
22 23 private Integer id;
23 24  
24 25 /**
25 26 * 仓库
26 27 */
27 28 @TableField(value = "warehouseCode")
  29 + @ApiModelProperty(value="仓库")
28 30 private String warehouseCode;
29 31  
30 32 /**
31 33 * 货主
32 34 */
33 35 @TableField(value = "companyCode")
  36 + @ApiModelProperty(value="货主")
34 37 private String companyCode;
35 38  
36 39 /**
37 40 * 入库单号
38 41 */
39 42 @TableField(value = "code")
  43 + @ApiModelProperty(value="入库单号")
40 44 private String code;
41 45  
42 46 /**
43 47 * 入库类型
44 48 */
45 49 @TableField(value = "receiptType")
  50 + @ApiModelProperty(value="入库类型")
46 51 private String receiptType;
47 52  
48 53 /**
49 54 * 首状态
50 55 */
51 56 @TableField(value = "firstStatus")
  57 + @ApiModelProperty(value="首状态")
52 58 private Integer firstStatus;
53 59  
54 60 /**
55 61 * 尾状态
56 62 */
57 63 @TableField(value = "lastStatus")
  64 + @ApiModelProperty(value="尾状态")
58 65 private Integer lastStatus;
59 66  
60 67 /**
61 68 * 关联单号
62 69 */
63 70 @TableField(value = "referCode")
  71 + @ApiModelProperty(value="关联单号")
64 72 private String referCode;
65 73  
66 74 /**
67 75 * 关联单号（内部号）
68 76 */
69 77 @TableField(value = "referId")
  78 + @ApiModelProperty(value="关联单号（内部号）")
70 79 private Integer referId;
71 80  
72 81 /**
73 82 * 关联订单类型
74 83 */
75 84 @TableField(value = "referType")
  85 + @ApiModelProperty(value="关联订单类型")
76 86 private String referType;
77 87  
78 88 /**
79 89 * 预计到达日期
80 90 */
81 91 @TableField(value = "scheduledArriveDate")
  92 + @ApiModelProperty(value="预计到达日期")
82 93 private Date scheduledArriveDate;
83 94  
84 95 /**
85 96 * 实际到达日期
86 97 */
87 98 @TableField(value = "actualArriveDate")
  99 + @ApiModelProperty(value="实际到达日期")
88 100 private Date actualArriveDate;
89 101  
90 102 /**
91 103 * 月台货位
92 104 */
93 105 @TableField(value = "recvDock")
  106 + @ApiModelProperty(value="月台货位")
94 107 private String recvDock;
95 108  
96 109 /**
97 110 * 关闭时间
98 111 */
99 112 @TableField(value = "closedAt")
  113 + @ApiModelProperty(value="关闭时间")
100 114 private Date closedAt;
101 115  
102 116 /**
103 117 * 强制关闭用户
104 118 */
105 119 @TableField(value = "closedBy")
  120 + @ApiModelProperty(value="强制关闭用户")
106 121 private String closedBy;
107 122  
108 123 /**
109 124 * 开始收货日期
110 125 */
111 126 @TableField(value = "startCheckinDatetime")
  127 + @ApiModelProperty(value="开始收货日期")
112 128 private Date startCheckinDatetime;
113 129  
114 130 /**
115 131 * 结束收货日期
116 132 */
117 133 @TableField(value = "endCheckinDatetime")
  134 + @ApiModelProperty(value="结束收货日期")
118 135 private Date endCheckinDatetime;
119 136  
120 137 /**
121 138 * 总数量
122 139 */
123 140 @TableField(value = "totalQty")
  141 + @ApiModelProperty(value="总数量")
124 142 private Integer totalQty;
125 143  
126 144 /**
127 145 * 总行数
128 146 */
129 147 @TableField(value = "totalLines")
  148 + @ApiModelProperty(value="总行数")
130 149 private Integer totalLines;
131 150  
132 151 /**
133 152 * 总箱数
134 153 */
135 154 @TableField(value = "toalCases")
  155 + @ApiModelProperty(value="总箱数")
136 156 private Integer toalCases;
137 157  
138 158 /**
139 159 * 总重量
140 160 */
141 161 @TableField(value = "totalWeight")
  162 + @ApiModelProperty(value="总重量")
142 163 private BigDecimal totalWeight;
143 164  
144 165 /**
145 166 * 总体积
146 167 */
147 168 @TableField(value = "totalVolume")
  169 + @ApiModelProperty(value="总体积")
148 170 private BigDecimal totalVolume;
149 171  
150 172 /**
151 173 * 入库单备注
152 174 */
153 175 @TableField(value = "receiptNote")
  176 + @ApiModelProperty(value="入库单备注")
154 177 private String receiptNote;
155 178  
156 179 /**
157 180 * 锁定
158 181 */
159 182 @TableField(value = "locked")
  183 + @ApiModelProperty(value="锁定")
160 184 private Integer locked;
161 185  
162 186 /**
163 187 * 锁定用户
164 188 */
165 189 @TableField(value = "lockedBy")
  190 + @ApiModelProperty(value="锁定用户")
166 191 private String lockedBy;
167 192  
168 193 /**
169 194 * 创建时间
170 195 */
171 196 @TableField(value = "created")
  197 + @ApiModelProperty(value="创建时间")
172 198 private Date created;
173 199  
174 200 /**
175 201 * 创建用户
176 202 */
177 203 @TableField(value = "createdBy")
  204 + @ApiModelProperty(value="创建用户")
178 205 private String createdBy;
179 206  
180 207 /**
181 208 * 创建时间
182 209 */
183 210 @TableField(value = "lastUpdated")
  211 + @ApiModelProperty(value="创建时间")
184 212 private Date lastUpdated;
185 213  
186 214 /**
187 215 * 更新用户
188 216 */
189 217 @TableField(value = "lastUpdatedBy")
  218 + @ApiModelProperty(value="更新用户")
190 219 private String lastUpdatedBy;
191 220  
192 221 /**
193 222 * 数据版本
194 223 */
195 224 @TableField(value = "version")
  225 + @ApiModelProperty(value="数据版本")
196 226 private Integer version;
197 227  
198 228 /**
199 229 * 自定义字段1
200 230 */
201 231 @TableField(value = "userDef1")
  232 + @ApiModelProperty(value="自定义字段1")
202 233 private String userDef1;
203 234  
204 235 /**
205 236 * 自定义字段2
206 237 */
207 238 @TableField(value = "userDef2")
  239 + @ApiModelProperty(value="自定义字段2")
208 240 private String userDef2;
209 241  
210 242 /**
211 243 * 自定义字段3
212 244 */
213 245 @TableField(value = "userDef3")
  246 + @ApiModelProperty(value="自定义字段3")
214 247 private String userDef3;
215 248  
216 249 /**
217 250 * 自定义字段4
218 251 */
219 252 @TableField(value = "userDef4")
  253 + @ApiModelProperty(value="自定义字段4")
220 254 private String userDef4;
221 255  
222 256 /**
223 257 * 自定义字段5
224 258 */
225 259 @TableField(value = "userDef5")
  260 + @ApiModelProperty(value="自定义字段5")
226 261 private String userDef5;
227 262  
228 263 /**
229 264 * 自定义字段6
230 265 */
231 266 @TableField(value = "userDef6")
  267 + @ApiModelProperty(value="自定义字段6")
232 268 private String userDef6;
233 269  
234 270 /**
235 271 * 自定义字段7
236 272 */
237 273 @TableField(value = "userDef7")
  274 + @ApiModelProperty(value="自定义字段7")
238 275 private String userDef7;
239 276  
240 277 /**
241 278 * 自定义字段8
242 279 */
243 280 @TableField(value = "userDef8")
  281 + @ApiModelProperty(value="自定义字段8")
244 282 private String userDef8;
245 283  
246 284 /**
247 285 * 处理标记
248 286 */
249 287 @TableField(value = "processStamp")
  288 + @ApiModelProperty(value="处理标记")
250 289 private String processStamp;
251 290  
  291 + /**
  292 + * 是否删除
  293 + */
252 294 @TableField(value = "deleted")
  295 + @ApiModelProperty(value="是否删除")
253 296 private Boolean deleted;
254 297  
255 298 private static final long serialVersionUID = 1L;
256   -
257   - public static final String COL_WAREHOUSECODE = "warehouseCode";
258   -
259   - public static final String COL_COMPANYCODE = "companyCode";
260   -
261   - public static final String COL_CODE = "code";
262   -
263   - public static final String COL_RECEIPTTYPE = "receiptType";
264   -
265   - public static final String COL_FIRSTSTATUS = "firstStatus";
266   -
267   - public static final String COL_LASTSTATUS = "lastStatus";
268   -
269   - public static final String COL_REFERCODE = "referCode";
270   -
271   - public static final String COL_REFERID = "referId";
272   -
273   - public static final String COL_REFERTYPE = "referType";
274   -
275   - public static final String COL_SCHEDULEDARRIVEDATE = "scheduledArriveDate";
276   -
277   - public static final String COL_ACTUALARRIVEDATE = "actualArriveDate";
278   -
279   - public static final String COL_RECVDOCK = "recvDock";
280   -
281   - public static final String COL_CLOSEDAT = "closedAt";
282   -
283   - public static final String COL_CLOSEDBY = "closedBy";
284   -
285   - public static final String COL_STARTCHECKINDATETIME = "startCheckinDatetime";
286   -
287   - public static final String COL_ENDCHECKINDATETIME = "endCheckinDatetime";
288   -
289   - public static final String COL_TOTALQTY = "totalQty";
290   -
291   - public static final String COL_TOTALLINES = "totalLines";
292   -
293   - public static final String COL_TOALCASES = "toalCases";
294   -
295   - public static final String COL_TOTALWEIGHT = "totalWeight";
296   -
297   - public static final String COL_TOTALVOLUME = "totalVolume";
298   -
299   - public static final String COL_RECEIPTNOTE = "receiptNote";
300   -
301   - public static final String COL_LOCKED = "locked";
302   -
303   - public static final String COL_LOCKEDBY = "lockedBy";
304   -
305   - public static final String COL_CREATED = "created";
306   -
307   - public static final String COL_CREATEDBY = "createdBy";
308   -
309   - public static final String COL_LASTUPDATED = "lastUpdated";
310   -
311   - public static final String COL_LASTUPDATEDBY = "lastUpdatedBy";
312   -
313   - public static final String COL_VERSION = "version";
314   -
315   - public static final String COL_USERDEF1 = "userDef1";
316   -
317   - public static final String COL_USERDEF2 = "userDef2";
318   -
319   - public static final String COL_USERDEF3 = "userDef3";
320   -
321   - public static final String COL_USERDEF4 = "userDef4";
322   -
323   - public static final String COL_USERDEF5 = "userDef5";
324   -
325   - public static final String COL_USERDEF6 = "userDef6";
326   -
327   - public static final String COL_USERDEF7 = "userDef7";
328   -
329   - public static final String COL_USERDEF8 = "userDef8";
330   -
331   - public static final String COL_PROCESSSTAMP = "processStamp";
332 299 }
333 300 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/receipt/receiptHeader/domain/ReceiptModel.java deleted
View file @049bcef
1   -package com.huaheng.pc.receipt.receiptHeader.domain;
2   -
3   -import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail;
4   -import lombok.Data;
5   -
6   -import java.util.List;
7   -
8   -/**
9   - * 入库实体类
10   - */
11   -@Data
12   -public class ReceiptModel {
13   -
14   - private ReceiptHeader receiptHeader;
15   -
16   - private List<ReceiptDetail> receiptDetail;
17   -}
src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java
  View file @4f1475a
1 1 package com.huaheng.pc.receipt.receiptHeader.service;
2 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.receipt.receiptHeader.mapper.ReceiptHeaderMapper;
3 8 import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
4   -import com.baomidou.mybatisplus.extension.service.IService;
5   -public interface ReceiptHeaderService extends IService<ReceiptHeader>{
6   -
  9 +@Service
  10 +public class ReceiptHeaderService extends ServiceImpl<ReceiptHeaderMapper, ReceiptHeader> {
7 11  
8 12 }
... ...
src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderServiceImpl.java deleted
View file @049bcef
1   -package com.huaheng.pc.receipt.receiptHeader.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.receipt.receiptHeader.mapper.ReceiptHeaderMapper;
8   -import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
9   -import com.huaheng.pc.receipt.receiptHeader.service.ReceiptHeaderService;
10   -@Service
11   -public class ReceiptHeaderServiceImpl extends ServiceImpl<ReceiptHeaderMapper, ReceiptHeader> implements ReceiptHeaderService{
12   -
13   -}
src/main/java/com/huaheng/pc/shipment/FilterConfigDetail/domain/FilterConfigDetail.java 0 → 100644
  View file @4f1475a
  1 +package com.huaheng.pc.shipment.FilterConfigDetail.domain;
  2 +
  3 +import com.baomidou.mybatisplus.annotation.IdType;
  4 +import com.baomidou.mybatisplus.annotation.TableField;
  5 +import com.baomidou.mybatisplus.annotation.TableId;
  6 +import com.baomidou.mybatisplus.annotation.TableName;
  7 +import io.swagger.annotations.ApiModel;
  8 +import io.swagger.annotations.ApiModelProperty;
  9 +import java.io.Serializable;
  10 +import java.util.Date;
  11 +import lombok.Data;
  12 +
  13 +@ApiModel(value="com.huaheng.pc.shipment.FilterConfigDetail.domain.FilterConfigDetail")
  14 +@Data
  15 +@TableName(value = "filter_config_detail")
  16 +public class FilterConfigDetail implements Serializable {
  17 + /**
  18 + * ID
  19 + */
  20 + @TableId(value = "id", type = IdType.AUTO)
  21 + @ApiModelProperty(value="ID")
  22 + private Integer id;
  23 +
  24 + /**
  25 + * 头表标识
  26 + */
  27 + @TableField(value = "headerId")
  28 + @ApiModelProperty(value="头表标识")
  29 + private Integer headerId;
  30 +
  31 + /**
  32 + * 编码
  33 + */
  34 + @TableField(value = "code")
  35 + @ApiModelProperty(value="编码")
  36 + private String code;
  37 +
  38 + /**
  39 + * 模块
  40 + */
  41 + @TableField(value = "moduleType")
  42 + @ApiModelProperty(value="模块")
  43 + private String moduleType;
  44 +
  45 + /**
  46 + * 类型
  47 + */
  48 + @TableField(value = "recordType")
  49 + @ApiModelProperty(value="类型")
  50 + private String recordType;
  51 +
  52 + /**
  53 + * 条件名
  54 + */
  55 + @TableField(value = "filterCode")
  56 + @ApiModelProperty(value="条件名")
  57 + private String filterCode;
  58 +
  59 + /**
  60 + * 仓库
  61 + */
  62 + @TableField(value = "warehouseCode")
  63 + @ApiModelProperty(value="仓库")
  64 + private String warehouseCode;
  65 +
  66 + /**
  67 + * 描述
  68 + */
  69 + @TableField(value = "description")
  70 + @ApiModelProperty(value="描述")
  71 + private String description;
  72 +
  73 + /**
  74 + * 全SQL
  75 + */
  76 + @TableField(value = "statement")
  77 + @ApiModelProperty(value="全SQL")
  78 + private String statement;
  79 +
  80 + /**
  81 + * 是否系统创建
  82 + */
  83 + @TableField(value = "systemCreated")
  84 + @ApiModelProperty(value="是否系统创建")
  85 + private Integer systemCreated;
  86 +
  87 + /**
  88 + * 是否自定义SQL
  89 + */
  90 + @TableField(value = "customSql")
  91 + @ApiModelProperty(value="是否自定义SQL")
  92 + private String customSql;
  93 +
  94 + /**
  95 + * 创建时间
  96 + */
  97 + @TableField(value = "created")
  98 + @ApiModelProperty(value="创建时间")
  99 + private Date created;
  100 +
  101 + /**
  102 + * 创建用户
  103 + */
  104 + @TableField(value = "createdBy")
  105 + @ApiModelProperty(value="创建用户")
  106 + private String createdBy;
  107 +
  108 + /**
  109 + * 创建时间
  110 + */
  111 + @TableField(value = "lastUpdated")
  112 + @ApiModelProperty(value="创建时间")
  113 + private Date lastUpdated;
  114 +
  115 + /**
  116 + * 更新用户
  117 + */
  118 + @TableField(value = "lastUpdatedBy")
  119 + @ApiModelProperty(value="更新用户")
  120 + private String lastUpdatedBy;
  121 +
  122 + /**
  123 + * 数据版本
  124 + */
  125 + @TableField(value = "version")
  126 + @ApiModelProperty(value="数据版本")
  127 + private Integer version;
  128 +
  129 + /**
  130 + * 自定义字段1
  131 + */
  132 + @TableField(value = "userDef1")
  133 + @ApiModelProperty(value="自定义字段1")
  134 + private String userDef1;
  135 +
  136 + /**
  137 + * 自定义字段2
  138 + */
  139 + @TableField(value = "userDef2")
  140 + @ApiModelProperty(value="自定义字段2")
  141 + private String userDef2;
  142 +
  143 + /**
  144 + * 自定义字段3
  145 + */
  146 + @TableField(value = "userDef3")
  147 + @ApiModelProperty(value="自定义字段3")
  148 + private String userDef3;
  149 +
  150 + /**
  151 + * 自定义字段4
  152 + */
  153 + @TableField(value = "userDef4")
  154 + @ApiModelProperty(value="自定义字段4")
  155 + private String userDef4;
  156 +
  157 + /**
  158 + * 自定义字段5
  159 + */
  160 + @TableField(value = "userDef5")
  161 + @ApiModelProperty(value="自定义字段5")
  162 + private String userDef5;
  163 +
  164 + /**
  165 + * 自定义字段6
  166 + */
  167 + @TableField(value = "userDef6")
  168 + @ApiModelProperty(value="自定义字段6")
  169 + private String userDef6;
  170 +
  171 + /**
  172 + * 自定义字段7
  173 + */
  174 + @TableField(value = "userDef7")
  175 + @ApiModelProperty(value="自定义字段7")
  176 + private String userDef7;
  177 +
  178 + /**
  179 + * 自定义字段8
  180 + */
  181 + @TableField(value = "userDef8")
  182 + @ApiModelProperty(value="自定义字段8")
  183 + private String userDef8;
  184 +
  185 + /**
  186 + * 处理标记
  187 + */
  188 + @TableField(value = "processStamp")
  189 + @ApiModelProperty(value="处理标记")
  190 + private String processStamp;
  191 +
  192 + /**
  193 + * 条件名称
  194 + */
  195 + @TableField(value = "filterName")
  196 + @ApiModelProperty(value="条件名称")
  197 + private String filterName;
  198 +
  199 + private static final long serialVersionUID = 1L;
  200 +}
0 201 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/shipment/FilterConfigDetail/mapper/FilterConfigDetailMapper.java 0 → 100644
  View file @4f1475a
  1 +package com.huaheng.pc.shipment.FilterConfigDetail.mapper;
  2 +
  3 +import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  4 +import com.huaheng.pc.shipment.FilterConfigDetail.domain.FilterConfigDetail;
  5 +
  6 +public interface FilterConfigDetailMapper extends BaseMapper<FilterConfigDetail> {
  7 +}
0 8 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/shipment/shipmentPreference/service/ShipmentPreferenceServiceImpl.java renamed to src/main/java/com/huaheng/pc/shipment/FilterConfigDetail/service/FilterConfigDetailService.java
  View file @4f1475a
1   -package com.huaheng.pc.shipment.shipmentPreference.service;
  1 +package com.huaheng.pc.shipment.FilterConfigDetail.service;
2 2  
3 3 import org.springframework.stereotype.Service;
4 4 import javax.annotation.Resource;
5 5 import java.util.List;
6 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;
  7 +import com.huaheng.pc.shipment.FilterConfigDetail.domain.FilterConfigDetail;
  8 +import com.huaheng.pc.shipment.FilterConfigDetail.mapper.FilterConfigDetailMapper;
10 9 @Service
11   -public class ShipmentPreferenceServiceImpl extends ServiceImpl<ShipmentPreferenceMapper, ShipmentPreference> implements ShipmentPreferenceService{
  10 +public class FilterConfigDetailService extends ServiceImpl<FilterConfigDetailMapper, FilterConfigDetail> {
12 11  
13 12 }
... ...
src/main/java/com/huaheng/pc/shipment/FilterConfigHeader/domain/FilterConfigHeader.java 0 → 100644
  View file @4f1475a
  1 +package com.huaheng.pc.shipment.FilterConfigHeader.domain;
  2 +
  3 +import com.baomidou.mybatisplus.annotation.IdType;
  4 +import com.baomidou.mybatisplus.annotation.TableField;
  5 +import com.baomidou.mybatisplus.annotation.TableId;
  6 +import com.baomidou.mybatisplus.annotation.TableName;
  7 +import io.swagger.annotations.ApiModel;
  8 +import io.swagger.annotations.ApiModelProperty;
  9 +import java.io.Serializable;
  10 +import java.util.Date;
  11 +import lombok.Data;
  12 +
  13 +@ApiModel(value="com.huaheng.pc.shipment.FilterConfigHeader.domain.FilterConfigHeader")
  14 +@Data
  15 +@TableName(value = "filter_config_header")
  16 +public class FilterConfigHeader implements Serializable {
  17 + /**
  18 + * ID
  19 + */
  20 + @TableId(value = "id", type = IdType.AUTO)
  21 + @ApiModelProperty(value="ID")
  22 + private Integer id;
  23 +
  24 + /**
  25 + * 模块
  26 + */
  27 + @TableField(value = "moduleType")
  28 + @ApiModelProperty(value="模块")
  29 + private String moduleType;
  30 +
  31 + /**
  32 + * 类型
  33 + */
  34 + @TableField(value = "recordType")
  35 + @ApiModelProperty(value="类型")
  36 + private String recordType;
  37 +
  38 + /**
  39 + * 条件名
  40 + */
  41 + @TableField(value = "filterCode")
  42 + @ApiModelProperty(value="条件名")
  43 + private String filterCode;
  44 +
  45 + /**
  46 + * 仓库
  47 + */
  48 + @TableField(value = "warehouseCode")
  49 + @ApiModelProperty(value="仓库")
  50 + private String warehouseCode;
  51 +
  52 + /**
  53 + * 描述
  54 + */
  55 + @TableField(value = "description")
  56 + @ApiModelProperty(value="描述")
  57 + private String description;
  58 +
  59 + /**
  60 + * 是否系统创建
  61 + */
  62 + @TableField(value = "systemCreated")
  63 + @ApiModelProperty(value="是否系统创建")
  64 + private Integer systemCreated;
  65 +
  66 + /**
  67 + * 创建时间
  68 + */
  69 + @TableField(value = "created")
  70 + @ApiModelProperty(value="创建时间")
  71 + private Date created;
  72 +
  73 + /**
  74 + * 创建用户
  75 + */
  76 + @TableField(value = "createdBy")
  77 + @ApiModelProperty(value="创建用户")
  78 + private String createdBy;
  79 +
  80 + /**
  81 + * 创建时间
  82 + */
  83 + @TableField(value = "lastUpdated")
  84 + @ApiModelProperty(value="创建时间")
  85 + private Date lastUpdated;
  86 +
  87 + /**
  88 + * 更新用户
  89 + */
  90 + @TableField(value = "lastUpdatedBy")
  91 + @ApiModelProperty(value="更新用户")
  92 + private String lastUpdatedBy;
  93 +
  94 + /**
  95 + * 数据版本
  96 + */
  97 + @TableField(value = "version")
  98 + @ApiModelProperty(value="数据版本")
  99 + private Integer version;
  100 +
  101 + /**
  102 + * 自定义字段1
  103 + */
  104 + @TableField(value = "userDef1")
  105 + @ApiModelProperty(value="自定义字段1")
  106 + private String userDef1;
  107 +
  108 + /**
  109 + * 自定义字段2
  110 + */
  111 + @TableField(value = "userDef2")
  112 + @ApiModelProperty(value="自定义字段2")
  113 + private String userDef2;
  114 +
  115 + /**
  116 + * 自定义字段3
  117 + */
  118 + @TableField(value = "userDef3")
  119 + @ApiModelProperty(value="自定义字段3")
  120 + private String userDef3;
  121 +
  122 + /**
  123 + * 自定义字段4
  124 + */
  125 + @TableField(value = "userDef4")
  126 + @ApiModelProperty(value="自定义字段4")
  127 + private String userDef4;
  128 +
  129 + /**
  130 + * 自定义字段5
  131 + */
  132 + @TableField(value = "userDef5")
  133 + @ApiModelProperty(value="自定义字段5")
  134 + private String userDef5;
  135 +
  136 + /**
  137 + * 自定义字段6
  138 + */
  139 + @TableField(value = "userDef6")
  140 + @ApiModelProperty(value="自定义字段6")
  141 + private String userDef6;
  142 +
  143 + /**
  144 + * 自定义字段7
  145 + */
  146 + @TableField(value = "userDef7")
  147 + @ApiModelProperty(value="自定义字段7")
  148 + private String userDef7;
  149 +
  150 + /**
  151 + * 自定义字段8
  152 + */
  153 + @TableField(value = "userDef8")
  154 + @ApiModelProperty(value="自定义字段8")
  155 + private String userDef8;
  156 +
  157 + /**
  158 + * 处理标记
  159 + */
  160 + @TableField(value = "processStamp")
  161 + @ApiModelProperty(value="处理标记")
  162 + private String processStamp;
  163 +
  164 + /**
  165 + * 条件名称
  166 + */
  167 + @TableField(value = "filterName")
  168 + @ApiModelProperty(value="条件名称")
  169 + private String filterName;
  170 +
  171 + private static final long serialVersionUID = 1L;
  172 +}
0 173 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/shipment/FilterConfigHeader/mapper/FilterConfigHeaderMapper.java 0 → 100644
  View file @4f1475a
  1 +package com.huaheng.pc.shipment.FilterConfigHeader.mapper;
  2 +
  3 +import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  4 +import com.huaheng.pc.shipment.FilterConfigHeader.domain.FilterConfigHeader;
  5 +
  6 +public interface FilterConfigHeaderMapper extends BaseMapper<FilterConfigHeader> {
  7 +}
0 8 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/config/warehouseConfig/service/WarehouseConfigServiceImpl.java renamed to src/main/java/com/huaheng/pc/shipment/FilterConfigHeader/service/FilterConfigHeaderService.java
  View file @4f1475a
1   -package com.huaheng.pc.config.warehouseConfig.service;
  1 +package com.huaheng.pc.shipment.FilterConfigHeader.service;
2 2  
3 3 import org.springframework.stereotype.Service;
4 4 import javax.annotation.Resource;
5 5 import java.util.List;
6 6 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
7   -import com.huaheng.pc.config.warehouseConfig.domain.WarehouseConfig;
8   -import com.huaheng.pc.config.warehouseConfig.mapper.WarehouseConfigMapper;
9   -import com.huaheng.pc.config.warehouseConfig.service.WarehouseConfigService;
  7 +import com.huaheng.pc.shipment.FilterConfigHeader.mapper.FilterConfigHeaderMapper;
  8 +import com.huaheng.pc.shipment.FilterConfigHeader.domain.FilterConfigHeader;
10 9 @Service
11   -public class WarehouseConfigServiceImpl extends ServiceImpl<WarehouseConfigMapper, WarehouseConfig> implements WarehouseConfigService{
  10 +public class FilterConfigHeaderService extends ServiceImpl<FilterConfigHeaderMapper, FilterConfigHeader> {
12 11  
13 12 }
... ...
src/main/java/com/huaheng/pc/shipment/shipmentAnalyzeTemplate/domain/ShipmentAnalyzeTemplate.java 0 → 100644
  View file @4f1475a
  1 +package com.huaheng.pc.shipment.shipmentAnalyzeTemplate.domain;
  2 +
  3 +import com.baomidou.mybatisplus.annotation.IdType;
  4 +import com.baomidou.mybatisplus.annotation.TableField;
  5 +import com.baomidou.mybatisplus.annotation.TableId;
  6 +import com.baomidou.mybatisplus.annotation.TableName;
  7 +import io.swagger.annotations.ApiModel;
  8 +import io.swagger.annotations.ApiModelProperty;
  9 +import java.io.Serializable;
  10 +import java.util.Date;
  11 +import lombok.Data;
  12 +
  13 +@ApiModel(value="com.huaheng.pc.shipment.shipmentAnalyzeTemplate.domain.ShipmentAnalyzeTemplate")
  14 +@Data
  15 +@TableName(value = "shipment_analyze_template")
  16 +public class ShipmentAnalyzeTemplate implements Serializable {
  17 + @TableId(value = "id", type = IdType.AUTO)
  18 + @ApiModelProperty(value="null")
  19 + private Integer id;
  20 +
  21 + /**
  22 + * 时间编码如：190813093125
  23 + */
  24 + @TableField(value = "code")
  25 + @ApiModelProperty(value="时间编码如：190813093125")
  26 + private String code;
  27 +
  28 + @TableField(value = "warehouseCode")
  29 + @ApiModelProperty(value="null")
  30 + private String warehouseCode;
  31 +
  32 + /**
  33 + * 分析的结果
  34 + */
  35 + @TableField(value = "treeStruct")
  36 + @ApiModelProperty(value="分析的结果")
  37 + private String treeStruct;
  38 +
  39 + /**
  40 + * 出库分析条件--前端界面选择
  41 + */
  42 + @TableField(value = "criteriaCode")
  43 + @ApiModelProperty(value="出库分析条件--前端界面选择")
  44 + private String criteriaCode;
  45 +
  46 + /**
  47 + * 创建时间
  48 + */
  49 + @TableField(value = "created")
  50 + @ApiModelProperty(value="创建时间")
  51 + private Date created;
  52 +
  53 + @TableField(value = "createdBy")
  54 + @ApiModelProperty(value="null")
  55 + private String createdBy;
  56 +
  57 + /**
  58 + * 创建时间
  59 + */
  60 + @TableField(value = "lastUpdated")
  61 + @ApiModelProperty(value="创建时间")
  62 + private Date lastUpdated;
  63 +
  64 + @TableField(value = "lastUpdatedBy")
  65 + @ApiModelProperty(value="null")
  66 + private String lastUpdatedBy;
  67 +
  68 + @TableField(value = "processStamp")
  69 + @ApiModelProperty(value="null")
  70 + private String processStamp;
  71 +
  72 + /**
  73 + * 数据版本
  74 + */
  75 + @TableField(value = "version")
  76 + @ApiModelProperty(value="数据版本")
  77 + private Integer version;
  78 +
  79 + private static final long serialVersionUID = 1L;
  80 +}
0 81 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/shipment/shipmentAnalyzeTemplate/mapper/ShipmentAnalyzeTemplateMapper.java 0 → 100644
  View file @4f1475a
  1 +package com.huaheng.pc.shipment.shipmentAnalyzeTemplate.mapper;
  2 +
  3 +import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  4 +import com.huaheng.pc.shipment.shipmentAnalyzeTemplate.domain.ShipmentAnalyzeTemplate;
  5 +
  6 +public interface ShipmentAnalyzeTemplateMapper extends BaseMapper<ShipmentAnalyzeTemplate> {
  7 +}
0 8 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/shipment/shipmentAnalyzeTemplate/service/ShipmentAnalyzeTemplateService.java 0 → 100644
  View file @4f1475a
  1 +package com.huaheng.pc.shipment.shipmentAnalyzeTemplate.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.shipmentAnalyzeTemplate.domain.ShipmentAnalyzeTemplate;
  8 +import com.huaheng.pc.shipment.shipmentAnalyzeTemplate.mapper.ShipmentAnalyzeTemplateMapper;
  9 +@Service
  10 +public class ShipmentAnalyzeTemplateService extends ServiceImpl<ShipmentAnalyzeTemplateMapper, ShipmentAnalyzeTemplate> {
  11 +
  12 +}
... ...
src/main/resources/mybatis/config/ReceiptPreferenceMapper.xml
  View file @4f1475a
... ... @@ -4,22 +4,27 @@
4 4 <resultMap id="BaseResultMap" type="com.huaheng.pc.config.receiptPreference.domain.ReceiptPreference">
5 5 <!--@mbg.generated-->
6 6 <id column="id" jdbcType="INTEGER" property="id" />
  7 + <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
7 8 <result column="code" jdbcType="VARCHAR" property="code" />
8 9 <result column="name" jdbcType="VARCHAR" property="name" />
9 10 <result column="receivingFlow" jdbcType="VARCHAR" property="receivingFlow" />
10   - <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
11 11 <result column="autoAssignLPN" jdbcType="INTEGER" property="autoAssignLPN" />
12 12 <result column="allowOverReceiving" jdbcType="BIT" property="allowOverReceiving" />
13 13 <result column="allowOverReceivingQty" jdbcType="INTEGER" property="allowOverReceivingQty" />
14 14 <result column="autoLocate" jdbcType="INTEGER" property="autoLocate" />
15 15 <result column="showOpenQty" jdbcType="INTEGER" property="showOpenQty" />
16   - <result column="receiptTypes" jdbcType="VARCHAR" property="receiptTypes" />
17 16 <result column="groupPutaway" jdbcType="INTEGER" property="groupPutaway" />
18 17 <result column="manuallyBuildLPN" jdbcType="INTEGER" property="manuallyBuildLPN" />
19   - <result column="ruleAssignment" jdbcType="VARCHAR" property="ruleAssignment" />
  18 + <result column="locationRule" jdbcType="VARCHAR" property="locationRule" />
  19 + <result column="emptyLocRule" jdbcType="VARCHAR" property="emptyLocRule" />
20 20 <result column="checkinByPiece" jdbcType="INTEGER" property="checkinByPiece" />
21 21 <result column="pieceConfirm" jdbcType="INTEGER" property="pieceConfirm" />
  22 + <result column="abcClass" jdbcType="VARCHAR" property="abcClass" />
  23 + <result column="daysToExpire" jdbcType="INTEGER" property="daysToExpire" />
  24 + <result column="expiringDays" jdbcType="INTEGER" property="expiringDays" />
  25 + <result column="minShelfLifeDays" jdbcType="INTEGER" property="minShelfLifeDays" />
22 26 <result column="allowQuickPutaway" jdbcType="INTEGER" property="allowQuickPutaway" />
  27 + <result column="attributeTemplateCode" jdbcType="VARCHAR" property="attributeTemplateCode" />
23 28 <result column="useQuickCheckIn" jdbcType="INTEGER" property="useQuickCheckIn" />
24 29 <result column="created" jdbcType="TIMESTAMP" property="created" />
25 30 <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
... ... @@ -38,10 +43,11 @@
38 43 </resultMap>
39 44 <sql id="Base_Column_List">
40 45 <!--@mbg.generated-->
41   - id, code, `name`, receivingFlow, warehouseCode, autoAssignLPN, allowOverReceiving,
42   - allowOverReceivingQty, autoLocate, showOpenQty, receiptTypes, groupPutaway, manuallyBuildLPN,
43   - ruleAssignment, checkinByPiece, pieceConfirm, allowQuickPutaway, useQuickCheckIn,
44   - created, createdBy, lastUpdated, lastUpdatedBy, version, userDef1, userDef2, userDef3,
45   - userDef4, userDef5, userDef6, userDef7, userDef8, processStamp
  46 + id, warehouseCode, code, `name`, receivingFlow, autoAssignLPN, allowOverReceiving,
  47 + allowOverReceivingQty, autoLocate, showOpenQty, groupPutaway, manuallyBuildLPN, locationRule,
  48 + emptyLocRule, checkinByPiece, pieceConfirm, abcClass, daysToExpire, expiringDays,
  49 + minShelfLifeDays, allowQuickPutaway, attributeTemplateCode, useQuickCheckIn, created,
  50 + createdBy, lastUpdated, lastUpdatedBy, version, userDef1, userDef2, userDef3, userDef4,
  51 + userDef5, userDef6, userDef7, userDef8, processStamp
46 52 </sql>
47 53 </mapper>
48 54 \ No newline at end of file
... ...
src/main/resources/mybatis/shipment/ShipmentPreferenceMapper.xml renamed to src/main/resources/mybatis/config/ShipmentPreferenceMapper.xml
  View file @4f1475a
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/mybatis/config/WarehouseConfigMapper.xml deleted
View file @049bcef
1   -<?xml version="1.0" encoding="UTF-8"?>
2   -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3   -<mapper namespace="com.huaheng.pc.config.warehouseConfig.mapper.WarehouseConfigMapper">
4   - <resultMap id="BaseResultMap" type="com.huaheng.pc.config.warehouseConfig.domain.WarehouseConfig">
5   - <!--@mbg.generated-->
6   - <id column="code" jdbcType="VARCHAR" property="code" />
7   - <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
8   - <result column="name" jdbcType="VARCHAR" property="name" />
9   - <result column="abcClass" jdbcType="VARCHAR" property="abcClass" />
10   - <result column="daysToExpire" jdbcType="INTEGER" property="daysToExpire" />
11   - <result column="locatingRule" jdbcType="VARCHAR" property="locatingRule" />
12   - <result column="allocationRule" jdbcType="VARCHAR" property="allocationRule" />
13   - <result column="replenishmentRule" jdbcType="VARCHAR" property="replenishmentRule" />
14   - <result column="emptyLocRule" jdbcType="VARCHAR" property="emptyLocRule" />
15   - <result column="receivingFlow" jdbcType="VARCHAR" property="receivingFlow" />
16   - <result column="shippingFlow" jdbcType="VARCHAR" property="shippingFlow" />
17   - <result column="attributeTemplateCode" jdbcType="VARCHAR" property="attributeTemplateCode" />
18   - <result column="trackSerialNum" jdbcType="INTEGER" property="trackSerialNum" />
19   - <result column="autoGenSerialNum" jdbcType="INTEGER" property="autoGenSerialNum" />
20   - <result column="autoGenSerialNumFormat" jdbcType="VARCHAR" property="autoGenSerialNumFormat" />
21   - <result column="snTemplateCode" jdbcType="VARCHAR" property="snTemplateCode" />
22   - <result column="expiringDays" jdbcType="INTEGER" property="expiringDays" />
23   - <result column="minShelfLifeDays" jdbcType="INTEGER" property="minShelfLifeDays" />
24   - <result column="enable" jdbcType="INTEGER" property="enable" />
25   - <result column="created" jdbcType="TIMESTAMP" property="created" />
26   - <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
27   - <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
28   - <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
29   - <result column="version" jdbcType="INTEGER" property="version" />
30   - <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
31   - <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
32   - <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
33   - <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
34   - <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />
35   - <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />
36   - <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
37   - <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
38   - </resultMap>
39   - <sql id="Base_Column_List">
40   - <!--@mbg.generated-->
41   - code, warehouseCode, `name`, abcClass, daysToExpire, locatingRule, allocationRule,
42   - replenishmentRule, emptyLocRule, receivingFlow, shippingFlow, attributeTemplateCode,
43   - trackSerialNum, autoGenSerialNum, autoGenSerialNumFormat, snTemplateCode, expiringDays,
44   - minShelfLifeDays, `enable`, created, createdBy, lastUpdated, lastUpdatedBy, version,
45   - userDef1, userDef2, userDef3, userDef4, userDef5, userDef6, userDef7, userDef8
46   - </sql>
47   -</mapper>
48 0 \ No newline at end of file
src/main/resources/mybatis/receipt/ReceiptDetailMapper.xml deleted
View file @049bcef
1   -<?xml version="1.0" encoding="UTF-8"?>
2   -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3   -<mapper namespace="com.huaheng.pc.receipt.receiptDetail.mapper.ReceiptDetailMapper">
4   - <resultMap id="BaseResultMap" type="com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail">
5   - <!--@mbg.generated-->
6   - <id column="id" jdbcType="INTEGER" property="id" />
7   - <result column="receiptId" jdbcType="INTEGER" property="receiptId" />
8   - <result column="receiptCode" jdbcType="VARCHAR" property="receiptCode" />
9   - <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
10   - <result column="companyCode" jdbcType="VARCHAR" property="companyCode" />
11   - <result column="materialCode" jdbcType="VARCHAR" property="materialCode" />
12   - <result column="materialName" jdbcType="VARCHAR" property="materialName" />
13   - <result column="materialSpec" jdbcType="VARCHAR" property="materialSpec" />
14   - <result column="materialUnit" jdbcType="VARCHAR" property="materialUnit" />
15   - <result column="supplierCode" jdbcType="VARCHAR" property="supplierCode" />
16   - <result column="batch" jdbcType="VARCHAR" property="batch" />
17   - <result column="lot" jdbcType="VARCHAR" property="lot" />
18   - <result column="qcCheck" jdbcType="VARCHAR" property="qcCheck" />
19   - <result column="projectNo" jdbcType="VARCHAR" property="projectNo" />
20   - <result column="manufactureDate" jdbcType="DATE" property="manufactureDate" />
21   - <result column="expirationDate" jdbcType="DATE" property="expirationDate" />
22   - <result column="agingDate" jdbcType="DATE" property="agingDate" />
23   - <result column="attributeTemplateCode" jdbcType="VARCHAR" property="attributeTemplateCode" />
24   - <result column="attribute1" jdbcType="VARCHAR" property="attribute1" />
25   - <result column="attribute2" jdbcType="VARCHAR" property="attribute2" />
26   - <result column="attribute3" jdbcType="VARCHAR" property="attribute3" />
27   - <result column="attribute4" jdbcType="VARCHAR" property="attribute4" />
28   - <result column="totalQty" jdbcType="INTEGER" property="totalQty" />
29   - <result column="openQty" jdbcType="INTEGER" property="openQty" />
30   - <result column="referCode" jdbcType="VARCHAR" property="referCode" />
31   - <result column="referId" jdbcType="INTEGER" property="referId" />
32   - <result column="referLineNum" jdbcType="VARCHAR" property="referLineNum" />
33   - <result column="locatingRule" jdbcType="VARCHAR" property="locatingRule" />
34   - <result column="inventorySts" jdbcType="VARCHAR" property="inventorySts" />
35   - <result column="itemListPrice" jdbcType="DECIMAL" property="itemListPrice" />
36   - <result column="itemNetPrice" jdbcType="DECIMAL" property="itemNetPrice" />
37   - <result column="isVirtualBom" jdbcType="INTEGER" property="isVirtualBom" />
38   - <result column="created" jdbcType="TIMESTAMP" property="created" />
39   - <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
40   - <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
41   - <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
42   - <result column="version" jdbcType="INTEGER" property="version" />
43   - <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
44   - <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
45   - <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
46   - <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
47   - <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />
48   - <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />
49   - <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
50   - <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
51   - <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
52   - <result column="deleted" jdbcType="BIT" property="deleted" />
53   - </resultMap>
54   - <sql id="Base_Column_List">
55   - <!--@mbg.generated-->
56   - id, receiptId, receiptCode, warehouseCode, companyCode, materialCode, materialName,
57   - materialSpec, materialUnit, supplierCode, batch, lot, qcCheck, projectNo, manufactureDate,
58   - expirationDate, agingDate, attributeTemplateCode, attribute1, attribute2, attribute3,
59   - attribute4, totalQty, openQty, referCode, referId, referLineNum, locatingRule, inventorySts,
60   - itemListPrice, itemNetPrice, isVirtualBom, created, createdBy, lastUpdated, lastUpdatedBy,
61   - version, userDef1, userDef2, userDef3, userDef4, userDef5, userDef6, userDef7, userDef8,
62   - processStamp, deleted
63   - </sql>
64   -
65   -</mapper>
66 0 \ No newline at end of file
src/main/resources/mybatis/receipt/ReceiptHeaderMapper.xml
  View file @4f1475a
... ... @@ -42,6 +42,7 @@
42 42 <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
43 43 <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
44 44 <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
  45 + <result column="deleted" jdbcType="BIT" property="deleted" />
45 46 </resultMap>
46 47 <sql id="Base_Column_List">
47 48 <!--@mbg.generated-->
... ... @@ -50,8 +51,6 @@
50 51 startCheckinDatetime, endCheckinDatetime, totalQty, totalLines, toalCases, totalWeight,
51 52 totalVolume, receiptNote, locked, lockedBy, created, createdBy, lastUpdated, lastUpdatedBy,
52 53 version, userDef1, userDef2, userDef3, userDef4, userDef5, userDef6, userDef7, userDef8,
53   - processStamp
  54 + processStamp, deleted
54 55 </sql>
55   -
56   -
57 56 </mapper>
58 57 \ No newline at end of file
... ...
src/main/resources/mybatis/shipment/FilterConfigDetailMapper.xml 0 → 100644
  View file @4f1475a
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.huaheng.pc.shipment.FilterConfigDetail.mapper.FilterConfigDetailMapper">
  4 + <resultMap id="BaseResultMap" type="com.huaheng.pc.shipment.FilterConfigDetail.domain.FilterConfigDetail">
  5 + <!--@mbg.generated-->
  6 + <id column="id" jdbcType="INTEGER" property="id" />
  7 + <result column="headerId" jdbcType="INTEGER" property="headerId" />
  8 + <result column="code" jdbcType="VARCHAR" property="code" />
  9 + <result column="moduleType" jdbcType="VARCHAR" property="moduleType" />
  10 + <result column="recordType" jdbcType="VARCHAR" property="recordType" />
  11 + <result column="filterCode" jdbcType="VARCHAR" property="filterCode" />
  12 + <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
  13 + <result column="description" jdbcType="VARCHAR" property="description" />
  14 + <result column="statement" jdbcType="LONGVARCHAR" property="statement" />
  15 + <result column="systemCreated" jdbcType="INTEGER" property="systemCreated" />
  16 + <result column="customSql" jdbcType="LONGVARCHAR" property="customSql" />
  17 + <result column="created" jdbcType="TIMESTAMP" property="created" />
  18 + <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
  19 + <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
  20 + <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
  21 + <result column="version" jdbcType="INTEGER" property="version" />
  22 + <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
  23 + <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
  24 + <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
  25 + <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
  26 + <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />
  27 + <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />
  28 + <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
  29 + <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
  30 + <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
  31 + <result column="filterName" jdbcType="VARCHAR" property="filterName" />
  32 + </resultMap>
  33 + <sql id="Base_Column_List">
  34 + <!--@mbg.generated-->
  35 + id, headerId, code, moduleType, recordType, filterCode, warehouseCode, description,
  36 + `statement`, systemCreated, customSql, created, createdBy, lastUpdated, lastUpdatedBy,
  37 + version, userDef1, userDef2, userDef3, userDef4, userDef5, userDef6, userDef7, userDef8,
  38 + processStamp, filterName
  39 + </sql>
  40 +</mapper>
0 41 \ No newline at end of file
... ...
src/main/resources/mybatis/shipment/FilterConfigHeaderMapper.xml 0 → 100644
  View file @4f1475a
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.huaheng.pc.shipment.FilterConfigHeader.mapper.FilterConfigHeaderMapper">
  4 + <resultMap id="BaseResultMap" type="com.huaheng.pc.shipment.FilterConfigHeader.domain.FilterConfigHeader">
  5 + <!--@mbg.generated-->
  6 + <id column="id" jdbcType="INTEGER" property="id" />
  7 + <result column="moduleType" jdbcType="VARCHAR" property="moduleType" />
  8 + <result column="recordType" jdbcType="VARCHAR" property="recordType" />
  9 + <result column="filterCode" jdbcType="VARCHAR" property="filterCode" />
  10 + <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
  11 + <result column="description" jdbcType="VARCHAR" property="description" />
  12 + <result column="systemCreated" jdbcType="INTEGER" property="systemCreated" />
  13 + <result column="created" jdbcType="TIMESTAMP" property="created" />
  14 + <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
  15 + <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
  16 + <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
  17 + <result column="version" jdbcType="INTEGER" property="version" />
  18 + <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
  19 + <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
  20 + <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
  21 + <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
  22 + <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />
  23 + <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />
  24 + <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
  25 + <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
  26 + <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
  27 + <result column="filterName" jdbcType="VARCHAR" property="filterName" />
  28 + </resultMap>
  29 + <sql id="Base_Column_List">
  30 + <!--@mbg.generated-->
  31 + id, moduleType, recordType, filterCode, warehouseCode, description, systemCreated,
  32 + created, createdBy, lastUpdated, lastUpdatedBy, version, userDef1, userDef2, userDef3,
  33 + userDef4, userDef5, userDef6, userDef7, userDef8, processStamp, filterName
  34 + </sql>
  35 +</mapper>
0 36 \ No newline at end of file
... ...
src/main/resources/mybatis/shipment/ShipmentAnalyzeTemplateMapper.xml 0 → 100644
  View file @4f1475a
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.huaheng.pc.shipment.shipmentAnalyzeTemplate.mapper.ShipmentAnalyzeTemplateMapper">
  4 + <resultMap id="BaseResultMap" type="com.huaheng.pc.shipment.shipmentAnalyzeTemplate.domain.ShipmentAnalyzeTemplate">
  5 + <!--@mbg.generated-->
  6 + <id column="id" jdbcType="INTEGER" property="id" />
  7 + <result column="code" jdbcType="VARCHAR" property="code" />
  8 + <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
  9 + <result column="treeStruct" jdbcType="LONGVARCHAR" property="treeStruct" />
  10 + <result column="criteriaCode" jdbcType="VARCHAR" property="criteriaCode" />
  11 + <result column="created" jdbcType="TIMESTAMP" property="created" />
  12 + <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
  13 + <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
  14 + <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
  15 + <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
  16 + <result column="version" jdbcType="INTEGER" property="version" />
  17 + </resultMap>
  18 + <sql id="Base_Column_List">
  19 + <!--@mbg.generated-->
  20 + id, code, warehouseCode, treeStruct, criteriaCode, created, createdBy, lastUpdated,
  21 + lastUpdatedBy, processStamp, version
  22 + </sql>
  23 +</mapper>
0 24 \ No newline at end of file
... ...
src/main/resources/templates/config/receiptPreference/add.html
  View file @4f1475a
... ... @@ -60,12 +60,6 @@
60 60 </div>
61 61 </div>
62 62 <div class="form-group">
63   - <label class="col-sm-3 control-label">入库单类型：</label>
64   - <div class="col-sm-8">
65   - <input id="receiptTypes" name="receiptTypes" class="form-control" type="text">
66   - </div>
67   - </div>
68   - <div class="form-group">
69 63 <label class="col-sm-3 control-label">RF组车收货：</label>
70 64 <div class="col-sm-8">
71 65 <input id="groupPutaway" name="groupPutaway" class="form-control" type="text">
... ... @@ -78,9 +72,15 @@
78 72 </div>
79 73 </div>
80 74 <div class="form-group">
81   - <label class="col-sm-3 control-label">定位规则动态指派：</label>
  75 + <label class="col-sm-3 control-label">定位规则：</label>
  76 + <div class="col-sm-8">
  77 + <input id="locationRule" name="locationRule" class="form-control" type="text">
  78 + </div>
  79 + </div>
  80 + <div class="form-group">
  81 + <label class="col-sm-3 control-label">空库位规则：</label>
82 82 <div class="col-sm-8">
83   - <input id="ruleAssignment" name="ruleAssignment" class="form-control" type="text">
  83 + <input id="emptyLocRule" name="emptyLocRule" class="form-control" type="text">
84 84 </div>
85 85 </div>
86 86 <div class="form-group">
... ... @@ -96,12 +96,42 @@
96 96 </div>
97 97 </div>
98 98 <div class="form-group">
  99 + <label class="col-sm-3 control-label">abc分类：</label>
  100 + <div class="col-sm-8">
  101 + <input id="abcClass" name="abcClass" 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="daysToExpire" name="daysToExpire" 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="expiringDays" name="expiringDays" 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="minShelfLifeDays" name="minShelfLifeDays" class="form-control" type="text">
  120 + </div>
  121 + </div>
  122 + <div class="form-group">
99 123 <label class="col-sm-3 control-label">RF快速上架：</label>
100 124 <div class="col-sm-8">
101 125 <input id="allowQuickPutaway" name="allowQuickPutaway" class="form-control" type="text">
102 126 </div>
103 127 </div>
104 128 <div class="form-group">
  129 + <label class="col-sm-3 control-label">属性模板：</label>
  130 + <div class="col-sm-8">
  131 + <input id="attributeTemplateCode" name="attributeTemplateCode" class="form-control" type="text">
  132 + </div>
  133 + </div>
  134 + <div class="form-group">
105 135 <label class="col-sm-3 control-label">快速入库：</label>
106 136 <div class="col-sm-8">
107 137 <input id="useQuickCheckIn" name="useQuickCheckIn" class="form-control" type="text">
... ...
src/main/resources/templates/config/receiptPreference/edit.html
  View file @4f1475a
... ... @@ -3,9 +3,9 @@
3 3 <meta charset="utf-8">
4 4 <head th:include="include :: header"></head>
5 5 <body class="white-bg">
6   -<div class="wrapper wrapper-content animated fadeInRight ibox-content" th:object="${receiptPreference}">
7   - <form class="form-horizontal m" id="form-receiptPreference-edit">
8   - <input name="id" th:field="*{id}">
  6 +<div class="wrapper wrapper-content animated fadeInRight ibox-content">
  7 + <form class="form-horizontal m" id="form-receiptPreference-edit" th:object="${receiptPreference}">
  8 + <input id="id" name="id" th:field="*{id}">
9 9 <div class="form-group">
10 10 <label class="col-sm-3 control-label">编码：</label>
11 11 <div class="col-sm-8">
... ... @@ -34,8 +34,8 @@
34 34 <label class="col-sm-3 control-label">允许超收：</label>
35 35 <div class="col-sm-8">
36 36 <div class="onoffswitch">
37   - <input type="checkbox" th:checked="true" class="onoffswitch-checkbox"
38   - id="allowOverReceiving" name="allowOverReceiving" th:field="*{allowOverReceiving}">
  37 + <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="allowOverReceiving"
  38 + name="allowOverReceiving" th:field="*{allowOverReceiving}">
39 39 <label class="onoffswitch-label" for="allowOverReceiving">
40 40 <span class="onoffswitch-inner"></span>
41 41 <span class="onoffswitch-switch"></span>
... ... @@ -46,8 +46,7 @@
46 46 <div class="form-group">
47 47 <label class="col-sm-3 control-label">允许超收范围：</label>
48 48 <div class="col-sm-8">
49   - <input id="allowOverReceivingQty" name="allowOverReceivingQty" class="form-control"
50   - type="text" th:field="*{allowOverReceivingQty}">
  49 + <input id="allowOverReceivingQty" name="allowOverReceivingQty" class="form-control" type="text" th:field="*{allowOverReceivingQty}">
51 50 </div>
52 51 </div>
53 52 <div class="form-group">
... ... @@ -63,12 +62,6 @@
63 62 </div>
64 63 </div>
65 64 <div class="form-group">
66   - <label class="col-sm-3 control-label">入库单类型：</label>
67   - <div class="col-sm-8">
68   - <input id="receiptTypes" name="receiptTypes" class="form-control" type="text" th:field="*{receiptTypes}">
69   - </div>
70   - </div>
71   - <div class="form-group">
72 65 <label class="col-sm-3 control-label">RF组车收货：</label>
73 66 <div class="col-sm-8">
74 67 <input id="groupPutaway" name="groupPutaway" class="form-control" type="text" th:field="*{groupPutaway}">
... ... @@ -81,9 +74,15 @@
81 74 </div>
82 75 </div>
83 76 <div class="form-group">
84   - <label class="col-sm-3 control-label">定位规则动态指派：</label>
  77 + <label class="col-sm-3 control-label">定位规则：</label>
  78 + <div class="col-sm-8">
  79 + <input id="locationRule" name="locationRule" class="form-control" type="text" th:field="*{locationRule}">
  80 + </div>
  81 + </div>
  82 + <div class="form-group">
  83 + <label class="col-sm-3 control-label">空库位规则：</label>
85 84 <div class="col-sm-8">
86   - <input id="ruleAssignment" name="ruleAssignment" class="form-control" type="text" th:field="*{ruleAssignment}">
  85 + <input id="emptyLocRule" name="emptyLocRule" class="form-control" type="text" th:field="*{emptyLocRule}">
87 86 </div>
88 87 </div>
89 88 <div class="form-group">
... ... @@ -99,12 +98,42 @@
99 98 </div>
100 99 </div>
101 100 <div class="form-group">
  101 + <label class="col-sm-3 control-label">abc分类：</label>
  102 + <div class="col-sm-8">
  103 + <input id="abcClass" name="abcClass" class="form-control" type="text" th:field="*{abcClass}">
  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="daysToExpire" name="daysToExpire" class="form-control" type="text" th:field="*{daysToExpire}">
  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="expiringDays" name="expiringDays" class="form-control" type="text" th:field="*{expiringDays}">
  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 + <input id="minShelfLifeDays" name="minShelfLifeDays" class="form-control" type="text" th:field="*{minShelfLifeDays}">
  122 + </div>
  123 + </div>
  124 + <div class="form-group">
102 125 <label class="col-sm-3 control-label">RF快速上架：</label>
103 126 <div class="col-sm-8">
104 127 <input id="allowQuickPutaway" name="allowQuickPutaway" class="form-control" type="text" th:field="*{allowQuickPutaway}">
105 128 </div>
106 129 </div>
107 130 <div class="form-group">
  131 + <label class="col-sm-3 control-label">属性模板：</label>
  132 + <div class="col-sm-8">
  133 + <input id="attributeTemplateCode" name="attributeTemplateCode" class="form-control" type="text" th:field="*{attributeTemplateCode}">
  134 + </div>
  135 + </div>
  136 + <div class="form-group">
108 137 <label class="col-sm-3 control-label">快速入库：</label>
109 138 <div class="col-sm-8">
110 139 <input id="useQuickCheckIn" name="useQuickCheckIn" class="form-control" type="text" th:field="*{useQuickCheckIn}">
... ... @@ -240,9 +269,8 @@
240 269 }
241 270 },
242 271 submitHandler: function(form) {
243   - var tableValue = $.common.getTableValue("#form-receiptPreference-edit");
244   - tableValue = formValueReplace(tableValue, "companyCode", $("#companyCode option:selected").val());
245   - tableValue = formValueReplace(tableValue, "enable", $("input[name='enable']").is(':checked'));
  272 + var tableValue = $.common.getTableValue("#form-receiptPreference-edi");
  273 + tableValue = formValueReplace(tableValue, "allowOverReceiving", $("input[name='allowOverReceiving']").is(':checked'));
246 274 $.operate.save(prefix + "/edit", tableValue);
247 275 }
248 276 });
... ...
src/main/resources/templates/config/receiptPreference/receiptPreference.html
  View file @4f1475a
... ... @@ -36,10 +36,10 @@
36 36 </form>
37 37 </div>
38 38 <div class="btn-group hidden-xs" id="toolbar" role="group">
39   - <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="config:locationType:add">
  39 + <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="config:receiptPreference:add">
40 40 <i class="fa fa-plus"></i> 新增
41 41 </a>
42   - <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="config:locationType:remove">
  42 + <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="config:receiptPreference:remove">
43 43 <i class="fa fa-trash-o"></i> 删除
44 44 </a>
45 45 </div>
... ... @@ -120,8 +120,12 @@
120 120 title : '人工组盘'
121 121 },
122 122 {
123   - field : 'ruleAssignment',
124   - title : '定位规则动态指派'
  123 + field : 'locationRule',
  124 + title : '定位规则'
  125 + },
  126 + {
  127 + field : 'emptyLocRule',
  128 + title : '空库位规则'
125 129 },
126 130 {
127 131 field : 'checkinByPiece',
... ... @@ -132,10 +136,30 @@
132 136 title : 'RF自动提交收货'
133 137 },
134 138 {
  139 + field : 'abcClass',
  140 + title : 'abc分类'
  141 + },
  142 + {
  143 + field : 'daysToExpire',
  144 + title : '保质期(天)'
  145 + },
  146 + {
  147 + field : 'expiringDays',
  148 + title : '临期预警(天)'
  149 + },
  150 + {
  151 + field : 'minShelfLifeDays',
  152 + title : '收货预警(天)'
  153 + },
  154 + {
135 155 field : 'allowQuickPutaway',
136 156 title : 'RF快速上架'
137 157 },
138 158 {
  159 + field : 'attributeTemplateCode',
  160 + title : '属性模板'
  161 + },
  162 + {
139 163 field : 'useQuickCheckIn',
140 164 title : '快速入库'
141 165 },
... ... @@ -208,5 +232,7 @@
208 232 $.table.init(options);
209 233 });
210 234 </script>
  235 + </div>
  236 +</div>
211 237 </body>
212 238 </html>
213 239 \ No newline at end of file
... ...
src/main/resources/templates/config/shipmentPreference/add.html 0 → 100644
  View file @4f1475a
  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 + <input id="allowCross" name="allowCross" 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="allowQcCheckResult" name="allowQcCheckResult" 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="showInventoryQty" name="showInventoryQty" class="form-control" type="text">
  66 + </div>
  67 + </div>
  68 + <div class="form-group">
  69 + <label class="col-sm-3 control-label">RF组车收货：</label>
  70 + <div class="col-sm-8">
  71 + <input id="groupPutaway" name="groupPutaway" class="form-control" type="text">
  72 + </div>
  73 + </div>
  74 + <div class="form-group">
  75 + <label class="col-sm-3 control-label">人工组盘：</label>
  76 + <div class="col-sm-8">
  77 + <input id="manuallyBuildLPN" name="manuallyBuildLPN" class="form-control" type="text">
  78 + </div>
  79 + </div>
  80 + <div class="form-group">
  81 + <label class="col-sm-3 control-label">RF逐件拣货：</label>
  82 + <div class="col-sm-8">
  83 + <input id="checkinByPiece" name="checkinByPiece" 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="allowQuickPickup" name="allowQuickPickup" class="form-control" type="text">
  90 + </div>
  91 + </div>
  92 + <!--<div class="form-group">
  93 + <label class="col-sm-3 control-label">数据版本：</label>
  94 + <div class="col-sm-8">
  95 + <input id="version" name="version" 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="created" name="created" 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="createdBy" name="createdBy" 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="lastUpdated" name="lastUpdated" 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="lastUpdatedBy" name="lastUpdatedBy" 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 + <!--&lt;!&ndash;<input id="enable" name="enable" class="form-control" type="text">&ndash;&gt;-->
  126 + <!--<div class="onoffswitch">-->
  127 + <!--<input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable">-->
  128 + <!--<label class="onoffswitch-label" for="enable">-->
  129 + <!--<span class="onoffswitch-inner"></span>-->
  130 + <!--<span class="onoffswitch-switch"></span>-->
  131 + <!--</label>-->
  132 + <!--</div>-->
  133 + <!--</div>-->
  134 + <!--</div>-->
  135 + <!--<div class="form-group"> -->
  136 + <!--<label class="col-sm-3 control-label">是否删除：</label>-->
  137 + <!--<div class="col-sm-8">-->
  138 + <!--<input id="deleted" name="deleted" class="form-control" type="text">-->
  139 + <!--</div>-->
  140 + <!--</div>-->
  141 + <!--<div class="form-group"> -->
  142 + <!--<label class="col-sm-3 control-label">自定义字段1：</label>-->
  143 + <!--<div class="col-sm-8">-->
  144 + <!--<input id="userDef1" name="userDef1" class="form-control" type="text">-->
  145 + <!--</div>-->
  146 + <!--</div>-->
  147 + <!--<div class="form-group"> -->
  148 + <!--<label class="col-sm-3 control-label">自定义字段2：</label>-->
  149 + <!--<div class="col-sm-8">-->
  150 + <!--<input id="userDef2" name="userDef2" class="form-control" type="text">-->
  151 + <!--</div>-->
  152 + <!--</div>-->
  153 + <!--<div class="form-group"> -->
  154 + <!--<label class="col-sm-3 control-label">自定义字段3：</label>-->
  155 + <!--<div class="col-sm-8">-->
  156 + <!--<input id="userDef3" name="userDef3" class="form-control" type="text">-->
  157 + <!--</div>-->
  158 + <!--</div>-->
  159 + <!--<div class="form-group"> -->
  160 + <!--<label class="col-sm-3 control-label">自定义字段4：</label>-->
  161 + <!--<div class="col-sm-8">-->
  162 + <!--<input id="userDef4" name="userDef4" class="form-control" type="text">-->
  163 + <!--</div>-->
  164 + <!--</div>-->
  165 + <!--<div class="form-group"> -->
  166 + <!--<label class="col-sm-3 control-label">自定义字段5：</label>-->
  167 + <!--<div class="col-sm-8">-->
  168 + <!--<input id="userDef5" name="userDef5" class="form-control" type="text">-->
  169 + <!--</div>-->
  170 + <!--</div>-->
  171 + <div class="form-group">
  172 + <div class="form-control-static col-sm-offset-9">
  173 + <button type="submit" class="btn btn-primary">提交</button>
  174 + <button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
  175 + </div>
  176 + </div>
  177 + </form>
  178 +</div>
  179 +<div th:include="include::footer"></div>
  180 +<script type="text/javascript">
  181 + var prefix = ctx + "config/shipmentPreference";
  182 + $("#form-shipmentPreference-add").validate({
  183 + rules:{
  184 + code:{
  185 + required: true,
  186 + },
  187 + name:{
  188 + required: true,
  189 + },
  190 + shippingFlow:{
  191 + required: true,
  192 + },
  193 + shipmentPickingRule:{
  194 + required: true,
  195 + },
  196 + shipmentPickingLocRange:{
  197 + required: true,
  198 + },
  199 + allocationRule: {
  200 + required: true,
  201 + },
  202 + autoAssignLPN: {
  203 + required: true,
  204 + },
  205 + allowCross: {
  206 + required: true,
  207 + },
  208 + allowQcCheckResult: {
  209 + required: true,
  210 + },
  211 + showInventoryQty: {
  212 + required: true,
  213 + },
  214 + groupPickup: {
  215 + required: true,
  216 + },
  217 + manuallyBuildLPN: {
  218 + required: true,
  219 + },
  220 + checkinByPiece: {
  221 + required: true,
  222 + },
  223 + allowQuickPickup: {
  224 + required: true,
  225 + }
  226 + },
  227 + submitHandler: function(form) {
  228 + var tableValue = $.common.getTableValue("#form-shipmentPreference-add");
  229 + $.operate.save(prefix + "/add", tableValue);
  230 + }
  231 + });
  232 +</script>
  233 +</body>
  234 +</html>
... ...
src/main/resources/templates/config/shipmentPreference/edit.html 0 → 100644
  View file @4f1475a
  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 + <input id="allowCross" name="allowCross" class="form-control" type="text" th:field="*{allowCross}">
  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="allowQcCheckResult" name="allowQcCheckResult" class="form-control"
  61 + type="text" th:field="*{allowQcCheckResult}">
  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="showInventoryQty" name="showInventoryQty" class="form-control" type="text" th:field="*{showInventoryQty}">
  68 + </div>
  69 + </div>
  70 + <div class="form-group">
  71 + <label class="col-sm-3 control-label">RF组车收货：</label>
  72 + <div class="col-sm-8">
  73 + <input id="groupPickup" name="groupPickup" class="form-control" type="text" th:field="*{groupPickup}">
  74 + </div>
  75 + </div>
  76 + <div class="form-group">
  77 + <label class="col-sm-3 control-label">人工组盘：</label>
  78 + <div class="col-sm-8">
  79 + <input id="manuallyBuildLPN" name="manuallyBuildLPN" class="form-control" type="text" th:field="*{manuallyBuildLPN}">
  80 + </div>
  81 + </div>
  82 + <div class="form-group">
  83 + <label class="col-sm-3 control-label">RF逐件收货：</label>
  84 + <div class="col-sm-8">
  85 + <input id="checkinByPiece" name="checkinByPiece" class="form-control" type="text" th:field="*{checkinByPiece}">
  86 + </div>
  87 + </div>
  88 + <div class="form-group">
  89 + <label class="col-sm-3 control-label">RF快速上架：</label>
  90 + <div class="col-sm-8">
  91 + <input id="allowQuickPickup" name="allowQuickPickup" class="form-control" type="text" th:field="*{allowQuickPickup}">
  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="version" name="version" 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="created" name="created" 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="createdBy" name="createdBy" 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="lastUpdated" name="lastUpdated" 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 + <!--<input id="lastUpdatedBy" name="lastUpdatedBy" class="form-control" type="text">-->
  122 + <!--</div>-->
  123 + <!--</div>-->
  124 + <!--<div class="form-group"> -->
  125 + <!--<label class="col-sm-3 control-label">是否有效：</label>-->
  126 + <!--<div class="col-sm-8">-->
  127 + <!--&lt;!&ndash;<input id="enable" name="enable" class="form-control" type="text">&ndash;&gt;-->
  128 + <!--<div class="onoffswitch">-->
  129 + <!--<input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable">-->
  130 + <!--<label class="onoffswitch-label" for="enable">-->
  131 + <!--<span class="onoffswitch-inner"></span>-->
  132 + <!--<span class="onoffswitch-switch"></span>-->
  133 + <!--</label>-->
  134 + <!--</div>-->
  135 + <!--</div>-->
  136 + <!--</div>-->
  137 + <!--<div class="form-group"> -->
  138 + <!--<label class="col-sm-3 control-label">是否删除：</label>-->
  139 + <!--<div class="col-sm-8">-->
  140 + <!--<input id="deleted" name="deleted" class="form-control" type="text">-->
  141 + <!--</div>-->
  142 + <!--</div>-->
  143 + <!--<div class="form-group"> -->
  144 + <!--<label class="col-sm-3 control-label">自定义字段1：</label>-->
  145 + <!--<div class="col-sm-8">-->
  146 + <!--<input id="userDef1" name="userDef1" class="form-control" type="text">-->
  147 + <!--</div>-->
  148 + <!--</div>-->
  149 + <!--<div class="form-group"> -->
  150 + <!--<label class="col-sm-3 control-label">自定义字段2：</label>-->
  151 + <!--<div class="col-sm-8">-->
  152 + <!--<input id="userDef2" name="userDef2" class="form-control" type="text">-->
  153 + <!--</div>-->
  154 + <!--</div>-->
  155 + <!--<div class="form-group"> -->
  156 + <!--<label class="col-sm-3 control-label">自定义字段3：</label>-->
  157 + <!--<div class="col-sm-8">-->
  158 + <!--<input id="userDef3" name="userDef3" class="form-control" type="text">-->
  159 + <!--</div>-->
  160 + <!--</div>-->
  161 + <!--<div class="form-group"> -->
  162 + <!--<label class="col-sm-3 control-label">自定义字段4：</label>-->
  163 + <!--<div class="col-sm-8">-->
  164 + <!--<input id="userDef4" name="userDef4" class="form-control" type="text">-->
  165 + <!--</div>-->
  166 + <!--</div>-->
  167 + <!--<div class="form-group"> -->
  168 + <!--<label class="col-sm-3 control-label">自定义字段5：</label>-->
  169 + <!--<div class="col-sm-8">-->
  170 + <!--<input id="userDef5" name="userDef5" class="form-control" type="text">-->
  171 + <!--</div>-->
  172 + <!--</div>-->
  173 + <div class="form-group">
  174 + <div class="form-control-static col-sm-offset-9">
  175 + <button type="submit" class="btn btn-primary">提交</button>
  176 + <button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
  177 + </div>
  178 + </div>
  179 + </form>
  180 +</div>
  181 +<div th:include="include::footer"></div>
  182 +<script type="text/javascript">
  183 + var prefix = ctx + "config/shipmentPreference";
  184 + $("#form-shipmentPreference-edit").validate({
  185 + rules:{
  186 + code:{
  187 + required: true,
  188 + },
  189 + name:{
  190 + required: true,
  191 + },
  192 + shippingFlow:{
  193 + required: true,
  194 + },
  195 + shipmentPickingRule:{
  196 + required: true,
  197 + },
  198 + shipmentPickingLocRange:{
  199 + required: true,
  200 + },
  201 + allocationRule: {
  202 + required: true,
  203 + },
  204 + autoAssignLPN: {
  205 + required: true,
  206 + },
  207 + allowCross: {
  208 + required: true,
  209 + },
  210 + allowQcCheckResult: {
  211 + required: true,
  212 + },
  213 + showInventoryQty: {
  214 + required: true,
  215 + },
  216 + groupPickup: {
  217 + required: true,
  218 + },
  219 + manuallyBuildLPN: {
  220 + required: true,
  221 + },
  222 + checkinByPiece: {
  223 + required: true,
  224 + },
  225 + allowQuickPickup: {
  226 + required: true,
  227 + }
  228 + },
  229 + submitHandler: function(form) {
  230 + var tableValue = $.common.getTableValue("#form-shipmentPreference-edit");
  231 + $.operate.save(prefix + "/edit", tableValue);
  232 + }
  233 + });
  234 +</script>
  235 +</body>
  236 +</html>
... ...
src/main/resources/templates/config/warehouseConfig/warehouse.html renamed to src/main/resources/templates/config/shipmentPreference/shipmentPreference.html
  View file @4f1475a
... ... @@ -6,214 +6,194 @@
6 6 <div class="container-div">
7 7 <div class="row">
8 8 <div class="col-sm-12 select-info">
9   - <form id="company-form">
  9 + <form id="shipmentPreference-form">
10 10 <div class="select-list">
11 11 <ul>
12 12 <li>
13   - 仓库编码：<input type="text" name="code"/>
  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"/>
14 26 </li>
15 27 <li>
16 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>-->
17 30 </li>
18 31 </ul>
19 32 </div>
20 33 </form>
21 34 </div>
22 35 <div class="btn-group hidden-xs" id="toolbar" role="group">
23   - <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="config:warehouse:add">
  36 + <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="config:shipmentPreference:add">
24 37 <i class="fa fa-plus"></i> 新增
25 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>
26 42 </div>
27 43  
28 44 <div class="col-sm-12 select-info">
29 45 <table id="bootstrap-table" data-mobile-responsive="true" class="table table-bordered table-hover"></table>
30 46 </div>
31   - </div>
32   -</div>
33   -<div th:include="include :: footer"></div>
34   -<script th:inline="javascript">
35   - var editFlag = [[${@permission.hasPermi('config:warehouseConfig:edit')}]];
36   - var removeFlag = [[${@permission.hasPermi('config:warehouseConfig:remove')}]];
37   - var prefix = ctx + "config/warehouseConfig";
38   - var datas = [[${@dict.getType('sys_normal_disable')}]];
39   - $(function() {
40   - var options = {
41   - url: prefix + "/list",
42   - createUrl: prefix + "/add",
43   - updateUrl: prefix + "/edit/{code}",
44   - removeUrl: prefix + "/remove",
45   - modalName: "仓库配置",
46   - search: false,
47   - columns: [{
48   - checkbox: true
49   - },
50   - {
51   - field : 'code',
52   - title : '编码',
53   - visible : false
54   - },
55   - {
56   - field : 'warehouseCode',
57   - title : '仓库编码'
58   - },
59   - {
60   - field : 'name',
61   - title : '名称'
62   - },
63   - {
64   - field : 'abcClass',
65   - title : 'ABC分类'
66   - },
67   - {
68   - field : 'daysToExpire',
69   - title : '保质期(天)'
70   - },
71   - {
72   - field : 'locatingRule',
73   - title : '定位规则'
74   - },
75   - {
76   - field : 'allocationRule',
77   - title : '分配规则' ,
78   - },
79   - {
80   - field : 'replenishmentRule',
81   - title : '补货规则'
82   - },
83   - {
84   - field : 'emptyLocRule',
85   - title : '空货位规则'
86   - },
87   - {
88   - field : 'receivingFlow',
89   - title : '入库流程'
90   - },
91   - {
92   - field : 'shippingFlow',
93   - title : '出库流程'
94   - },
95   - {
96   - field : 'attributeTemplateCode',
97   - title : '属性模版'
98   - },
99   - {
100   - field : 'trackSerialNum',
101   - title : '记录序列号'
102   - },
103   - {
104   - field : 'autoGenSerialNum',
105   - title : '自动生成序列号'
106   - },
107   - {
108   - field : 'autoGenSerialNumFormat',
109   - title : '自动生成序列号表达式'
110   - },
111   - {
112   - field : 'snTemplateCode',
113   - title : '序列号模版'
114   - },
115   - {
116   - field : 'expiringDays',
117   - title : '临期预警天数'
118   - },
119   - {
120   - field : 'minShelfLifeDays',
121   - title : '收货预警天数'
122   - },
123   - {
124   - field : 'created',
125   - title : '创建时间',
126   - visible : false
127   - },
128   - {
129   - field : 'createdBy',
130   - title : '创建用户',
131   - visible : false
132   - },
133   - {
134   - field : 'lastUpdated',
135   - title : '更新时间',
136   - visible : false
137   - },
138   - {
139   - field : 'lastUpdatedBy',
140   - title : '更新用户',
141   - visible : false
142   - },
143   - {
144   - field : 'enable',
145   - title : '状态' ,
146   - align: 'center',
147   - formatter: function(value, row, index) {
148   - return $.table.selectDictLabel(datas, value);
149   - }
150   - },
151   - // {
152   - // field : 'deleted',
153   - // title : '是否删除'
154   - // },
155   - {
156   - field : 'userDef1',
157   - title : '自定义字段1',
158   - visible:false
159   - },
160   - {
161   - field : 'userDef2',
162   - title : '自定义字段2' ,
163   - visible:false
164   - },
165   - {
166   - field : 'userDef3',
167   - title : '自定义字段3',
168   - visible:false
169   - },
170   - {
171   - field : 'userDef4',
172   - title : '自定义字段4',
173   - visible:false
174   - },
175   - {
176   - field : 'userDef5',
177   - title : '自定义字段5',
178   - visible:false
179   - },
180   - {
181   - field : 'userDef6',
182   - title : '自定义字段7',
183   - visible:false
184   - },
185   - {
186   - field : 'userDef7',
187   - title : '自定义字段7',
188   - visible:false
189   - },
190   - {
191   - field : 'userDef8',
192   - title : '自定义字段8',
193   - visible:false
194   - },
195   - {
196   - field : 'version',
197   - title : '数据版本',
198   - visible:false
199   - },
200   - {
201   - title: '操作',
202   - align: 'center',
203   - formatter: function(value, row, index) {
204   - var actions = [];
205   - actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick= edit(\''+row.code+'\')><i class="fa fa-edit"></i>编辑</a> ');
206   - return actions.join('');
207   - }
208   - }]
209   - };
210   - $.table.init(options);
211   - });
212   -
213   - function edit(code) {
214   - var url = prefix + "/edit/"+code;
215   - $.modal.open("修改" + $.table._option.modalName, url);
216   - }
217   -</script>
  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>
218 198 </body>
219 199 </html>
220 200 \ No newline at end of file
... ...
src/main/resources/templates/config/warehouseConfig/add.html deleted
View file @049bcef
1   -<!DOCTYPE html>
2   -<html lang="en">
3   -<head>
4   - <meta charset="UTF-8">
5   - <title>Title</title>
6   -</head>
7   -<body>
8   -
9   -</body>
10   -</html>
11 0 \ No newline at end of file