From bf8542839864bc961fd39216118584818a1785f6 Mon Sep 17 00:00:00 2001 From: siontion Date: Thu, 27 Jun 2024 18:25:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/controller/admin/chanjet/ChanjetController.java | 4 ++-- .../mes/module/biz/dal/mysql/taskreport/TaskReportMapper.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/ChanjetController.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/ChanjetController.java index b966126d..e65b2d86 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/ChanjetController.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/ChanjetController.java @@ -228,9 +228,9 @@ public class ChanjetController { return success(true); } + @PermitAll + @TenantIgnore @GetMapping("/chronicData") - @Operation(summary = "同步数据") - @PreAuthorize("@ss.hasPermission('biz:storage:create')") // @Scheduled(cron = "0 0 3 * * ?") public void synchronizeData() throws ChanjetApiException{ diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/taskreport/TaskReportMapper.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/taskreport/TaskReportMapper.java index 6e15c4e9..012487fc 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/taskreport/TaskReportMapper.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/taskreport/TaskReportMapper.java @@ -13,6 +13,7 @@ import com.chanko.yunxi.mes.module.biz.dal.dataobject.taskdispatch.TaskDispatchD import com.chanko.yunxi.mes.module.biz.dal.dataobject.taskdispatch.TaskDispatchDetailDO; import com.chanko.yunxi.mes.module.biz.dal.dataobject.taskreport.TaskReportDO; import com.chanko.yunxi.mes.module.biz.dal.dataobject.warehouse.WarehouseDO; +import com.chanko.yunxi.mes.module.biz.dal.mysql.warehouse.WarehouseMapper; import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO; import com.github.yulichang.wrapper.MPJLambdaWrapper; import org.apache.ibatis.annotations.Mapper; @@ -97,7 +98,7 @@ public interface TaskReportMapper extends BaseMapperX { .select("y.is_final as isFinal") .select("e.id as materialId") .select("e.code as materialCode") - .select("w.warehouse_id as whId") + .select("c.warehouse_id as whId") .select("w.wh_no as whNo") .leftJoin(TaskDispatchDetailDO.class, "x", TaskDispatchDetailDO::getId, TaskReportDO::getDispatchDetailId) .leftJoin(ProcedureDO.class, "y", ProcedureDO::getId, TaskReportDO::getProcedureId)