wms / wms_xiaogangabu · Commits

Commit 3b611612a975cceeb6dfde05b60e0b49a05640c0

Authored by pengcheng
1 parent 1595cdc5
develop ... test

修改字段属性

Inline Side-by-side
Showing 16 changed files with 737 additions and 195 deletions
src/main/java/com/huaheng/pc/config/FilterConfigDetail/domain/FilterConfigDetail.java
  View file @3b61161
... ... @@ -11,7 +11,7 @@ import lombok.Data;
11 11 import java.io.Serializable;
12 12 import java.util.Date;
13 13  
14   -@ApiModel(value="com.huaheng.pc.shipment.FilterConfigDetail.domain.FilterConfigDetail")
  14 +@ApiModel(value="com.huaheng.pc.config.FilterConfigDetail.domain.FilterConfigDetail")
15 15 @Data
16 16 @TableName(value = "filter_config_detail")
17 17 public class FilterConfigDetail implements Serializable {
... ... @@ -83,14 +83,14 @@ public class FilterConfigDetail implements Serializable {
83 83 */
84 84 @TableField(value = "systemCreated")
85 85 @ApiModelProperty(value="是否系统创建")
86   - private Integer systemCreated;
  86 + private Boolean systemCreated;
87 87  
88 88 /**
89 89 * 是否自定义SQL
90 90 */
91 91 @TableField(value = "customSql")
92 92 @ApiModelProperty(value="是否自定义SQL")
93   - private String customSql;
  93 + private Boolean customSql;
94 94  
95 95 /**
96 96 * 创建时间
... ...
src/main/java/com/huaheng/pc/config/FilterConfigHeader/domain/FilterConfigHeader.java
  View file @3b61161
... ... @@ -11,7 +11,7 @@ import lombok.Data;
11 11 import java.io.Serializable;
12 12 import java.util.Date;
13 13  
14   -@ApiModel(value="com.huaheng.pc.shipment.FilterConfigHeader.domain.FilterConfigHeader")
  14 +@ApiModel(value="com.huaheng.pc.config.FilterConfigHeader.domain.FilterConfigHeader")
15 15 @Data
16 16 @TableName(value = "filter_config_header")
17 17 public class FilterConfigHeader implements Serializable {
... ... @@ -62,7 +62,7 @@ public class FilterConfigHeader implements Serializable {
62 62 */
63 63 @TableField(value = "systemCreated")
64 64 @ApiModelProperty(value="是否系统创建")
65   - private Integer systemCreated;
  65 + private Boolean systemCreated;
66 66  
67 67 /**
68 68 * 创建时间
... ...
src/main/java/com/huaheng/pc/config/shipmentPreference/domain/ShipmentPreference.java
  View file @3b61161
... ... @@ -10,7 +10,7 @@ import io.swagger.annotations.ApiModelProperty;
10 10 import java.io.Serializable;
11 11 import java.util.Date;
12 12  
13   -@ApiModel(value="com.huaheng.pc.shipment.shipmentPreference.domain.ShipmentPreference")
  13 +@ApiModel(value="com.huaheng.pc.config.shipmentPreference.domain.ShipmentPreference")
14 14 @TableName(value = "shipment_preference")
15 15 public class ShipmentPreference implements Serializable {
16 16 /**
... ... @@ -81,14 +81,14 @@ public class ShipmentPreference implements Serializable {
81 81 */
82 82 @TableField(value = "allowCross")
83 83 @ApiModelProperty(value="允许越库")
84   - private Integer allowCross;
  84 + private Boolean allowCross;
85 85  
86 86 /**
87 87 * 允许未质检的出库
88 88 */
89 89 @TableField(value = "allowQcCheckResult")
90 90 @ApiModelProperty(value="允许未质检的出库")
91   - private Integer allowQcCheckResult;
  91 + private Boolean allowQcCheckResult;
92 92  
93 93 /**
94 94 * 显示库存数量
... ... @@ -382,39 +382,19 @@ public class ShipmentPreference implements Serializable {
382 382 this.autoAssignLPN = autoAssignLPN;
383 383 }
384 384  
385   - /**
386   - * 获取允许越库
387   - *
388   - * @return allowCross - 允许越库
389   - */
390   - public Integer getAllowCross() {
  385 + public Boolean getAllowCross() {
391 386 return allowCross;
392 387 }
393 388  
394   - /**
395   - * 设置允许越库
396   - *
397   - * @param allowCross 允许越库
398   - */
399   - public void setAllowCross(Integer allowCross) {
  389 + public void setAllowCross(Boolean allowCross) {
400 390 this.allowCross = allowCross;
401 391 }
402 392  
403   - /**
404   - * 获取允许未质检的出库
405   - *
406   - * @return allowQcCheckResult - 允许未质检的出库
407   - */
408   - public Integer getAllowQcCheckResult() {
  393 + public Boolean getAllowQcCheckResult() {
409 394 return allowQcCheckResult;
410 395 }
411 396  
412   - /**
413   - * 设置允许未质检的出库
414   - *
415   - * @param allowQcCheckResult 允许未质检的出库
416   - */
417   - public void setAllowQcCheckResult(Integer allowQcCheckResult) {
  397 + public void setAllowQcCheckResult(Boolean allowQcCheckResult) {
418 398 this.allowQcCheckResult = allowQcCheckResult;
419 399 }
420 400  
... ...
src/main/java/com/huaheng/pc/config/shipmentType/config/shipmentTypeController.java 0 → 100644
  View file @3b61161
  1 +package com.huaheng.pc.config.shipmentType.config;
  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.shipmentType.domain.ShipmentType;
  18 +import com.huaheng.pc.config.shipmentType.service.ShipmentTypeService;
  19 +import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader;
  20 +import com.huaheng.pc.shipment.shipmentHeader.service.ShipmentHeaderService;
  21 +import io.swagger.annotations.ApiParam;
  22 +import org.apache.shiro.authz.annotation.RequiresPermissions;
  23 +import org.springframework.beans.factory.annotation.Autowired;
  24 +import org.springframework.stereotype.Controller;
  25 +import org.springframework.ui.ModelMap;
  26 +import org.springframework.web.bind.annotation.*;
  27 +
  28 +import javax.annotation.Resource;
  29 +import java.util.ArrayList;
  30 +import java.util.List;
  31 +
  32 +@Controller
  33 +@RequestMapping("/config/shipmentType")
  34 +public class shipmentTypeController extends BaseController {
  35 +
  36 + @Resource
  37 + private ShipmentTypeService shipmentTypeService;
  38 + @Autowired
  39 + private ShipmentHeaderService shipmentHeaderService;
  40 +
  41 + private String prefix = "config/shipmentType";
  42 +
  43 + @RequiresPermissions("config:shipmentType:view")
  44 + @GetMapping()
  45 + public String shipmentType() {
  46 + return prefix + "/shipmentType";
  47 + }
  48 +
  49 + /**
  50 + * 查询出库类型
  51 + */
  52 + @RequiresPermissions("config:shipmentType:list")
  53 + @Log(title = "配置-出库类型",operating = "出库类型列表", action = BusinessType.GRANT)
  54 + @PostMapping("/list")
  55 + @ResponseBody
  56 + public TableDataInfo list(@ApiParam(name="shipmentType",value="编码、类型") ShipmentType shipmentType,
  57 + @ApiParam(name = "createdBegin", value = "起止时间") String createdBegin,
  58 + @ApiParam(name = "createdEnd", value = "结束时间") String createdEnd) {
  59 + LambdaQueryWrapper<ShipmentType> lambdaQueryWrapper = Wrappers.lambdaQuery();
  60 + PageDomain pageDomain = TableSupport.buildPageRequest();
  61 + Integer pageNum = pageDomain.getPageNum();
  62 + Integer pageSize = pageDomain.getPageSize();
  63 + lambdaQueryWrapper.gt(StringUtils.isNotEmpty(createdBegin), ShipmentType::getCreated, createdBegin)
  64 + .lt(StringUtils.isNotEmpty(createdEnd), ShipmentType::getCreated, createdEnd)
  65 + .eq(StringUtils.isNotEmpty(shipmentType.getCode()), ShipmentType::getCode, shipmentType.getCode())
  66 + .eq(StringUtils.isNotEmpty(shipmentType.getReferType()), ShipmentType::getReferType, shipmentType.getReferType())
  67 + .like(StringUtils.isNotEmpty(shipmentType.getName()), ShipmentType::getName, shipmentType.getName())
  68 + .in(ShipmentType::getCompanyCode, ShiroUtils.getCompanyCodeList())
  69 + .eq(ShipmentType::getWarehouseCode, ShiroUtils.getWarehouseCode());
  70 +
  71 + if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
  72 + /*使用分页查询*/
  73 + Page<ShipmentType> page = new Page<>(pageNum, pageSize);
  74 + IPage<ShipmentType> iPage = shipmentTypeService.page(page, lambdaQueryWrapper);
  75 + return getMpDataTable(iPage.getRecords(), iPage.getTotal());
  76 + } else {
  77 + List<ShipmentType> list = shipmentTypeService.list(lambdaQueryWrapper);
  78 + return getDataTable(list);
  79 + }
  80 + }
  81 +
  82 + /**
  83 + * 新增出库类型
  84 + */
  85 + @GetMapping("/add")
  86 + public String add() {
  87 + return prefix + "/add";
  88 + }
  89 +
  90 + /**
  91 + * 新增出库类型
  92 + */
  93 + @RequiresPermissions("config:shipmentType:add")
  94 + @Log(title = "配置-出库类型",operating = "新增出库类型", action = BusinessType.INSERT)
  95 + @PostMapping("/add")
  96 + @ResponseBody
  97 + public AjaxResult addSave(ShipmentType shipmentType) {
  98 + shipmentType.setWarehouseCode(ShiroUtils.getWarehouseCode());
  99 + shipmentType.setCreatedBy(ShiroUtils.getLoginName());
  100 + shipmentType.setLastUpdatedBy(ShiroUtils.getLoginName());
  101 + return toAjax(shipmentTypeService.save(shipmentType ));
  102 + }
  103 +
  104 + /**
  105 + * 修改出库类型
  106 + */
  107 + @GetMapping("/edit/{id}")
  108 + public String edit(@PathVariable("id") Integer id, ModelMap mmap) {
  109 + ShipmentType shipmentType = shipmentTypeService.getById(id);
  110 + mmap.put("shipmentType", shipmentType);
  111 + return prefix + "/edit";
  112 + }
  113 +
  114 + /**
  115 + * 修改保存出库类型
  116 + */
  117 + @RequiresPermissions("config:shipmentType:edit")
  118 + @Log(title = "配置-出库类型",operating = "修改出库类型", action = BusinessType.UPDATE)
  119 + @PostMapping("/edit")
  120 + @ResponseBody
  121 + public AjaxResult editSave(ShipmentType shipmentType) {
  122 + shipmentType.setLastUpdatedBy(ShiroUtils.getLoginName());
  123 + return toAjax(shipmentTypeService.updateById(shipmentType));
  124 + }
  125 +
  126 + /**
  127 + * 删除出库
  128 + */
  129 + @RequiresPermissions("config:shipmentType:remove")
  130 + @Log(title = "配置-出库管理",operating = "修改出库", action = BusinessType.DELETE)
  131 + @PostMapping( "/remove")
  132 + @ResponseBody
  133 + public AjaxResult remove(String ids) {
  134 + if (StringUtils.isEmpty(ids)) {
  135 + return AjaxResult.error("id不能为空");
  136 + }
  137 + List<Integer> list = new ArrayList<>();
  138 + for (Integer id : Convert.toIntArray(ids)) {
  139 + ShipmentType shipmentType = shipmentTypeService.getById(id);
  140 + LambdaQueryWrapper<ShipmentHeader> lambda = Wrappers.lambdaQuery();
  141 + lambda.eq(ShipmentHeader::getShipmentType, shipmentType.getCode());
  142 + List<ShipmentHeader> receiptHeaderList = shipmentHeaderService.list(lambda);
  143 + if (receiptHeaderList.size() == 0){
  144 + list.add(id);
  145 + } else {
  146 + return AjaxResult.error("类型"+shipmentType.getCode()+"存在出库单，不能删除");
  147 + }
  148 + }
  149 + return toAjax(shipmentTypeService.removeByIds(list));
  150 + }
  151 +}
... ...
src/main/java/com/huaheng/pc/shipment/shipmentType/domain/ShipmentType.java renamed to src/main/java/com/huaheng/pc/config/shipmentType/domain/ShipmentType.java
  View file @3b61161
1   -package com.huaheng.pc.shipment.shipmentType.domain;
  1 +package com.huaheng.pc.config.shipmentType.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  
... ... @@ -41,6 +42,13 @@ public class ShipmentType implements Serializable {
41 42 private String code;
42 43  
43 44 /**
  45 + * 编码
  46 + */
  47 + @TableField(value = "name")
  48 + @ApiModelProperty(value="编码")
  49 + private String name;
  50 +
  51 + /**
44 52 * 关联订单类型
45 53 */
46 54 @TableField(value = "referType")
... ... @@ -59,7 +67,7 @@ public class ShipmentType implements Serializable {
59 67 */
60 68 @TableField(value = "enable")
61 69 @ApiModelProperty(value="是否启用")
62   - private String enable;
  70 + private Boolean enable;
63 71  
64 72 /**
65 73 * 创建时间
... ... @@ -124,33 +132,6 @@ public class ShipmentType implements Serializable {
124 132 @ApiModelProperty(value="自定义字段4")
125 133 private String userDef4;
126 134  
127   - /**
128   - * 自定义字段5
129   - */
130   - @TableField(value = "userDef5")
131   - @ApiModelProperty(value="自定义字段5")
132   - private String userDef5;
133   -
134   - /**
135   - * 自定义字段6
136   - */
137   - @TableField(value = "userDef6")
138   - @ApiModelProperty(value="自定义字段6")
139   - private String userDef6;
140   -
141   - /**
142   - * 自定义字段7
143   - */
144   - @TableField(value = "userDef7")
145   - @ApiModelProperty(value="自定义字段7")
146   - private String userDef7;
147   -
148   - /**
149   - * 自定义字段8
150   - */
151   - @TableField(value = "userDef8")
152   - @ApiModelProperty(value="自定义字段8")
153   - private String userDef8;
154 135  
155 136 /**
156 137 * 处理标记
... ... @@ -167,6 +148,8 @@ public class ShipmentType implements Serializable {
167 148  
168 149 public static final String COL_CODE = "code";
169 150  
  151 + public static final String COL_NAME= "name";
  152 +
170 153 public static final String COL_REFERTYPE = "referType";
171 154  
172 155 public static final String COL_SHIPMENTFLOW = "shipmentFlow";
... ... @@ -191,14 +174,6 @@ public class ShipmentType implements Serializable {
191 174  
192 175 public static final String COL_USERDEF4 = "userDef4";
193 176  
194   - public static final String COL_USERDEF5 = "userDef5";
195   -
196   - public static final String COL_USERDEF6 = "userDef6";
197   -
198   - public static final String COL_USERDEF7 = "userDef7";
199   -
200   - public static final String COL_USERDEF8 = "userDef8";
201   -
202 177 public static final String COL_PROCESSSTAMP = "processStamp";
203 178  
204 179 /**
... ... @@ -273,6 +248,14 @@ public class ShipmentType implements Serializable {
273 248 this.code = code;
274 249 }
275 250  
  251 + public String getName() {
  252 + return name;
  253 + }
  254 +
  255 + public void setName(String name) {
  256 + this.name = name;
  257 + }
  258 +
276 259 /**
277 260 * 获取关联订单类型
278 261 *
... ... @@ -309,21 +292,11 @@ public class ShipmentType implements Serializable {
309 292 this.shipmentFlow = shipmentFlow;
310 293 }
311 294  
312   - /**
313   - * 获取是否启用
314   - *
315   - * @return enable - 是否启用
316   - */
317   - public String getEnable() {
  295 + public Boolean getEnable() {
318 296 return enable;
319 297 }
320 298  
321   - /**
322   - * 设置是否启用
323   - *
324   - * @param enable 是否启用
325   - */
326   - public void setEnable(String enable) {
  299 + public void setEnable(Boolean enable) {
327 300 this.enable = enable;
328 301 }
329 302  
... ... @@ -489,77 +462,6 @@ public class ShipmentType implements Serializable {
489 462 this.userDef4 = userDef4;
490 463 }
491 464  
492   - /**
493   - * 获取自定义字段5
494   - *
495   - * @return userDef5 - 自定义字段5
496   - */
497   - public String getUserDef5() {
498   - return userDef5;
499   - }
500   -
501   - /**
502   - * 设置自定义字段5
503   - *
504   - * @param userDef5 自定义字段5
505   - */
506   - public void setUserDef5(String userDef5) {
507   - this.userDef5 = userDef5;
508   - }
509   -
510   - /**
511   - * 获取自定义字段6
512   - *
513   - * @return userDef6 - 自定义字段6
514   - */
515   - public String getUserDef6() {
516   - return userDef6;
517   - }
518   -
519   - /**
520   - * 设置自定义字段6
521   - *
522   - * @param userDef6 自定义字段6
523   - */
524   - public void setUserDef6(String userDef6) {
525   - this.userDef6 = userDef6;
526   - }
527   -
528   - /**
529   - * 获取自定义字段7
530   - *
531   - * @return userDef7 - 自定义字段7
532   - */
533   - public String getUserDef7() {
534   - return userDef7;
535   - }
536   -
537   - /**
538   - * 设置自定义字段7
539   - *
540   - * @param userDef7 自定义字段7
541   - */
542   - public void setUserDef7(String userDef7) {
543   - this.userDef7 = userDef7;
544   - }
545   -
546   - /**
547   - * 获取自定义字段8
548   - *
549   - * @return userDef8 - 自定义字段8
550   - */
551   - public String getUserDef8() {
552   - return userDef8;
553   - }
554   -
555   - /**
556   - * 设置自定义字段8
557   - *
558   - * @param userDef8 自定义字段8
559   - */
560   - public void setUserDef8(String userDef8) {
561   - this.userDef8 = userDef8;
562   - }
563 465  
564 466 /**
565 467 * 获取处理标记
... ...
src/main/java/com/huaheng/pc/shipment/shipmentType/mapper/ShipmentTypeMapper.java renamed to src/main/java/com/huaheng/pc/config/shipmentType/mapper/ShipmentTypeMapper.java
  View file @3b61161
1   -package com.huaheng.pc.shipment.shipmentType.mapper;
  1 +package com.huaheng.pc.config.shipmentType.mapper;
2 2  
3 3 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4   -import com.huaheng.pc.shipment.shipmentType.domain.ShipmentType;
  4 +import com.huaheng.pc.config.shipmentType.domain.ShipmentType;
5 5  
6 6 public interface ShipmentTypeMapper extends BaseMapper<ShipmentType> {
7 7 }
8 8 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/shipment/shipmentType/service/ShipmentTypeService.java renamed to src/main/java/com/huaheng/pc/config/shipmentType/service/ShipmentTypeService.java
  View file @3b61161
1   -package com.huaheng.pc.shipment.shipmentType.service;
  1 +package com.huaheng.pc.config.shipmentType.service;
2 2  
3   -import com.huaheng.pc.shipment.shipmentType.domain.ShipmentType;
4 3 import com.baomidou.mybatisplus.extension.service.IService;
  4 +import com.huaheng.pc.config.shipmentType.domain.ShipmentType;
  5 +
5 6 public interface ShipmentTypeService extends IService<ShipmentType>{
6 7  
7 8  
... ...
src/main/java/com/huaheng/pc/config/shipmentType/service/ShipmentTypeServiceImpl.java 0 → 100644
  View file @3b61161
  1 +package com.huaheng.pc.config.shipmentType.service;
  2 +
  3 +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  4 +import com.huaheng.pc.config.shipmentType.domain.ShipmentType;
  5 +import com.huaheng.pc.config.shipmentType.mapper.ShipmentTypeMapper;
  6 +import org.springframework.stereotype.Service;
  7 +
  8 +@Service
  9 +public class ShipmentTypeServiceImpl extends ServiceImpl<ShipmentTypeMapper, ShipmentType> implements ShipmentTypeService {
  10 +
  11 +}
... ...
src/main/java/com/huaheng/pc/shipment/shipmentType/service/ShipmentTypeServiceImpl.java deleted
View file @1595cdc
1   -package com.huaheng.pc.shipment.shipmentType.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.shipmentType.mapper.ShipmentTypeMapper;
8   -import com.huaheng.pc.shipment.shipmentType.domain.ShipmentType;
9   -import com.huaheng.pc.shipment.shipmentType.service.ShipmentTypeService;
10   -@Service
11   -public class ShipmentTypeServiceImpl extends ServiceImpl<ShipmentTypeMapper, ShipmentType> implements ShipmentTypeService{
12   -
13   -}
src/main/resources/mybatis/config/FilterConfigDetailMapper.xml
  View file @3b61161
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   -<mapper namespace="com.huaheng.pc.shipment.FilterConfigDetail.mapper.FilterConfigDetailMapper">
  3 +<mapper namespace="com.huaheng.pc.config.FilterConfigDetail.mapper.FilterConfigDetailMapper">
4 4 <resultMap id="BaseResultMap" type="com.huaheng.pc.config.FilterConfigDetail.domain.FilterConfigDetail">
5 5 <!--@mbg.generated-->
6 6 <id column="id" jdbcType="INTEGER" property="id" />
... ... @@ -12,8 +12,8 @@
12 12 <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
13 13 <result column="description" jdbcType="VARCHAR" property="description" />
14 14 <result column="statement" jdbcType="LONGVARCHAR" property="statement" />
15   - <result column="systemCreated" jdbcType="INTEGER" property="systemCreated" />
16   - <result column="customSql" jdbcType="LONGVARCHAR" property="customSql" />
  15 + <result column="systemCreated" jdbcType="BIT" property="systemCreated" />
  16 + <result column="customSql" jdbcType="BIT" property="customSql" />
17 17 <result column="created" jdbcType="TIMESTAMP" property="created" />
18 18 <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
19 19 <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
... ... @@ -23,10 +23,6 @@
23 23 <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
24 24 <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
25 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 26 <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
31 27 <result column="filterName" jdbcType="VARCHAR" property="filterName" />
32 28 </resultMap>
... ... @@ -34,7 +30,7 @@
34 30 <!--@mbg.generated-->
35 31 id, headerId, code, moduleType, recordType, filterCode, warehouseCode, description,
36 32 `statement`, systemCreated, customSql, created, createdBy, lastUpdated, lastUpdatedBy,
37   - version, userDef1, userDef2, userDef3, userDef4, userDef5, userDef6, userDef7, userDef8,
  33 + version, userDef1, userDef2, userDef3, userDef4,
38 34 processStamp, filterName
39 35 </sql>
40 36 </mapper>
41 37 \ No newline at end of file
... ...
src/main/resources/mybatis/config/FilterConfigHeaderMapper.xml
  View file @3b61161
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   -<mapper namespace="com.huaheng.pc.shipment.FilterConfigHeader.mapper.FilterConfigHeaderMapper">
  3 +<mapper namespace="com.huaheng.pc.config.FilterConfigHeader.mapper.FilterConfigHeaderMapper">
4 4 <resultMap id="BaseResultMap" type="com.huaheng.pc.config.FilterConfigHeader.domain.FilterConfigHeader">
5 5 <!--@mbg.generated-->
6 6 <id column="id" jdbcType="INTEGER" property="id" />
... ... @@ -9,7 +9,7 @@
9 9 <result column="filterCode" jdbcType="VARCHAR" property="filterCode" />
10 10 <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
11 11 <result column="description" jdbcType="VARCHAR" property="description" />
12   - <result column="systemCreated" jdbcType="INTEGER" property="systemCreated" />
  12 + <result column="systemCreated" jdbcType="BIT" property="systemCreated" />
13 13 <result column="created" jdbcType="TIMESTAMP" property="created" />
14 14 <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
15 15 <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
... ... @@ -19,10 +19,6 @@
19 19 <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
20 20 <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
21 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 22 <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
27 23 <result column="filterName" jdbcType="VARCHAR" property="filterName" />
28 24 </resultMap>
... ... @@ -30,6 +26,6 @@
30 26 <!--@mbg.generated-->
31 27 id, moduleType, recordType, filterCode, warehouseCode, description, systemCreated,
32 28 created, createdBy, lastUpdated, lastUpdatedBy, version, userDef1, userDef2, userDef3,
33   - userDef4, userDef5, userDef6, userDef7, userDef8, processStamp, filterName
  29 + userDef4, processStamp, filterName
34 30 </sql>
35 31 </mapper>
36 32 \ No newline at end of file
... ...
src/main/resources/mybatis/config/ShipmentPreferenceMapper.xml
  View file @3b61161
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   -<mapper namespace="com.huaheng.pc.shipment.shipmentPreference.mapper.ShipmentPreferenceMapper">
  3 +<mapper namespace="com.huaheng.pc.config.shipmentPreference.mapper.ShipmentPreferenceMapper">
4 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" />
... ... @@ -12,8 +12,8 @@
12 12 <result column="shipmentPickingLocRange" jdbcType="VARCHAR" property="shipmentPickingLocRange" />
13 13 <result column="allocationRule" jdbcType="VARCHAR" property="allocationRule" />
14 14 <result column="autoAssignLPN" jdbcType="INTEGER" property="autoAssignLPN" />
15   - <result column="allowCross" jdbcType="INTEGER" property="allowCross" />
16   - <result column="allowQcCheckResult" jdbcType="INTEGER" property="allowQcCheckResult" />
  15 + <result column="allowCross" jdbcType="BIT" property="allowCross" />
  16 + <result column="allowQcCheckResult" jdbcType="BIT" property="allowQcCheckResult" />
17 17 <result column="showInventoryQty" jdbcType="INTEGER" property="showInventoryQty" />
18 18 <result column="groupPickup" jdbcType="INTEGER" property="groupPickup" />
19 19 <result column="manuallyBuildLPN" jdbcType="INTEGER" property="manuallyBuildLPN" />
... ...
src/main/resources/mybatis/shipment/ShipmentTypeMapper.xml renamed to src/main/resources/mybatis/config/ShipmentTypeMapper.xml
  View file @3b61161
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   -<mapper namespace="com.huaheng.pc.shipment.shipmentType.mapper.ShipmentTypeMapper">
4   - <resultMap id="BaseResultMap" type="com.huaheng.pc.shipment.shipmentType.domain.ShipmentType">
  3 +<mapper namespace="com.huaheng.pc.config.shipmentType.mapper.ShipmentTypeMapper">
  4 + <resultMap id="BaseResultMap" type="com.huaheng.pc.config.shipmentType.domain.ShipmentType">
5 5 <!--@mbg.generated-->
6 6 <id column="id" jdbcType="INTEGER" property="id" />
7 7 <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
... ... @@ -9,7 +9,7 @@
9 9 <result column="code" jdbcType="VARCHAR" property="code" />
10 10 <result column="referType" jdbcType="VARCHAR" property="referType" />
11 11 <result column="shipmentFlow" jdbcType="VARCHAR" property="shipmentFlow" />
12   - <result column="enable" jdbcType="VARCHAR" property="enable" />
  12 + <result column="enable" jdbcType="BIT" property="enable" />
13 13 <result column="created" jdbcType="TIMESTAMP" property="created" />
14 14 <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
15 15 <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
... ... @@ -19,16 +19,12 @@
19 19 <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
20 20 <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
21 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 22 <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
27 23 </resultMap>
28 24 <sql id="Base_Column_List">
29 25 <!--@mbg.generated-->
30 26 id, warehouseCode, companyCode, code, referType, shipmentFlow, `enable`, created,
31 27 createdBy, lastUpdated, lastUpdatedBy, version, userDef1, userDef2, userDef3, userDef4,
32   - userDef5, userDef6, userDef7, userDef8, processStamp
  28 + processStamp
33 29 </sql>
34 30 </mapper>
35 31 \ No newline at end of file
... ...
src/main/resources/templates/config/shipmentType/add.html 0 → 100644
  View file @3b61161
  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-receiptType-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 + <select id="companyCode" name="companyCode" class="form-control" th:with="companyList=${@companyService.selectCompanyByCurrentUserId()}">
  24 + <option th:each="company : ${companyList}" th:text="${company['name']}" th:value="${company['code']}"></option>
  25 + </select>
  26 + </div>
  27 + </div>
  28 + <!--<div class="form-group"> -->
  29 + <!--<label class="col-sm-3 control-label">仓库Id：</label>-->
  30 + <!--<div class="col-sm-8">-->
  31 + <!--<input id="warehouseId" name="warehouseId" class="form-control" type="text">-->
  32 + <!--</div>-->
  33 + <!--</div>-->
  34 + <!--<div class="form-group"> -->
  35 + <!--<label class="col-sm-3 control-label">仓库编码：</label>-->
  36 + <!--<div class="col-sm-8">-->
  37 + <!--<input id="warehouseCode" name="warehouseCode" class="form-control" type="text">-->
  38 + <!--</div>-->
  39 + <!--</div>-->
  40 + <div class="form-group">
  41 + <label class="col-sm-3 control-label">关联订单类型：</label>
  42 + <div class="col-sm-8">
  43 + <input id="referType" name="referType" class="form-control" type="text">
  44 + </div>
  45 + </div>
  46 + <div class="form-group">
  47 + <label class="col-sm-3 control-label">出库流程：</label>
  48 + <div class="col-sm-8">
  49 + <select id="receiptFlow" name="shipmentFlow" class="form-control" th:with="statusFlowList=${@StatusFlow.flowList()}">
  50 + <option th:each="flow : ${statusFlowList}" th:text="${flow['name']}" th:value="${flow['code']}"></option>
  51 + </select>
  52 + </div>
  53 + </div>
  54 + <!--<div class="form-group">
  55 + <label class="col-sm-3 control-label">数据版本：</label>
  56 + <div class="col-sm-8">
  57 + <input id="version" name="version" class="form-control" type="text">
  58 + </div>
  59 + </div>-->
  60 + <!--<div class="form-group"> -->
  61 + <!--<label class="col-sm-3 control-label">创建时间：</label>-->
  62 + <!--<div class="col-sm-8">-->
  63 + <!--<input id="created" name="created" class="form-control" type="text">-->
  64 + <!--</div>-->
  65 + <!--</div>-->
  66 + <!--<div class="form-group"> -->
  67 + <!--<label class="col-sm-3 control-label">创建者：</label>-->
  68 + <!--<div class="col-sm-8">-->
  69 + <!--<input id="createdBy" name="createdBy" class="form-control" type="text">-->
  70 + <!--</div>-->
  71 + <!--</div>-->
  72 + <!--<div class="form-group"> -->
  73 + <!--<label class="col-sm-3 control-label">创建时间：</label>-->
  74 + <!--<div class="col-sm-8">-->
  75 + <!--<input id="lastUpdated" name="lastUpdated" class="form-control" type="text">-->
  76 + <!--</div>-->
  77 + <!--</div>-->
  78 + <!--<div class="form-group"> -->
  79 + <!--<label class="col-sm-3 control-label">更新者：</label>-->
  80 + <!--<div class="col-sm-8">-->
  81 + <!--<input id="lastUpdatedBy" name="lastUpdatedBy" class="form-control" type="text">-->
  82 + <!--</div>-->
  83 + <!--</div>-->
  84 + <!--<div class="form-group"> -->
  85 + <!--<label class="col-sm-3 control-label">是否有效：</label>-->
  86 + <!--<div class="col-sm-8">-->
  87 + <!--&lt;!&ndash;<input id="enable" name="enable" class="form-control" type="text">&ndash;&gt;-->
  88 + <!--<div class="onoffswitch">-->
  89 + <!--<input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable">-->
  90 + <!--<label class="onoffswitch-label" for="enable">-->
  91 + <!--<span class="onoffswitch-inner"></span>-->
  92 + <!--<span class="onoffswitch-switch"></span>-->
  93 + <!--</label>-->
  94 + <!--</div>-->
  95 + <!--</div>-->
  96 + <!--</div>-->
  97 + <!--<div class="form-group"> -->
  98 + <!--<label class="col-sm-3 control-label">是否删除：</label>-->
  99 + <!--<div class="col-sm-8">-->
  100 + <!--<input id="deleted" name="deleted" class="form-control" type="text">-->
  101 + <!--</div>-->
  102 + <!--</div>-->
  103 + <!--<div class="form-group"> -->
  104 + <!--<label class="col-sm-3 control-label">自定义字段1：</label>-->
  105 + <!--<div class="col-sm-8">-->
  106 + <!--<input id="userDef1" name="userDef1" class="form-control" type="text">-->
  107 + <!--</div>-->
  108 + <!--</div>-->
  109 + <!--<div class="form-group"> -->
  110 + <!--<label class="col-sm-3 control-label">自定义字段2：</label>-->
  111 + <!--<div class="col-sm-8">-->
  112 + <!--<input id="userDef2" name="userDef2" class="form-control" type="text">-->
  113 + <!--</div>-->
  114 + <!--</div>-->
  115 + <!--<div class="form-group"> -->
  116 + <!--<label class="col-sm-3 control-label">自定义字段3：</label>-->
  117 + <!--<div class="col-sm-8">-->
  118 + <!--<input id="userDef3" name="userDef3" class="form-control" type="text">-->
  119 + <!--</div>-->
  120 + <!--</div>-->
  121 + <!--<div class="form-group"> -->
  122 + <!--<label class="col-sm-3 control-label">自定义字段4：</label>-->
  123 + <!--<div class="col-sm-8">-->
  124 + <!--<input id="userDef4" name="userDef4" class="form-control" type="text">-->
  125 + <!--</div>-->
  126 + <!--</div>-->
  127 + <!--<div class="form-group"> -->
  128 + <!--<label class="col-sm-3 control-label">自定义字段5：</label>-->
  129 + <!--<div class="col-sm-8">-->
  130 + <!--<input id="userDef5" name="userDef5" class="form-control" type="text">-->
  131 + <!--</div>-->
  132 + <!--</div>-->
  133 + <div class="form-group">
  134 + <label class="col-sm-3 control-label">是否启用：</label>
  135 + <div class="col-sm-8">
  136 + <div class="onoffswitch">
  137 + <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable">
  138 + <label class="onoffswitch-label" for="enable">
  139 + <span class="onoffswitch-inner"></span>
  140 + <span class="onoffswitch-switch"></span>
  141 + </label>
  142 + </div>
  143 + </div>
  144 + </div>
  145 + <div class="form-group">
  146 + <div class="form-control-static col-sm-offset-9">
  147 + <button type="submit" class="btn btn-primary">提交</button>
  148 + <button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
  149 + </div>
  150 + </div>
  151 + </form>
  152 +</div>
  153 +<div th:include="include::footer"></div>
  154 +<script type="text/javascript">
  155 + var prefix = ctx + "config/shipmentType";
  156 + $("#form-receiptType-add").validate({
  157 + rules:{
  158 + code:{
  159 + required:true,
  160 + },
  161 + name:{
  162 + required:true,
  163 + },
  164 + shipmentFlow:{
  165 + required:true,
  166 + },
  167 + },
  168 + submitHandler: function(form) {
  169 + // $.operate.save(prefix + "/add", $('#form-locationType-add').serialize());
  170 + var tableValue = $.common.getTableValue("#form-receiptType-add");
  171 + tableValue = formValueReplace(tableValue, "companyCode", $("#companyCode option:selected").val());
  172 + tableValue = formValueReplace(tableValue, "shipmentFlow", $("#shipmentFlow option:selected").val());
  173 + tableValue = formValueReplace(tableValue, "enable", $("input[name='enable']").is(':checked'));
  174 + $.operate.save(prefix + "/add", tableValue);
  175 + }
  176 + });
  177 +</script>
  178 +</body>
  179 +</html>
... ...
src/main/resources/templates/config/shipmentType/edit.html 0 → 100644
  View file @3b61161
  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-shipmentType-edit" th:object="${shipmentType}">
  8 + <input name="id" type="hidden" 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 + <select id="companyCode" name="companyCode" class="form-control" th:with="companyList=${@companyService.selectCompanyByCurrentUserId()}"
  25 + th:field="*{companyCode}">
  26 + <option th:each="company : ${companyList}" th:text="${company['name']}" th:value="${company['code']}"></option>
  27 + </select>
  28 + </div>
  29 + </div>
  30 + <!--<div class="form-group"> -->
  31 + <!--<label class="col-sm-3 control-label">仓库Id：</label>-->
  32 + <!--<div class="col-sm-8">-->
  33 + <!--<input id="warehouseId" name="warehouseId" class="form-control" type="text">-->
  34 + <!--</div>-->
  35 + <!--</div>-->
  36 + <!--<div class="form-group"> -->
  37 + <!--<label class="col-sm-3 control-label">仓库编码：</label>-->
  38 + <!--<div class="col-sm-8">-->
  39 + <!--<input id="warehouseCode" name="warehouseCode" class="form-control" type="text">-->
  40 + <!--</div>-->
  41 + <!--</div>-->
  42 + <div class="form-group">
  43 + <label class="col-sm-3 control-label">关联订单类型：</label>
  44 + <div class="col-sm-8">
  45 + <input id="referType" name="referType" class="form-control" type="text" th:field="*{referType}">
  46 + </div>
  47 + </div>
  48 + <div class="form-group">
  49 + <label class="col-sm-3 control-label">出库流程：</label>
  50 + <div class="col-sm-8">
  51 + <select id="receiptFlow" name="shipmentFlow" class="form-control" th:with="statusFlowList=${@StatusFlow.flowList()}" th:field="*{receiptFlow}">
  52 + <option th:each="flow : ${statusFlowList}" th:text="${flow['name']}" th:value="${flow['code']}"></option>
  53 + </select>
  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="version" name="version" 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="created" name="created" class="form-control" type="text">-->
  66 + <!--</div>-->
  67 + <!--</div>-->
  68 + <!--<div class="form-group"> -->
  69 + <!--<label class="col-sm-3 control-label">创建者：</label>-->
  70 + <!--<div class="col-sm-8">-->
  71 + <!--<input id="createdBy" name="createdBy" 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="lastUpdated" name="lastUpdated" class="form-control" type="text">-->
  78 + <!--</div>-->
  79 + <!--</div>-->
  80 + <!--<div class="form-group"> -->
  81 + <!--<label class="col-sm-3 control-label">更新者：</label>-->
  82 + <!--<div class="col-sm-8">-->
  83 + <!--<input id="lastUpdatedBy" name="lastUpdatedBy" class="form-control" type="text">-->
  84 + <!--</div>-->
  85 + <!--</div>-->
  86 + <!--<div class="form-group"> -->
  87 + <!--<label class="col-sm-3 control-label">是否有效：</label>-->
  88 + <!--<div class="col-sm-8">-->
  89 + <!--&lt;!&ndash;<input id="enable" name="enable" class="form-control" type="text">&ndash;&gt;-->
  90 + <!--<div class="onoffswitch">-->
  91 + <!--<input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable">-->
  92 + <!--<label class="onoffswitch-label" for="enable">-->
  93 + <!--<span class="onoffswitch-inner"></span>-->
  94 + <!--<span class="onoffswitch-switch"></span>-->
  95 + <!--</label>-->
  96 + <!--</div>-->
  97 + <!--</div>-->
  98 + <!--</div>-->
  99 + <!--<div class="form-group"> -->
  100 + <!--<label class="col-sm-3 control-label">是否删除：</label>-->
  101 + <!--<div class="col-sm-8">-->
  102 + <!--<input id="deleted" name="deleted" class="form-control" type="text">-->
  103 + <!--</div>-->
  104 + <!--</div>-->
  105 + <!--<div class="form-group"> -->
  106 + <!--<label class="col-sm-3 control-label">自定义字段1：</label>-->
  107 + <!--<div class="col-sm-8">-->
  108 + <!--<input id="userDef1" name="userDef1" class="form-control" type="text">-->
  109 + <!--</div>-->
  110 + <!--</div>-->
  111 + <!--<div class="form-group"> -->
  112 + <!--<label class="col-sm-3 control-label">自定义字段2：</label>-->
  113 + <!--<div class="col-sm-8">-->
  114 + <!--<input id="userDef2" name="userDef2" class="form-control" type="text">-->
  115 + <!--</div>-->
  116 + <!--</div>-->
  117 + <!--<div class="form-group"> -->
  118 + <!--<label class="col-sm-3 control-label">自定义字段3：</label>-->
  119 + <!--<div class="col-sm-8">-->
  120 + <!--<input id="userDef3" name="userDef3" class="form-control" type="text">-->
  121 + <!--</div>-->
  122 + <!--</div>-->
  123 + <!--<div class="form-group"> -->
  124 + <!--<label class="col-sm-3 control-label">自定义字段4：</label>-->
  125 + <!--<div class="col-sm-8">-->
  126 + <!--<input id="userDef4" name="userDef4" class="form-control" type="text">-->
  127 + <!--</div>-->
  128 + <!--</div>-->
  129 + <!--<div class="form-group"> -->
  130 + <!--<label class="col-sm-3 control-label">自定义字段5：</label>-->
  131 + <!--<div class="col-sm-8">-->
  132 + <!--<input id="userDef5" name="userDef5" class="form-control" type="text">-->
  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 + <div class="onoffswitch">
  139 + <input type="checkbox" th:checked="*{enable}" class="onoffswitch-checkbox" id="enable" name="enable">
  140 + <label class="onoffswitch-label" for="enable">
  141 + <span class="onoffswitch-inner"></span>
  142 + <span class="onoffswitch-switch"></span>
  143 + </label>
  144 + </div>
  145 + </div>
  146 + </div>
  147 + <div class="form-group">
  148 + <div class="form-control-static col-sm-offset-9">
  149 + <button type="submit" class="btn btn-primary">提交</button>
  150 + <button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
  151 + </div>
  152 + </div>
  153 + </form>
  154 +</div>
  155 +<div th:include="include::footer"></div>
  156 +<script type="text/javascript">
  157 + var prefix = ctx + "config/shipmentType";
  158 + $("#form-receiptType-edit").validate({
  159 + rules:{
  160 + code:{
  161 + required:true,
  162 + },
  163 + name:{
  164 + required:true,
  165 + },
  166 + shipmentFlow:{
  167 + required:true,
  168 + },
  169 + },
  170 + submitHandler: function(form) {
  171 + // $.operate.save(prefix + "/add", $('#form-locationType-add').serialize());
  172 + var tableValue = $.common.getTableValue("#form-shipmentType-edit");
  173 + tableValue = formValueReplace(tableValue, "companyCode", $("#companyCode option:selected").val());
  174 + tableValue = formValueReplace(tableValue, "shipmentFlow", $("#shipmentFlow option:selected").val());
  175 + tableValue = formValueReplace(tableValue, "enable", $("input[name='enable']").is(':checked'));
  176 + $.operate.save(prefix + "/edit", tableValue);
  177 + }
  178 + });
  179 +</script>
  180 +</body>
  181 +</html>
... ...
src/main/resources/templates/config/shipmentType/shipmentType.html 0 → 100644
  View file @3b61161
  1 +<!DOCTYPE HTML>
  2 +<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
  3 +<meta charset="utf-8">
  4 +<head th:include="include :: header"></head>
  5 +<body class="gray-bg">
  6 +<div class="container-div">
  7 + <div class="row">
  8 + <div class="col-sm-12 select-info">
  9 + <form id="shipmentType-form">
  10 + <div class="select-list">
  11 + <ul>
  12 + <li>
  13 + 编码：<input type="text" name="code"/>
  14 + </li>
  15 + <li>
  16 + 名称：<input type="text" name="name"/>
  17 + </li>
  18 + <li class="time">
  19 + <label>创建时间： </label>
  20 + <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/>
  21 + <span>-</span>
  22 + <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"/>
  23 + </li>
  24 + <li>
  25 + <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
  26 + <!--<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="system:role:export"><i class="fa fa-download"></i>&nbsp;导出</a>-->
  27 + </li>
  28 + </ul>
  29 + </div>
  30 + </form>
  31 + </div>
  32 + <div class="btn-group hidden-xs" id="toolbar" role="group">
  33 + <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="config:shipmentType:add">
  34 + <i class="fa fa-plus"></i> 新增
  35 + </a>
  36 + <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="config:shipmentType:remove">
  37 + <i class="fa fa-trash-o"></i> 删除
  38 + </a>
  39 + </div>
  40 +
  41 + <div class="col-sm-12 select-info">
  42 + <table id="bootstrap-table" data-mobile-responsive="true" class="table table-bordered table-hover"></table>
  43 + </div>
  44 + <div>
  45 + </div>
  46 + <div th:include="include :: footer"></div>
  47 + <script th:inline="javascript">
  48 + var editFlag = [[${@permission.hasPermi('config:shipmentType:edit')}]];
  49 + var removeFlag = [[${@permission.hasPermi('config:shipmentType:remove')}]];
  50 + var prefix = ctx + "config/shipmentType";
  51 + var datas = [[${@dict.getType('sys_normal_disable')}]];
  52 + $(function() {
  53 + var options = {
  54 + url: prefix + "/list",
  55 + createUrl: prefix + "/add",
  56 + updateUrl: prefix + "/edit/{id}",
  57 + removeUrl: prefix + "/remove",
  58 + modalName: "出库单类型",
  59 + search: false,
  60 + columns: [{
  61 + checkbox: true
  62 + },
  63 + {
  64 + field : 'id',
  65 + title : '出库单类型Id'
  66 + },
  67 + {
  68 + field : 'code',
  69 + title : '类型编码'
  70 + },
  71 + {
  72 + field : 'name',
  73 + title : '名称'
  74 + },
  75 + {
  76 + field : 'companyCode',
  77 + title : '货主编码',
  78 + visible:false
  79 + },
  80 + {
  81 + field : 'warehouseCode',
  82 + title : '仓库编码',
  83 + visible:false
  84 + },
  85 + {
  86 + field : 'referType',
  87 + title : '关联订单类型'
  88 + },
  89 + {
  90 + field : 'shipmentFlow',
  91 + title : '出库流程'
  92 + },
  93 + {
  94 + field : 'created',
  95 + title : '创建时间'
  96 + },
  97 + {
  98 + field : 'createdBy',
  99 + title : '创建用户'
  100 + },
  101 + {
  102 + field : 'lastUpdated',
  103 + title : '更新时间'
  104 + },
  105 + {
  106 + field : 'lastUpdatedBy',
  107 + title : '更新用户'
  108 + },
  109 + {
  110 + field : 'enable',
  111 + title : '是否有效',
  112 + formatter: function(value, row, index) {
  113 + return $.table.selectDictLabel(datas, value);
  114 + },
  115 + align: 'center',
  116 + },
  117 + {
  118 + field : 'version',
  119 + title : '数据版本',
  120 + visible : false
  121 + },
  122 + {
  123 + field : 'processStamp',
  124 + title : '处理标记',
  125 + visible : false
  126 + },
  127 + {
  128 + field : 'userDef1',
  129 + title : '自定义字段1' ,
  130 + visible:false
  131 + },
  132 + {
  133 + field : 'userDef2',
  134 + title : '自定义字段2' ,
  135 + visible:false
  136 + },
  137 + {
  138 + field : 'userDef3',
  139 + title : '自定义字段3' ,
  140 + visible:false
  141 + },
  142 + {
  143 + field : 'userDef4',
  144 + title : '自定义字段4' ,
  145 + visible:false
  146 + },
  147 + {
  148 + title: '操作',
  149 + align: 'center',
  150 + formatter: function(value, row, index) {
  151 + var actions = [];
  152 + actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')" ><i class="fa fa-edit"></i>编辑</a> ');
  153 + actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')" ><i class="fa fa-trash-o"></i>删除</a>');
  154 + return actions.join('');
  155 + }
  156 + }]
  157 + };
  158 + $.table.init(options);
  159 + });
  160 + </script>
  161 +</body>
  162 +</html>
0 163 \ No newline at end of file
... ...