通知Qisda自动重发修正

真实绑定时无法找到预绑定料盘问题
解决补料需求单出库时,如果有首盘工单在缺料补发,会等到缺料补发出完时才会出库的问题
自动执行间隔2分钟
通知Qisda接口放入线程中执行
纯入库接口添加code参数
入库通知时使用initialAmount字段

myproject/src/main/java/com/myproject/bean/qisda/InquiryShelfBean.java

@@ -146,7 +146,7 @@ public class InquiryShelfBean {
         //保证双层线上最多只能有两个料架
         List<ShelfInfo> cAndDShelfList = getSortedCAndDShelfList(task);
         AppendInfo taskAppendInfo = task.getAppendInfo();
-        if(taskAppendInfo.isFirstReelAction()){
+        if(taskAppendInfo.isFirstReelAction() && !task.isLessSendReel()){
             //如果任务是在最小(有空位)和次小的料架当中,可以出库
             ShelfInfo firstEmptyShelf = null;
             ShelfInfo secondEmptyShelf = null;

myproject/src/main/java/com/myproject/bean/update/Barcode.java

@@ -572,7 +572,7 @@ public class Barcode extends BaseMongoBean {
         if(realBind){
             appendInfo.setBindSlot(outItem.getSlotlocation()+"");
         }else{
-            appendInfo.setBindSlot("");
+            appendInfo.setBindSlot(null);
         }
 
         appendInfo.setSlotIndex(outItem.getSlotlocation());

myproject/src/main/java/com/myproject/bean/update/qisda/OutInfo.java

@@ -90,6 +90,11 @@ public class OutInfo extends BaseMongoBean {
      */
     private long firstExecuteTime;
 
+    /**
+     * 上次任务完成时间
+     */
+    private long taskEndTime;
+
     @Transient
     private Map<String, OutItem> outItemMap = new HashMap<>();
 
@@ -355,7 +360,7 @@ public class OutInfo extends BaseMongoBean {
         this.firstExecuteTime = firstExecuteTime;
     }
 
-    public boolean updateExecuteTime(long executeTime){
+    public boolean updateFirstExecuteTime(long executeTime){
         if(this.firstExecuteTime <= 0){
             setFirstExecuteTime(executeTime);
             return true;
@@ -363,6 +368,28 @@ public class OutInfo extends BaseMongoBean {
         return false;
     }
 
+    public long getTaskEndTime() {
+        return taskEndTime;
+    }
+
+    public void setTaskEndTime(long taskEndTime) {
+        this.taskEndTime = taskEndTime;
+    }
+
+    public Date getFirstExecuteDate(){
+        if(firstExecuteTime > 0){
+            return new Date(firstExecuteTime);
+        }
+        return null;
+    }
+
+    public Date getTaskEndDate(){
+        if(taskEndTime > 0){
+            return new Date(taskEndTime);
+        }
+        return null;
+    }
+
     @Override
     public String toString() {
         return "OutInfo{" +

myproject/src/main/java/com/myproject/dao/mongo/qisda/IOutInfoDao.java

@@ -20,6 +20,8 @@ public interface IOutInfoDao extends IMongoDao {
 
     void updateStatus(String hSerial, int bindStatus, int sendStatus);
 
+    void updateTaskEndTime(String hSerial, long taskEndTime);
+
     void updateTaskFinishNum(String hSerail, int taskFinishNum);
 
     void updateOutReelNum(String hSerial, int outReelNum);

myproject/src/main/java/com/myproject/dao/mongo/qisda/impl/OutInfoDaoImpl.java

@@ -82,6 +82,11 @@ public class OutInfoDaoImpl extends AbstractMongoDao implements IOutInfoDao {
     }
 
     @Override
+    public void updateTaskEndTime(String hSerial, long taskEndTime){
+        update(hSerial, "taskEndTime", taskEndTime);
+    }
+
+    @Override
     public void updateTaskFinishNum(String hSerail, int taskFinishNum){
         update(hSerail, "taskFinishNum", taskFinishNum);
     }

myproject/src/main/java/com/myproject/util/DateUtil.java

@@ -206,13 +206,13 @@ public final class DateUtil {
         Calendar c = Calendar.getInstance();
         c.set(Calendar.DAY_OF_YEAR,5);
         list.add(c.getTime());
-        c.set(Calendar.DAY_OF_YEAR,3);
-        list.add(c.getTime());
-        c.set(Calendar.DAY_OF_YEAR,2);
+        c.set(Calendar.DAY_OF_YEAR,10);
         list.add(c.getTime());
         c.set(Calendar.DAY_OF_YEAR,1);
         list.add(c.getTime());
-        c.set(Calendar.DAY_OF_YEAR,4);
+        c.set(Calendar.DAY_OF_YEAR,111);
+        list.add(c.getTime());
+        c.set(Calendar.DAY_OF_YEAR,9);
         list.add(c.getTime());
 
         list.sort(new Comparator<Date>() {

myproject/src/main/java/com/myproject/util/QisdaApi.java

@@ -20,6 +20,8 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 /**
  * Created by sunke on 2020/4/14.
@@ -30,12 +32,66 @@ public class QisdaApi {
 
     private static String USER_NAME = "SMD-BOX";
 
+    private static ExecutorService threadPool = Executors.newCachedThreadPool();
+
+    /**
+     * CIS收料入库接口
+     */
+    public static void VMIMateriaReceive(final Barcode barcode, final DataLog task){
+        threadPool.execute(new Runnable() {
+            @Override
+            public void run() {
+                VMIMateriaReceiveThread(barcode, task);
+            }
+        });
+    }
+
+    /**
+     * 纯入库操作完成时通知Qisda
+     */
+    public static void VMILocationIn(final String reelID, final String location, final String fullCodeStr){
+        threadPool.execute(new Runnable() {
+            @Override
+            public void run() {
+                VMILocationInThread(reelID, location, fullCodeStr);
+            }
+        });
+    }
+
+    /**
+     * 出仓完成时通知(线程)
+     * @param materialInfoMap
+     */
+    public static void VMILocationOut(final String reelId, final Map<String, Object> materialInfoMap){
+        threadPool.execute(new Runnable() {
+            @Override
+            public void run() {
+                VMILocationOutThread(reelId, materialInfoMap);
+            }
+        });
+    }
+
+    /**
+     * 物料放上小车时调用(线程)
+     * @param task 任务信息
+     * @param barcode 条码信息
+     * @param latest 本次工单第几盘料(F 第一次，L 最后一次， M 中间)
+     */
+    public static void VMIMateriaRecAss(final DataLog task, final Barcode barcode, final String latest){
+        threadPool.execute(new Runnable() {
+            @Override
+            public void run() {
+                VMIMateriaRecAssThread(task, barcode, latest);
+            }
+        });
+    }
 
     /**
      * 获取库存进行比对
      */
     public static Map<String,DiffInfo> getInventory() throws ApiException {
         String url = "http://10.85.17.233/ESMTCommonInterface/CommonService.asmx/VMIStcok";
+
         Map<String,Object> paramMap = new HashMap<String,Object>();
         paramMap.put("area","4D");
 
@@ -345,16 +401,19 @@ public class QisdaApi {
         return barcode;
     }
 
+
+
     /**
      * 纯入库操作完成时通知Qisda
      */
-    public static void VMILocationIn(String reelID, String location){
+    public static void VMILocationInThread(String reelID, String location,String fullCodeStr){
         String url = "http://10.85.17.233/ESMTCommonInterface/CommonService.asmx/VMILocationIn";
         Map<String,Object> paramMap = new HashMap<String,Object>();
         paramMap.put("reelID",reelID);
         paramMap.put("location",location);
         paramMap.put("userName",USER_NAME);
-        log.info("纯入库操作完成时通知Qisda接口(VMILocationIn):reelID=" + reelID + "&location="+location);
+        paramMap.put("code",fullCodeStr);
+        log.info("纯入库操作完成时通知Qisda接口(VMILocationIn):reelID=" + reelID + "&location="+location +"&code=" + fullCodeStr);
         QisdaApiRequest apiRequest = new QisdaApiRequest("纯入库",paramMap,reelID,url);
         try {
             String result = HttpHelper.postParam(url,paramMap);
@@ -367,10 +426,12 @@ public class QisdaApi {
         QisdaCache.addFailedRequest(apiRequest);
     }
 
+
+
     /**
      * CIS收料入库接口
      */
-    public static void VMIMateriaReceive(Barcode barcode, DataLog task){
+    public static void VMIMateriaReceiveThread(Barcode barcode, DataLog task){
         String url = "http://10.85.17.233/ESMTCommonInterface/CommonService.asmx/VMIMateriaReceive";
 
         Map<String,Object> materialInfoMap = new HashMap<String,Object>();
@@ -408,11 +469,12 @@ public class QisdaApi {
     }
 
 
+
     /**
      * 出仓完成时通知
      * @param materialInfoMap
      */
-    public static void VMILocationOut(String reelId, Map<String, Object> materialInfoMap){
+    private static void VMILocationOutThread(String reelId, Map<String, Object> materialInfoMap){
         String url = "http://10.85.17.233/ESMTCommonInterface/CommonService.asmx/VMILocationOut";
         String materialInfo = JsonUtil.toJsonStr(materialInfoMap);
 
@@ -433,14 +495,13 @@ public class QisdaApi {
     }
 
 
-
     /**
      * 物料放上小车时调用
      * @param task 任务信息
      * @param barcode 条码信息
      * @param latest 本次工单第几盘料(F 第一次，L 最后一次， M 中间)
      */
-    public static void VMIMateriaRecAss(DataLog task, Barcode barcode, String latest){
+    private static void VMIMateriaRecAssThread(DataLog task, Barcode barcode, String latest){
         String url = "http://10.85.17.233/ESMTCommonInterface/CommonService.asmx/VMIMateriaRecAss";
         Map<String,Object> materialInfoMap = new HashMap<String,Object>();
         AppendInfo appendInfo = task.getAppendInfo();
@@ -461,13 +522,14 @@ public class QisdaApi {
             materialInfoMap.put("vehicleID","");//料车编号
         }
         int rfidLoc = appendInfo.getRfidLoc();
-        if(task.isLessSendReel()){
-            if(appendInfo.isFirstReelAction()){
-                rfidLoc = 1;
-            }else if(appendInfo.isTailAction()){
-                rfidLoc = 2;
-            }
-        }
+        rfidLoc = task.resolveRfidLoc(rfidLoc + "");
+//        if(task.isLessSendReel()){
+//            if(appendInfo.isFirstReelAction()){
+//                rfidLoc = 1;
+//            }else if(appendInfo.isTailAction()){
+//                rfidLoc = 2;
+//            }
+//        }
         materialInfoMap.put("vehicleLocation",rfidLoc);//料车架位号
         materialInfoMap.put("lot", barcode.getBatch());//生产批次（批次号）
         String productCode = DateUtil.toDateString(barcode.getProduceDate(),"yyyyMMdd");

myproject/src/main/java/com/myproject/webapp/controller/qisda/util/OutInfoCache.java

@@ -157,9 +157,17 @@ public class OutInfoCache {
     }
 
     public void executeOutTask(){
+        long now = System.currentTimeMillis();
         for (OutInfo unEndOutInfo : getCachedOutInfos()) {
-            //未执行过的,走双层线
-            checkOutOutItems(unEndOutInfo.gethSerial());
+            //未执行过的或任务已完成的才可以执行
+            if(unEndOutInfo.isTaskEnd() || unEndOutInfo.isNew()){
+                long lastEndTime = unEndOutInfo.getTaskEndTime();
+                //距离上次任务完成2分钟后才可再次执行
+                if(now - lastEndTime >= 2 * 60 * 1000){
+                    checkOutOutItems(unEndOutInfo.gethSerial());
+                }
+            }
+
         }
     }
 
@@ -291,7 +299,7 @@ public class OutInfoCache {
     public void addOutInfo(OutInfo outInfo){
         //先把缓存清理掉,从数据库中查询
         String hserial =outInfo.gethSerial();
-        if(!hserial.isEmpty()){
+        if(!hserial.isEmpty() && !outInfo.isSendEnd() && !outInfo.isClosed()){
             log.info("将需求单"+ outInfo +"加入到缓存");
             outInfo.setOutItemMap(new HashMap<String, OutItem>());
             List<OutItem> outItemList = outItemDao.findByHSerial(hserial);
@@ -399,7 +407,14 @@ public class OutInfoCache {
      * 获取缓存的需求单信息
      */
     public List<OutInfo> getCachedOutInfos(){
-        List<OutInfo> outInfoList = Lists.newArrayList(outInfoMap.values());
+        List<OutInfo> outInfoList = Lists.newArrayList();
+        for (OutInfo outInfo : outInfoMap.values()) {
+            if(outInfo.isClosed() || outInfo.isSendEnd()){
+                removeFromCache(outInfo.gethSerial());
+            }else{
+                outInfoList.add(outInfo);
+            }
+        }
         //执行过按执行时间先后排序, 未执行过的放在最后
         outInfoList.sort(new Comparator<OutInfo>() {
             @Override
@@ -567,16 +582,21 @@ public class OutInfoCache {
                     sendEnd = false;
                 }
             }
-            if(sendEnd){
-                outInfo.setSendStatus(StorageConstants.SEND_STATUS.SEND_OK);
-            }else{
-                //有出库的,状态为发料缺料
-                if(outInfo.isTaskEnd()){
+
+            if(outInfo.isTaskEnd()){
+                outInfo.setTaskEndTime(System.currentTimeMillis());
+                if(sendEnd){
+                    outInfo.setSendStatus(StorageConstants.SEND_STATUS.SEND_OK);
+                }else{
+                    //有出库的,状态为发料缺料
                     outInfo.setSendStatus(StorageConstants.SEND_STATUS.SEND_LESS);
                 }
+
+                outInfoDao.updateTaskEndTime(outInfo.gethSerial(), outInfo.getTaskEndTime());
+                outInfoDao.updateStatus(outInfo.gethSerial(), -1 , outInfo.getSendStatus());
             }
+
             outInfoMap.put(outInfo.gethSerial(),outInfo);
-            outInfoDao.updateStatus(outInfo.gethSerial(), -1 , outInfo.getSendStatus());
             if(outInfo.isSendEnd()){
                 removeFromCache(outInfo.gethSerial());
             }
@@ -590,11 +610,8 @@ public class OutInfoCache {
         log.info("需求单["+hSerial+"]发料已完成或关闭,从缓存中清除,同时清理使用过的料串");
     }
 
-
-
-
     private OutInfo updateExecuteTime(OutInfo outInfo,long executeTime){
-        boolean updateResult = outInfo.updateExecuteTime(executeTime);
+        boolean updateResult = outInfo.updateFirstExecuteTime(executeTime);
         if(updateResult){
             outInfoDao.updateExecuteTime(outInfo.gethSerial(), outInfo.getFirstExecuteTime());
             outInfoMap.put(outInfo.gethSerial(),outInfo);
@@ -635,14 +652,21 @@ public class OutInfoCache {
         if(dataCache.getSettings().isStopOut()){
             return ResultBean.newErrorResult(100, "系统更新中,暂停出库,请稍后再试",false);
         }
+
         if(outInfo == null){
             return ResultBean.newErrorResult(1001,"未找到需求单",false);
         }
 
-        if(outInfo.isExecuting()){
-            return ResultBean.newErrorResult(1003,"需求单["+outInfo.gethSerial()+"]正在执行",false);
+        String hSerial = outInfo.gethSerial();
+        String executingHSerial = QisdaCache.getCurrentOrderHSerial();
+        if(hSerial.equals(executingHSerial)){
+            return ResultBean.newErrorResult(1006,"需求单["+outInfo.gethSerial()+"]正在执行",false);
         }
 
+//        if(!outInfo.isNew() && !outInfo.isTaskEnd()){
+//            return ResultBean.newErrorResult(1007,"需求单["+outInfo.gethSerial()+"]执行未完成",false);
+//        }
+
         //如果有其他任务在执行,不允许出库
         Collection<DataLog> queueTasks = taskService.getQueueTasks();
         List<DataLog> allTasks = taskService.getFinishedTasks();

myproject/src/main/java/com/myproject/webapp/controller/webService/MainTimer.java

@@ -69,19 +69,15 @@ public class MainTimer {
         }, 60, 10, TimeUnit.SECONDS);
     }
 
-    private boolean isProcessTask = false;
 
     private void timerTask(){
         try{
-            if(isProcessTask){
-                return;
-            }
-            isProcessTask = true;
+            QisdaCache.runTimer();
             outInfoCache.runTimer();
         }catch (Exception e){
             log.error("定时器执行出错",e);
         }finally {
-            isProcessTask = false;
+
         }
     }
 

myproject/src/main/java/com/myproject/webapp/controller/webService/QisdaApiController.java

@@ -138,7 +138,8 @@ public class QisdaApiController extends BaseController {
     public static void PutInFinished(Barcode barcode, DataLog task){
         //纯入库
         if(barcode.getAppendInfo().isCISIn()){
-            QisdaApi.VMILocationIn(barcode.getBarcode(),task.getPosName());
+            String fullCode = barcode.getFullCodeStr();
+            QisdaApi.VMILocationIn(barcode.getBarcode(),task.getPosName(),fullCode);
         }else{
             //DN单收料或Facility收料
             QisdaApi.VMIMateriaReceive(barcode, task);

myproject/src/main/java/com/myproject/webapp/controller/webService/QisdaBindService.java

@@ -393,7 +393,7 @@ public class QisdaBindService {
             int realLockQty = outItem.getRealLockQty();
             int newRealLockQty = realLockQty + dbQty;
 
-            log.info("\t真实绑定["+barcode.getBarcode()+"]到So=["+outItem.getSo()+"]hSerial=["+outItem.getSourceName()+"] 绑定数量:" + outItem.getRealLockQty() +"/" + outItem.getQty());
+            log.info("\t真实绑定["+barcode.getBarcode()+"]到So=["+outItem.getSo()+"]hSerial=["+outItem.getSourceName()+"] 绑定数量:" + newRealLockQty +"/" + outItem.getQty());
             barcode.realBindItem(outItem);
             pos.setBarcode(barcode);
             storagePosDao.save(pos);

myproject/src/main/java/com/myproject/webapp/controller/webService/QisdaCache.java

@@ -122,14 +122,16 @@ public class QisdaCache {
         if(failedRequestMap.get(mapKey) == null){
             log.info(mapKey + "通知指令发送到Qisda失败,加入到缓存");
             failedRequestMap.put(apiRequest.getMapKey(), apiRequest);
+            cacheInfoDao.updateCacheItem(FAILED_REQUEST_MAP_KEY, failedRequestMap);
         }
     }
 
     public static void removeFailedRequest(QisdaApiRequest apiRequest){
         String mapKey = apiRequest.getMapKey();
-        if(failedRequestMap.get(mapKey) == null){
+        if(failedRequestMap.get(mapKey) != null){
             log.info(mapKey + "通知指令发送到Qisda成功,从缓存中移除");
             failedRequestMap.remove(apiRequest.getMapKey());
+            cacheInfoDao.updateCacheItem(FAILED_REQUEST_MAP_KEY, failedRequestMap);
         }
     }
 

myproject/src/main/java/com/myproject/webapp/controller/webService/QisdaDeviceController.java

@@ -803,8 +803,8 @@ public class QisdaDeviceController extends BaseController {
                             log.info("缺料补发料需要通知Qisda");
                             Barcode barcodeObj = barcodeManager.findByBarcode(cacheTask.getBarcode());
                             String latest = outInfo.getShelfLatest();
+                            //放到线程中
                             QisdaApi.VMIMateriaRecAss(cacheTask, barcodeObj,latest);
-
                         } else{
                             Barcode barcodeObj = barcodeManager.findByBarcode(cacheTask.getBarcode());
                             String latest = outInfo.getShelfLatest();

myproject/src/main/java/com/myproject/webapp/controller/webService/TaskService.java

@@ -665,7 +665,7 @@ public class TaskService implements ITaskService {
         if(barcode != null){
             task.setPartNumber(barcode.getPartNumber());
             task.setBarcode(barcode.getBarcode());
-            task.setNum(barcode.getAmount());
+            task.setNum(barcode.getInitialAmount());
             task.setW(barcode.getPlateSize());
             task.setH(barcode.getHeight());
             AppendInfo appendInfo = barcode.getAppendInfo();
@@ -872,7 +872,7 @@ public class TaskService implements ITaskService {
             for (DataLog task : waitTasks) {
                 if(task.isCheckOutTask()) {
                     AppendInfo appendInfo = task.getAppendInfo();
-                    if(appendInfo.isFirstReelAction()){
+                    if(appendInfo.isFirstReelAction() && !task.isLessSendReel()){
                         //首盘料
                         hasFirstReelAction = true;
                     }
@@ -1578,7 +1578,7 @@ public class TaskService implements ITaskService {
                 task.setPartNumber(barcode.getPartNumber());
                 task.setBarcode(barcode.getBarcode());
                 task.setAppendInfo(barcode.getAppendInfo());
-                task.setNum(barcode.getAmount());
+                task.setNum(barcode.getInitialAmount());
 
                 dataCache.updateInventory(pos,barcode);
                 //dataCache.updateStorage(task.getCid());
@@ -1661,7 +1661,7 @@ public class TaskService implements ITaskService {
         dataLog.setAppendInfo(barcode.getAppendInfo());
         //dataLog.setRelationCodes(barcode.getRelationCodes());
         dataLog.setType(StorageConstants.OP.PUT_IN);
-        dataLog.setNum(barcode.getAmount());
+        dataLog.setNum(barcode.getInitialAmount());
 
         dataLog.setCid(storage.getCid());