出库优先迈征工单

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

@@ -625,6 +625,7 @@ public class LiteOrderCache {
                         task.setItemNo(orderItem.getItemNo());
                         task.setItemNo(orderItem.getItemNo());
                         task.setModel(orderItem.getModel());
                         task.setModel(orderItem.getModel());
                         task.setMo(orderItem.getMo());
                         task.setMo(orderItem.getMo());
+                        task.setMaiZhengOrder(cacheOrder.isMaiZheng());
 
 
                         //先调用tower发料
                         //先调用tower发料
                         String result = lizhenApi.towerCheck(task);
                         String result = lizhenApi.towerCheck(task);

src/main/java/com/neotel/smfcore/core/system/service/po/DataLog.java

@@ -383,6 +383,8 @@ public class DataLog extends BasePo implements Serializable {
 
 
     private int itemNo = 1;
     private int itemNo = 1;
 
 
+    private boolean maiZhengOrder = false;
+
     public String getBarcode() {
     public String getBarcode() {
         if(barcode == null){
         if(barcode == null){
             return "";
             return "";

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

@@ -469,6 +469,26 @@ public class TaskService {
             }
             }
         }
         }
 
 
+        DataLog maiZhengTask = null;
+        for (DataLog task : allTasks) {//优先分配单盘任务和没有工单的任务
+            if (cid.equals(task.getCid()) && task.isCheckOutTask() && task.isWait()) {
+                String posName = task.getPosName();
+                if (!Strings.isNullOrEmpty(posName)) {//有库位号
+                    if (task.isMaiZhengOrder()) {
+                        //单盘优先出库
+                        if (maiZhengTask == null || task.getCreateDate().before(maiZhengTask.getCreateDate())) {
+                            maiZhengTask = task;
+                        }
+                    }
+                }
+            }
+        }
+        if (maiZhengTask != null) {
+            log.info("分配优先(迈征)出库任务" + maiZhengTask.getBarcode() + "[" + maiZhengTask.getPosName() + "]到 " + cid);
+            return maiZhengTask;
+        }
+
+
         //指定紧急单盘出库的优先出库,否则按批量出库处理
         //指定紧急单盘出库的优先出库,否则按批量出库处理
         DataLog singleOutTask = null;
         DataLog singleOutTask = null;
         for (DataLog task : allTasks) {//优先分配单盘任务和没有工单的任务
         for (DataLog task : allTasks) {//优先分配单盘任务和没有工单的任务

src/main/java/com/neotel/smfcore/custom/lizhen/LizhenApi.java

@@ -295,7 +295,7 @@ public class LizhenApi extends DefaultSmfApiListener {
      */
      */
     @Override
     @Override
     public void inTaskStatusChange(String inNotifyUrl, DataLog task) {
     public void inTaskStatusChange(String inNotifyUrl, DataLog task) {
-        if (task.isFinished()){
+        /*if (task.isFinished()){
             Barcode barcode = barcodeManager.findByBarcode(task.getBarcode());
             Barcode barcode = barcodeManager.findByBarcode(task.getBarcode());
             Map<String,Object> paramMap = new HashMap<>();
             Map<String,Object> paramMap = new HashMap<>();
             paramMap.put("pickingid","");
             paramMap.put("pickingid","");
@@ -326,7 +326,7 @@ public class LizhenApi extends DefaultSmfApiListener {
                 e.printStackTrace();
                 e.printStackTrace();
                 log.info(barcode.getBarcode()+"入库成功,通知MES保存物料异常:" + e.getMessage());
                 log.info(barcode.getBarcode()+"入库成功,通知MES保存物料异常:" + e.getMessage());
             }
             }
-        }
+        }*/
         if (task.isFinished()){
         if (task.isFinished()){
             //DataLog oldTask = dataLogManager.findOne(new Query(Criteria.where("barcode").is(task.getBarcode()).and("type").is(OP.CHECKOUT)
             //DataLog oldTask = dataLogManager.findOne(new Query(Criteria.where("barcode").is(task.getBarcode()).and("type").is(OP.CHECKOUT)
             //        .and("status").is(OP_STATUS.FINISHED.name()).and("createDate").lte(new Date())).with(Sort.by(Sort.Direction.DESC, "createDate")));
             //        .and("status").is(OP_STATUS.FINISHED.name()).and("createDate").lte(new Date())).with(Sort.by(Sort.Direction.DESC, "createDate")));
@@ -662,6 +662,7 @@ public class LizhenApi extends DefaultSmfApiListener {
         paramMap.put("reel_id",task.getBarcode());
         paramMap.put("reel_id",task.getBarcode());
         paramMap.put("ipn",task.getPartNumber());
         paramMap.put("ipn",task.getPartNumber());
         paramMap.put("qty",task.getNum());
         paramMap.put("qty",task.getNum());
+        paramMap.put("station_id",task.getTableNo());
 
 
         //发料类型(0:智能仓1:虚拟仓2:物料预警3：手动发料)
         //发料类型(0:智能仓1:虚拟仓2:物料预警3：手动发料)
         int type = 0;
         int type = 0;