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

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

@@ -237,6 +237,7 @@ public class InComingServiceImpl implements IInComingService {
 	@Transactional(rollbackFor = Exception.class)
 	public R incomingPackage(InComingDTO inComingDTO) {
 		AtomicReference<String> audio = new AtomicReference<>();
+		AtomicReference<Integer> audioCode = new AtomicReference<>();
 		List<TrunklineAdvanceDetailEntity> sendAdvanceDetailEntityList = new ArrayList<>();
 		String orderPackageCode = inComingDTO.getOrderPackageCode();//包件码
 		Long warehouseId = inComingDTO.getWarehouseId();//仓库id
@@ -393,6 +394,7 @@ public class InComingServiceImpl implements IInComingService {
 									map.put("orderPackageCode", packageCode);
 									R r = warehouseTrayTypeClient.orderScanOrderPackageCodeReturnR(map);
 									int code = r.getCode();
+									audioCode.set(code);
 									if (code != 200) {
 										audio.set(r.getMsg());
 									} else {
@@ -529,6 +531,7 @@ public class InComingServiceImpl implements IInComingService {
 									map.put("orderPackageCode", packageCode);
 									R r = warehouseTrayTypeClient.orderScanOrderPackageCodeReturnR(map);
 									int code = r.getCode();
+									audioCode.set(code);
 									if (code != 200) {
 										audio.set(r.getMsg());
 									} else {
@@ -595,8 +598,9 @@ public class InComingServiceImpl implements IInComingService {
 		}
 
 		String a = audio.get();
+		Integer code = audioCode.get();
 		if (StringUtil.isNotBlank(a)) {
-			return Resp.scanFail(2001, a, a);
+			return Resp.scanFail(code, a, a);
 		}
 
 		return R.success("入库成功");