1.同步老系统盘点任务部分代码提交

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

@@ -0,0 +1,12 @@
+package com.logpm.patch.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class SyncInventoryDTO implements Serializable {
+
+
+
+}

blade-service-api/logpm-patch-api/src/main/java/com/logpm/patch/entity/SyncInventoryEntity.java

@@ -0,0 +1,67 @@
+package com.logpm.patch.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+import java.util.Date;
+
+@Data
+@TableName("logpm_patch_sync_inventory")
+@ApiModel(value = "SyncInventory对象", description = "同步老系统盘点任务数据")
+@EqualsAndHashCode(callSuper = true)
+public class SyncInventoryEntity extends TenantEntity {
+
+	/**
+	 * 预留1
+	 */
+	@ApiModelProperty(value = "预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ApiModelProperty(value = "预留2")
+	private String reserve2;
+
+	/**
+	 * 预留3
+	 */
+	@ApiModelProperty(value = "预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ApiModelProperty(value = "预留4")
+	private String reserve4;
+
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String reserve5;
+
+	@ApiModelProperty(value = "盘点任务编码")
+	private String inventoryNo;
+
+	@ApiModelProperty(value = "盘点任务id")
+	private Integer inventoryId;
+
+	@ApiModelProperty(value = "同步开始时间")
+	private Date syncStartDate;
+
+	@ApiModelProperty(value = "同步结束时间")
+	private Date syncEndDate;
+
+	@ApiModelProperty(value = "同步状态 0未开始 1同步中 2同步完成 3同步异常")
+	private Integer syncStatus;
+
+	@ApiModelProperty(value = "新系统仓库id")
+	private Long warehouseId;
+
+	@ApiModelProperty(value = "老系统仓库id")
+	private Integer oldWarehouseId;
+
+}

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

@@ -16,6 +16,7 @@
  */
 package com.logpm.patch.controller;
 
+import com.logpm.patch.service.ISyncInventoryService;
 import io.swagger.annotations.Api;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
@@ -25,8 +26,8 @@ import org.springframework.web.bind.annotation.RestController;
 /**
  * 库存品条码记录表 控制器
  *
- * @author TJJ
- * @since 2023-09-04
+ * @author zhy
+ * @since 2023-10-20
  */
 @RestController
 @AllArgsConstructor
@@ -34,6 +35,8 @@ import org.springframework.web.bind.annotation.RestController;
 @Api(value = "库存品条码记录表", tags = "库存品条码记录表接口")
 public class SyncInventoryController extends BladeController {
 
+	private final ISyncInventoryService syncInventoryService;
+
 	/**
 	 * 库存品条码记录表 详情
 	 */
@@ -47,11 +50,11 @@ public class SyncInventoryController extends BladeController {
 	/**
 	 * 库存品条码记录表 分页
 	 */
-//	@GetMapping("/list")
+//	@PostMapping("/list")
 //	@ApiOperationSupport(order = 2)
 //	@ApiOperation(value = "分页", notes = "传入disStockListDetail")
-//	public R<IPage<DisStockListDetailEntity>> list(@ApiIgnore @RequestParam Map<String, Object> disStockListDetail, Query query) {
-//		IPage<DisStockListDetailEntity> pages = disStockListDetailService.page(Condition.getPage(query), Condition.getQueryWrapper(disStockListDetail, DisStockListDetailEntity.class));
+//	public R<IPage<SyncInventoryEntity>> list(@RequestParam SyncInventoryDTO syncInventoryDTO) {
+//		IPage<SyncInventoryEntity> pages = syncInventoryService.page(Condition.getPage(query), Condition.getQueryWrapper(disStockListDetail, DisStockListDetailEntity.class));
 //		return R.data(pages);
 //	}
 

blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/SyncInventoryMapper.java

@@ -0,0 +1,9 @@
+package com.logpm.patch.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.logpm.patch.entity.SyncInventoryEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface SyncInventoryMapper extends BaseMapper<SyncInventoryEntity> {
+}

blade-service/logpm-patch/src/main/java/com/logpm/patch/service/ISyncInventoryService.java

@@ -0,0 +1,7 @@
+package com.logpm.patch.service;
+
+import com.logpm.patch.entity.SyncInventoryEntity;
+import org.springblade.core.mp.base.BaseService;
+
+public interface ISyncInventoryService extends BaseService<SyncInventoryEntity> {
+}

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

@@ -0,0 +1,15 @@
+package com.logpm.patch.service.impl;
+
+import com.logpm.patch.entity.SyncInventoryEntity;
+import com.logpm.patch.mapper.SyncInventoryMapper;
+import com.logpm.patch.service.ISyncInventoryService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@AllArgsConstructor
+@Service
+public class SyncInventoryServiceImpl extends BaseServiceImpl<SyncInventoryMapper, SyncInventoryEntity> implements ISyncInventoryService {
+}

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

@@ -72,11 +72,11 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService {
 		log.info("#############handleData: 处理订单开始");
 		for (String orderCode:orderCodeList){
 			log.info("#############handleData: 当前处理orderCode={}的订单",orderCode);
-			DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findStockArticleByOrderCode(orderCode);
-			if(!Objects.isNull(stockArticleEntity)){
-				log.info("#############handleData: 订单orderCode={}已存在",orderCode);
-				continue;
-			}
+//			DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findStockArticleByOrderCode(orderCode);
+//			if(!Objects.isNull(stockArticleEntity)){
+//				log.info("#############handleData: 订单orderCode={}已存在",orderCode);
+//				continue;
+//			}
 			//查询订单是否在盘点任务中有被盘点到
 //			InventoryDetailEntity inventoryDetailEntity = inventoryDetailClient.findOrderIsExist(orderCode);
 //			if(!Objects.isNull(inventoryDetailEntity)){