Commit cf98ab99 sunke

出入库记录操作人改为工单料盘出库页面操作人

1 个父辈 390524a4
...@@ -389,7 +389,6 @@ public class OrderController { ...@@ -389,7 +389,6 @@ public class OrderController {
public ResultBean nextOrder(@RequestParam Map<String, String> paramsMap) { public ResultBean nextOrder(@RequestParam Map<String, String> paramsMap) {
User user = userManager.findByUserName(SecurityUtils.getCurrentUsername()); User user = userManager.findByUserName(SecurityUtils.getCurrentUsername());
if (ObjectUtil.isNotEmpty(user.getCurrOrderNo())) { if (ObjectUtil.isNotEmpty(user.getCurrOrderNo())) {
//判断上个工单是否已完成 //判断上个工单是否已完成
LiteOrder preOrder = liteOrderCache.findOrderByNo(user.getCurrOrderNo()); LiteOrder preOrder = liteOrderCache.findOrderByNo(user.getCurrOrderNo());
List<DataLog> preTasks = getOrderTaskByUser(user, preOrder, true); List<DataLog> preTasks = getOrderTaskByUser(user, preOrder, true);
...@@ -421,9 +420,9 @@ public class OrderController { ...@@ -421,9 +420,9 @@ public class OrderController {
//设置此工单的任务可以发送给料架 //设置此工单的任务可以发送给料架
List<DataLog> taskList = getOrderTaskByUser(user, liteOrder, true); List<DataLog> taskList = getOrderTaskByUser(user, liteOrder, true);
for (DataLog datalog : for (DataLog datalog : taskList) {
taskList) {
datalog.setInOperate(true); datalog.setInOperate(true);
datalog.setOperator(user.getUsername());
taskService.updateQueueTask(datalog); taskService.updateQueueTask(datalog);
} }
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!