Merge branch 'dev-temp-castle-241223-44172' into test

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/ShipmentDetailReportDaoImpl.java

@@ -103,6 +103,10 @@ public class ShipmentDetailReportDaoImpl implements IShipmentDetailReportDao {
         commonQueryHql.append("AND ms.isValid = :isValid ");
 
         // 动态添加其他查询条件
+        if (!StringUtils.isEmpty(model.getVin())) {
+            commonQueryHql.append("AND momd.vin like :vin ");
+        }
+
         if (!StringUtils.isEmpty(model.getShippingCode())) {
             commonQueryHql.append("AND ms.shippingCode like :shippingCode ");
         }
@@ -152,6 +156,11 @@ public class ShipmentDetailReportDaoImpl implements IShipmentDetailReportDao {
         dataQuery.setParameter("organizeCode", model.getOrganizeCode());
         dataQuery.setParameter("isDeleted", CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
         dataQuery.setParameter("isValid", CommonEnumUtil.IS_VAILD.VAILD.getValue());
+
+        if (!StringUtils.isEmpty(model.getVin())) {
+            dataQuery.setParameter("vin", model.getVin() + "%");
+        }
+
         if (!StringUtils.isEmpty(model.getShippingCode())) {
             dataQuery.setParameter("shippingCode", model.getShippingCode() + "%");
         }

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

@@ -435,9 +435,9 @@ public class MesEarlyWarningServiceImpl implements IMesEarlyWarningService {
         }
         mesKanBanShowModel.setSummaryRealSupplyRealCount(summaryRealSupplyRealCount);
         Long summaryWorkOrderYellowCount = kanBan.getSummaryWorkOrderYellowCount();
-        if (summaryRealSupplyRealCount > summaryWorkOrderYellowCount){
+        if (summaryRealSupplyRealCount > summaryWorkOrderYellowCount && summaryRealSupplyRealCount < summaryWorkOrderRedCount){
             mesKanBanShowModel.setSummaryWorkOrderColor("orange");
-        }else if (summaryRealSupplyRealCount > summaryWorkOrderRedCount){
+        }else if (summaryRealSupplyRealCount >= summaryWorkOrderRedCount){
             mesKanBanShowModel.setSummaryWorkOrderColor("red");
         }
         //成品缓冲