1.干线逻辑更新

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

@@ -2086,16 +2086,16 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 					if ("0".equals(packageStatus)) {
 						//未入库
 						log.warn("##################loadingScan: 包件暂未入库 orderPackageCode={}", orderPackageCode);
-						return R.fail(405, "包件暂未入库");
+						remark = "有系统数据,包件暂未入库";
 					} else {
 						//已入库
 						String waybillNo1 = trunklineAdvanceDetailEntity.getWaybillNo();
 						if (StringUtil.isBlank(waybillNo1)) {
 							log.warn("##################loadingScan: 暂存单未开单 orderPackageCode={}", orderPackageCode);
-							return R.fail(405, "订单未开单");
+							remark = "有系统数据,暂存单未开单";
 						} else {
 							log.warn("##################loadingScan: 包件暂未入到本仓 orderPackageCode={} warehouseId={}", orderPackageCode, warehouseId);
-							return R.fail(405, "包件暂未入到本仓");
+							remark = "有系统数据,包件暂未入到本仓";
 						}
 					}
 				}