From 545bc6e2c7f54af2d0aacb097da12b43e9a80abc Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Tue, 18 Feb 2025 17:11:34 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=8E=A8=E8=8D=90?= =?UTF-8?q?=E4=B8=8A=E8=B4=A7=E5=8D=95=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/res/inout/IoSplitInvResponse.java | 1 + .../api/res/inout/IoSplitInvViewResponse.java | 38 ++++++------------- .../mapper/inout/IoSplitFifoInvMapper.xml | 1 + 3 files changed, 13 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/glxp/api/res/inout/IoSplitInvResponse.java b/src/main/java/com/glxp/api/res/inout/IoSplitInvResponse.java index 3fb954f36..9b65a1c35 100644 --- a/src/main/java/com/glxp/api/res/inout/IoSplitInvResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoSplitInvResponse.java @@ -135,6 +135,7 @@ public class IoSplitInvResponse { private String zxxsdycpbs; private String bzgg; private String useLevelUnit; + private String prepnSpec; private String nameCode; diff --git a/src/main/java/com/glxp/api/res/inout/IoSplitInvViewResponse.java b/src/main/java/com/glxp/api/res/inout/IoSplitInvViewResponse.java index 58f4a0ed5..6f21abb7d 100644 --- a/src/main/java/com/glxp/api/res/inout/IoSplitInvViewResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoSplitInvViewResponse.java @@ -11,48 +11,32 @@ import java.util.Date; @Data public class IoSplitInvViewResponse { - @ExcelProperty(value = "区域编码", index = 0) - @ColumnWidth(30) - private Integer freightRow; - - - @ExcelProperty(value = "出货槽编码", index = 1) - @ColumnWidth(30) - private String workPlaceQueueCode; - - - @ExcelProperty(value = "出货槽名称", index = 2) - @ColumnWidth(30) - private String workPlaceQueueCodeName; - - - @ExcelProperty(value = "产品通用名", index = 3) + @ExcelProperty(value = "产品通用名", index = 0) @ColumnWidth(30) private String cpmctymc; - - @ExcelProperty(value = "产品标识", index = 4) + @ExcelProperty(value = "制剂规格", index = 1) @ColumnWidth(30) - private String nameCode; + private String prepnSpec; - - @ExcelProperty(value = "规格型号", index = 5) + @ExcelProperty(value = "包装规格", index = 2) @ColumnWidth(30) private String ggxh; - @ExcelProperty(value = "剩余数量", index = 6) + @ExcelProperty(value = "推荐上货数量", index = 3) @ColumnWidth(30) - private Integer reCount; + private Integer suggestOutCount; - @ExcelProperty(value = "最大存药数量", index = 7) + @ExcelProperty(value = "区域编码", index = 4) @ColumnWidth(30) - private Integer maxDrugCount; + private Integer freightRow; - @ExcelProperty(value = "推荐上货数量", index = 8) + @ExcelProperty(value = "取货槽编码", index = 5) @ColumnWidth(30) - private Integer suggestOutCount; + private String workPlaceQueueCode; + } diff --git a/src/main/resources/mybatis/mapper/inout/IoSplitFifoInvMapper.xml b/src/main/resources/mybatis/mapper/inout/IoSplitFifoInvMapper.xml index 48d50043c..436ce0a3c 100644 --- a/src/main/resources/mybatis/mapper/inout/IoSplitFifoInvMapper.xml +++ b/src/main/resources/mybatis/mapper/inout/IoSplitFifoInvMapper.xml @@ -117,6 +117,7 @@