箱码幅面分页查询和查看详情根据业务变动修改

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/vo/result/BoxCodeFormatVO.java

@@ -20,9 +20,6 @@ public class BoxCodeFormatVO implements Serializable {
     @ApiModelProperty(value = "id")
     private Long id;
 
-    @ApiModelProperty(value = "部门id")
-    private Long deptId;
-
     @ApiModelProperty(value = "码库id")
     private Long codeStoreId;
 
@@ -32,9 +29,6 @@ public class BoxCodeFormatVO implements Serializable {
     @ApiModelProperty(value = "箱码幅面名称")
     private String name;
 
-    @ApiModelProperty(value = "部门名称")
-    private String deptName;
-
     @ApiModelProperty(value = "码库名称")
     private String codeStoreName;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/vo/result/QrPackageVO.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -16,7 +17,7 @@ import java.util.List;
  */
 @Data
 @ApiModel
-public class QrPackageVO {
+public class QrPackageVO implements Serializable {
 
 	@ApiModelProperty("码包id")
 	private Long id;

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/ListBoxCodeFormatReq.java

@@ -16,8 +16,8 @@ import java.io.Serializable;
 @ApiModel
 public class ListBoxCodeFormatReq extends PageReq implements Serializable {
 
-    @ApiModelProperty(value = "部门id")
-    private Long deptId;
+    @ApiModelProperty(value = "包材厂id")
+    private Long factoryId;
 
     @ApiModelProperty(value = "箱码幅面名称")
     private String name;

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/BoxCodeFormatDetailRes.java

@@ -20,25 +20,19 @@ public class BoxCodeFormatDetailRes implements Serializable {
     @ApiModelProperty(value = "id")
     private Long id;
 
-    @ApiModelProperty(value = "部门id")
-    private Long deptId;
-
     @ApiModelProperty(value = "码库id")
     private Long codeStoreId;
 
-    @ApiModelProperty(value = "供应商id")
+    @ApiModelProperty(value = "包材厂id")
     private Long factoryId;
 
     @ApiModelProperty(value = "箱码幅面名称")
     private String name;
 
-    @ApiModelProperty(value = "部门名称")
-    private String deptName;
-
     @ApiModelProperty(value = "码库名称")
     private String codeStoreName;
 
-    @ApiModelProperty(value = "供应商名称")
+    @ApiModelProperty(value = "包材厂名称")
     private String factoryName;
 
     @ApiModelProperty(value = "每卷色标量")

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/ListBoxCodeFormatRes.java

@@ -41,13 +41,10 @@ public class ListBoxCodeFormatRes extends PageResp implements Serializable {
         @ApiModelProperty(value = "箱码幅面名称")
         private String name;
 
-        @ApiModelProperty(value = "部门名称")
-        private String deptName;
-
         @ApiModelProperty(value = "码库名称")
         private String codeStoreName;
 
-        @ApiModelProperty(value = "供应商名称")
+        @ApiModelProperty(value = "包材厂名称")
         private String factoryName;
 
         @ApiModelProperty(value = "每卷色标量")

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/BoxCodeFormatMapper.xml

@@ -27,14 +27,13 @@
 
     <select id="listBoxCodeFormat" resultType="com.abi.qms.platform.dao.vo.result.BoxCodeFormatVO">
         select bcf.id, bcf.name,bcf.color_per_roll_scalar,bcf.format_number,bcf.remark,
-        bcf.state,bcf.update_time,bd.dept_name,bf.factory_name
+        bcf.state,bcf.update_time,bf.factory_name
         from box_code_format bcf
-        left join base_department bd on bd.id=bcf.dept_id
         left join base_factory bf on bf.id=bcf.factory_id
         <where>
             bcf.is_delete = 0
-            <if test="param.deptId != null and param.deptId != ''">
-                AND bd.id = #{param.deptId}
+            <if test="param.factoryId != null and param.factoryId != ''">
+                AND bf.id = #{param.factoryId}
             </if>
             <if test="param.name != null and param.name != ''">
                 AND bcf.name like concat('%',#{param.name},'%')
@@ -48,9 +47,8 @@
 
     <select id="selectBoxCodeFormatDetailById" resultType="com.abi.qms.platform.dao.vo.result.BoxCodeFormatVO">
         select bcf.id, bcf.name,bcf.color_per_roll_scalar,bcf.format_number,bcf.remark,
-        bcf.state,bcf.update_time,bd.dept_name,bf.factory_name,bcf.dept_id,bcf.code_store_id,bcf.factory_id
+        bcf.state,bcf.update_time,bf.factory_name,bcf.dept_id,bcf.code_store_id,bcf.factory_id
         from box_code_format bcf
-        left join base_department bd on bd.id=bcf.dept_id
         left join base_factory bf on bf.id=bcf.factory_id
         where bcf.id = #{id} and bcf.is_delete = 0
     </select>