1.接收出库单修改

2.料盒操作增加生产日期

src/main/java/com/neotel/smfcore/common/init/MainTimer.java

@@ -46,13 +46,13 @@ public class MainTimer {
         log.info("开始加载未完成的任务...");
         List<DataLog> unExecuteTasks = dataLogManager.findUnFinishedTasks();
         for (DataLog unExecuteTask : unExecuteTasks) {
-            if (unExecuteTask.isExecuting() || unExecuteTask.isWait()||unExecuteTask.isOutBox()||unExecuteTask.isInLine()|| unExecuteTask.isInRobot()||unExecuteTask.isBoxdoor()) {
+            //if (unExecuteTask.isExecuting() || unExecuteTask.isWait()||unExecuteTask.isOutBox()||unExecuteTask.isInLine()|| unExecuteTask.isInRobot()||unExecuteTask.isBoxdoor()) {
                 try {
                     taskService.addTaskToExecute(unExecuteTask);
                 }catch (Exception e){
                     log.error("初始化任务["+unExecuteTask+"]出错："+e);
                 }
-            }
+            //}
         }
         log.info("加载未完成的任务完成，共[" + unExecuteTasks.size() + "]条数据...");
     }

src/main/java/com/neotel/smfcore/core/storage/rest/MaterialBoxController.java

@@ -94,6 +94,7 @@ public class MaterialBoxController {
         subBarcode.setPartNumber(barcode.getPartNumber());
         subBarcode.setAmount(barcode.getAmount());
         subBarcode.setPidBarcode(barcode.getPidBarcode());
+        subBarcode.setProduceDate(barcode.getProduceDate());
 
         subCodeList.add(subBarcode);
         barcode.setSubCodeList(subCodeList);
@@ -240,6 +241,7 @@ public class MaterialBoxController {
         boxBarcode.setPartNumber(partNumber);
         boxBarcode.setAmount(amount+barcode.getAmount());
         boxBarcode.setPidBarcode(barcode.getBarcode());
+        boxBarcode.setProduceDate(barcode.getProduceDate());
 
         //设置治具盒的入库时间
         long boxPutInTime = boxBarcode.getPutInTime();

src/main/java/com/neotel/smfcore/custom/aiqingzhiyin1643/Aiqingzhiyin1643Menu.java

@@ -25,14 +25,14 @@ public class Aiqingzhiyin1643Menu {
     @PostConstruct
     public void init(){
         String menuLabel = "1643";
-        /*Menu poutOut = Menu.CreatePMenu("物料管理", 3, "order", "workOrder", null);
-        MenuInit.addMenu(menuLabel,poutOut,99, "上架/下架","putAwayPutOut", "system/putAwayPutOut/index","putAwayPutOut");*/
-
 
         Menu finishedGoodsWarehouse = Menu.CreatePMenu("成品仓管理", 4, "finishedGoodsWarehouse", "FGStorage", null);
         MenuInit.addMenu(menuLabel,finishedGoodsWarehouse,1, "上架","putAway", "neolight/putAway/index","putAway");
         MenuInit.addMenu(menuLabel,finishedGoodsWarehouse,2, "下架","putOut", "neolight/putOut/index","putOut");
 
+        Menu structuredStorage = Menu.CreatePMenu("结构仓管理", 5, "structuredStorage", "structuredStorage", null);
+        MenuInit.addMenu(menuLabel, structuredStorage, 1, "上架/下架", "putAwayPutOut", "system/putAwayPutOut/index", "putAwayPutOut");
+
         String apiName = smfApi.getApiName();
         if(Strings.isNotBlank(apiName) && apiName.equals(menuLabel)){
             menuInit.showMenu(apiName);

src/main/java/com/neotel/smfcore/custom/aiqingzhiyin1643/controller/AgvDeviceController.java

@@ -186,10 +186,12 @@ public class AgvDeviceController {
         DataLog opTask = null;
         List<DataLog> allTasks = taskService.getAllTasks();
         for (DataLog task : allTasks) {
-            if (rfid.startsWith(task.getBarcode())) {
-                if (!task.isCancel() && !task.isFinished()) {
-                    opTask = task;
-                    break;
+            if (StringUtils.isNotEmpty(task.getBarcode())){
+                if (rfid.startsWith(task.getBarcode())) {
+                    if (!task.isCancel() && !task.isFinished()) {
+                        opTask = task;
+                        break;
+                    }
                 }
             }
         }

src/main/java/com/neotel/smfcore/custom/aiqingzhiyin1643/momo/controller/MomoController.java

@@ -69,7 +69,7 @@ public class MomoController {
     @ApiOperation("接口4：MOM传递出库任务给WMS")
     @RequestMapping("/PDAAPI/DeliveryOrder/InsertDeliveryOrder")
     @AnonymousAccess
-    public DeliveryOrderResponse insertDeliveryOrder(@RequestBody DeliveryOrder deliveryOrder) {
+    public ApiResponse insertDeliveryOrder(@RequestBody DeliveryOrder deliveryOrder) {
         log.info("MOM传递出库任务给WMS:" + JSON.toJSONString(deliveryOrder));
         //判断存不存在
         String orderNo = deliveryOrder.getDeliveryOrder();
@@ -78,12 +78,12 @@ public class MomoController {
             liteOrder = liteOrderManager.findByOrderNo(orderNo);
         }
         if (liteOrder != null) {
-            return new DeliveryOrderResponse(null, false, "-1", "出库任务:" + orderNo + "已经存在");
+            return new ApiResponse("出库任务:" + orderNo + "已存在", null, "fail");
         }
         liteOrder = createLiteorder(deliveryOrder);
         liteOrder = liteOrderManager.createWithItems(liteOrder);
         liteOrderCache.addOrderToMap(liteOrder);
-        return new DeliveryOrderResponse(null, true, "", "");
+        return new ApiResponse(orderNo + "接收成功", null, "success");
     }
 
     private LiteOrder createLiteorder(DeliveryOrder deliveryOrder) {