Merge remote-tracking branch 'origin/master'

src/main/java/com/steerinfo/dil/mapper/QmsQueueResultMapper.java

@@ -204,4 +204,7 @@ public interface QmsQueueResultMapper extends IBaseMapper<QmsQueueResult, BigDec
      * @Description:复刻进厂数
     */
     int getSteelOrderNum();
+
+    int updateQmsResult(BigDecimal resultTotalId);
+
 }

src/main/java/com/steerinfo/dil/service/impl/QmsQueueListServiceImpl.java

@@ -352,6 +352,7 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
                 //        continue;
                 //    }
                 //}
+
                 //更新排队链表
                 count += qmsQueueListMapper.updateListEnFactory(mesMap);
                 //更新进厂实绩
@@ -368,6 +369,8 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
                     list.add(new WebSocketCapacity(5 , "system",String.valueOf(mesMap.get("capacityNumber")), "可以进厂" + new Date(), new Date()));
                 }
             }
+            //更新排队实绩,将放行时间保存
+            count += qmsQueueResultMapper.updateQmsResult(DataChange.dataToBigDecimal(mesMap.get("resultTotalId")));
             //更新物资子表 每个物资的装货点ID
             mesMap.replace("id",DataChange.dataToBigDecimal(mesMap.get("id")));
             qmsQueueSpellingListMapper.updateOOMLoadWarehouse(mesMap);

src/main/resources/com/steerinfo/dil/mapper/QmsQueueResultMapper.xml

@@ -980,7 +980,6 @@
         where RESULT_ID = #{resultId}
     </update>
 
-
     <select id="getQueueListByQueueUpSpelling" parameterType="map" resultType="java.util.LinkedHashMap">
         select QQR.RESULT_ID "resultId",
         QQR.RESULT_TOTAL_ID "resultTotalId",
@@ -2464,4 +2463,9 @@
           AND TLFR.RESULT_OUT_GATE_TIME IS NULL
           AND OO.ORDER_TYPE = 1
     </select>
+    <update id="updateQmsResult" parameterType="java.math.BigDecimal">
+        update QMS_QUEUE_RESULT QQR
+        SET QQR.UPDATE_TIME = sysdate
+        where QQR.RESULT_TOTAL_ID = #{resultTotalId}
+    </update>
 </mapper>