From cedba19d8a3a8d2fa63afefd5e314de7e21cab04 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Fri, 20 Oct 2023 14:15:45 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=90=8C=E6=AD=A5=E8=80=81=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E7=9B=98=E7=82=B9=E4=BB=BB=E5=8A=A1=E9=83=A8=E5=88=86=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/patch/dto/SyncInventoryDTO.java | 12 ++++ .../patch/entity/SyncInventoryEntity.java | 67 +++++++++++++++++++ .../controller/SyncInventoryController.java | 13 ++-- .../patch/mapper/SyncInventoryMapper.java | 9 +++ .../patch/service/ISyncInventoryService.java | 7 ++ .../impl/SyncInventoryServiceImpl.java | 15 +++++ .../impl/SyncOrderInfoServiceImpl.java | 10 +-- 7 files changed, 123 insertions(+), 10 deletions(-) create mode 100644 blade-service-api/logpm-patch-api/src/main/java/com/logpm/patch/dto/SyncInventoryDTO.java create mode 100644 blade-service-api/logpm-patch-api/src/main/java/com/logpm/patch/entity/SyncInventoryEntity.java create mode 100644 blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/SyncInventoryMapper.java create mode 100644 blade-service/logpm-patch/src/main/java/com/logpm/patch/service/ISyncInventoryService.java create mode 100644 blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncInventoryServiceImpl.java diff --git a/blade-service-api/logpm-patch-api/src/main/java/com/logpm/patch/dto/SyncInventoryDTO.java b/blade-service-api/logpm-patch-api/src/main/java/com/logpm/patch/dto/SyncInventoryDTO.java new file mode 100644 index 000000000..9602769e7 --- /dev/null +++ b/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 { + + + +} diff --git a/blade-service-api/logpm-patch-api/src/main/java/com/logpm/patch/entity/SyncInventoryEntity.java b/blade-service-api/logpm-patch-api/src/main/java/com/logpm/patch/entity/SyncInventoryEntity.java new file mode 100644 index 000000000..6b6821b5a --- /dev/null +++ b/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; + +} diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/controller/SyncInventoryController.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/controller/SyncInventoryController.java index cd16ee25e..aad12529c 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/controller/SyncInventoryController.java +++ b/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> list(@ApiIgnore @RequestParam Map disStockListDetail, Query query) { -// IPage pages = disStockListDetailService.page(Condition.getPage(query), Condition.getQueryWrapper(disStockListDetail, DisStockListDetailEntity.class)); +// public R> list(@RequestParam SyncInventoryDTO syncInventoryDTO) { +// IPage pages = syncInventoryService.page(Condition.getPage(query), Condition.getQueryWrapper(disStockListDetail, DisStockListDetailEntity.class)); // return R.data(pages); // } diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/SyncInventoryMapper.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/SyncInventoryMapper.java new file mode 100644 index 000000000..1fee7b157 --- /dev/null +++ b/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 { +} diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/ISyncInventoryService.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/ISyncInventoryService.java new file mode 100644 index 000000000..40dbe0ecd --- /dev/null +++ b/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 { +} diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncInventoryServiceImpl.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncInventoryServiceImpl.java new file mode 100644 index 000000000..7774248f6 --- /dev/null +++ b/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 implements ISyncInventoryService { +} diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java index 6a3400cba..2295e6a0f 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java +++ b/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)){