wms / wms_henanqingyuan · Commits

Commit 7b4c9e2b120ca8545a061af12a8dfb0044a6d7c4

Authored by mahuandong
2 parents 29abde44 b2f65fd5

Merge remote-tracking branch 'origin/develop' into develop

Inline Side-by-side
Showing 19 changed files with 328 additions and 269 deletions
src/main/java/com/huaheng/pc/config/cycleCountPreference/controller/cycleCountPreferenceController.java
  View file @7b4c9e2
... ... @@ -103,12 +103,10 @@ public class cycleCountPreferenceController extends BaseController {
103 103 @PostMapping("/addSave")
104 104 @ResponseBody
105 105 public AjaxResult addSave(CycleCountPreference cycleCountPreference) {
106   - cycleCountPreference.setWarehouseCode(ShiroUtils.getWarehouseCode());
107   - cycleCountPreference.setCreatedBy(ShiroUtils.getLoginName());
108   - cycleCountPreference.setCreated(new Date());
109   - cycleCountPreference.setLastUpdatedBy(ShiroUtils.getLoginName());
110   -
111   - return toAjax(cycleCountPreferenceService.save(cycleCountPreference));
  106 + if(cycleCountPreference == null){
  107 + return AjaxResult.error("新增数据不能为空！");
  108 + }
  109 + return cycleCountPreferenceService.addSave(cycleCountPreference);
112 110 }
113 111  
114 112 /**
... ...
src/main/java/com/huaheng/pc/config/cycleCountPreference/domain/CycleCountPreference.java
  View file @7b4c9e2
... ... @@ -81,8 +81,8 @@ public class CycleCountPreference implements Serializable {
81 81 /**
82 82 * 有效
83 83 */
84   - @TableField(value = "Enable")
85   - @ApiModelProperty(value="有效")
  84 + @TableField(value = "enable")
  85 + @ApiModelProperty(value="是否有效")
86 86 private Boolean enable;
87 87  
88 88 /**
... ...
src/main/java/com/huaheng/pc/config/cycleCountPreference/service/CycleCountPreferenceService.java
  View file @7b4c9e2
1 1 package com.huaheng.pc.config.cycleCountPreference.service;
2 2  
  3 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  4 +import com.baomidou.mybatisplus.core.toolkit.Wrappers;
  5 +import com.huaheng.common.utils.security.ShiroUtils;
  6 +import com.huaheng.framework.web.domain.AjaxResult;
  7 +import com.huaheng.pc.inventory.cycleCountDetail.domain.CycleCountDetail;
  8 +import com.huaheng.pc.inventory.cycleCountDetail.service.CycleCountDetailService;
  9 +import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
3 10 import org.springframework.stereotype.Service;
4 11 import javax.annotation.Resource;
  12 +import java.text.SimpleDateFormat;
  13 +import java.util.Date;
5 14 import java.util.List;
6 15 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
7 16 import com.huaheng.pc.config.cycleCountPreference.mapper.CycleCountPreferenceMapper;
8 17 import com.huaheng.pc.config.cycleCountPreference.domain.CycleCountPreference;
  18 +import org.springframework.transaction.annotation.Transactional;
  19 +
9 20 @Service
10 21 public class CycleCountPreferenceService extends ServiceImpl<CycleCountPreferenceMapper, CycleCountPreference> {
11 22  
  23 +
  24 + @Resource
  25 + private CycleCountDetailService cycleCountDetailService;
  26 +
  27 +
  28 +
  29 +
  30 + /**
  31 + *新增盘点首选项
  32 + * @param cycleCountPreference
  33 + * @return
  34 + */
  35 + @Transactional
  36 + public AjaxResult addSave (CycleCountPreference cycleCountPreference){
  37 +
  38 + cycleCountPreference.setCode(newCode());
  39 + cycleCountPreference.setWarehouseCode(ShiroUtils.getWarehouseCode());
  40 + cycleCountPreference.setCreatedBy(ShiroUtils.getLoginName());
  41 + cycleCountPreference.setCreated(new Date());
  42 + cycleCountPreference.setLastUpdatedBy(ShiroUtils.getLoginName());
  43 + this.save(cycleCountPreference);
  44 + return AjaxResult.success("新增完成！");
  45 + }
  46 +
  47 +
  48 + /**
  49 + * 自动生成盘点首选项Code
  50 + * 使用特定字段和ID组合成Code
  51 + */
  52 + public String newCode(){
  53 + //先查询前一个ID生成当前的数字，再拼接
  54 + String code = null;
  55 + Date now = new Date();
  56 + SimpleDateFormat df = new SimpleDateFormat("yyyyMMdd");
  57 + LambdaQueryWrapper<CycleCountPreference> lambda = Wrappers.lambdaQuery();
  58 + lambda.select(CycleCountPreference::getCode)
  59 + .orderByDesc(CycleCountPreference::getId).last("Limit 1");
  60 + // code = ccp + 日期 + (排序号 + 1)
  61 + String maxCode = null;
  62 + CycleCountPreference cycleCountPreference = this.getOne(lambda);
  63 + if ( cycleCountPreference != null){
  64 + maxCode = this.getOne(lambda).getCode();
  65 + }
  66 + if (maxCode != null && maxCode.substring(maxCode.length() - 13, maxCode.length() - 5).equals(df.format(now))) {
  67 + Integer Count = Integer.valueOf(maxCode.substring(maxCode.length() - 5 ));
  68 + code = "ccp" + df.format(now) + String.format("%05d", Count + 1);
  69 + } else {
  70 + code = "ccp" + df.format(now) +"00001";
  71 + }
  72 + return code;
  73 + }
  74 +
  75 +
  76 +
  77 +
  78 +
  79 +
  80 +
  81 +
  82 +
  83 +
12 84 }
... ...
src/main/java/com/huaheng/pc/inventory/cycleCountDetail/domain/CycleCountDetail.java
  View file @7b4c9e2
