Merge remote-tracking branch 'origin/master'

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

@@ -2,6 +2,7 @@ package com.ktg.mes.md.mapper;
 
 import com.ktg.mes.md.domain.BaseKnife;
 import com.ktg.mes.md.domain.MdItem;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -12,6 +13,7 @@ import java.util.List;
  * @author yinjinlu
  * @date 2024-10-31
  */
+@Mapper
 public interface BaseKnifeMapper {
     /**
      * 查询工具台账

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

@@ -1,6 +1,7 @@
 package com.ktg.mes.md.mapper;
 
 import com.ktg.mes.wm.domain.UcmCtMaterial;
+import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
 
@@ -10,6 +11,7 @@ import java.util.List;
  * @author yinjinlu
  * @date 2024-11-15
  */
+@Mapper
 public interface UcmCtMaterialMapper2 {
     /**
      * 查询料箱物料绑定

ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/UcmCtBaseServiceImpl.java

@@ -12,6 +12,7 @@ import com.ktg.mes.wm.domain.box.BoxItem;
 import com.ktg.mes.wm.domain.box.RfidCard;
 import com.ktg.mes.wm.mapper.UcmCtBaseMapper;
 import com.ktg.mes.wm.service.IUcmCtBaseService;
+import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -28,15 +29,11 @@ import static org.apache.commons.lang3.SystemUtils.getUserName;
  * @date 2024-10-31
  */
 @Service
+@RequiredArgsConstructor
 public class UcmCtBaseServiceImpl implements IUcmCtBaseService {
-    @Autowired
-    private UcmCtBaseMapper ucmCtBaseMapper;
-
-    @Autowired
-    private BaseKnifeMapper baseKnifeMapper;
-
-    @Autowired
-    private UcmCtMaterialMapper2 ucmCtMaterialMapper2;
+    private final UcmCtBaseMapper ucmCtBaseMapper;
+    private final BaseKnifeMapper baseKnifeMapper;
+    private final UcmCtMaterialMapper2 ucmCtMaterialMapper2;
 
     /**
      * 查询料箱管理