修复后台处理bug

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/mq/TaskWorkNode.java

@@ -155,7 +155,7 @@ public class TaskWorkNode {
 
     private final String fileName = "";
 
-    private static ReentrantLock lock = new ReentrantLock();
+    private static ReentrantLock lock = new ReentrantLock(true);
 
     public void updateTaskStatusJob(String data, String consumerQueue) throws InterruptedException {
         String returnData = "";

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/TaskServiceImpl.java

@@ -729,7 +729,7 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
             planIdList = planList.stream().map(p -> p.getId()).collect(Collectors.toList());
         }
 
-        List<TTask> taskList = baseMapper.selectList(Wraps.<TTask>lbQ().eq(TTask::getTaskBatchNo,taskBatchNo).eq(TTask::getDraftFlag,draftFlag).eq(TTask::getPlanId,planId).in(TTask::getPlanId,pArr).in(TTask::getPlanId,planIdList));
+        List<TTask> taskList = baseMapper.selectList(Wraps.<TTask>lbQ().eq(TTask::getTaskBatchNo,taskBatchNo).eq(TTask::getDraftFlag,draftFlag).eq(TTask::getPlanId,planId).isNotNull(TTask::getExpectStartTime).in(TTask::getPlanId,pArr).in(TTask::getPlanId,planIdList));
         List<String>dateStrList = new ArrayList<>();
         for(TTask t:taskList){
             String date1 = DateUtil.dateToString0(t.getExpectStartTime(),"yyyy-MM-dd");

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionResourceCenter/service/impl/MachineNodeServiceImpl.java

@@ -153,8 +153,6 @@ public class MachineNodeServiceImpl implements NodeOperationService {
         zZone = zoneService.getById(zone_id);
         // 判断该节点使用那条线的plc
         plcInfo = DictionaryKey.PLC_CATEGORY.get(zZone.getNo());
-        // 判断该节点使用那条线的plc
-        plcInfo = DictionaryKey.PLC_CATEGORY.get(zZone.getNo());
 
         BBom bom = bBomMapper.selectById(task.getBomId());
         bomZzoneId = bom.getZoneId();

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/websocket/WebSocketServer.java

@@ -48,7 +48,7 @@ public class WebSocketServer {
     public void onOpen(Session session,@PathParam(value = "userid") String userid) {
         SessionSet.add(session);
         int cnt = OnlineCount.incrementAndGet(); // 在线数加1
-        log.info("有连接加入，当前连接数为：{}", cnt);
+        //log.info("有连接加入，当前连接数为：{}", cnt);
         //绑定用户和session
         List<Session> sessionList = userSessionsMap.get(userid);
         if(sessionList == null || sessionList.isEmpty()){
@@ -69,7 +69,7 @@ public class WebSocketServer {
         int cnt = OnlineCount.decrementAndGet();
         List<Session> sessionList = userSessionsMap.get(userid);
         sessionList.remove(session);
-        log.info("有连接关闭，当前连接数为：{}", cnt);
+        //log.info("有连接关闭，当前连接数为：{}", cnt);
     }
 
     /**
@@ -80,7 +80,7 @@ public class WebSocketServer {
      */
     @OnMessage
     public void onMessage(String message, Session session) {
-        log.info("来自客户端的消息：{}",message);
+        //log.info("来自客户端的消息：{}",message);
 
         //(内网暂时不用)如果是token，校验token解析token信息，并绑定token和session
         //根据消息报文相应进行业务处理
@@ -96,7 +96,7 @@ public class WebSocketServer {
      */
     @OnError
     public void onError(Session session, Throwable error) {
-        log.error("发生错误：{}，Session ID： {}",error.getMessage(),session.getId());
+        //log.error("发生错误：{}，Session ID： {}",error.getMessage(),session.getId());
         error.printStackTrace();
     }
 
@@ -109,7 +109,7 @@ public class WebSocketServer {
         try {
             session.getBasicRemote().sendText(message);
         } catch (IOException e) {
-            log.error("发送消息出错：{}", e.getMessage());
+            //log.error("发送消息出错：{}", e.getMessage());
             e.printStackTrace();
         }
     }
@@ -129,7 +129,7 @@ public class WebSocketServer {
             }
 
         } catch (IOException e) {
-            log.error("发送消息出错：{}", e.getMessage());
+            //log.error("发送消息出错：{}", e.getMessage());
             e.printStackTrace();
         }
     }

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/operationManagementCenter/PlanMapper.xml

@@ -27,7 +27,7 @@
     <sql id="Base_Column_List">
         id,create_time,update_time,order_product_id,
         plan_no, order_id, audit_status, remark, create_user, plan_status, update_user, start_time, end_time, scheduling_status, produce_status,bomId, partsNo,partsAlias,bomAlias,deliveryTime,pdeliveryTime,produceNum,
-        unqualifiedBomNum, prority, status,rhythm_type,orderNo,orderStatus,orderName,source,bomDesc,process,planBomNum,zoenDesc,completeNum,zoneId, org_id
+        unqualifiedBomNum, prority, status,rhythm_type,orderNo,orderStatus,orderName,source,bomDesc,process,planBomNum,zoenDesc,completeNum,zoneId, org_id, qualification
     </sql>
 
     <!-- 分页 -->
@@ -36,7 +36,7 @@
         <include refid="Base_Column_List"/>
         from (
         select a.*,b.order_no as orderNo,b.order_name orderName,b.source,b.order_status as orderStatus,c.bomDesc,ifnull(b.produce_num,0) as produceNum, c.bomId, c.partsNo,c.partsAlias,c.bomAlias,c.pdeliveryTime,b.delivery_time deliveryTime,c.order_product_id,d.id as zoneId, d.org_id,
-        ifnull(v.completeCount ,0) as completeNum,unqualifiedBomNum,
+        ifnull(v.completeCount ,0) as completeNum, unqualifiedBomNum, ifnull(round(100*(v.completeCount-unqualifiedBomNum)/v.completeCount, 2), 0)as qualification,
         CASE WHEN ifnull(w.taskCount,0)=0 then 0 else  round(100 *( wcCount / taskCount),2) end process,ifnull(c.plan_bom_num,0) as planBomNum,d.name as zoenDesc from imcs_p_plan a
         left join (
         select ord.* from imcs_o_order ord

imcs-admin-boot/imcs-tenant-biz/src/main/java/com/github/zuihou/tenant/service/impl/ProductionresourceServiceImpl.java

@@ -177,8 +177,8 @@ public class ProductionresourceServiceImpl extends SuperCacheServiceImpl<Product
 
         String getOrgIds = this.getOrgIds();
         if(StringUtil.isNotEmpty(getOrgIds)){
-            String safeguard_orgId = map.get("orgIds").toString();
-            map.put("orgIds", safeguard_orgId+","+getOrgIds);
+            String safeguard_orgId = map.containsKey("orgIds")? map.get("orgIds").toString(): "";
+            map.put("orgIds", StringUtil.isEmpty(safeguard_orgId)?getOrgIds : safeguard_orgId+","+getOrgIds);
         }else{
             map.remove("orgIds");
         }