优化

platform-dao/src/main/java/com/platform/dao/dto/store/SpareStoreDTO.java

@@ -24,6 +24,7 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class SpareStoreDTO extends BaseDTO implements Serializable {
+    private String pickId;
 
     private Integer tokenType;
     /**

platform-service/src/main/java/com/platform/service/yongyou/impl/YongyouServiceImpl.java

@@ -10,14 +10,17 @@ import com.platform.common.util.StringUtils;
 import com.platform.common.yongyou.request.*;
 import com.platform.common.yongyou.response.*;
 import com.platform.dao.bean.MyVOPage;
+import com.platform.dao.dto.repair.RepairApplicationFormDTO;
 import com.platform.dao.dto.sqarepartmanage.SparePartInfoDTO;
 import com.platform.dao.dto.store.SpareStoreDTO;
+import com.platform.dao.entity.repair.RepairApplicationForm;
 import com.platform.dao.entity.sb.SbInfo;
 import com.platform.dao.entity.sb.SbModelSpareBom;
 import com.platform.dao.entity.store.OutStoreDetail;
 import com.platform.dao.entity.store.OutStoreForm;
 import com.platform.dao.enums.OutStoreStatusEnum;
 import com.platform.dao.enums.YesNoEnum;
+import com.platform.dao.mapper.repair.RepairApplicationFormMapper;
 import com.platform.dao.mapper.sb.SbInfoMapper;
 import com.platform.dao.mapper.sb.SbModelSpareBomMapper;
 import com.platform.dao.vo.query.sparepartmanage.SparePartInfoVO;
@@ -31,6 +34,7 @@ import handler.yongyou.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
@@ -57,6 +61,8 @@ public class YongyouServiceImpl implements YongyouService {
     private SbInfoMapper sbInfoMapper;
     @Resource
     private SbModelSpareBomMapper sbModelSpareBomMapper;
+    @Resource
+    private RepairApplicationFormMapper repairApplicationFormMapper;
     private String token_key = "yongyou-token";
     private String Conn_key = "yongyou-Conn";
     private String cAcc_ID_key = "yongyou-cAcc_ID";
@@ -274,6 +280,22 @@ public class YongyouServiceImpl implements YongyouService {
                 throw new BusinessException("系统有误，请查验！");
             }
             spareIds = sbModelSpareBoms.stream().map(SbModelSpareBom::getSpareId).collect(Collectors.toList());
+        }else if (record.getPickId()!=null){
+            RepairApplicationForm form = new RepairApplicationForm();
+            form.setId(record.getPickId());
+            RepairApplicationForm repairApplicationForm = repairApplicationFormMapper.selectOne(form);
+            SbInfo sbInfo = new SbInfo();
+            sbInfo.setId(record.getSbId());
+            sbInfo = sbInfoMapper.selectByPrimaryKey(sbInfo);
+            List<SbModelSpareBom> sbModelSpareBoms = new ArrayList<>();
+            if (sbInfo!=null){
+                SbModelSpareBom bom = new SbModelSpareBom();
+                bom.setSbId(sbInfo.getId());
+                sbModelSpareBoms = sbModelSpareBomMapper.select(bom);
+            }else {
+                throw new BusinessException("系统有误，请查验！");
+            }
+            spareIds = sbModelSpareBoms.stream().map(SbModelSpareBom::getSpareId).collect(Collectors.toList());
         }
         // 已生成情况，直接推送
         GetCurrentStockHandler handler = new GetCurrentStockHandler();