排序工单关闭，队列表也需要关闭

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java

@@ -248,7 +248,10 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
             if (!Objects.equals(bean.getWorkOrderStatus(), result.getWorkOrderStatus()) && bean.getWorkOrderStatus() == MesExtEnumUtil.ORDER_STATUS.RELEASE.getValue()) {
                 isSavePrintQueue = true;
             }
-
+            //排序工单 关闭工单对列表
+            if (!Objects.equals(bean.getWorkOrderStatus(), result.getWorkOrderStatus()) && MesExtEnumUtil.ORDER_STATUS.CLOSE.getValue() == bean.getWorkOrderStatus() && MesExtEnumUtil.ORDER_TYPE.SORT.getValue() == bean.getWorkOrderType()) {
+                closeMesQueueOrder(bean.getWorkOrderNo(), bean.getOrganizeCode(), AuthUtilExt.getUserName());
+            }
             result.setWorkOrderStatus(bean.getWorkOrderStatus());
             if (result.getWorkOrderStatus() == MesExtEnumUtil.ORDER_STATUS.CREATE.getValue()
                     && bean.getWorkOrderStatus() == MesExtEnumUtil.ORDER_STATUS.RELEASE.getValue()) {
@@ -2548,6 +2551,13 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
         return queueOrderRao.findByHqlWhere(packBean);
     }
 
+    public void closeMesQueueOrder(String workOrderNo, String organizeCode, String userName) {
+        if (StringUtil.isEmpty(workOrderNo) || StringUtil.isEmpty(organizeCode)) return;
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
+        DdlPreparedPack.getStringEqualPack(workOrderNo, "workOrderNo", packBean);
+        queueOrderRao.updateByProperties(new String[]{"modifyUser", "modifyDatetime", "status"}, new Object[]{userName, TimeTool.getNowTime(true), MesExtEnumUtil.QUEUE_ORDER_STATUS.CLOSED.getValue()}, packBean);
+    }
+
     public MesPrintQueue getMesPrintQuanOrder(String workOrderNo, String organizeCode) {
         if(StringUtil.isEmpty(workOrderNo) || StringUtil.isEmpty(organizeCode)) return null;
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);