diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/FilterThrInvWarehouseRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/FilterThrInvWarehouseRequest.java
index bef05a4..f68ed99 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/FilterThrInvWarehouseRequest.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/FilterThrInvWarehouseRequest.java
@@ -23,4 +23,9 @@ public class FilterThrInvWarehouseRequest extends ListPageRequest {
* 第三方系统标识
*/
private String thirdSysFk;
+
+ /**
+ * 状态 0:禁用 1:启用
+ */
+ private Integer status;
}
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java
index 3f6b598..5bd4464 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java
@@ -271,7 +271,7 @@ public class OrderServiceImpl implements OrderService {
supplementOrder.setSubInvCode(order.getInvStorageCode());
supplementOrder.setFromSubInvCode(order.getInvWarehouseCode());
//根据分库code查询总库coder
- InvSubWarehouseEntity invSubWarehouseEntity=invSubWarehouseDao.filterGroupInvSubAndcode(order.getFromCorpId());
+ InvSubWarehouseEntity invSubWarehouseEntity = invSubWarehouseDao.filterGroupInvSubAndcode(order.getFromSubInvCode());
supplementOrder.setLocStorageCode(invSubWarehouseEntity.getParentId());
supplementOrder.setInvStorageCode(invSubWarehouseEntity.getParentId());
String name = invWarehouseDao.getNameByCode(order.getInvStorageCode());
diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml
index 1ea324a..075c72e 100644
--- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvWarehouseDao.xml
@@ -34,6 +34,9 @@
and thirdSysFk = #{thirdSysFk}
+
+ AND status = #{status}
+