diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/OrderEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/OrderEntity.java index eb50e87..a41780d 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/OrderEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/OrderEntity.java @@ -60,4 +60,9 @@ public class OrderEntity { private String createTime; private String fromSubInvCode; + + private String billTypeName; + private String subInvName; + private String invName; + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderEntity.java index d86d598..dc809f8 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderEntity.java @@ -45,4 +45,10 @@ public class StockOrderEntity { //委托验收已完成 private boolean entrustEnd; + + + private String billTypeName; + private String subInvName; + private String invName; + } diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml index f51e9cb..ff8d2b6 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml @@ -191,7 +191,8 @@ - SELECT stock_order.* FROM stock_order + SELECT stock_order.* ,inv_warehouse.name invName, inv_warehouse_sub.name subInvName ,basic_bustype_local.name billTypeName FROM stock_order + left join basic_bustype_local on stock_order.billType = basic_bustype_local.action LEFT JOIN inv_warehouse ON stock_order.locStorageCode = inv_warehouse.`code` LEFT JOIN inv_warehouse_sub ON inv_warehouse_sub.parentId = inv_warehouse.`code` LEFT JOIN inv_warehouse_user on inv_warehouse_sub.code = inv_warehouse_user.`code` - and id =#{id} + and stock_order.id =#{id} and billNo LIKE concat('%',#{billNo},'%') @@ -140,7 +141,7 @@ and statusInfo = #{statusInfo} - and type = #{type} + and stock_order.type = #{type} and sourceType = #{sourceType}