修改装车的逻辑 切换车次

blade-service/logpm-business/src/main/java/com/logpm/business/service/impl/BusinessPreOrderServiceImpl.java

@@ -269,9 +269,16 @@ public class BusinessPreOrderServiceImpl extends BaseServiceImpl<BusinessPreOrde
 			// 全仓查询
 			if (!list2.isEmpty()) {
 				for (BusinessPreOrderEntity distributionBusinessPreOrderEntity : list2) {
-					if (distributionBusinessPreOrderEntity.getOrderPackageCode().equals(orderPackageCode)) {
+					if (distributionBusinessPreOrderEntity.getOrderPackageCode().equals(orderPackageCode)&& "20".equals(distributionBusinessPreOrderEntity.getOrderPackageLoadingStatus())) {
+						return Resp.scanSuccessWithData("已装车", "当前包件已在其它车次装车，请切换后在进行扫描", distributionBusinessPreOrderEntity.getDistrCarNumber());
+					}else if(distributionBusinessPreOrderEntity.getOrderPackageCode().equals(orderPackageCode) && "10".equals(distributionBusinessPreOrderEntity.getOrderPackageLoadingStatus())){
+
 						return Resp.scanSuccessWithData("是否切换车次", "当前包件不在当前车次，是否切换车次?", distributionBusinessPreOrderEntity.getDistrCarNumber());
 					}
+
+
+
+
 					selectD = distributionBusinessPreOrderEntity;
 					break;
 				}