diff --git a/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java b/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java
index 488c5b5..a358d26 100644
--- a/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java
+++ b/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java
@@ -513,7 +513,7 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl<ShipmentCont
Wave wave = waveService.getById(item.getWaveId());
wave.setStatus(999);
waveService.updateById(wave);
- return AjaxResult.error("主单为"+item.getShipmentCode()+"子单id为"+item.getId() + "的单据没有库存，波次失败");
+ throw new ServiceException("主单为"+item.getShipmentCode()+"子单id为"+item.getId() + "的单据没有库存，波次失败");
}
if (inventoryList.size() < 1) {
num = num + 1;
diff --git a/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java b/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
index 9cd6806..5542963 100644
--- a/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
+++ b/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
@@ -426,7 +426,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
throw new ServiceException("任务(" + taskId + ")任务已经是完成的！");
}
//如果没有库位不能完成
- if (StringUtils.isEmpty(task.getToLocation())) {
+ if (StringUtils.isEmpty(task.getFromLocation())) {
throw new ServiceException("任务" + taskId + "没有库位，执行中止");
}
this.completeTask(task);
@@ -1273,13 +1273,11 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
task.setLastUpdated(new Date());
taskHeaderService.updateById(task);
- //如果是临时容器出库完成后删除容器
- containerService.removeByCode(task.getContainerCode());
//将库位状态改为空闲，如果是整出的对应的容器也清空
LambdaQueryWrapper<Location> lam=Wrappers.lambdaQuery();
- lam.eq(Location::getCode,task.getToLocation());
+ lam.eq(Location::getCode,task.getFromLocation());
Location locationRecord = locationService.getOne(lam);
if(lam == null){
throw new ServiceException("系统没有"+task.getToLocation()+"库位");
diff --git a/src/main/resources/static/huaheng/js/common.js b/src/main/resources/static/huaheng/js/common.js
index 6621886..d3238e9 100644
--- a/src/main/resources/static/huaheng/js/common.js
+++ b/src/main/resources/static/huaheng/js/common.js
@@ -23,8 +23,10 @@ $(function(){
var laydate = layui.laydate;
var day1 = new Date();
day1.setTime(day1.getTime()-24*60*60*1000*7);
+ var endDay = new Date();
+ endDay.setTime(endDay.getTime()+24*60*60*1000);
laydate.render({ elem: '#startTime', theme: 'molv',value: new Date(day1), isInitValue: true});
- laydate.render({ elem: '#endTime', theme: 'molv',value: new Date(), isInitValue: true });
+ laydate.render({ elem: '#endTime', theme: 'molv',value: new Date(endDay), isInitValue: true });
});
}
});
diff --git a/src/main/resources/templates/shipment/wave/wave.html b/src/main/resources/templates/shipment/wave/wave.html
index 2b4a993..de6ebcc 100644
--- a/src/main/resources/templates/shipment/wave/wave.html
+++ b/src/main/resources/templates/shipment/wave/wave.html
@@ -229,7 +229,7 @@
return v.id;
}).join(',')
};
- localSubmit(url, "post", "json", data);
+ $.operate.submit(url, "post", "json", data);
}
@@ -246,7 +246,7 @@
return v.id;
}).join(',')
};
- localSubmit(url, "post", "json", data);
+ $.operate.submit(url, "post", "json", data);
}
</script>
</body>
diff --git a/src/main/resources/templates/task/task/task.html b/src/main/resources/templates/task/task/task.html
index f7922a6..6c03c39 100644
--- a/src/main/resources/templates/task/task/task.html
+++ b/src/main/resources/templates/task/task/task.html
@@ -260,8 +260,7 @@
},
{
field : 'userDef1',
- title : '自定义字段1' ,
- visible:false
+ title : '处理' ,
},
{
field : 'userDef2',
diff --git a/src/main/resources/templates/task/taskHeader/taskHeader.html b/src/main/resources/templates/task/taskHeader/taskHeader.html
index 4a393ae..b908105 100644
--- a/src/main/resources/templates/task/taskHeader/taskHeader.html
+++ b/src/main/resources/templates/task/taskHeader/taskHeader.html
@@ -30,9 +30,11 @@
<li>
容器编号：<input type="text" name="containerCode"/>
</li>
-
+ <li>
+ 源库位编号：<input type="text" name="fromLocation"/>
+ </li>
<li>
- 库位编号：<input type="text" name="toLocation"/>
+ 目的库位编号：<input type="text" name="toLocation"/>
</li>
<li class="time" style="height: 30px">
<label>创建时间： </label>
@@ -170,9 +172,15 @@
}
},
+ {
+ field : 'fromLocation',
+ title : '源库位号',
+ visible:true
+ },
+
{
field : 'toLocation',
- title : '库位号',
+ title : '目的库位号',
visible:true
},
{
@@ -210,8 +218,7 @@
},
{
field : 'userDef1',
- title : '自定义字段1' ,
- visible:false
+ title : '处理' ,
},
{
field : 'userDef2',