2023年9月25日09:44:55

ruoyi-admin/src/main/java/com/ruoyi/web/controller/iot/domain/Order.java

@@ -101,6 +101,16 @@ public class Order {
 
     private List<ProductOrder> productOrderList;
 
+    private TransportOrder transportOrder;
+
+    public TransportOrder getTransportOrder() {
+        return transportOrder;
+    }
+
+    public void setTransportOrder(TransportOrder transportOrder) {
+        this.transportOrder = transportOrder;
+    }
+
     public List<ProductOrder> getProductOrderList() {
         return productOrderList;
     }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/iot/domain/ProductOrder.java

@@ -59,4 +59,108 @@ public class ProductOrder {
      */
     private Integer stopNumber;
 
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(Long orderId) {
+        this.orderId = orderId;
+    }
+
+    public Long getProcessId() {
+        return processId;
+    }
+
+    public void setProcessId(Long processId) {
+        this.processId = processId;
+    }
+
+    public Long getEquipmentId() {
+        return equipmentId;
+    }
+
+    public void setEquipmentId(Long equipmentId) {
+        this.equipmentId = equipmentId;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public Long getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(Long taskId) {
+        this.taskId = taskId;
+    }
+
+    public Integer getProductNum() {
+        return productNum;
+    }
+
+    public void setProductNum(Integer productNum) {
+        this.productNum = productNum;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public String getStopTime() {
+        return stopTime;
+    }
+
+    public void setStopTime(String stopTime) {
+        this.stopTime = stopTime;
+    }
+
+    public Integer getStopNumber() {
+        return stopNumber;
+    }
+
+    public void setStopNumber(Integer stopNumber) {
+        this.stopNumber = stopNumber;
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/iot/domain/TransportOrder.java

@@ -0,0 +1,203 @@
+package com.ruoyi.web.controller.iot.domain;
+
+/**
+ * @author :jixinyuan
+ * @date : 2023/9/25
+ */
+public class TransportOrder {
+
+    /**
+     * 主键
+     */
+    private Long id;
+    /**
+     * 订单编号
+     */
+    private String orderNum;
+    /**
+     * 订单名称
+     */
+    private String orderName;
+    /**
+     * 客户名称
+     */
+    private Long customerId;
+    /**
+     * 订单数量
+     */
+    private Integer number;
+    /**
+     * 单位
+     */
+    private String unit;
+    /**
+     * 发货方式
+     */
+    private String deliveryWay;
+    /**
+     * 发货数量
+     */
+    private Integer deliveryNum;
+    /**
+     * 发货单号
+     */
+    private String invoiceNumber;
+    /**
+     * 发货状态 0 ：未发货 1 ：已发货 2 ：已签收
+     */
+    private Integer shippingStatus;
+    /**
+     * 发货人
+     */
+    private String consigner;
+    /**
+     * 发货报告
+     */
+    private String deliveryReport;
+    /**
+     * 发货时间
+     */
+    private String deliveryTime;
+    /**
+     * 到货时间
+     */
+    private String receiveTime;
+    /**
+     * 创建时间
+     */
+    private String createTime;
+    /**
+     * 客户名称
+     */
+    private String customerName;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getOrderNum() {
+        return orderNum;
+    }
+
+    public void setOrderNum(String orderNum) {
+        this.orderNum = orderNum;
+    }
+
+    public String getOrderName() {
+        return orderName;
+    }
+
+    public void setOrderName(String orderName) {
+        this.orderName = orderName;
+    }
+
+    public Long getCustomerId() {
+        return customerId;
+    }
+
+    public void setCustomerId(Long customerId) {
+        this.customerId = customerId;
+    }
+
+    public Integer getNumber() {
+        return number;
+    }
+
+    public void setNumber(Integer number) {
+        this.number = number;
+    }
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+
+    public String getDeliveryWay() {
+        return deliveryWay;
+    }
+
+    public void setDeliveryWay(String deliveryWay) {
+        this.deliveryWay = deliveryWay;
+    }
+
+    public Integer getDeliveryNum() {
+        return deliveryNum;
+    }
+
+    public void setDeliveryNum(Integer deliveryNum) {
+        this.deliveryNum = deliveryNum;
+    }
+
+    public String getInvoiceNumber() {
+        return invoiceNumber;
+    }
+
+    public void setInvoiceNumber(String invoiceNumber) {
+        this.invoiceNumber = invoiceNumber;
+    }
+
+    public Integer getShippingStatus() {
+        return shippingStatus;
+    }
+
+    public void setShippingStatus(Integer shippingStatus) {
+        this.shippingStatus = shippingStatus;
+    }
+
+    public String getConsigner() {
+        return consigner;
+    }
+
+    public void setConsigner(String consigner) {
+        this.consigner = consigner;
+    }
+
+    public String getDeliveryReport() {
+        return deliveryReport;
+    }
+
+    public void setDeliveryReport(String deliveryReport) {
+        this.deliveryReport = deliveryReport;
+    }
+
+    public String getDeliveryTime() {
+        return deliveryTime;
+    }
+
+    public void setDeliveryTime(String deliveryTime) {
+        this.deliveryTime = deliveryTime;
+    }
+
+    public String getReceiveTime() {
+        return receiveTime;
+    }
+
+    public void setReceiveTime(String receiveTime) {
+        this.receiveTime = receiveTime;
+    }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getCustomerName() {
+        return customerName;
+    }
+
+    public void setCustomerName(String customerName) {
+        this.customerName = customerName;
+    }
+}
+

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

@@ -7,6 +7,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.page.TableSupport;
 import com.ruoyi.web.controller.iot.domain.Order;
 import com.ruoyi.web.controller.iot.domain.ProductOrder;
+import com.ruoyi.web.controller.iot.domain.TransportOrder;
 import com.ruoyi.web.controller.iot.service.IOrderService;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;
@@ -84,11 +85,18 @@ public class OrderServiceImpl implements IOrderService {
             dataSource.setUsername("db_cdyq6tkqn1ioja179i8b");
             dataSource.setPassword("By@#5c9i75sgtx3b620g6m6e");
             JdbcTemplate template = new JdbcTemplate(dataSource);
-            detail = template.queryForObject("SELECT * FROM t_factory_order where id = ;" + order.getId(), Order.class);
-            if (!ObjectUtils.isEmpty(detail)){
-                List<ProductOrder> productOrderList = template.query("SELECT * FROM t_product_order_detail where order_id = ;"+ detail.getId(),
+            detail = template.queryForObject("SELECT * FROM t_factory_order where id = " + order.getId() + ";" , new BeanPropertyRowMapper<Order>(Order.class));
+            if (!ObjectUtils.isEmpty(detail)) {
+                List<ProductOrder> productOrderList = template.query("SELECT * FROM t_product_order_detail where order_id = " + detail.getId() + ";" ,
                         new BeanPropertyRowMapper<ProductOrder>(ProductOrder.class));
-                detail.setProductOrderList(productOrderList);
+                if (!ObjectUtils.isEmpty(productOrderList)) {
+                    detail.setProductOrderList(productOrderList);
+                }
+                List<TransportOrder> transportOrders = template.query("SELECT * FROM t_transport_order where order_num = '" + detail.getOrderNum() + "';" ,
+                        new BeanPropertyRowMapper<TransportOrder>(TransportOrder.class));
+                if (!ObjectUtils.isEmpty(transportOrders) && transportOrders.size() > 0) {
+                    detail.setTransportOrder(transportOrders.get(0));
+                }
             }
         } catch (Exception e) {
             throw new RuntimeException(e.getMessage());