接收工单增加execute字段,表示收到之后是否立即执行出库

src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java

@@ -396,11 +396,12 @@ public class LiteOrderCache {
                 while (assignNum < remainNum) {
                 while (assignNum < remainNum) {
                     Collection<String> excludePosIds =  excludeOutPosIds();
                     Collection<String> excludePosIds =  excludeOutPosIds();
                     String partNumber = orderItem.getPn();
                     String partNumber = orderItem.getPn();
+                    String reelId = orderItem.getRi();
 
 
                     StoragePos pos = null;
                     StoragePos pos = null;
-                    if(cacheOrder.getType()==2){
+                    if(!Strings.isNullOrEmpty(reelId)){
                         //RI
                         //RI
-                        pos=storagePosManager.getByBarcode(orderItem.getRi());
+                        pos=storagePosManager.getByBarcode(reelId);
                         if(excludePosIds.contains(pos.getId())) {
                         if(excludePosIds.contains(pos.getId())) {
                             log.info("工单[" + orderNo + "]RI出库,任务数[" + taskReelCount + "]出库位置仓位【" + pos.getPosName() + "】RI=[" + pos.getBarcode().getBarcode() + "]已在操作队列中，跳过不处理");
                             log.info("工单[" + orderNo + "]RI出库,任务数[" + taskReelCount + "]出库位置仓位【" + pos.getPosName() + "】RI=[" + pos.getBarcode().getBarcode() + "]已在操作队列中，跳过不处理");
                             break;
                             break;
@@ -429,7 +430,7 @@ public class LiteOrderCache {
                         taskService.addTaskToExecute(task);
                         taskService.addTaskToExecute(task);
                     }
                     }
                     //如果是RI出库，只有一盘，出完就结束
                     //如果是RI出库，只有一盘，出完就结束
-                    if(cacheOrder.getType()==2){
+                    if(!Strings.isNullOrEmpty(reelId)){
                         break;
                         break;
                     }
                     }
                 }
                 }
@@ -477,7 +478,7 @@ public class LiteOrderCache {
 
 
         Storage storage = dataCache.getStorageById(pos.getStorageId());
         Storage storage = dataCache.getStorageById(pos.getStorageId());
         DataLog task = new DataLog(storage,pos.getBarcode(),pos);
         DataLog task = new DataLog(storage,pos.getBarcode(),pos);
-        String operator = SecurityUtils.getCurrentUsername();
+        String operator = SecurityUtils.getLoginUsername();
         task.setOperator(operator);
         task.setOperator(operator);
         return task;
         return task;
     }
     }

src/main/java/com/neotel/smfcore/custom/neotel/NeotelController.java

@@ -62,6 +62,16 @@ public class NeotelController {
                     return ResultBean.newErrorResult(1, "smfcore.valueCanotNull", "{0}不能为空", new String[]{"outItems"});
                     return ResultBean.newErrorResult(1, "smfcore.valueCanotNull", "{0}不能为空", new String[]{"outItems"});
                 }
                 }
                 String orderNo = paramMap.get("hSerial").toString(); //需求单号
                 String orderNo = paramMap.get("hSerial").toString(); //需求单号
+                LiteOrder order = liteOrderManager.findByOrderNo(orderNo);
+                if(order != null){
+                    return ResultBean.newErrorResult(101, "smfcore.liteOrder.exist", "需求单{0}已存在", new String[]{orderNo});
+                }
+
+                boolean execute = false;
+                if (paramMap.get("execute") != null) {
+                    execute = Boolean.valueOf(paramMap.get("execute").toString());
+                }
+
                 String line = paramMap.get("line") == null ? "" : paramMap.get("line").toString(); //线别
                 String line = paramMap.get("line") == null ? "" : paramMap.get("line").toString(); //线别
                 String so = paramMap.get("so") == null ? "" : paramMap.get("so").toString(); //工单号
                 String so = paramMap.get("so") == null ? "" : paramMap.get("so").toString(); //工单号
                 //需求单详情数据
                 //需求单详情数据
@@ -90,6 +100,9 @@ public class NeotelController {
                 liteOrder.setOrderItems(orderItemList);
                 liteOrder.setOrderItems(orderItemList);
                 liteOrder = liteOrderManager.createWithItems(liteOrder);
                 liteOrder = liteOrderManager.createWithItems(liteOrder);
                 liteOrderCache.addOrderToMap(liteOrder);
                 liteOrderCache.addOrderToMap(liteOrder);
+                if(execute){
+                    liteOrderCache.checkOutLiteOrder(liteOrder.getOrderNo(),false);
+                }
             }
             }
             return ResultBean.newOkResult("");
             return ResultBean.newOkResult("");
         }
         }