... ... @@ -287,6 +287,12 @@ public class CycleCountDetail implements Serializable {
287 287 @ApiModelProperty(value = "盘点主单号")
288 288 private String cycleCountHeadCode;
289 289  
  290 + /**
  291 + *盘点首选项编码
  292 + */
  293 + @TableField(value = "preferenceCode")
  294 + @ApiModelProperty(value = "盘点首选项编码")
  295 + private String preferenceCode;
290 296  
291 297  
292 298  
... ... @@ -587,6 +593,14 @@ public class CycleCountDetail implements Serializable {
587 593 this.gapQty = gapQty;
588 594 }
589 595  
  596 + public String getPreferenceCode() {
  597 + return preferenceCode;
  598 + }
  599 +
  600 + public void setPreferenceCode(String preferenceCode) {
  601 + this.preferenceCode = preferenceCode;
  602 + }
  603 +
590 604 /**
591 605 * 获取失败原因
592 606 *
... ...
src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java
  View file @7b4c9e2
... ... @@ -513,7 +513,7 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl&lt;ShipmentCont
513 513 Wave wave = waveService.getById(item.getWaveId());
514 514 wave.setStatus(999);
515 515 waveService.updateById(wave);
516   - return AjaxResult.error("主单为"+item.getShipmentCode()+"子单id为"+item.getId() + "的单据没有库存，波次失败");
  516 + throw new ServiceException("主单为"+item.getShipmentCode()+"子单id为"+item.getId() + "的单据没有库存，波次失败");
517 517 }
518 518 if (inventoryList.size() < 1) {
519 519 num = num + 1;
... ...
src/main/java/com/huaheng/pc/shipment/shipmentDetail/mapper/ShipmentDetailMapper.java
  View file @7b4c9e2
... ... @@ -16,5 +16,7 @@ public interface ShipmentDetailMapper extends BaseMapper&lt;ShipmentDetail&gt; {
16 16  
17 17 Integer countUnCompleted(Integer shipmentId);
18 18  
  19 + Map<String,Integer> selectStatus(Integer id);
  20 +
19 21  
20 22 }
21 23 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/shipment/shipmentDetail/service/ShipmentDetailService.java
  View file @7b4c9e2
... ... @@ -3,6 +3,10 @@ package com.huaheng.pc.shipment.shipmentDetail.service;
3 3 import com.huaheng.framework.web.domain.AjaxResult;
4 4 import com.huaheng.pc.shipment.shipmentDetail.domain.ShipmentDetail;
5 5 import com.baomidou.mybatisplus.extension.service.IService;
  6 +
  7 +import java.util.List;
  8 +import java.util.Map;
  9 +
6 10 public interface ShipmentDetailService extends IService<ShipmentDetail>{
7 11  
8 12 /**
... ... @@ -20,5 +24,7 @@ public interface ShipmentDetailService extends IService&lt;ShipmentDetail&gt;{
20 24 //选中的单据加入波次
21 25 void saveWave(String ids,String code);
22 26  
  27 + Map<String,Integer> selectStatus(Integer id);
  28 +
23 29  
24 30 }
... ...
src/main/java/com/huaheng/pc/shipment/shipmentDetail/service/ShipmentDetailServiceImpl.java
  View file @7b4c9e2
... ... @@ -236,6 +236,7 @@ public class ShipmentDetailServiceImpl extends ServiceImpl&lt;ShipmentDetailMapper,
236 236  
237 237 }else {
238 238 //创建波次
  239 + wave=new Wave();
239 240 wave.setWarehouseCode(ShiroUtils.getWarehouseCode());
240 241 wave.setMasterCode(code);
241 242 wave.setWaveName(waveMaster.getName());
... ... @@ -273,4 +274,11 @@ public class ShipmentDetailServiceImpl extends ServiceImpl&lt;ShipmentDetailMapper,
273 274 }
274 275  
275 276 }
  277 +
  278 +
  279 + //查看最高状态和最低状态
  280 + @Override
  281 + public Map<String,Integer> selectStatus(Integer id) {
  282 + return shipmentDetailMapper.selectStatus(id);
  283 + }
276 284 }
... ...
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
  View file @7b4c9e2
... ... @@ -426,7 +426,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
426 426 throw new ServiceException("任务(" + taskId + ")任务已经是完成的！");
427 427 }
428 428 //如果没有库位不能完成
429   - if (StringUtils.isEmpty(task.getToLocation())) {
  429 + if (StringUtils.isEmpty(task.getFromLocation())) {
430 430 throw new ServiceException("任务" + taskId + "没有库位，执行中止");
431 431 }
432 432 this.completeTask(task);
... ... @@ -1276,13 +1276,11 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
1276 1276 task.setLastUpdated(new Date());
1277 1277 taskHeaderService.updateById(task);
1278 1278  
1279   - //如果是临时容器出库完成后删除容器
1280   - containerService.removeByCode(task.getContainerCode());
1281 1279  
1282 1280 //将库位状态改为空闲，如果是整出的对应的容器也清空
1283 1281  
1284 1282 LambdaQueryWrapper<Location> lam=Wrappers.lambdaQuery();
1285   - lam.eq(Location::getCode,task.getToLocation());
  1283 + lam.eq(Location::getCode,task.getFromLocation());
1286 1284 Location locationRecord = locationService.getOne(lam);
1287 1285 if(lam == null){
1288 1286 throw new ServiceException("系统没有"+task.getToLocation()+"库位");
... ... @@ -1345,25 +1343,47 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
1345 1343 shipmentContainerHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
1346 1344 LambdaUpdateWrapper<ShipmentContainerHeader> shipmentContainerHeaderLambdaUpdateWrapper = Wrappers.lambdaUpdate();
1347 1345 shipmentContainerHeaderLambdaUpdateWrapper.eq(ShipmentContainerHeader::getId,task.getAllocationHeadId());
1348   - if (! shipmentContainerHeaderService.update(shipmentContainerHeader, shipmentContainerHeaderLambdaUpdateWrapper))
  1346 + if (! shipmentContainerHeaderService.update(shipmentContainerHeader, shipmentContainerHeaderLambdaUpdateWrapper)) {
1349 1347 throw new ServiceException("更新组盘头状态失败");
1350   - //修改出库单状态
1351   - LambdaQueryWrapper<TaskDetail> taskDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
1352   - taskDetailLambdaQueryWrapper.eq(TaskDetail::getTaskId,task.getId());
1353   - List<TaskDetail> taskDetailList = taskDetailService.list(taskDetailLambdaQueryWrapper);
1354   -
1355   - for (TaskDetail taskDeatails: taskDetailList) {
1356   - LambdaQueryWrapper<ShipmentDetail> shipmentDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
1357   - shipmentDetailLambdaQueryWrapper.eq(ShipmentDetail::getId,taskDeatails.getBillDetailId());
1358   -
1359   - ShipmentHeader shipmentHeader =new ShipmentHeader();
1360   - shipmentHeader.setId(shipmentDetailService.getOne(shipmentDetailLambdaQueryWrapper).getShipmentId());
1361   - shipmentHeader.setFirstStatus(300);
1362   - shipmentHeader.setLastStatus(300);
1363   - shipmentHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
1364   - shipmentHeader.setLastUpdated(new Date());
1365   - shipmentHeaderService.updateById(shipmentHeader);
1366   - }
  1348 + }
  1349 + //修改出库单状态
  1350 + LambdaQueryWrapper<TaskDetail> taskDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
  1351 + taskDetailLambdaQueryWrapper.eq(TaskDetail::getTaskId,task.getId());
  1352 + List<TaskDetail> taskDetailList = taskDetailService.list(taskDetailLambdaQueryWrapper);
  1353 +
  1354 + HashSet<Integer> ids = new HashSet<>();
  1355 + for (TaskDetail taskDeatails: taskDetailList) {
  1356 + LambdaQueryWrapper<ShipmentDetail> shipmentDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
  1357 + shipmentDetailLambdaQueryWrapper.eq(ShipmentDetail::getId, taskDeatails.getBillDetailId());
  1358 + ShipmentDetail shipmentDetail = shipmentDetailService.getOne(shipmentDetailLambdaQueryWrapper);
  1359 + if (shipmentDetail == null) {
  1360 + throw new ServiceException("查找出库单明细失败");
  1361 + }
  1362 + if (shipmentDetail.getShipQty().compareTo(shipmentDetail.getRequestQty()) == 0) {
  1363 + shipmentDetail.setStatus(500);
  1364 + shipmentDetailService.updateById(shipmentDetail);
  1365 + }
  1366 + ids.add(shipmentDetail.getShipmentId());
  1367 + }
  1368 +
  1369 + for(Integer id : ids) {
  1370 + ShipmentHeader shipmentHeader = shipmentHeaderService.getById(id);
  1371 + if(shipmentHeader != null) {
  1372 + Map<String,Integer> status = shipmentDetailService.selectStatus(shipmentHeader.getId());
  1373 + Integer maxStatus = status.get("maxStatus");
  1374 + Integer minStatus = status.get("minStatus");
  1375 + if(maxStatus == 500){
  1376 + shipmentHeader.setFirstStatus(500);
  1377 + }
  1378 + if(minStatus == 500) {
  1379 + shipmentHeader.setLastStatus(500);
  1380 + }
  1381 + shipmentHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
  1382 + shipmentHeader.setLastUpdated(new Date());
  1383 + shipmentHeaderService.updateById(shipmentHeader);
  1384 + }
  1385 + }
  1386 +
1367 1387  
1368 1388 }
1369 1389  
... ...
src/main/resources/mybatis/config/CycleCountPreferenceMapper.xml
  View file @7b4c9e2
... ... @@ -12,7 +12,7 @@
12 12 <result column="promptItem" jdbcType="BOOLEAN" property="promptItem" />
13 13 <result column="promptQuantity" jdbcType="BOOLEAN" property="promptQuantity" />
14 14 <result column="allowAddNewInventory" jdbcType="BOOLEAN" property="allowAddNewInventory" />
15   - <result column="Enable" jdbcType="BOOLEAN" property="enable" />
  15 + <result column="enable" jdbcType="BOOLEAN" property="enable" />
16 16 <result column="created" jdbcType="TIMESTAMP" property="created" />
17 17 <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
18 18 <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
... ... @@ -27,7 +27,7 @@
27 27 <sql id="Base_Column_List">
28 28 <!--@mbg.generated-->
29 29 id, code, `name`, warehouseCode, promptLocation, promptLpn, promptItem, promptQuantity,
30   - allowAddNewInventory, `Enable`, created, createdBy, lastUpdated, lastUpdatedBy, version,
  30 + allowAddNewInventory, enable, created, createdBy, lastUpdated, lastUpdatedBy, version,
31 31 userDef1, userDef2, userDef3, processStamp, countByPiece
32 32 </sql>
33 33 </mapper>
34 34 \ No newline at end of file
... ...
src/main/resources/mybatis/inventory/CycleCountDetailMapper.xml
  View file @7b4c9e2
... ... @@ -42,6 +42,7 @@
42 42 <result column="batch" jdbcType="VARCHAR" property="batch" />
43 43 <result column="lot" jdbcType="VARCHAR" property="lot" />
44 44 <result column="projectNo" jdbcType="VARCHAR" property="projectNo" />
  45 + <result column="preferenceCode" jdbcType="VARCHAR" property="preferenceCode" />
45 46 </resultMap>
46 47 <sql id="Base_Column_List">
47 48 <!--@mbg.generated-->
... ... @@ -50,6 +51,6 @@
50 51 companyCode, inventorySts, systemQty, countedQty, gapQty, rejectionNote, countedBy,
51 52 countedAt, assignedTo, assignedAt, completedBy, completedAt, enableStatus, created,
52 53 createdBy, lastUpdated, lastUpdatedBy, version, userDef1, userDef2, userDef3, processStamp,
53   - batch, lot, projectNo
  54 + batch, lot, projectNo, preferenceCode
54 55 </sql>
55 56 </mapper>
56 57 \ No newline at end of file
... ...
src/main/resources/mybatis/shipment/ShipmentDetailMapper.xml
  View file @7b4c9e2
... ... @@ -80,4 +80,9 @@
80 80 SELECT COUNT(*) FROM shipment_detail WHERE shipmentId=#{shipmentId} AND shipQty>requestQty
81 81 </select>
82 82  
  83 + <select id="selectStatus" resultType="java.util.Map">
  84 + SELECT max(status) maxStatus,min(status) minStatus
  85 + FROM shipment_detail
  86 + WHERE shipmentId=#{id}
  87 + </select>
83 88 </mapper>
84 89 \ No newline at end of file
... ...
src/main/resources/static/huaheng/js/common.js
  View file @7b4c9e2
... ... @@ -23,8 +23,10 @@ $(function(){
23 23 var laydate = layui.laydate;
24 24 var day1 = new Date();
25 25 day1.setTime(day1.getTime()-24*60*60*1000*7);
  26 + var endDay = new Date();
  27 + endDay.setTime(endDay.getTime()+24*60*60*1000);
26 28 laydate.render({ elem: '#startTime', theme: 'molv',value: new Date(day1), isInitValue: true});
27   - laydate.render({ elem: '#endTime', theme: 'molv',value: new Date(), isInitValue: true });
  29 + laydate.render({ elem: '#endTime', theme: 'molv',value: new Date(endDay), isInitValue: true });
28 30 });
29 31 }
30 32 });
... ...
src/main/resources/templates/config/cycleCountPreference/add.html
  View file @7b4c9e2
1 1 <!DOCTYPE HTML>
2   -<html lang="zh" xmlns:th="http://www.thymeleaf.org">
  2 +<html lang="zh" xmlns:th="http://www.thymeleaf.org">
3 3 <meta charset="utf-8">
4 4 <head th:include="include :: header"></head>
5 5 <body class="white-bg">
6 6 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
7 7 <form class="form-horizontal m" id="form-cycleCountPreference-add">
8   - <div class="form-group">
  8 + <!--<div class="form-group">
9 9 <label class="col-sm-3 control-label">盘点首选项编码：</label>
10 10 <div class="col-sm-8">
11 11 <input id="code" name="code" class="form-control" type="text">
12 12 </div>
13   - </div>
  13 + </div>-->
14 14 <div class="form-group">
15 15 <label class="col-sm-3 control-label">盘点首选项名称：</label>
16 16 <div class="col-sm-8">
... ... @@ -22,7 +22,8 @@
22 22 <label class="col-sm-3 control-label">系统提示库位：</label>
23 23 <div class="col-sm-8">
24 24 <div class="onoffswitch">
25   - <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="promptLocation" name="promptLocation">
  25 + <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="promptLocation"
  26 + name="promptLocation">
26 27 <label class="onoffswitch-label" for="promptLocation">
27 28 <span class="onoffswitch-inner"></span>
28 29 <span class="onoffswitch-switch"></span>
... ... @@ -35,7 +36,8 @@
35 36 <label class="col-sm-3 control-label">系统提示容器：</label>
36 37 <div class="col-sm-8">
37 38 <div class="onoffswitch">
38   - <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="promptLpn" name="promptLpn">
  39 + <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="promptLpn"
  40 + name="promptLpn">
39 41 <label class="onoffswitch-label" for="promptLpn">
40 42 <span class="onoffswitch-inner"></span>
41 43 <span class="onoffswitch-switch"></span>
... ... @@ -48,8 +50,9 @@
48 50 <label class="col-sm-3 control-label">系统提示物料：</label>
49 51 <div class="col-sm-8">
50 52 <div class="onoffswitch">
51   - <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="promptItem" name="promptItem">
52   - <label class="onoffswitch-label" for="promptLpn">
  53 + <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="promptItem"
  54 + name="promptItem">
  55 + <label class="onoffswitch-label" for="promptItem">
53 56 <span class="onoffswitch-inner"></span>
54 57 <span class="onoffswitch-switch"></span>
55 58 </label>
... ... @@ -60,120 +63,29 @@
60 63 <div class="form-group">
61 64 <label class="col-sm-3 control-label">显示库存数量：</label>
62 65 <div class="col-sm-8">
63   - <div class="onoffswitch">
64   - <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="promptQuantity" name="promptQuantity">
65   - <label class="onoffswitch-label" for="promptQuantity">
66   - <span class="onoffswitch-inner"></span>
67   - <span class="onoffswitch-switch"></span>
68   - </label>
69   - </div>
  66 + <div class="onoffswitch">
  67 + <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="promptQuantity"
  68 + name="promptQuantity">
  69 + <label class="onoffswitch-label" for="promptQuantity">
  70 + <span class="onoffswitch-inner"></span>
  71 + <span class="onoffswitch-switch"></span>
  72 + </label>
  73 + </div>
70 74 </div>
71 75 </div>
72   -
73   -<!-- <div class="form-group">
74   - <label class="col-sm-3 control-label">允许添加库存：</label>
75   - <div class="col-sm-8">
76   - <div class="onoffswitch">
77   - <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="allowAddNewInventory" name="allowAddNewInventory">
78   - <label class="onoffswitch-label" for="allowAddNewInventory">
79   - <span class="onoffswitch-inner"></span>
80   - <span class="onoffswitch-switch"></span>
81   - </label>
82   - </div>
83   - </div>
84   - </div>-->
85   -
86   -<!-- <div class="form-group">
87   - <label class="col-sm-3 control-label">RF逐件盘点：</label>
  76 + <div class="form-group">
  77 + <label class="col-sm-3 control-label">是否有效：</label>
88 78 <div class="col-sm-8">
89 79 <div class="onoffswitch">
90   - <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="countByPiece" name="countByPiece">
91   - <label class="onoffswitch-label" for="countByPiece">
  80 + <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable"
  81 + name="enable">
  82 + <label class="onoffswitch-label" for="enable">
92 83 <span class="onoffswitch-inner"></span>
93 84 <span class="onoffswitch-switch"></span>
94 85 </label>
95 86 </div>
96 87 </div>
97   - </div>-->
98   -
99   - <!--<div class="form-group">
100   - <label class="col-sm-3 control-label">数据版本：</label>
101   - <div class="col-sm-8">
102   - <input id="version" name="version" class="form-control" type="text">
103   - </div>
104   - </div>-->
105   - <!--<div class="form-group"> -->
106   - <!--<label class="col-sm-3 control-label">创建时间：</label>-->
107   - <!--<div class="col-sm-8">-->
108   - <!--<input id="created" name="created" class="form-control" type="text">-->
109   - <!--</div>-->
110   - <!--</div>-->
111   - <!--<div class="form-group"> -->
112   - <!--<label class="col-sm-3 control-label">创建者：</label>-->
113   - <!--<div class="col-sm-8">-->
114   - <!--<input id="createdBy" name="createdBy" class="form-control" type="text">-->
115   - <!--</div>-->
116   - <!--</div>-->
117   - <!--<div class="form-group"> -->
118   - <!--<label class="col-sm-3 control-label">创建时间：</label>-->
119   - <!--<div class="col-sm-8">-->
120   - <!--<input id="lastUpdated" name="lastUpdated" class="form-control" type="text">-->
121   - <!--</div>-->
122   - <!--</div>-->
123   - <!--<div class="form-group"> -->
124   - <!--<label class="col-sm-3 control-label">更新者：</label>-->
125   - <!--<div class="col-sm-8">-->
126   - <!--<input id="lastUpdatedBy" name="lastUpdatedBy" class="form-control" type="text">-->
127   - <!--</div>-->
128   - <!--</div>-->
129   - <div class="form-group">
130   - <label class="col-sm-3 control-label">是否有效：</label>
131   - <div class="col-sm-8">
132   - <div class="onoffswitch">
133   - <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable">
134   - <label class="onoffswitch-label" for="enable">
135   - <span class="onoffswitch-inner"></span>
136   - <span class="onoffswitch-switch"></span>
137   - </label>
138   - </div>
139   - </div>
140 88 </div>
141   - <!--<div class="form-group"> -->
142   - <!--<label class="col-sm-3 control-label">是否删除：</label>-->
143   - <!--<div class="col-sm-8">-->
144   - <!--<input id="deleted" name="deleted" class="form-control" type="text">-->
145   - <!--</div>-->
146   - <!--</div>-->
147   - <!--<div class="form-group"> -->
148   - <!--<label class="col-sm-3 control-label">自定义字段1：</label>-->
149   - <!--<div class="col-sm-8">-->
150   - <!--<input id="userDef1" name="userDef1" class="form-control" type="text">-->
151   - <!--</div>-->
152   - <!--</div>-->
153   - <!--<div class="form-group"> -->
154   - <!--<label class="col-sm-3 control-label">自定义字段2：</label>-->
155   - <!--<div class="col-sm-8">-->
156   - <!--<input id="userDef2" name="userDef2" class="form-control" type="text">-->
157   - <!--</div>-->
158   - <!--</div>-->
159   - <!--<div class="form-group"> -->
160   - <!--<label class="col-sm-3 control-label">自定义字段3：</label>-->
161   - <!--<div class="col-sm-8">-->
162   - <!--<input id="userDef3" name="userDef3" class="form-control" type="text">-->
163   - <!--</div>-->
164   - <!--</div>-->
165   - <!--<div class="form-group"> -->
166   - <!--<label class="col-sm-3 control-label">自定义字段4：</label>-->
167   - <!--<div class="col-sm-8">-->
168   - <!--<input id="userDef4" name="userDef4" class="form-control" type="text">-->
169   - <!--</div>-->
170   - <!--</div>-->
171   - <!--<div class="form-group"> -->
172   - <!--<label class="col-sm-3 control-label">自定义字段5：</label>-->
173   - <!--<div class="col-sm-8">-->
174   - <!--<input id="userDef5" name="userDef5" class="form-control" type="text">-->
175   - <!--</div>-->
176   - <!--</div>-->
177 89 <div class="form-group">
178 90 <div class="form-control-static col-sm-offset-9">
179 91 <input type="submit" class="btn btn-primary" value="提交">
... ... @@ -186,32 +98,22 @@
186 98 <script type="text/javascript">
187 99 var prefix = ctx + "config/cycleCountPreference";
188 100 $("#form-cycleCountPreference-add").validate({
189   - rules:{
190   - code:{
  101 + rules: {
  102 + code: {
191 103 required: true,
192 104 },
193   - name:{
  105 + name: {
194 106 required: true,
195 107 },
196   - promptLocation:{
197   - required: true,
198   - },
199   - promptLpn:{
200   - required: true,
201   - },
202   - promptItem:{
203   - required: true,
204   - },
205   - promptQuantity: {
206   - required: true,
207   - },
208   - allowAddNewInventory: {
209   - required: true,
210   - }
  108 +
211 109 },
212   - submitHandler: function(form) {
  110 + submitHandler: function (form) {
213 111 var tableValue = $.common.getTableValue("#form-cycleCountPreference-add");
214   - //tableValue = formValueReplace(tableValue, "allowOverReceiving", $("input[name='allowOverReceiving']").is(':checked'));
  112 + tableValue = formValueReplace(tableValue, "promptLocation", $("input[name='promptLocation']").is(':checked'));
  113 + tableValue = formValueReplace(tableValue, "promptLpn", $("input[name='promptLpn']").is(':checked'));
  114 + tableValue = formValueReplace(tableValue, "promptItem", $("input[name='promptItem']").is(':checked'));
  115 + tableValue = formValueReplace(tableValue, "promptQuantity", $("input[name='promptQuantity']").is(':checked'));
  116 + tableValue = formValueReplace(tableValue, "enable", $("input[name='enable']").is(':checked'));
215 117 $.operate.save(prefix + "/addSave", tableValue);
216 118 }
217 119 });
... ...
src/main/resources/templates/config/cycleCountPreference/cycleCountPreference.html
  View file @7b4c9e2
... ... @@ -90,29 +90,65 @@
90 90 {
91 91 field : 'promptLocation',
92 92 title : '系统提示库位',
  93 + formatter: function (value, item, index) {
  94 + if (value==true) {
  95 + return '<span class="badge" style="background-color: #00B83F;color: white;width: 36px;">' + ' 是 ' + '</span>';
  96 + }
  97 + else if (value==false) {
  98 + return '<span class="badge" style="background-color: #ff0000;color: white;width: 36px;">' + ' 否 ' + '</span>';
  99 + }
  100 + }
93 101 },
94 102 {
95 103 field : 'promptLpn',
96   - title : '系统提示容器'
  104 + title : '系统提示容器',
  105 + formatter: function (value, item, index) {
  106 + if (value==true) {
  107 + return '<span class="badge" style="background-color: #00B83F;color: white;width: 36px;">' + ' 是 ' + '</span>';
  108 + }
  109 + else if (value==false) {
  110 + return '<span class="badge" style="background-color: #ff0000;color: white;width: 36px;">' + ' 否 ' + '</span>';
  111 + }
  112 + }
97 113 },
98 114 {
99 115 field : 'promptItem',
100   - title : '系统提示物料'
  116 + title : '系统提示物料',
  117 + formatter: function (value, item, index) {
  118 + if (value==true) {
  119 + return '<span class="badge" style="background-color: #00B83F;color: white;width: 36px;">' + ' 是 ' + '</span>';
  120 + }
  121 + else if (value==false) {
  122 + return '<span class="badge" style="background-color: #ff0000;color: white;width: 36px;">' + ' 否 ' + '</span>';
  123 + }
  124 + }
101 125 },
102 126 {
103 127 field : 'promptQuantity',
104   - title : '显示库存数量'
  128 + title : '显示库存数量',
  129 + formatter: function (value, item, index) {
  130 + if (value==true) {
  131 + return '<span class="badge" style="background-color: #00B83F;color: white;width: 36px;">' + ' 是 ' + '</span>';
  132 + }
  133 + else if (value==false) {
  134 + return '<span class="badge" style="background-color: #ff0000;color: white;width: 36px;">' + ' 否 ' + '</span>';
  135 + }
  136 + }
105 137 },
106 138 {
107 139 field : 'allowAddNewInventory',
108 140 title : '允许添加库存',
  141 + formatter: function (value, item, index) {
  142 + if (value==true) {
  143 + return '<span class="badge" style="background-color: #00B83F;color: white;width: 36px;">' + ' 是 ' + '</span>';
  144 + }
  145 + else if (value==false) {
  146 + return '<span class="badge" style="background-color: #ff0000;color: white;width: 36px;">' + ' 否 ' + '</span>';
  147 + }
  148 + },
109 149 visible : false
110 150 },
111 151 {
112   - field : 'Enable',
113   - title : '有效'
114   - },
115   - {
116 152 field : 'created',
117 153 title : '创建时间',
118 154 visible : true
... ... @@ -132,20 +168,40 @@
132 168 title : '更新用户',
133 169 visible : false
134 170 },
135   - {
  171 + /*{
136 172 field : 'version',
137 173 title : '数据版本',
138 174 visible : false
139   - },
140   - {
  175 + },*/
  176 + /*{
141 177 field : 'processStamp',
142 178 title : '处理标记',
143 179 visible : false
144   - },
  180 + },*/
145 181 {
146 182 field : 'countByPiece',
147 183 title : 'RF逐件盘点' ,
148   - visible : false
  184 + visible : false,
  185 + formatter: function (value, item, index) {
  186 + if (value==true) {
  187 + return '<span class="badge" style="background-color: #00B83F;color: white;width: 36px;">' + ' 是 ' + '</span>';
  188 + }
  189 + else if (value==false) {
  190 + return '<span class="badge" style="background-color: #ff0000;color: white;width: 36px;">' + ' 否 ' + '</span>';
  191 + }
  192 + }
  193 + },
  194 + {
  195 + field : 'enable',
  196 + title : '有效',
  197 + formatter: function (value, item, index) {
  198 + if (value==true) {
  199 + return '<span class="badge" style="background-color: #00B83F;color: white;width: 36px;">' + ' 是 ' + '</span>';
  200 + }
  201 + else if (value==false) {
  202 + return '<span class="badge" style="background-color: #ff0000;color: white;width: 36px;">' + ' 否 ' + '</span>';
  203 + }
  204 + }
149 205 },
150 206 /*{
151 207 field : 'userDef1',
... ... @@ -168,7 +224,7 @@
168 224 align: 'center',
169 225 formatter: function(value, row, index) {
170 226 var actions = [];
171   - //actions.push('<a class="btn btn-success btn-xs " href="#" onclick="$.operate.edit(\'' + row.id + '\')" ><i class="fa fa-edit"></i>修改</a> ');
  227 + actions.push('<a class="btn btn-success btn-xs " href="#" onclick="$.operate.edit(\'' + row.id + '\')" ><i class="fa fa-edit"></i>修改</a> ');
172 228 actions.push('<a class="btn btn-danger btn-xs " href="#" onclick="$.operate.remove(\'' + row.id + '\')" ><i class="fa fa-trash-o"></i>删除</a>');
173 229 return actions.join('');
174 230 }
... ...
src/main/resources/templates/config/cycleCountPreference/edit.html
  View file @7b4c9e2
... ... @@ -14,59 +14,74 @@
14 14 <div class="form-group">
15 15 <label class="col-sm-3 control-label">盘点首选项编码：</label>
16 16 <div class="col-sm-8">
17   - <input id="code" name="code" class="form-control" type="text" th:field="*{code}">
  17 + <input id="code" name="code" class="form-control" type="text" th:field="*{code}" readonly="readonly">
18 18 </div>
19 19 </div>
20 20 <div class="form-group">
21 21 <label class="col-sm-3 control-label">盘点首选项名称：</label>
22 22 <div class="col-sm-8">
23   - <input id="name" name="name" class="form-control" type="text" th:field="*{name}">
  23 + <input id="name" name="name" class="form-control" type="text" th:field="*{name}" readonly="readonly">
24 24 </div>
25 25 </div>
26   - <div class="form-group">
  26 + <!--<div class="form-group">
27 27 <label class="col-sm-3 control-label">仓库：</label>
28 28 <div class="col-sm-8">
29 29 <input id="warehouseCode" name="warehouseCode" class="form-control" type="text" th:field="*{warehouseCode}" readonly="readonly">
30 30 </div>
31   - </div>
  31 + </div>-->
32 32 <div class="form-group">
33 33 <label class="col-sm-3 control-label">系统提示货位：</label>
34 34 <div class="col-sm-8">
35   - <input id="promptLocation" name="promptLocation" class="form-control" type="text" th:field="*{promptLocation}">
  35 + <div class="onoffswitch">
  36 + <input type="checkbox" th:checked="*{promptLocation}" class="onoffswitch-checkbox" id="promptLocation"
  37 + name="promptLocation">
  38 + <label class="onoffswitch-label" for="promptLocation">
  39 + <span class="onoffswitch-inner"></span>
  40 + <span class="onoffswitch-switch"></span>
  41 + </label>
  42 + </div>
36 43 </div>
37 44 </div>
38 45 <div class="form-group">
39   - <label class="col-sm-3 control-label">系统提示LPN：</label>
40   - <div class="col-sm-8">
41   - <input id="promptLpn" name="promptLpn" class="form-control" type="text" th:field="*{promptLpn}">
42   - </div>
43   - </div>
44   - <!--<div class="form-group">
45   - <label class="col-sm-3 control-label">系统提示LPN：</label>
  46 + <label class="col-sm-3 control-label">系统提示容器：</label>
46 47 <div class="col-sm-8">
47 48 <div class="onoffswitch">
48   - <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="promptLpn"
49   - name="promptLpn" th:field="*{promptLpn}">
  49 + <input type="checkbox" th:checked="*{promptLpn}" class="onoffswitch-checkbox" id="promptLpn"
  50 + name="promptLpn" >
50 51 <label class="onoffswitch-label" for="promptLpn">
51 52 <span class="onoffswitch-inner"></span>
52 53 <span class="onoffswitch-switch"></span>
53 54 </label>
54 55 </div>
55 56 </div>
56   - </div>-->
  57 + </div>
57 58 <div class="form-group">
58 59 <label class="col-sm-3 control-label">系统提示物料：</label>
59 60 <div class="col-sm-8">
60   - <input id="promptItem" name="promptItem" class="form-control" type="text" th:field="*{promptItem}">
  61 + <div class="onoffswitch">
  62 + <input type="checkbox" th:checked="*{promptItem}" class="onoffswitch-checkbox" id="promptItem"
  63 + name="promptItem">
  64 + <label class="onoffswitch-label" for="promptItem">
  65 + <span class="onoffswitch-inner"></span>
  66 + <span class="onoffswitch-switch"></span>
  67 + </label>
  68 + </div>
61 69 </div>
62 70 </div>
63 71 <div class="form-group">
64 72 <label class="col-sm-3 control-label">显示库存数量：</label>
65 73 <div class="col-sm-8">
66   - <input id="promptQuantity" name="promptQuantity" class="form-control" type="text" th:field="*{promptQuantity}">
  74 + <div class="onoffswitch">
  75 + <input type="checkbox" th:checked="*{promptQuantity}" class="onoffswitch-checkbox" id="promptQuantity"
  76 + name="promptQuantity">
  77 + <label class="onoffswitch-label" for="promptQuantity">
  78 + <span class="onoffswitch-inner"></span>
  79 + <span class="onoffswitch-switch"></span>
  80 + </label>
  81 + </div>
67 82 </div>
68 83 </div>
69   - <div class="form-group">
  84 + <!--<div class="form-group">
70 85 <label class="col-sm-3 control-label">允许添加库存：</label>
71 86 <div class="col-sm-8">
72 87 <input id="allowAddNewInventory" name="allowAddNewInventory" class="form-control" type="text" th:field="*{allowAddNewInventory}">
... ... @@ -83,7 +98,7 @@
83 98 <div class="col-sm-8">
84 99 <input id="version" name="version" class="form-control" type="text" th:field="*{version}">
85 100 </div>
86   - </div>
  101 + </div>-->
87 102 <div class="form-group">
88 103 <label class="col-sm-3 control-label">创建时间：</label>
89 104 <div class="col-sm-8">
... ... @@ -96,73 +111,25 @@
96 111 <input id="createdBy" name="createdBy" class="form-control" type="text" th:field="*{createdBy}" readonly="readonly">
97 112 </div>
98 113 </div>
99   - <!--<div class="form-group"> -->
100   - <!--<label class="col-sm-3 control-label">更新时间：</label>-->
101   - <!--<div class="col-sm-8">-->
102   - <!--<input id="lastUpdated" name="lastUpdated" class="form-control" type="text">-->
103   - <!--</div>-->
104   - <!--</div>-->
105   - <!--<div class="form-group"> -->
106   - <!--<label class="col-sm-3 control-label">更新者：</label>-->
107   - <!--<div class="col-sm-8">-->
108   - <!--<input id="lastUpdatedBy" name="lastUpdatedBy" class="form-control" type="text">-->
109   - <!--</div>-->
110   - <!--</div>-->
111   - <div class="form-group">
  114 + <!--<div class="form-group">
112 115 <label class="col-sm-3 control-label">处理标记：</label>
113 116 <div class="col-sm-8">
114 117 <input id="processStamp" name="processStamp" class="form-control" type="text" th:field="*{processStamp}" />
115 118 </div>
116   - </div>
117   - <!--<div class="form-group">
118   - <label class="col-sm-3 control-label">是否有效：</label>
119   - <div class="col-sm-8">
120   - &lt;!&ndash;<input id="enable" name="enable" class="form-control" type="text">&ndash;&gt;
121   - <div class="onoffswitch">
122   - <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable">
123   - <label class="onoffswitch-label" for="enable">
124   - <span class="onoffswitch-inner"></span>
125   - <span class="onoffswitch-switch"></span>
126   - </label>
127   - </div>
128   - </div>
129 119 </div>-->
130   - <!--<div class="form-group"> -->
131   - <!--<label class="col-sm-3 control-label">是否删除：</label>-->
132   - <!--<div class="col-sm-8">-->
133   - <!--<input id="deleted" name="deleted" class="form-control" type="text">-->
134   - <!--</div>-->
135   - <!--</div>-->
136   - <!--<div class="form-group"> -->
137   - <!--<label class="col-sm-3 control-label">自定义字段1：</label>-->
138   - <!--<div class="col-sm-8">-->
139   - <!--<input id="userDef1" name="userDef1" class="form-control" type="text">-->
140   - <!--</div>-->
141   - <!--</div>-->
142   - <!--<div class="form-group"> -->
143   - <!--<label class="col-sm-3 control-label">自定义字段2：</label>-->
144   - <!--<div class="col-sm-8">-->
145   - <!--<input id="userDef2" name="userDef2" class="form-control" type="text">-->
146   - <!--</div>-->
147   - <!--</div>-->
148   - <!--<div class="form-group"> -->
149   - <!--<label class="col-sm-3 control-label">自定义字段3：</label>-->
150   - <!--<div class="col-sm-8">-->
151   - <!--<input id="userDef3" name="userDef3" class="form-control" type="text">-->
152   - <!--</div>-->
153   - <!--</div>-->
154   - <!--<div class="form-group"> -->
155   - <!--<label class="col-sm-3 control-label">自定义字段4：</label>-->
156   - <!--<div class="col-sm-8">-->
157   - <!--<input id="userDef4" name="userDef4" class="form-control" type="text">-->
158   - <!--</div>-->
159   - <!--</div>-->
160   - <!--<div class="form-group"> -->
161   - <!--<label class="col-sm-3 control-label">自定义字段5：</label>-->
162   - <!--<div class="col-sm-8">-->
163   - <!--<input id="userDef5" name="userDef5" class="form-control" type="text">-->
164   - <!--</div>-->
165   - <!--</div>-->
  120 + <div class="form-group">
  121 + <label class="col-sm-3 control-label">是否有效：</label>
  122 + <div class="col-sm-8">
  123 + <div class="onoffswitch">
  124 + <input type="checkbox" th:checked="*{enable}" class="onoffswitch-checkbox" id="enable"
  125 + name="enable" >
  126 + <label class="onoffswitch-label" for="enable">
  127 + <span class="onoffswitch-inner"></span>
  128 + <span class="onoffswitch-switch"></span>
  129 + </label>
  130 + </div>
  131 + </div>
  132 + </div>
166 133 <div class="form-group">
167 134 <div class="form-control-static col-sm-offset-9">
168 135 <input type="submit" class="btn btn-primary" value="提交">
... ...
src/main/resources/templates/shipment/wave/wave.html
  View file @7b4c9e2
... ... @@ -229,7 +229,7 @@
229 229 return v.id;
230 230 }).join(',')
231 231 };
232   - localSubmit(url, "post", "json", data);
  232 + $.operate.submit(url, "post", "json", data);
233 233 }
234 234  
235 235  
... ... @@ -246,7 +246,7 @@
246 246 return v.id;
247 247 }).join(',')
248 248 };
249   - localSubmit(url, "post", "json", data);
  249 + $.operate.submit(url, "post", "json", data);
250 250 }
251 251 </script>
252 252 </body>
... ...
src/main/resources/templates/task/task/task.html
  View file @7b4c9e2
... ... @@ -260,8 +260,7 @@
260 260 },
261 261 {
262 262 field : 'userDef1',
263   - title : '自定义字段1' ,
264   - visible:false
  263 + title : '处理' ,
265 264 },
266 265 {
267 266 field : 'userDef2',
... ...
src/main/resources/templates/task/taskHeader/taskHeader.html
  View file @7b4c9e2
... ... @@ -30,9 +30,11 @@
30 30 <li>
31 31 容器编号：<input type="text" name="containerCode"/>
32 32 </li>
33   -
  33 + <li>
  34 + 源库位编号：<input type="text" name="fromLocation"/>
  35 + </li>
34 36 <li>
35   - 库位编号：<input type="text" name="toLocation"/>
  37 + 目的库位编号：<input type="text" name="toLocation"/>
36 38 </li>
37 39 <li class="time" style="height: 30px">
38 40 <label>创建时间： </label>
... ... @@ -170,9 +172,15 @@
170 172 }
171 173  
172 174 },
  175 + {
  176 + field : 'fromLocation',
  177 + title : '源库位号',
  178 + visible:true
  179 + },
  180 +
173 181 {
174 182 field : 'toLocation',
175   - title : '库位号',
  183 + title : '目的库位号',
176 184 visible:true
177 185 },
178 186 {
... ... @@ -210,8 +218,7 @@
210 218 },
211 219 {
212 220 field : 'userDef1',
213   - title : '自定义字段1' ,
214   - visible:false
  221 + title : '处理' ,
215 222 },
216 223 {
217 224 field : 'userDef2',
... ...