修改看板逻辑

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesEarlyWarningServiceImpl.java

@@ -262,6 +262,8 @@ public class MesEarlyWarningServiceImpl implements IMesEarlyWarningService {
         //先查对列表,找到对应产线工位的工单
         List<MesQueueOrder> queueOrderList = queueOrderRao.findByHqlTopWhere(queueOrderPackBean,1);
         //过滤掉关闭和拆解的工单
+        List<MesWorkOrder> workOrderList = new ArrayList<>();
+        if (!queueOrderList.isEmpty()){
             List<Integer> orderStatusList1 = new ArrayList<>();
             orderStatusList1.add(MesExtEnumUtil.ORDER_STATUS.RELEASE.getValue());
             orderStatusList1.add(MesExtEnumUtil.ORDER_STATUS.PROCESS.getValue());
@@ -270,7 +272,8 @@ public class MesEarlyWarningServiceImpl implements IMesEarlyWarningService {
             DdlPreparedPack.getInPackList(workOrderNoQueueList,"workOrderNo",orderPackBean);
             DdlPreparedPack.getInPackList(orderStatusList1,"workOrderStatus",orderPackBean);
             DdlPreparedPack.getOrderBy("productSeq",CommonEnumUtil.ASC_OR_DESC.ASC.getValue(), orderPackBean);
-        List<MesWorkOrder> workOrderList = workOrderRao.findByHqlTopWhere(orderPackBean, 1);
+            workOrderList = workOrderRao.findByHqlTopWhere(orderPackBean, 1);
+        }
         return !workOrderList.isEmpty() ? workOrderList.get(0) : null;
     }
 
@@ -291,7 +294,7 @@ public class MesEarlyWarningServiceImpl implements IMesEarlyWarningService {
         DdlPreparedPack.getStringNotBlanklPack("custOrderNo",workOrderPackBean);
         DdlPreparedPack.getOrderBy("productSeq",CommonEnumUtil.ASC_OR_DESC.DESC.getValue(), workOrderPackBean);
         List<MesWorkOrder> mesWorkOrders = workOrderRao.findByHqlTopWhere(workOrderPackBean, 1);
-        return mesWorkOrders.get(0);
+        return !mesWorkOrders.isEmpty() ? mesWorkOrders.get(0): null;
     }
 
     private Integer getWorkCounts(String realEndTime,String organizeCode,String workCenterCode){
@@ -404,6 +407,9 @@ public class MesEarlyWarningServiceImpl implements IMesEarlyWarningService {
         mesKanBanShowModel.setSupplyRedBuffer(supplyRedBuffer);
         //供货缓冲实际
         Long realSupplyBuffer = Long.parseLong(infoDD.getCsnNo().substring(3,10)) - Long.parseLong(infoKH.getCsnNo().substring(3,10)) - kanBan.getOnlineAdjustNum();
+       if (realSupplyBuffer < 0){
+           realSupplyBuffer = 0L;
+       }
         mesKanBanShowModel.setRealSupplyBuffer(realSupplyBuffer);
         if (realSupplyBuffer < supplyRedBuffer){
             mesKanBanShowModel.setRealSupplyBufferColor("red");
@@ -412,6 +418,7 @@ public class MesEarlyWarningServiceImpl implements IMesEarlyWarningService {
             mesKanBanShowModel.setRealSupplyBufferColor("yellow");
             mesKanBanShowModel.setSupplyRedBuffer(supplyYellowBuffer);
         }
+
         //线头积单
          Long summaryWorkOrderRedCount = kanBan.getSummaryWorkOrderRedCount();
          mesKanBanShowModel.setSummaryWorkOrderRedCount(summaryWorkOrderRedCount);
@@ -440,9 +447,9 @@ public class MesEarlyWarningServiceImpl implements IMesEarlyWarningService {
         //成品实际缓冲
         Long realProductionBuffer;
         if (workOrderLast.getCustOrderNo().length() >= 10){
-            realProductionBuffer = Long.parseLong(workOrderLast.getCustOrderNo().substring(workOrderLast.getCustOrderNo().length() - 7)) - Long.parseLong(infoKH.getCsnNo().substring(3, 10))  - kanBan.getOnlineAdjustNum() ;
+            realProductionBuffer = Long.parseLong(workOrderLast.getCustOrderNo().substring(workOrderLast.getCustOrderNo().length() - 7)) - Long.parseLong(infoKH.getCsnNo().substring(3, 10))  - kanBan.getOnlineToShippingAdjustNum() ;
         }else {
-            realProductionBuffer = Long.parseLong(workOrderLast.getCustOrderNo().substring(workOrderLast.getCustOrderNo().length() - 5)) - Long.parseLong(infoKH.getCsnNo().substring(infoKH.getCsnNo().length()-5)) - kanBan.getOnlineAdjustNum() ;
+            realProductionBuffer = Long.parseLong(workOrderLast.getCustOrderNo().substring(workOrderLast.getCustOrderNo().length() - 5)) - Long.parseLong(infoKH.getCsnNo().substring(infoKH.getCsnNo().length()-5)) - kanBan.getOnlineToShippingAdjustNum() ;
 
         }
         if(realProductionBuffer <0){