ktg-common/pom.xml

@@ -157,12 +157,6 @@
             <version>2.2.9</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <scope>annotationProcessor</scope>
-        </dependency>
-
     </dependencies>
 
 </project>

ktg-mes/src/main/java/com/ktg/mes/md/mapper/AP0AEMapper.java

@@ -3,14 +3,12 @@ package com.ktg.mes.md.mapper;
 import com.ktg.common.annotation.DataSource;
 import com.ktg.common.enums.DataSourceType;
 import com.ktg.mes.md.domain.AP0AE;
-import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
 
 /**
  * @author Kelvin
  */
-@Mapper
 public interface AP0AEMapper {
     @DataSource(DataSourceType.SQLSERVER)
     List<AP0AE> selectOutNewData();

ktg-mes/src/main/java/com/ktg/mes/md/service/IAP0AEService.java

@@ -8,16 +8,8 @@ import java.util.List;
  * @author luo26
  */
 public interface IAP0AEService {
+    public List<AP0AE> selectOutNewData();
 
-    /**
-     * 获取借用记录
-     * @return 借用记录列表
-     */
-    public List<AP0AE> selectBorrowedNewData();
 
-    /**
+    public List<AP0AE> selectInNewData();
-     * 获取归还记录
-     * @return 归还记录列表
-     */
-    public List<AP0AE> selectReturnedNewData();
 }

ktg-mes/src/main/java/com/ktg/mes/md/service/impl/AP0AEServiceImpl.java

@@ -15,7 +15,6 @@ import com.ktg.mes.wm.domain.WmsInTask;
 import com.ktg.mes.wm.service.IWmStorageAreaService;
 import com.ktg.mes.wm.service.IWmsInPlanService;
 import com.ktg.mes.wm.service.IWmsInTaskService;
-import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -30,21 +29,29 @@ import java.util.List;
  * @author Kelvin
  */
 @Service
-@RequiredArgsConstructor
 public class AP0AEServiceImpl implements IAP0AEService {
-    private final AP0AEMapper aP0AEMapper;
+    @Autowired
-    private final IWmsInPlanService wmsInPlanService;
+    private AP0AEMapper aP0AEMapper;
-    private final IWmsInTaskService wmsInTaskService;
+
-    private final IWmStorageAreaService wmStorageAreaService;
+    @Autowired
-    private final IMdItemService mdItemService;
+    private IWmsInPlanService wmsInPlanService;
+
+    @Autowired
+    private IWmsInTaskService wmsInTaskService;
+
+    @Autowired
+    private IWmStorageAreaService wmStorageAreaService;
+
+    @Autowired
+    private IMdItemService mdItemService;
 
     @Override
-    public List<AP0AE> selectBorrowedNewData() {
+    public List<AP0AE> selectOutNewData() {
         return this.aP0AEMapper.selectOutNewData();
     }
 
     @Override
-    public List<AP0AE> selectReturnedNewData() {
+    public List<AP0AE> selectInNewData() {
         List<AP0AE> ap0aeList = aP0AEMapper.selectInNewData();
         ap0aeList.stream().filter(ap0ae -> ap0ae.getAE003() != null).forEach(ap0ae -> {
             WmsInPlan wmsInPlan = new WmsInPlan();