查询sap order item 加一个出参

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

@@ -32,7 +32,7 @@ public class BaseMaterial {
 	@Schema(name = "物料名称")
     private String materialName;
 
-	@Schema(name = "物料类型: 1-瓶子 2-PET 3-罐盖 4-瓶盖 5-纸板箱 6-塑箱 7-小桶&叉子 8-托盘")
+	@Schema(name = "物料类型: 3-罐盖 4-瓶盖 5-纸板箱")
     private Integer materialType;
 
     @Schema(name = "活动ID")

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

@@ -114,4 +114,7 @@ public class QrPackage implements Serializable {
 	@Schema(name = "是否作废 0-未作废 1-已作废")
 	private Integer invalid;
 
+	@Schema(name = "生成码包错误堆栈信息")
+	private String generateErrStackInfo;
+
 }

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

@@ -33,6 +33,9 @@ public class GetPackageCodeRes {
     @Schema(name = "物料id")
     private Long materialId;
 
+    @Schema(name = "物料类型: 3-罐盖 4-瓶盖 5-纸板箱")
+    private Integer materialType;
+
     @Schema(name = "采购数量")
     private Long purchaseCount;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/infrastructure/event/CodePackageCreateListener.java

@@ -1,9 +1,11 @@
 package com.abi.qms.platform.infrastructure.event;
 
+import cn.hutool.core.exceptions.ExceptionUtil;
 import com.abi.qms.platform.dao.entity.QrPackage;
 import com.abi.qms.platform.dao.enums.QrPackageGenerateStatusEnum;
 import com.abi.qms.platform.service.GenerateCodeService;
 import com.abi.qms.platform.service.QrPackageService;
+import com.abi.task.common.api.exception.BusinessException;
 import freemarker.template.TemplateException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,7 +41,9 @@ public class CodePackageCreateListener {
             QrPackage qrPackage = new QrPackage();
             qrPackage.setId(qrPackageId);
             qrPackage.setGenerateStatus(QrPackageGenerateStatusEnum.GENERATE_FAIL.getCode());
+            qrPackage.setGenerateErrStackInfo(e.getMessage()+" stack:"+ExceptionUtil.stacktraceToOneLineString(e));
             qrPackageService.failedRollback(qrPackage);
         }
     }
+
 }

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

@@ -784,7 +784,9 @@ public class QrPackageServiceImpl implements QrPackageService {
     @Override
     public void failedRollback(QrPackage qrPackage) {
         // 更改生成状态为生成失败
-        QrPackage qrPackageUpdate = new QrPackage().setId(qrPackage.getId()).setGenerateStatus(QrPackageGenerateStatusEnum.GENERATE_FAIL.getCode());
+        QrPackage qrPackageUpdate = new QrPackage().setId(qrPackage.getId())
+                .setGenerateStatus(QrPackageGenerateStatusEnum.GENERATE_FAIL.getCode())
+                .setGenerateErrStackInfo(qrPackage.getGenerateErrStackInfo());
         qrPackageMapper.updateById(qrPackageUpdate);
     }
 
@@ -1044,6 +1046,7 @@ public class QrPackageServiceImpl implements QrPackageService {
         res.setFactoryBeerName(beerFactory.getFactoryName());
         res.setIsFirstFactory(coverFactory.getIsFirstFactory());
         res.setMaterialId(material.getId());
+        res.setMaterialType(material.getMaterialType());
         res.setPurchaseCount(orderItem.getPurchaseCount());
         res.setQrType(getPackageCode(material.getMaterialType()));
 

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

@@ -30,6 +30,9 @@
         <result column="QR_TYPE" property="qrType"/>
         <result column="FACTORY_COVER_LEVEL_TWO_ID" property="factoryCoverLevelTwoId"/>
         <result column="INVALID" property="invalid"/>
+        <result column="generate_err_stack_info" property="generateErrStackInfo"/>
+
+
     </resultMap>
 
     <select id="listQrPackage" resultType="com.abi.qms.platform.dao.vo.result.QrPackageVO">

abi-cloud-qr-platform-server/src/test/java/com/abi/qms/platform/EncryptionTest.java

@@ -61,9 +61,9 @@ public class EncryptionTest {
     public static void main(String[] args) {
         String key = "EC/Z+S7c3EFJa2dtvLyekg==";
         // 单个字符串解码
-        // String content = "aLI5iXza3R/w7aJ2AsYhUT7EGS0Zqk94k1nXK9rT8AvJGMbMUJytae53f82pFphWy0bmnEGv4fWb6RcpE9m3tQ==";
+        String content = "aLI5iXza3R/w7aJ2AsYhUT7EGS0Zqk94k1nXK9rT8Av5vycunG6LV66hW277u21j68NwDCVe7b1uVF8/sZaqnQ==";
         // 文件解码
-        String content = readToString("C:\\Users\\ThinkPad\\Downloads\\8905ecf5-bfaa-4962-9743-04a5ca2a8807\\1.txt");
+        //String content = readToString("C:\\Users\\ThinkPad\\Downloads\\8905ecf5-bfaa-4962-9743-04a5ca2a8807\\1.txt");
         String decodeStr = AesEncodeUtil.aesDecode(content, key);
         System.out.println(decodeStr);
     }