Merge remote-tracking branch 'origin/dev' into dev

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java

@@ -45,8 +45,6 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
     @Resource
     private PurchaseCheckDetailsMapper checkDetailsMapper;
 
-    @Autowired
-    private IPurchaseMacodeInfoService purchaseMacodeInfoService;
 
 
     /**
@@ -271,12 +269,12 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
      * @return 结果
      */
     @Override
-    public int modifyManageStatus(MaInputVO maInputVO) throws Exception {
+    public int modifyManageStatus(MaInputVO maInputVO) {
         if (maInputVO.getInputRecordList().get(0) != null && maInputVO.getInputRecordList().get(0).getTaskId() != null) {
             Long taskId = maInputVO.getInputRecordList().get(0).getTaskId();
             PurchaseMacodeInfo purchaseMacodeInfo = new PurchaseMacodeInfo();
             purchaseMacodeInfo.setTaskId(taskId);
-            List<PurchaseMacodeInfo> purchaseMacodeInfos = purchaseMacodeInfoService.selectPutinDetails(purchaseMacodeInfo);
+            List<PurchaseMacodeInfo> purchaseMacodeInfos = selectPutinDetails(purchaseMacodeInfo);
             for (PurchaseMacodeInfo macodeInfo : purchaseMacodeInfos) {
                 if (macodeInfo.getMaCode() == null) {
                     return 0;