Merge branch 'dev' into pre-production

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

@@ -2367,8 +2367,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		}catch (Exception e){
 			log.error("推送数据失败",e);
 		}
-		return Resp.scanFail(3001,"装车成功",audio);
-//		return Resp.scanSuccess("装车成功",audio);
+		return Resp.scanSuccess("装车成功",audio);
 	}
 
 	private void pushFactoryOrderData(Long warehouseId, String orderPackageCode, String orderCode) {
@@ -2554,7 +2553,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			2, isData, isAbnormal, trayId, trayCode, trayName, fromWarehouseId, loadScanId, remark);
 
 		updateNumByLoadId(loadId);
-		return Resp.scanFail(3001,"装车成功",audio);
+		return Resp.scanSuccess("装车成功",audio);
 	}
 
 	@Override
@@ -6128,7 +6127,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		}
 
 		if (isData == 0) {
-			return Resp.scanFail("卸车成功", "系统无数据");
+			return Resp.scanSuccess("卸车成功", "系统无编码");
 		}
 		return R.success("卸车成功");
 	}