1.干线逻辑更新

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mq/OpenOrderToLoadListener.java

@@ -47,7 +47,7 @@ public class OpenOrderToLoadListener {
 			JSONArray advanceIds = jsonObject.getJSONArray("advanceIds");
 			Set<Long> loadIds = new HashSet<>();
 			for (Object object : advanceIds) {
-				Long advanceId = JSONUtil.toBean((JSONObject) object, Long.class);
+				Long advanceId = (Long) object;
 				List<TrunklineAdvanceDetailEntity> advanceDetailEntityList = advanceDetailService.findListByAdvanceId(advanceId);
 				for (TrunklineAdvanceDetailEntity advanceDetailEntity : advanceDetailEntityList) {
 					String orderPackageCode = advanceDetailEntity.getOrderPackageCode();
@@ -67,6 +67,9 @@ public class OpenOrderToLoadListener {
 					String warehouseName = carsLoadScanEntity.getWarehouseName();
 					String orderCode = carsLoadScanEntity.getOrderCode();
 					Long finalNodeId = carsLoadScanEntity.getFinalNodeId();
+					Long createUser = carsLoadScanEntity.getCreateUser();
+					String tenantId = carsLoadScanEntity.getTenantId();
+					Long createDept = carsLoadScanEntity.getCreateDept();
 					TrunklineCarsLoadLineEntity carsLoadLineEntity = carsLoadLineService.findEntityByLoadIdAndNodeId(loadId, warehouseId);
 					if(Objects.isNull(carsLoadLineEntity)){
 						continue;
@@ -74,6 +77,10 @@ public class OpenOrderToLoadListener {
 					TrunklineCarsOrderEntity trunklineCarsOrderEntity = carsOrderService.findEntityByLoadIdAndWarehouseIdAndOrderCodeAndWaybillNo(loadId, warehouseId, orderCode, waybillNo);
 					if(Objects.isNull(trunklineCarsOrderEntity)){
 						trunklineCarsOrderEntity = new TrunklineCarsOrderEntity();
+						trunklineCarsOrderEntity.setTenantId(tenantId);
+						trunklineCarsOrderEntity.setCreateUser(createUser);
+						trunklineCarsOrderEntity.setCreateDept(createDept);
+						trunklineCarsOrderEntity.setUpdateUser(createUser);
 						trunklineCarsOrderEntity.setLoadId(loadId);
 						trunklineCarsOrderEntity.setNodeId(warehouseId);
 						trunklineCarsOrderEntity.setNodeName(warehouseName);

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

@@ -2125,12 +2125,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 					fromWarehouseName = fromWarehouseEntity.getName();
 				}
 				WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNumber);
-				if (Objects.isNull(waybillEntity)) {
+				if (!Objects.isNull(waybillEntity)) {
-					log.warn("##################loadingScan: 运单信息不存在 waybillNumber={}", waybillNumber);
+					waybillId = waybillEntity.getId();
-					return R.fail(405, "运单信息不存在");
+					waybillNo = waybillEntity.getWaybillNo();
 				}
-				waybillId = waybillEntity.getId();
-				waybillNo = waybillEntity.getWaybillNo();
 				carsLoadScanEntity.setWaybillId(waybillId);
 				carsLoadScanEntity.setWaybillNo(waybillNo);
 				carsLoadScanEntity.setOrderCode(orderCode);
@@ -2170,11 +2168,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				fromWarehouseName = fromWarehouseEntity.getName();
 			}
 			WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillNo(waybillNo);
-			if (Objects.isNull(waybillEntity)) {
+			if (!Objects.isNull(waybillEntity)) {
-				log.warn("##################loadingScan: 运单信息不存在 waybillNo={}", waybillNo);
+				waybillId = waybillEntity.getId();
-				return R.fail(405, "运单信息不存在");
 			}
-			waybillId = waybillEntity.getId();
+
 
 			carsLoadScanEntity.setWaybillId(waybillId);
 			carsLoadScanEntity.setWaybillNo(waybillNo);