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

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

@@ -10819,7 +10819,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			String orderPackageStatus = distributionParcelListEntity.getOrderPackageStatus();
 			if ("20".equals(orderPackageStatus) || "30".equals(orderPackageStatus)) {
 				log.warn("##############unloadPackage: 包件已入库 orderPackageCode={} warehouseId={}", orderPackageCode, warehouseId);
-				return R.success( "包件已入库");
+				return Resp.scanFail(200,"包件已入库", "包件已入库");
 			}
 		}
 
@@ -11620,7 +11620,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			String orderPackageStatus = distributionParcelListEntity.getOrderPackageStatus();
 			if ("20".equals(orderPackageStatus) || "30".equals(orderPackageStatus)) {
 				log.warn("##############unloadPackageNoXz: 包件已入库 orderPackageCode={} warehouseId={}", orderPackageCode, warehouseId);
-				return R.fail(405, "包件已入库");
+				return Resp.scanFail(200, "包件已入库","包件已入库");
 			}
 		}