修改物料查询明细，添加SUK名称，及码类型

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

@@ -71,6 +71,16 @@ 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{

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

@@ -2,7 +2,9 @@ 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.ListMaterialReq;
+import com.abi.qms.platform.dto.req.QrOnePackageBatchReq;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
@@ -25,4 +27,11 @@ public interface BaseMaterialMapper extends BaseMapper<BaseMaterial> {
      */
     IPage<MaterialVO> listMaterial(IPage page, @Param("req") ListMaterialReq req);
 
+    /**
+     * 查询物料明细信息
+     * @param
+     * @return
+     */
+    MaterialVO getMaterialDetail(@Param("req") GetMaterialReq req);
+
 }

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

@@ -38,6 +38,14 @@ 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/service/MaterialService.java

@@ -73,6 +73,11 @@ 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/impl/MaterialServiceImpl.java

@@ -3,6 +3,8 @@ package com.abi.qms.platform.service.impl;
 import com.abi.qms.platform.dao.entity.BaseMaterial;
 import com.abi.qms.platform.dao.entity.BaseSku;
 import com.abi.qms.platform.dao.enums.MaterialTypeEnum;
+import com.abi.qms.platform.dao.enums.QrRepertoryTypeEnum;
+import com.abi.qms.platform.dao.enums.QrTypeEnum;
 import com.abi.qms.platform.dao.enums.ValidEnum;
 import com.abi.qms.platform.dao.mapper.BaseMaterialMapper;
 import com.abi.qms.platform.dao.mapper.BaseSkuMapper;
@@ -150,6 +152,29 @@ 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

@@ -9,39 +9,11 @@ import com.abi.qms.platform.dao.entity.QrPackageBatch;
 import com.abi.qms.platform.dao.entity.QrPackageDownloadRecord;
 import com.abi.qms.platform.dao.entity.QrRepertoryColumn;
 import com.abi.qms.platform.dao.entity.UserInfo;
-import com.abi.qms.platform.dao.enums.FactoryLevelEnum;
-import com.abi.qms.platform.dao.enums.FactoryTypeEnum;
-import com.abi.qms.platform.dao.enums.InvalidEnum;
-import com.abi.qms.platform.dao.enums.QrPackageApplyStatusEnum;
-import com.abi.qms.platform.dao.enums.QrPackageGenerateStatusEnum;
-import com.abi.qms.platform.dao.enums.QrRepertoryTypeEnum;
-import com.abi.qms.platform.dao.mapper.BaseActiveMapper;
-import com.abi.qms.platform.dao.mapper.BaseFactoryMapper;
-import com.abi.qms.platform.dao.mapper.QrBoxMappingMapper;
-import com.abi.qms.platform.dao.mapper.QrPackageBatchMapper;
-import com.abi.qms.platform.dao.mapper.QrPackageDownloadRecordMapper;
-import com.abi.qms.platform.dao.mapper.QrPackageMapper;
-import com.abi.qms.platform.dao.mapper.QrRepertoryColumnMapper;
+import com.abi.qms.platform.dao.enums.*;
+import com.abi.qms.platform.dao.mapper.*;
 import com.abi.qms.platform.dao.tablestore.entity.QrCode;
-import com.abi.qms.platform.dao.vo.result.PackageActiveVO;
-import com.abi.qms.platform.dao.vo.result.QrBoxMappingVO;
-import com.abi.qms.platform.dao.vo.result.QrPackageBatchVO;
-import com.abi.qms.platform.dao.vo.result.QrPackageVO;
-import com.abi.qms.platform.dao.vo.result.QrSingleCheckVO;
-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.QrOneBoxCodeMappingReq;
-import com.abi.qms.platform.dto.req.QrOnePackageBatchReq;
-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.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;
@@ -137,6 +109,8 @@ public class QrPackageServiceImpl implements QrPackageService {
     @Autowired
     private TableStoreUtils tableStoreUtils;
 
+    @Autowired
+    private BaseMaterialMapper baseMaterialMapper;
     /**
      * 保存码包
      */
@@ -293,7 +267,16 @@ 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();
+        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());
+        }
+        //end
         return qrPackage;
     }
 

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

@@ -53,4 +53,12 @@
 
     </select>
 
+    <select id="getMaterialDetail" 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
+        from base_material m
+        left join base_sku bs on m.sku_id = bs.id
+        where m.id = #{req.id}
+    </select>
 </mapper>