修改码包新增里面物料查询明细

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

@@ -102,7 +102,7 @@ public class QrPackageController {
         return BaseResponse.create();
     }
 
-    @ApiOperation("码类型查询")
+    @ApiOperation("码包物料查询")
     @GetMapping("getPackageCodeType")
     public BaseResponse<GetPackageCodeRes> getPackageCodeType(@Validated GetPackageCodeReq getPackageCodeReq){
         //查询物料明细

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/entity/QrPackage.java

@@ -78,6 +78,9 @@ public class QrPackage implements Serializable {
 	@Schema(name = "是否已下载")
     private Integer isDownload;
 
+	@Schema(name = "下载时间")
+	private LocalDateTime downloadTime;
+
 	@Schema(name = "创建时间")
 	@TableField(fill = FieldFill.INSERT)
 	private LocalDateTime createTime;

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

@@ -1,6 +1,7 @@
 package com.abi.qms.platform.dao.mapper;
 
 import com.abi.qms.platform.dao.entity.BaseMaterial;
+import com.abi.qms.platform.dao.vo.result.BaseSapMateriVO;
 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;
@@ -29,10 +30,10 @@ public interface BaseMaterialMapper extends BaseMapper<BaseMaterial> {
     IPage<MaterialVO> listMaterial(IPage page, @Param("req") ListMaterialReq req);
 
     /**
-     * 获取码类型
+     * 获取码包物料信息
      * @param req
      * @return
      */
-    MaterialVO getPackageCodeType(@Param("req") GetPackageCodeReq req);
+    BaseSapMateriVO getPackageCodeType(@Param("req") GetPackageCodeReq req);
 
 }

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

@@ -0,0 +1,32 @@
+package com.abi.qms.platform.dao.vo.result;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ *码包新增选择物料后下拉展示 出参
+ * @author liguosong
+ */
+@Data
+@ApiModel
+public class BaseSapMateriVO {
+    @Schema(name = "id")
+    private Long id;
+
+    @Schema(name = "物料名称")
+    private String materialName;
+
+    @Schema(name = "物料类型: 1-瓶子 2-PET 3-罐子 4-瓶盖 5-纸板箱 6-塑箱 7-小桶&叉子 8-托盘")
+    private Integer materialType;
+
+    @Schema(name = "采购数量")
+    private Long  purchaseCount;
+
+    @Schema(name = "啤酒厂名称")
+    private String sapBeerFactoryName;
+
+    @Schema(name = "包材厂名称")
+    private String sapCoverFactoryName;
+
+}

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

@@ -20,6 +20,14 @@ public class GetPackageCodeRes {
     @Schema(name = "码类型")
     private Integer qrType;
 
+    @Schema(name = "采购数量")
+    private Long purchaseCount;
+
+    @Schema(name = "包材厂")
+    private String sapCoverFactoryName;
+
+    @Schema(name = "啤酒厂")
+    private String sapBeerFactoryName;
     //603版 已废弃
     /*@Schema(name = "SKU商品名称")
     private String skuName;*/

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

@@ -567,7 +567,10 @@ public class QrPackageServiceImpl implements QrPackageService {
                 .setCreateBy(userId)
                 .setQrPackageId(qrPackage.getId());
         qrPackageDownloadRecordMapper.insert(downloadRecord);
-
+        //更新码包表下载时间
+        QrPackage qrPackages=new QrPackage()
+                .setDownloadTime(LocalDateTime.now());
+        qrPackageMapper.updateById(qrPackages);
     }
 
     /**
@@ -788,12 +791,12 @@ public class QrPackageServiceImpl implements QrPackageService {
         //判断ID是否为空
         AssertUtil.isNull(req.getId(),"物料ID为空");
         //查询物料类型
-        MaterialVO materialVO=baseMaterialMapper.getPackageCodeType(req);
-        AssertUtil.isNull(materialVO, "物料不存在");
+        BaseSapMateriVO BaseSap=baseMaterialMapper.getPackageCodeType(req);
+        AssertUtil.isNull(BaseSap, "物料不存在");
         //根据物料类型转换箱码类型
-        Integer qrType = getPackageCode(materialVO.getMaterialType());
+        Integer qrType = getPackageCode(BaseSap.getMaterialType());
         //转化出参
-        GetPackageCodeRes res = PojoConverterUtils.copy(materialVO, GetPackageCodeRes.class);
+        GetPackageCodeRes res = PojoConverterUtils.copy(BaseSap, GetPackageCodeRes.class);
         //码类型赋值
         res.setQrType(qrType);
         return res;

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

@@ -52,10 +52,19 @@
 
     </select>
 
-    <select id="getPackageCodeType" resultType="com.abi.qms.platform.dao.vo.result.MaterialVO">
+    <select id="getPackageCodeType" resultType="com.abi.qms.platform.dao.vo.result.BaseSapMateriVO">
         select
-        m.id, m.material_name, m.material_type
-        from base_material m
+            bm.id,
+            bm.material_name,
+            bm.material_type,
+            soi.purchase_count,
+            sbf.sap_beer_factory_name,
+            scf.sap_cover_factory_name
+        from base_material bm
+                 left join base_sap_material bsm on bm.material_code=bsm.sap_material_id
+                 left join qr_package_sap_order_item soi on soi.sap_material_id=bsm.sap_material_id
+                 left join base_sap_beer_factory sbf on soi.sap_beer_factory_id=sbf.sap_beer_factory_id
+                 left join base_sap_cover_factory scf on scf.sap_cover_factory_id=soi.sap_cover_factory_id
         where m.id = #{req.id}
     </select>
 </mapper>

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

@@ -20,6 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result column="REASON_APPLY" property="reasonApply" />
         <result column="DOWNLOAD_PATH" property="downloadPath" />
         <result column="IS_DOWNLOAD" property="isDownload" />
+        <result column="DOWNLOAD_TIME" property="downloadTime" />
         <result column="CREATE_TIME" property="createTime" />
         <result column="CREATE_BY" property="createBy" />
         <result column="UPDATE_TIME" property="updateTime" />