Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/iot/service/impl/OrderServiceImpl.java

@@ -95,18 +95,36 @@ public class OrderServiceImpl implements IOrderService {
                 List<Order> orders = template.query("SELECT fo.*,tto.shipping_status as status, '" + keyUrl + "' as url" + " FROM t_factory_order fo left join t_transport_order tto on fo.order_num = tto.order_num where 1=1 "
                                 + (ObjectUtils.isEmpty(condition) ? "" : condition) + ";",
                         new BeanPropertyRowMapper<Order>(Order.class));
-                for (Order item : orders) {
-                    if (item.getOrderStatus().equals(1)) {
-                        item.setStatus("生产中");
-                    }
-                    if ("1".equals(item.getStatus())) {
-                        item.setStatus("已发货");
-                    }
-                    if ("2".equals(item.getStatus())) {
-                        item.setStatus("已签收");
+                if (order.getStatus() == null || "".equals(order.getStatus())) {
+                    for (Order item : orders) {
+                        if (item.getOrderStatus().equals(1)) {
+                            item.setStatus("生产中");
+                        }
+                        if ("1".equals(item.getStatus())) {
+                            item.setStatus("已发货");
+                        }
+                        if ("2".equals(item.getStatus())) {
+                            item.setStatus("已签收");
+                        }
+                        if (item.getOverdue().contains("逾期")) {
+                            item.setStatus("已逾期");
+                        }
                     }
-                    if (item.getOverdue().contains("逾期")) {
-                        item.setStatus("已逾期");
+                } else {
+                    for (Order item : orders) {
+
+                        if ("已逾期".equals(order.getStatus())) {
+                            item.setStatus("已逾期");;
+                        }
+                        if ("生产中".equals(order.getStatus())) {
+                            item.setStatus("生产中");
+                        }
+                        if ("已发货".equals(order.getStatus())) {
+                            item.setStatus("已发货");
+                        }
+                        if ("已签收".equals(order.getStatus())) {
+                            item.setStatus("已签收");
+                        }
                     }
                 }
                 orderList.addAll(orders);