diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java index dd1b7aef..d359b3ae 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java @@ -27,7 +27,6 @@ import com.glxp.api.admin.entity.inout.WarehouseEntity; import com.glxp.api.admin.entity.inventory.InvProductDetailEntity; import com.glxp.api.admin.entity.inventory.InvProductEntity; import com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity; -import com.glxp.api.admin.entity.inventory.InvWarehouseEntity; import com.glxp.api.admin.req.business.StockOrderFilterRequest; import com.glxp.api.admin.req.inout.OrderFilterRequest; import com.glxp.api.admin.req.inout.OrderQueryRequest; @@ -319,7 +318,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()); @@ -547,8 +546,8 @@ public class OrderServiceImpl implements OrderService { @Override public void queryPrintRemark(List resultList) { for (StockOrderResponse stockOrderResponse : resultList) { - String printRemark = orderDao.selectPrintRemarkById(stockOrderResponse.getOrderIdFk()); - stockOrderResponse.setPrintRemark(printRemark); + String printRemark = orderDao.selectPrintRemarkById(stockOrderResponse.getOrderIdFk()); + stockOrderResponse.setPrintRemark(printRemark); } }