优化

platform-dao/src/main/resources/mapper/sb/SbModelSpareBomMapper.xml

@@ -145,7 +145,7 @@
 
             update t_sb_model_spare_bom bom
             <set>
-                bom.oldOrNew = #{oldOrNew}
+                bom.old_or_new = #{oldOrNew}
             </set>
             where bom.sb_id=#{sbId}
             <if test="list!=null and list.size()>0">

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

@@ -584,9 +584,11 @@ public class YongyouServiceImpl implements YongyouService {
                                 req.setStrWhere(whereStr.toString());
                             }
                             List<SpareStoreVO> oldSpareStoreVOS = getList(handler,req);
-                            List<String> spareNos = oldSpareStoreVOS.stream().map(SpareStoreVO::getNo).collect(Collectors.toList());
-                            sbModelSpareBomMapper.updateBatch2(spareNos,2,record.getSbId());
-                            returnList.addAll(oldSpareStoreVOS);
+                            if (oldSpareStoreVOS!=null && oldSpareStoreVOS.size()>0) {
+                                List<String> spareNos = oldSpareStoreVOS.stream().map(SpareStoreVO::getNo).collect(Collectors.toList());
+                                sbModelSpareBomMapper.updateBatch2(spareNos, 2, record.getSbId());
+                                returnList.addAll(oldSpareStoreVOS);
+                            }
 
                             req.setCAcc_ID("005");
                             req.setToken(geToken(1));
@@ -601,9 +603,11 @@ public class YongyouServiceImpl implements YongyouService {
                                 req.setStrWhere(whereStr.toString());
                             }
                             List<SpareStoreVO> oldSpareStoreVOS2 = getList(handler,req);
-                            List<String> spareNos2 = oldSpareStoreVOS.stream().map(SpareStoreVO::getNo).collect(Collectors.toList());
-                            sbModelSpareBomMapper.updateBatch2(spareNos2,2,record.getSbId());
-                            returnList.addAll(oldSpareStoreVOS2);
+                            if (oldSpareStoreVOS2!=null&&oldSpareStoreVOS2.size()>0) {
+                                List<String> spareNos2 = oldSpareStoreVOS.stream().map(SpareStoreVO::getNo).collect(Collectors.toList());
+                                sbModelSpareBomMapper.updateBatch2(spareNos2, 1, record.getSbId());
+                                returnList.addAll(oldSpareStoreVOS2);
+                            }
                         }
                     }
                     else {
@@ -611,7 +615,7 @@ public class YongyouServiceImpl implements YongyouService {
                             req.setCAcc_ID("993");
                             req.setToken(geToken(1));
                             req.setConn(getConn2(1));
-                            for (SpareVO spareVO : newF) {
+                            for (SpareVO spareVO : oldF) {
                                 whereStr.append(spareVO.getBeiJianCode() + ",");
                             }
                             sqlStr = whereStr.toString().substring(0, whereStr.toString().length() - 1) + ")";