diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/config/SAPConfig.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/config/SAPConfig.java index f24b5bdf..bb7d6d96 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/config/SAPConfig.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/config/SAPConfig.java @@ -92,6 +92,7 @@ public class SAPConfig { } @Bean(destroyMethod = "") + @Lazy public JCoDestination jcoDestination() throws JCoException { return JCoDestinationManager.getDestination(ABAP_AS_POOLED); } diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/SapService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/SapService.java index 584b4579..6e5febd0 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/SapService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/SapService.java @@ -21,6 +21,7 @@ import com.nflg.wms.common.util.VUtil; import com.sap.conn.jco.*; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; import java.math.BigDecimal; @@ -32,9 +33,11 @@ import java.util.stream.Collectors; public class SapService { @Resource + @Lazy private JCoDestination destination; @Resource + @Lazy private JCoRepository repository; /** diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InventoryVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InventoryVO.java index f1a0ad50..16676ee8 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InventoryVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InventoryVO.java @@ -38,4 +38,9 @@ public class InventoryVO { * 批次号 */ private String batchNumber; + + /** + * 序列号 + */ + private String serialNo; } diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsInventoryMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsInventoryMapper.xml index 822ad624..7a732e25 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsInventoryMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsInventoryMapper.xml @@ -3,7 +3,7 @@