Merge remote-tracking branch 'origin/feature/1.0.0' into feature/1.0.0

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

@@ -71,16 +71,6 @@ public class MaterialController {
         return BaseResponse.create(result);
     }
 
-    @ApiOperation("查询物料明细加SUK名称")
-    @GetMapping("getMaterialDetail")
-    public BaseResponse<GetMaterialRes> getMaterialDetail(@Validated GetMaterialReq getMaterialReq) throws Exception{
-        //查询物料明细
-        GetMaterialRes  result = materialService.getMaterialDetail(getMaterialReq);
-        //包装出参
-        return BaseResponse.create(result);
-    }
-
-
     @ApiOperation("物料启用")
     @PostMapping("enableMaterial")
     public BaseResponse enableMaterial(@Validated @RequestBody EnableMaterialReq enableMaterialReq) throws Exception{
@@ -125,13 +115,6 @@ public class MaterialController {
         return BaseResponse.create(result);
     }
 
-
-
-
-
-
-
-
 }
 
 

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

@@ -1,9 +1,8 @@
 package com.abi.qms.platform.controller.console;
 
 import com.abi.qms.platform.dto.req.*;
-import com.abi.qms.platform.dto.res.CheckQrPackageRepetitiveRes;
-import com.abi.qms.platform.dto.res.GetQrPackageDetailRes;
-import com.abi.qms.platform.dto.res.ListQrPackageRes;
+import com.abi.qms.platform.dto.res.*;
+import com.abi.qms.platform.service.MaterialService;
 import com.abi.qms.platform.service.QrPackageService;
 import com.abi.task.common.api.base.BaseResponse;
 import io.swagger.annotations.Api;
