1.同步订单功能添加

blade-service-api/logpm-patch-api/src/main/java/com/logpm/patch/dto/SyncInventoryDTO.java

@@ -14,4 +14,6 @@ public class SyncInventoryDTO implements Serializable {
 
 	private Long warehouseId;
 
+	private String orderCodes;
+
 }

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadEntity.java

@@ -49,6 +49,12 @@ public class TrunklineCarsLoadEntity extends TenantEntity {
 	/** 副驾id */
 	@ApiModelProperty(name = "副驾id",notes = "")
 	private Long assistantId ;
+	/** 副驾i名称 */
+	@ApiModelProperty(name = "副驾i名称",notes = "")
+	private String assistantName ;
+	/** 副驾i电话 */
+	@ApiModelProperty(name = "副驾i电话",notes = "")
+	private String assistantMobile ;
 	/** 是否外请司机0否 1是 */
 	@ApiModelProperty(name = "是否外请司机0否 1是",notes = "")
 	private Integer isExternal ;

blade-service/logpm-patch/src/main/java/com/logpm/patch/controller/SyncOrderInfoController.java

@@ -0,0 +1,73 @@
+package com.logpm.patch.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
+import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
+import com.logpm.patch.dto.SyncInventoryDTO;
+import com.logpm.patch.entity.SyncInventoryEntity;
+import com.logpm.patch.service.ISyncOrderInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.common.exception.CustomerException;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.StringUtil;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+
+@Slf4j
+@RestController
+@AllArgsConstructor
+@RequestMapping("/syncOrderInfo")
+@Api(value = "同步订单信息控制器", tags = "同步订单信息接口")
+public class SyncOrderInfoController {
+
+	private final IBasicdataWarehouseClient warehouseClient;
+	private final ISyncOrderInfoService syncOrderInfoService;
+
+	@ResponseBody
+	@PostMapping("/syncOrder")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入disStockListDetail")
+	public R<IPage<SyncInventoryEntity>> syncOrder(@RequestBody SyncInventoryDTO syncInventoryDTO) {
+		String method = "############syncOrder: ";
+
+		try{
+			String orderCodes = syncInventoryDTO.getOrderCodes();
+
+			if(StringUtil.isBlank(orderCodes)){
+				log.warn(method+"订单号不能为空 orderCodes={}",orderCodes);
+				return R.fail(403,"订单号不能为空");
+			}
+
+			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+			if(Objects.isNull(myCurrentWarehouse)){
+				log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse);
+				return R.fail(403,"仓库信息为空");
+			}
+
+			String[] split = orderCodes.split(",");
+
+			List<String> orderCodeList = new ArrayList<>(Arrays.asList(split));
+
+			syncOrderInfoService.handleData(orderCodeList,myCurrentWarehouse.getOldId(),myCurrentWarehouse.getId(),null);
+
+			return R.success("拉取成功");
+		}catch (CustomerException e){
+			log.warn(e.message);
+			return R.fail(e.code,e.message);
+		}catch (Exception e){
+			log.error(method+"系统异常，联系管理员",e);
+			return R.fail(500,"系统异常，联系管理员");
+		}
+
+
+	}
+
+}

blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java

@@ -105,14 +105,20 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService {
 
 					saveTrayTypeInfoPackage(orderCode,oldWarehouseId,newWarehouseId);
 
-					orderClient.updateStatusWithTableName(1,orderCode,tableName);
+					if(!StringUtil.isBlank(tableName)){
+						orderClient.updateStatusWithTableName(1,orderCode,tableName);
+					}
 
 				}catch (CustomerException e){
 					log.error("同步订单"+orderCode+"失败: "+e.message,e);
-					orderClient.updateStatusWithTableName(2,orderCode,tableName);
+					if(!StringUtil.isBlank(tableName)){
+						orderClient.updateStatusWithTableName(2,orderCode,tableName);
+					}
 				}catch (Exception e){
 					log.error("同步订单"+orderCode+"失败",e);
-					orderClient.updateStatusWithTableName(2,orderCode,tableName);
+					if(!StringUtil.isBlank(tableName)){
+						orderClient.updateStatusWithTableName(2,orderCode,tableName);
+					}
 				}
 
 //			}

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

@@ -906,6 +906,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		String carNumber = carsLoadDTO.getCarNumber();
 		String remark = carsLoadDTO.getRemark();
 		String loadType = carsLoadDTO.getLoadType();
+		String assistantName = carsLoadDTO.getAssistantName();
+		String assistantMobile = carsLoadDTO.getAssistantMobile();
 
 		TrunklineCarsLoadEntity carsLoadEntity = baseMapper.selectById(loadId);
 		if(Objects.isNull(carsLoadEntity)){
@@ -914,6 +916,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		}
 		carsLoadEntity.setDriverId(driverId);
 		carsLoadEntity.setAssistantId(assistantId);
+		carsLoadEntity.setAssistantName(assistantName);
+		carsLoadEntity.setAssistantMobile(assistantMobile);
 		carsLoadEntity.setDriverName(driverName);
 		carsLoadEntity.setDriverMobile(driverMobile);
 		carsLoadEntity.setCarId(carId);
@@ -1945,7 +1949,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			carsLoadWaybillInfoVO.setCarsLoadOrderInfoList(carsLoadOrderInfoList);
 
 		}
-		return R.data(carsLoadWaybillInfoList);
+		trunklineCarsLoadVO.setCarsLoadWaybillInfoList(carsLoadWaybillInfoList);
+
+		return R.data(trunklineCarsLoadVO);
 	}
 
 	@Override