新增啤酒厂下拉选择框接口

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/controller/console/BoxCodeFormatController.java

@@ -8,9 +8,7 @@ import com.abi.qms.platform.dto.req.ListBoxCodeFormatReq;
 import com.abi.qms.platform.dto.req.SaveBoxCodeFormatReq;
 import com.abi.qms.platform.dto.res.BoxCodeFormatDetailRes;
 import com.abi.qms.platform.dto.res.ListBoxCodeFormatRes;
-import com.abi.qms.platform.dto.res.ListPackageFactorySelectRes;
 import com.abi.qms.platform.service.BoxCodeFormatService;
-import com.abi.qms.platform.service.FactoryService;
 import com.abi.task.common.api.base.BaseResponse;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -38,8 +36,6 @@ public class BoxCodeFormatController {
     @Autowired
     private BoxCodeFormatService boxCodeFormatService;
 
-    @Autowired
-    private FactoryService factoryService;
 
     @ApiOperation("箱码幅面新增/修改")
     @PostMapping("saveBoxCodeFormat")
@@ -95,13 +91,4 @@ public class BoxCodeFormatController {
         return BaseResponse.create();
     }
 
-    @ApiOperation("包材厂下拉框")
-    @GetMapping("listPackageFactorySelect")
-    public BaseResponse<ListPackageFactorySelectRes> listPackageFactorySelect() {
-        //包材厂下拉框
-        ListPackageFactorySelectRes result = factoryService.listPackageFactorySelect();
-        //包装出参
-        return BaseResponse.create(result);
-    }
-
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/controller/console/FactoryController.java

@@ -5,10 +5,7 @@ import com.abi.qms.platform.dto.req.EnableFactoryReq;
 import com.abi.qms.platform.dto.req.GetFactoryDetailReq;
 import com.abi.qms.platform.dto.req.ListFactoryReq;
 import com.abi.qms.platform.dto.req.SaveFactoryReq;
-import com.abi.qms.platform.dto.res.ExcelImportRes;
-import com.abi.qms.platform.dto.res.GetFactoryDetailRes;
-import com.abi.qms.platform.dto.res.ListFactoryEnableRes;
-import com.abi.qms.platform.dto.res.ListFactoryRes;
+import com.abi.qms.platform.dto.res.*;
 import com.abi.qms.platform.service.FactoryService;
 import com.abi.task.common.api.base.BaseResponse;
 import com.abi.task.common.excel.ExcelInputFactory;
@@ -117,6 +114,23 @@ public class FactoryController {
         return BaseResponse.create(result);
     }
 
+    @ApiOperation("包材厂下拉框")
+    @GetMapping("listPackageFactorySelect")
+    public BaseResponse<ListPackageFactorySelectRes> listPackageFactorySelect() {
+        //包材厂下拉框
+        ListPackageFactorySelectRes result = factoryService.listPackageFactorySelect();
+        //包装出参
+        return BaseResponse.create(result);
+    }
+
+    @ApiOperation("啤酒厂下拉框")
+    @GetMapping("listBeerFactorySelect")
+    public BaseResponse<ListBeerFactorySelectRes> listBeerFactorySelect() {
+        //啤酒厂下拉框
+        ListBeerFactorySelectRes result = factoryService.listBeerFactorySelect();
+        //包装出参
+        return BaseResponse.create(result);
+    }
 
 }
 

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

@@ -0,0 +1,44 @@
+package com.abi.qms.platform.dto.res;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author Eurus
+ * @date 2021/5/21 15:07
+ * @Description: 啤酒厂下拉列表 出参
+ */
+@Data
+@ApiModel
+public class ListBeerFactorySelectRes  implements Serializable {
+
+    @ApiModelProperty("啤酒厂列表")
+    private List<FactoryBean> factoryBeanList;
+
+    /**
+     * 供应商bean
+     */
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @ToString
+    @ApiModel(value = "ListBeerFactorySelectRes_FactoryBean")
+    public static class FactoryBean implements Serializable {
+
+        @ApiModelProperty(value = "id")
+        private Long id;
+
+        @ApiModelProperty(value = "供应商code")
+        private String factoryCode;
+
+        @ApiModelProperty(value = "供应商名称")
+        private String factoryName;
+    }
+}

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/FactoryService.java

@@ -43,4 +43,10 @@ public interface FactoryService {
      * @return
      */
     ListPackageFactorySelectRes listPackageFactorySelect();
+
+    /**
+     * 啤酒厂下拉列表
+     * @return
+     */
+    ListBeerFactorySelectRes listBeerFactorySelect();
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/FactoryServiceImpl.java

@@ -288,6 +288,7 @@ public class FactoryServiceImpl implements FactoryService {
         }else{
             listPackageFactorySelectRes.setLoginType(LoginTypeEnum.NOT_PACKAGE.getCode());
         }
+        param.eq("factory_type", FactoryTypeEnum.COVER.getCode());
         param.eq("is_delete", 0);
         param.eq("valid", 1);
         List<BaseFactory> baseDepartments = baseFactoryMapper.selectList(param);
@@ -296,6 +297,19 @@ public class FactoryServiceImpl implements FactoryService {
         return listPackageFactorySelectRes;
     }
 
+    @Override
+    public ListBeerFactorySelectRes listBeerFactorySelect() {
+        QueryWrapper<BaseFactory> param = new QueryWrapper<>();
+        param.eq("factory_type", FactoryTypeEnum.BEER.getCode());
+        param.eq("is_delete", 0);
+        param.eq("valid", 1);
+        List<BaseFactory> baseDepartments = baseFactoryMapper.selectList(param);
+        ListBeerFactorySelectRes listBeerFactorySelectRes = new ListBeerFactorySelectRes();
+        List<ListBeerFactorySelectRes.FactoryBean> factoryBeans = PojoConverterUtils.copyList(baseDepartments, ListBeerFactorySelectRes.FactoryBean.class);
+        listBeerFactorySelectRes.setFactoryBeanList(factoryBeans);
+        return listBeerFactorySelectRes;
+    }
+
     /**
      * 检查批量导入的内容
      *

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

@@ -26,6 +26,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="factoryCoverName" column="factory_cover_name"/>
         <!-- 啤酒厂 -->
         <result property="factoryBeerName" column="factory_beer_name"/>
+        <!-- 物料名称 -->
+        <result property="materialName" column="material_name"/>
         <!-- 码库 -->
         <result property="qrRepertoryId" column="qr_Repertory_id"/>
         <result property="qrRepertoryName" column="qr_repertory_name"/>