@@ -29,6 +28,9 @@ public class QrPackageController {
     @Autowired
     private QrPackageService qrPackageService;
 
+    @Autowired
+    private MaterialService materialService;
+
     @ApiOperation("码包新增修改")
     @PostMapping("/saveQrPackage")
     public BaseResponse saveQrPackage(@Validated @RequestBody SaveQrPackageReq saveQrPackageReq) {
@@ -80,7 +82,7 @@ public class QrPackageController {
         return BaseResponse.create();
     }
 
-    @ApiOperation("/下载码包")
+    @ApiOperation("下载码包")
     @GetMapping("/downloadQrPackage")
     public void downloadQrPackage(@Validated DownloadQrPackageReq downloadQrPackageReq, HttpServletResponse response) {
         qrPackageService.downloadQrPackage(downloadQrPackageReq, response);
@@ -100,4 +102,12 @@ public class QrPackageController {
         return BaseResponse.create();
     }
 
+    @ApiOperation("码类型查询")
+    @GetMapping("getPackageCodeType")
+    public BaseResponse<GetPackageCodeRes> getPackageCodeType(@Validated GetPackageCodeReq getPackageCodeReq){
+        //查询物料明细
+        GetPackageCodeRes  result = qrPackageService.getPackageCodeType(getPackageCodeReq);
+        //包装出参
+        return BaseResponse.create(result);
+    }
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/mapper/BaseMaterialMapper.java

@@ -3,6 +3,7 @@ package com.abi.qms.platform.dao.mapper;
 import com.abi.qms.platform.dao.entity.BaseMaterial;
 import com.abi.qms.platform.dao.vo.result.MaterialVO;
 import com.abi.qms.platform.dto.req.GetMaterialReq;
+import com.abi.qms.platform.dto.req.GetPackageCodeReq;
 import com.abi.qms.platform.dto.req.ListMaterialReq;
 import com.abi.qms.platform.dto.req.QrOnePackageBatchReq;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -28,10 +29,10 @@ public interface BaseMaterialMapper extends BaseMapper<BaseMaterial> {
     IPage<MaterialVO> listMaterial(IPage page, @Param("req") ListMaterialReq req);
 
     /**
-     * 查询物料明细信息
-     * @param
+     * 获取码类型
+     * @param req
      * @return
      */
-    MaterialVO getMaterialDetail(@Param("req") GetMaterialReq req);
+    MaterialVO getPackageCodeType(@Param("req") GetPackageCodeReq req);
 
 }

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

@@ -0,0 +1,15 @@
+package com.abi.qms.platform.dto.req;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * @author:Li.guosong
+ * @Description: 码类型查询入参
+ */
+@Data
+@Schema
+public class GetPackageCodeReq {
+    @Schema(name = "id")
+    private Long id;
+}

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

@@ -38,14 +38,6 @@ public class GetMaterialRes implements Serializable {
     @Schema(name = "SKU商品Id")
     private Long skuId;
 
-    //20210602 lgs sta
-    @Schema(name = "SKU商品名称")
-    private String skuName;
-
-    @Schema(name = "码类型")
-    private String qrType;
-    //end
-
     @ApiModelProperty(value = "创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;

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

@@ -0,0 +1,26 @@
+package com.abi.qms.platform.dto.res;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+  * 码类型查询出参
+  * @author Liguosong
+  * @date: 20210602
+ */
+@Data
+@Schema
+public class GetPackageCodeRes {
+    @Schema(name = "id")
+    private Long id;
+
+    @Schema(name = "物料名称")
+    private String materialName;
+
+    @Schema(name = "码类型")
+    private Integer qrType;
+
+    @Schema(name = "SKU商品名称")
+    private String skuName;
+
+}

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

@@ -73,11 +73,5 @@ public interface MaterialService{
      */
     ListMaterialForSelectRes listMaterialForSelect(ListMaterialForSelectReq listMaterialForSelectReq) throws Exception;
 
-    /**
-     * lgs 20210602
-     * 查询物料明细（添加出参：SKU名称）
-     * @param req
-     * @return
-     */
-    GetMaterialRes getMaterialDetail(GetMaterialReq req);
+
 }

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

@@ -2,22 +2,8 @@ package com.abi.qms.platform.service;
 
 
 import com.abi.qms.platform.dao.entity.QrPackage;
-import com.abi.qms.platform.dto.req.DeleteQrPackageReq;
-import com.abi.qms.platform.dto.req.DownloadQrPackageReq;
-import com.abi.qms.platform.dto.req.GetQrPackageDetailReq;
-import com.abi.qms.platform.dto.req.GetQrSingleCheckDetailCodeReq;
-import com.abi.qms.platform.dto.req.InvalidQrPackageReq;
-import com.abi.qms.platform.dto.req.InvalidQrSingleReq;
-import com.abi.qms.platform.dto.req.ListQrPackageReq;
-import com.abi.qms.platform.dto.req.PassQrPackageReq;
-import com.abi.qms.platform.dto.req.RefuseQrPackageReq;
-import com.abi.qms.platform.dto.req.SaveQrPackageReq;
-import com.abi.qms.platform.dto.req.SendMobileMsgReq;
-import com.abi.qms.platform.dto.req.ValidSAPOrderNoAndMaterialReq;
-import com.abi.qms.platform.dto.res.GetQrPackageDetailRes;
-import com.abi.qms.platform.dto.res.GetQrSingleCheckDetailRes;
-import com.abi.qms.platform.dto.res.ListQrPackageRes;
-import com.abi.qms.platform.dto.res.ValidSAPOrderNoAndMaterialRes;
+import com.abi.qms.platform.dto.req.*;
+import com.abi.qms.platform.dto.res.*;
 
 import javax.servlet.http.HttpServletResponse;
 
@@ -114,4 +100,11 @@ public interface QrPackageService {
      * @param invalidQrSingleReq
      */
     void invalidQrSingle(InvalidQrSingleReq invalidQrSingleReq);
+
+    /**
+     * 根据物料ID获取码包code
+     * @param req
+     * @return
+     */
+    GetPackageCodeRes getPackageCodeType(GetPackageCodeReq req);
 }

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

@@ -152,25 +152,7 @@ public class MaterialServiceImpl implements MaterialService {
 
     }
 
-    /**
-     *
-     * @param req
-     * @return
-     */
-    @Override
-    public GetMaterialRes getMaterialDetail(GetMaterialReq req){
-        AssertUtil.isNull(req.getId(),"物料ID为空");
-        MaterialVO materialVO=baseMaterialMapper.getMaterialDetail(req);
-        AssertUtil.isNull(materialVO, "物料不存在");
-        // //转化出参
-        GetMaterialRes res = PojoConverterUtils.copy(materialVO, GetMaterialRes.class);
-        if (MaterialTypeEnum.BOTTLE_CAP.is(materialVO.getMaterialType())) {
-            res.setQrType(QrTypeEnum.CAP.getName());
-        }else{
-            res.setQrType(QrTypeEnum.CARTON.getName());
-        }
-        return res;
-    }
+
 
 
 

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

@@ -22,10 +22,7 @@ import com.abi.qms.platform.dao.mapper.*;
 import com.abi.qms.platform.dao.tablestore.entity.QrCode;
 import com.abi.qms.platform.dao.vo.result.*;
 import com.abi.qms.platform.dto.req.*;
-import com.abi.qms.platform.dto.res.GetQrPackageDetailRes;
-import com.abi.qms.platform.dto.res.GetQrSingleCheckDetailRes;
-import com.abi.qms.platform.dto.res.ListQrPackageRes;
-import com.abi.qms.platform.dto.res.ValidSAPOrderNoAndMaterialRes;
+import com.abi.qms.platform.dto.res.*;
 import com.abi.qms.platform.infrastructure.mq.GenerateCodeConsumer;
 import com.abi.qms.platform.infrastructure.util.AssertUtil;
 import com.abi.qms.platform.infrastructure.util.FreeMarkerUtils;
@@ -279,15 +276,12 @@ public class QrPackageServiceImpl implements QrPackageService {
         qrPackage.setStandbyRatio(req.getStandbyRatio());
         qrPackage.setReasonApply(req.getReasonApply());
         qrPackage.setInvalid(InvalidEnum.NOT_INVALID.getCode());
-        //20210602 lgs sta 根据物料ID查询物料类型，判断码类型，保存至码包表中
-        GetMaterialReq Material=new GetMaterialReq();
+        //sta 根据物料ID查询物料类型，判断码类型，保存至码包表中
+        GetPackageCodeReq Material=new GetPackageCodeReq();
         Material.setId(req.getMaterialId());
-        MaterialVO vo=baseMaterialMapper.getMaterialDetail(Material);
-        if (MaterialTypeEnum.BOTTLE_CAP.is(vo.getMaterialType())) {
-            qrPackage.setQrType(QrTypeEnum.CAP.getCode());
-        }else{
-            qrPackage.setQrType(QrTypeEnum.CARTON.getCode());
-        }
+        MaterialVO vo=baseMaterialMapper.getPackageCodeType(Material);
+        AssertUtil.isNull(vo, "物料信息不存在");
+        qrPackage.setQrType(getPackageCode(vo.getMaterialType()));
         //end
         return qrPackage;
     }
@@ -791,6 +785,33 @@ public class QrPackageServiceImpl implements QrPackageService {
             throw new BusinessException("更新tableStore异常");
         }
     }
+    @Override
+    public GetPackageCodeRes getPackageCodeType(GetPackageCodeReq req){
+        //判断ID是否为空
+        AssertUtil.isNull(req.getId(),"物料ID为空");
+        //查询物料类型及suk名称
+        MaterialVO materialVO=baseMaterialMapper.getPackageCodeType(req);
+        AssertUtil.isNull(materialVO, "物料不存在");
+        //转化出参
+        GetPackageCodeRes res = PojoConverterUtils.copy(materialVO, GetPackageCodeRes.class);
+        //码类型赋值
+        res.setQrType(getPackageCode(materialVO.getMaterialType()));
+        return res;
+    }
 
+    /**
+     * 根据物料类型转换码类型
+     * 物料类型： 4-瓶盖 5-纸板箱
+     * 码类型：1-箱码 2-盖码
+     * @param type
+     * @return
+     */
+    public Integer getPackageCode(Integer type){
+        if (MaterialTypeEnum.BOTTLE_CAP.is(type)) {
+            return QrTypeEnum.CAP.getCode();
+        }else{
+            return  QrTypeEnum.CARTON.getCode();
+        }
 
+    }
 }

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

@@ -53,10 +53,9 @@
 
     </select>
 
-    <select id="getMaterialDetail" resultType="com.abi.qms.platform.dao.vo.result.MaterialVO">
+    <select id="getPackageCodeType" resultType="com.abi.qms.platform.dao.vo.result.MaterialVO">
         select
-        m.id, m.material_code, m.material_name, m.material_type, m.description,
-        m.valid,m.create_time,m.update_time,bs.sku_name
+        m.id, m.material_name, m.material_type,bs.sku_name
         from base_material m
         left join base_sku bs on m.sku_id = bs.id
         where m.id = #{req.id}