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 037a6dc69..59646ec0c 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 b0d04e081..1a148b145 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 a6852414d..41400e15e 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");