报工入库

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{
 

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<TaskReportDO> {
                 .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)