From 5bfd9fa520568feb3462814ab4c20f89e07209cc Mon Sep 17 00:00:00 2001
From: Yangwl <1726150332@qq.com>
Date: Thu, 28 Mar 2024 16:36:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=A5=E6=96=99=E6=A3=80=E9=AA=8C=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E7=89=A9=E6=96=99=E5=87=AD=E8=AF=81=E5=8F=B7=E3=80=81?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E5=87=AD=E8=AF=81=E4=B8=AD=E7=9A=84=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../op/system/api/domain/quality/QcCheckTaskIncomeDTO.java  | 4 ++--
 op-modules/op-mes/src/main/resources/bootstrap.yml          | 6 ++++++
 .../main/java/com/op/sap/service/impl/SapItemSyncImpl.java  | 3 +++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/QcCheckTaskIncomeDTO.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/QcCheckTaskIncomeDTO.java
index 037a6dc6..59646ec0 100644
--- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/QcCheckTaskIncomeDTO.java
+++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/QcCheckTaskIncomeDTO.java
@@ -98,11 +98,11 @@ public class QcCheckTaskIncomeDTO extends BaseEntity {
 	private String status;
 
 	/** 预留字段1 */
-	//@Excel(name = "预留字段1")
+	@Excel(name = "物料凭证编号")
 	private String attr1;
 
 	/** 预留字段2 */
-	//@Excel(name = "预留字段2")
+	@Excel(name = "物料凭证中的项目")
 	private String attr2;
 
 	/** 预留字段3 */
diff --git a/op-modules/op-mes/src/main/resources/bootstrap.yml b/op-modules/op-mes/src/main/resources/bootstrap.yml
index b0d04e08..1a148b14 100644
--- a/op-modules/op-mes/src/main/resources/bootstrap.yml
+++ b/op-modules/op-mes/src/main/resources/bootstrap.yml
@@ -28,3 +28,9 @@ spring:
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+  servlet:
+    multipart:
+      max-file-size: 50MB
+      max-request-size: 50MB
+
+
diff --git a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java
index a6852414..41400e15 100644
--- a/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java
+++ b/op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java
@@ -411,6 +411,9 @@ public class SapItemSyncImpl implements SapItemSyncService {
                 qcCheckTaskIncomeDTO.setSupplierName(maraTable.getString("LIFNR_NM"));
                 qcCheckTaskIncomeDTO.setMaterialCode(maraTable.getString("MATNR"));//物料号
                 qcCheckTaskIncomeDTO.setMaterialName(maraTable.getString("MAKTX"));//物料描述
+                qcCheckTaskIncomeDTO.setMaterialName(maraTable.getString("MAKTX"));//物料描述
+                qcCheckTaskIncomeDTO.setAttr1(maraTable.getString("MBLNR"));//物料凭证编号
+                qcCheckTaskIncomeDTO.setAttr2(maraTable.getString("ZEILE"));//物料凭证中的项目
                 qcCheckTaskIncomeDTO.setQuality(new BigDecimal(maraTable.getString("MENGE")));//数量
                 qcCheckTaskIncomeDTO.setUnit(maraTable.getString("MEINS"));//单位
                 String inputDateTime = maraTable.getString("CPUDT")+" "+maraTable.getString("CPUTM");