fix: 修改推荐上货单导出

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;

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;
+
 
 }

src/main/resources/mybatis/mapper/inout/IoSplitFifoInvMapper.xml

@@ -117,6 +117,7 @@
   <select id="filterKcyjList" parameterType="com.glxp.api.req.inout.IoSplitFifoInvRequest" resultType="com.glxp.api.res.inout.IoSplitInvResponse">
     select isfi.*,
            bp.cpmctymc,
+           bp.prepnSpec,
            CASE   WHEN bp.ggxh IS NULL THEN bp.bzgg  ELSE bp.ggxh END AS ggxh,
            bp.bzgg,
            bu.useLevelUnit,