1.业务修改数据bug修改

2.主单同步分单数据修改订舱数据bug修改

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/service/impl/BillsServiceImpl.java

@@ -5744,15 +5744,15 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 					if (!bookingList.isEmpty() && ObjectUtils.isNotNull(item.getTemporaryId())) {
 						Bills bills1 = bookingList.stream().filter(e -> e.getId().equals(item.getTemporaryId())).findFirst().orElse(null);
 						if (bills1 != null) {
-							bills1.setMblno(bills.getMblno());
-							bills1.setHblno(bills.getHblno());
-							bills1.setVesselId(bills.getVesselId());
-							bills1.setVesselCnName(bills.getVesselCnName());
-							bills1.setVesselEnName(bills.getVesselEnName());
-							bills1.setVoyageNo(bills.getVoyageNo());
-							bills1.setCyReturnTime(bills.getCyReturnTime());
-							bills1.setCyTrailerTime(bills.getCyTrailerTime());
-							bills1.setSiRemarks(bills.getSiRemarks());
+							bills1.setMblno(item.getMblno());
+							bills1.setHblno(item.getHblno());
+							bills1.setVesselId(item.getVesselId());
+							bills1.setVesselCnName(item.getVesselCnName());
+							bills1.setVesselEnName(item.getVesselEnName());
+							bills1.setVoyageNo(item.getVoyageNo());
+							bills1.setCyReturnTime(item.getCyReturnTime());
+							bills1.setCyTrailerTime(item.getCyTrailerTime());
+							bills1.setSiRemarks(item.getSiRemarks());
 							bookingListNew.add(bills1);
 						}
 					}

blade-service/blade-los/src/main/java/org/springblade/los/business/update/service/impl/UpdateServiceImpl.java

@@ -357,7 +357,6 @@ public class UpdateServiceImpl extends ServiceImpl<UpdateMapper, Update> impleme
 				lambdaQueryWrapper.eq(Bills::getBillNo, update.getRetrievalValue());
 			} else if ("2".equals(update.getRetrievalType())) {
 				lambdaQueryWrapper.eq(Bills::getMblno, update.getRetrievalValue());
-				lambdaQueryWrapper.eq(Bills::getBillType, "MM");
 				lambdaQueryWrapper.apply("find_in_set(bill_type,'MM,DD')");
 			}else if ("3".equals(update.getRetrievalType())) {
 				lambdaQueryWrapper.eq(Bills::getHblno, update.getRetrievalValue());