diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java index 8c2b669ff..89f55776c 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java @@ -373,7 +373,6 @@ public class IoOrderDetailResultController extends BaseController { ioOrderDetailResultData.put("isStack", ioOrderDetailResultResponse.getIsStack() == null ? ' ' : ioOrderDetailResultResponse.getIsStack()); ioOrderDetailResultData.put("groupBuy", ioOrderDetailResultResponse.getGroupBuy() == null ? ' ' : ioOrderDetailResultResponse.getGroupBuy()); ioOrderDetailResultData.put("invoiceCodes", ioOrderDetailResultResponse.getInvoiceCodes() == null ? ' ' : ioOrderDetailResultResponse.getInvoiceCodes()); - ioOrderDetailResultData.put("fromOutName", ioOrderDetailResultResponse.getFromOutName() == null ? ' ' : ioOrderDetailResultResponse.getFromOutName()); if (thrProductsEntity != null) { ioOrderDetailResultData.put("cplb", thrProductsEntity.getCplb() == null ? ' ' : thrProductsEntity.getCplb()); } diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java index 34185e09e..502761d1d 100644 --- a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java +++ b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java @@ -65,7 +65,6 @@ public class FilterOrderDetailResultRequest extends ListPageRequest { private String confirmEndTime; //发票确认结束日期 private String corpName;//供应商名字 - private String fromOutName;//出库科室 private Boolean groupBuy; //是否集采产品 } diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java index 47b0d886f..83c49f26a 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java @@ -221,7 +221,7 @@ public class IoOrderDetailResultResponse { private Boolean isStack; private Boolean groupBuy; - private String fromOutName; + public String getFromName() { if (StrUtil.isNotEmpty(fromCorpName)) return fromCorpName; diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml index 3e058416c..3afd30e08 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml @@ -25,25 +25,22 @@