Merge remote-tracking branch 'origin/pre-production' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

@@ -1082,7 +1082,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				.eq(DistributionLoadscanEntity::getOrderPackageCode, distrilbutionloadingscanDTO.getBarcode()));
 			if (Func.isNotEmpty(loadscanEntity)) {
 				if (loadscanEntity.getSignforState().equals(2)) {
-					return Resp.scanFail("重复扫描", "重复扫描");
+					return Resp.scanFail("重复扫描", "包件已签收");
 				}
 				//存在装车记录，进行修改即可
 				//进行签收记录数据的维护
@@ -1216,8 +1216,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					if (parcelListEntity.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue())){
 						return Resp.scanFail("包件已签收", "包件已签收");
 					}else {
-
-						return R.fail(3006, "异常签收");
+						return R.fail(3006, null);
 					}
 				} else {
 					return Resp.scanFail("不满足签收条件", "不满足签收条件");