1 合单分盘料通知QISDA数据重复问题修正

2 合单分盘料出库时只生成一个任务

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

@@ -63,11 +63,13 @@ public class QisdaApi {
      * 出仓完成时通知(线程)
      * 出仓完成时通知(线程)
      * @param materialInfoMap
      * @param materialInfoMap
      */
      */
-    public static void VMILocationOut(final String reelId, final Map<String, Object> materialInfoMap){
+    public static void VMILocationOut(String reelId, Map<String, Object> materialInfoMap){
+        final String barcode = reelId;
+        final String materialInfo = JsonUtil.toJsonStr(materialInfoMap);
         threadPool.execute(new Runnable() {
         threadPool.execute(new Runnable() {
             @Override
             @Override
             public void run() {
             public void run() {
-                VMILocationOutThread(reelId, materialInfoMap);
+                VMILocationOutThread(barcode, materialInfo);
             }
             }
         });
         });
     }
     }
@@ -506,16 +508,14 @@ public class QisdaApi {
 
 
     /**
     /**
      * 出仓完成时通知
      * 出仓完成时通知
-     * @param materialInfoMap
+     * @param materialInfo
      */
      */
-    private static void VMILocationOutThread(String reelId, Map<String, Object> materialInfoMap){
+    private static void VMILocationOutThread(String reelId, String materialInfo){
         if(DataCache.isProductionFor(DataCache.CUSTOMER.DEBUG)){
         if(DataCache.isProductionFor(DataCache.CUSTOMER.DEBUG)){
             log.info("程序调试阶段,暂不处理,调试完成后更改PRO");
             log.info("程序调试阶段,暂不处理,调试完成后更改PRO");
             return;
             return;
         }
         }
         String url = "http://10.85.71.25:8080/ESMTCommonInterface/CommonService.asmx/VMILocationOut";
         String url = "http://10.85.71.25:8080/ESMTCommonInterface/CommonService.asmx/VMILocationOut";
-        String materialInfo = JsonUtil.toJsonStr(materialInfoMap);
-
         Map<String,Object> paramMap = new HashMap<String,Object>();
         Map<String,Object> paramMap = new HashMap<String,Object>();
         paramMap.put("materialInfo",materialInfo);
         paramMap.put("materialInfo",materialInfo);
         paramMap.put("userName",USER_NAME);
         paramMap.put("userName",USER_NAME);

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

@@ -1577,6 +1577,22 @@ public class OutInfoCache {
             //出分盘料
             //出分盘料
             List<StoragePos> cutPosList = storagePosDao.findCutList(outItem.getSo(), outItem.getSlotlocation(),outItem.getSoseq());
             List<StoragePos> cutPosList = storagePosDao.findCutList(outItem.getSo(), outItem.getSlotlocation(),outItem.getSoseq());
             for (StoragePos pos : cutPosList) {
             for (StoragePos pos : cutPosList) {
+                //如果已有出库任务,不再执行
+                boolean hasExitTask = false;
+                List<DataLog> allTasks = taskService.getAllTasks();
+                for (DataLog existTask : allTasks) {
+                    if(existTask.isCheckOutTask()){
+                        String barcode = existTask.getBarcode();
+                        if(barcode.equals(pos.getBarcode().getBarcode())){
+                            //相同条码已经有出库任务
+                            hasExitTask = true;
+                            break;
+                        }
+                    }
+                }
+                if(hasExitTask){
+                    continue;
+                }
                 DataLog task = newTask(outItem, pos);
                 DataLog task = newTask(outItem, pos);
                 task = InquiryShelfBean.addUnlimitLoc(task, outItem);
                 task = InquiryShelfBean.addUnlimitLoc(task, outItem);
                 task = dataLogDao.save(task);
                 task = dataLogDao.save(task);

myproject/src/main/webapp/WEB-INF/pages/updateHistory.jsp

@@ -12,6 +12,25 @@
 <div class="row">
 <div class="row">
     <div class="col-md-12">
     <div class="col-md-12">
         <ul class="timeline">
         <ul class="timeline">
+
+            <li class="timeline-yellow">
+                <div class="timeline-time">
+                    <span class="date">2023</span>
+                    <span class="time">08-28</span>
+                </div>
+                <div class="timeline-icon">
+                    <i class="fa fa-clock-o"></i>
+                </div>
+                <div class="timeline-body">
+                    <h2>版本: V2023082814</h2>
+                    <div class="timeline-content">
+                        <ul>
+                            <li>合单分盘料通知QISDA数据重复问题修正</li>
+                            <li>合单分盘料出库时只生成一个任务</li>
+                        </ul>
+                    </div>
+                </div>
+            </li>
             <li class="timeline-grey">
             <li class="timeline-grey">
                 <div class="timeline-time">
                 <div class="timeline-time">
                     <span class="date">2023</span>
                     <span class="date">2023</span>

myproject/src/main/webapp/decorators/metro.jsp

@@ -239,7 +239,7 @@
   <div class="page-footer-inner">
   <div class="page-footer-inner">
     2016&copy; <a href="${ctx}/updateHistory.html">SMD BOX</a>
     2016&copy; <a href="${ctx}/updateHistory.html">SMD BOX</a>
   </div>
   </div>
-  <span class="right" style="color: #a3a3a3;">Version: V2023081717</span>
+  <span class="right" style="color: #a3a3a3;">Version: V2023082814</span>
   <div class="scroll-to-top">
   <div class="scroll-to-top">
     <i class="icon-arrow-up"></i>
     <i class="icon-arrow-up"></i>
   </div>
   </div>