1.分配出库任务,bug修改

2.迈征工单不允许人工手动刷料

src/main/java/com/neotel/smfcore/core/system/util/TaskService.java

@@ -496,7 +496,7 @@ public class TaskService {
         String export = exportMap.get(cid);
         String export = exportMap.get(cid);
 
 
         //1.找到与上一次出料口不同的任务
         //1.找到与上一次出料口不同的任务
-        outTask = getNeedOutTask(allTasks, export, cid, false);
+        outTask = getNeedOutTask(allTasks, export, cid, true);
 
 
         //2.如果没找到,不找到最早的任务
         //2.如果没找到,不找到最早的任务
         if (outTask == null) {
         if (outTask == null) {
@@ -542,7 +542,7 @@ public class TaskService {
                         }
                         }
                         if (task != null) {
                         if (task != null) {
                             log.info(outTask.getSourceName()+"barcode为:"+task.getBarcode()+"面别为:"+task.getSide());
                             log.info(outTask.getSourceName()+"barcode为:"+task.getBarcode()+"面别为:"+task.getSide());
-                            exportMap.put(cid, task.getSide());
+                            exportMap.put(cid, task.getExport());
                             return task;
                             return task;
                         }
                         }
                     }
                     }
@@ -555,7 +555,7 @@ public class TaskService {
             log.info(outTask.getSourceName()+"barcode为:"+outTask.getBarcode()+"面别为:"+outTask.getSide());
             log.info(outTask.getSourceName()+"barcode为:"+outTask.getBarcode()+"面别为:"+outTask.getSide());
 
 
             if(StringUtils.isNotBlank(outTask.getSide())) {
             if(StringUtils.isNotBlank(outTask.getSide())) {
-                exportMap.put(cid, outTask.getSide());
+                exportMap.put(cid, outTask.getExport());
             }
             }
         }
         }
 
 
@@ -625,8 +625,8 @@ public class TaskService {
                             if (StringUtils.isNotBlank(exportStr)) {
                             if (StringUtils.isNotBlank(exportStr)) {
                                 String export = task.getExport();
                                 String export = task.getExport();
                                 if (StringUtils.isNotBlank(export)){
                                 if (StringUtils.isNotBlank(export)){
-                                   String resultExport =  exportStr.substring(0,exportStr.length()-1);
-                                   if (!export.startsWith(resultExport)) {
+                                   //String resultExport =  exportStr.substring(0,exportStr.length()-1);
+                                   if (!export.equals(exportStr)) {
                                        outTask = task;
                                        outTask = task;
                                    }
                                    }
                                 }
                                 }

src/main/java/com/neotel/smfcore/custom/lizhen/innerBox/rest/PrinterRestController.java

@@ -7,6 +7,7 @@ import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.core.barcode.utils.CodeResolve;
 import com.neotel.smfcore.core.barcode.utils.CodeResolve;
 import com.neotel.smfcore.core.device.enums.OP;
 import com.neotel.smfcore.core.device.enums.OP;
 import com.neotel.smfcore.core.device.enums.OP_STATUS;
 import com.neotel.smfcore.core.device.enums.OP_STATUS;
+import com.neotel.smfcore.core.order.LiteOrderCache;
 import com.neotel.smfcore.core.order.service.manager.ILiteOrderItemManager;
 import com.neotel.smfcore.core.order.service.manager.ILiteOrderItemManager;
 import com.neotel.smfcore.core.order.service.manager.ILiteOrderManager;
 import com.neotel.smfcore.core.order.service.manager.ILiteOrderManager;
 import com.neotel.smfcore.core.order.service.po.LiteOrder;
 import com.neotel.smfcore.core.order.service.po.LiteOrder;
@@ -51,6 +52,9 @@ public class PrinterRestController {
     @Autowired
     @Autowired
     private IDataLogManager dataLogManager;
     private IDataLogManager dataLogManager;
 
 
+    @Autowired
+    private LiteOrderCache liteOrderCache;
+
 
 
     @ApiOperation("补打印标签")
     @ApiOperation("补打印标签")
     @RequestMapping("/labelPrinting")
     @RequestMapping("/labelPrinting")
@@ -74,6 +78,15 @@ public class PrinterRestController {
 
 
             //如果有正在执行的任务,直接完成,另外获取贴标信息
             //如果有正在执行的任务,直接完成,另外获取贴标信息
             if (dataLog != null) {
             if (dataLog != null) {
+                String sourceId = dataLog.getSourceId();
+                if (StringUtils.isNotEmpty(sourceId)){
+                    LiteOrder liteOrder = liteOrderManager.get(sourceId);
+                    if (liteOrder != null){
+                        if (liteOrder.isMaiZheng()){
+                            return ResultBean.newErrorResult(-1,"",barcodeStr+"属于迈征工单:"+liteOrder.getOrderNo()+",不允许手动出库");
+                        }
+                    }
+                }
                 finishTask(dataLog);
                 finishTask(dataLog);
                 resultMap = getLabelInfo(dataLog);
                 resultMap = getLabelInfo(dataLog);
             }
             }