diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaHolidayController.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaHolidayController.java index 1c5a4d7..3dc43eb 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaHolidayController.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaHolidayController.java @@ -3,17 +3,14 @@ package com.ruoyi.oa.controller; import java.util.Date; import java.util.List; import java.util.Arrays; -import java.util.concurrent.TimeUnit; -import com.alibaba.excel.util.DateUtils; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ruoyi.oa.domain.CalendarDay; import com.ruoyi.oa.domain.vo.SysHolidayVo; import com.ruoyi.oa.domain.vo.SysOaHolidayListVo; import lombok.RequiredArgsConstructor; import javax.servlet.http.HttpServletResponse; import javax.validation.constraints.*; -import cn.dev33.satoken.annotation.SaCheckPermission; + import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import com.ruoyi.common.annotation.RepeatSubmit; @@ -23,7 +20,6 @@ import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.EditGroup; -import com.ruoyi.common.core.validate.QueryGroup; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.oa.domain.vo.SysOaHolidayVo; @@ -141,4 +137,9 @@ public class SysOaHolidayController extends BaseController { public R> queryList(SysOaHolidayBo bo){ return R.ok(iSysOaHolidayService.queryVoList(bo)); } + + @GetMapping("/queryOwnList") + public List queryOwnList(SysOaHolidayBo bo, PageQuery pageQuery){ + return iSysOaHolidayService.queryOwnList(bo,pageQuery); + } } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaProjectController.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaProjectController.java index c187231..5a85c94 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaProjectController.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaProjectController.java @@ -3,10 +3,9 @@ package com.ruoyi.oa.controller; import java.util.Date; import java.util.List; import java.util.Arrays; -import java.util.concurrent.TimeUnit; import com.baomidou.dynamic.datasource.annotation.DSTransactional; -import com.ruoyi.oa.domain.bo.SysOaOutWarehouseBo; +import com.ruoyi.oa.domain.bo.SysOaWarehouseDetailBo; import com.ruoyi.oa.domain.vo.SysOaOutWarehouseListVo; import com.ruoyi.oa.mapper.SysOaTaskMapper; import lombok.RequiredArgsConstructor; @@ -22,7 +21,6 @@ import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.EditGroup; -import com.ruoyi.common.core.validate.QueryGroup; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.oa.domain.vo.SysOaProjectVo; @@ -142,7 +140,7 @@ public class SysOaProjectController extends BaseController { */ @SaCheckPermission("oa:project:list") @GetMapping("/outWare/list") - public TableDataInfo outWareList(SysOaOutWarehouseBo bo, PageQuery pageQuery) { + public TableDataInfo outWareList(SysOaWarehouseDetailBo bo, PageQuery pageQuery) { return iSysOaProjectService.queryOutWarePageList(bo, pageQuery); } } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaWarehouseController.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaWarehouseController.java index 8b0c066..00e80e5 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaWarehouseController.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaWarehouseController.java @@ -6,7 +6,11 @@ import java.util.Arrays; import java.util.concurrent.TimeUnit; import com.ruoyi.common.excel.ExcelResult; +import com.ruoyi.oa.domain.SysOaWarehouseMaster; +import com.ruoyi.oa.domain.bo.SysOaWarehouseDetailBo; +import com.ruoyi.oa.domain.bo.SysOaWarehouseMasterBo; import com.ruoyi.oa.listener.SysOaWarehouseListener; +import com.ruoyi.oa.service.ISysOaWarehouseMasterService; import lombok.RequiredArgsConstructor; import javax.servlet.http.HttpServletResponse; import javax.validation.constraints.*; @@ -44,6 +48,8 @@ public class SysOaWarehouseController extends BaseController { private final ISysOaWarehouseService iSysOaWarehouseService; + private final ISysOaWarehouseMasterService iSysOaWarehouseMasterService; + /** * 查询仓库管理列表 */ @@ -98,6 +104,8 @@ public class SysOaWarehouseController extends BaseController { return toAjax(iSysOaWarehouseService.insertByBo(bo)); } + + /** * 修改仓库管理 */ @@ -130,12 +138,24 @@ public class SysOaWarehouseController extends BaseController { * @param file 导入文件 * @param updateSupport 是否更新已存在数据 */ - @Log(title = "投诉工单导入", businessType = BusinessType.IMPORT) + @Log(title = "入库工单导入", businessType = BusinessType.IMPORT) @SaCheckPermission("complaint:complaint:import") @PostMapping(value = "/importData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) public R importData(@RequestPart("file") MultipartFile file, boolean updateSupport) throws Exception { ExcelResult result = ExcelUtil.importExcel(file.getInputStream(), SysOaWarehouseVo.class, new SysOaWarehouseListener(true)); + SysOaWarehouseMasterBo sysOaWarehouseMaster = new SysOaWarehouseMasterBo(); + sysOaWarehouseMaster.setType(1L); + List list = new ArrayList<>(); + result.getList().forEach(item -> { + SysOaWarehouseDetailBo bo = new SysOaWarehouseDetailBo(); + bo.setWarehouseId(item.getId()); + bo.setAmount(item.getInventory()); + bo.setSignPrice(item.getPrice()); + list.add(bo); + }); + sysOaWarehouseMaster.setWarehouseList(list); + iSysOaWarehouseMasterService.insertByBo(sysOaWarehouseMaster); return R.ok(result.getAnalysis()); } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaOutWarehouseController.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaWarehouseDetailController.java similarity index 61% rename from ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaOutWarehouseController.java rename to ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaWarehouseDetailController.java index 070d5ff..f7bb3b0 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaOutWarehouseController.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaWarehouseDetailController.java @@ -2,7 +2,6 @@ package com.ruoyi.oa.controller; import java.util.List; import java.util.Arrays; -import java.util.concurrent.TimeUnit; import com.ruoyi.oa.domain.bo.SysOaOutWarehouseBoList; import com.ruoyi.oa.domain.vo.SysOaOutWarehouseListVo; @@ -19,12 +18,11 @@ import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.EditGroup; -import com.ruoyi.common.core.validate.QueryGroup; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.oa.domain.vo.SysOaOutWarehouseVo; -import com.ruoyi.oa.domain.bo.SysOaOutWarehouseBo; -import com.ruoyi.oa.service.ISysOaOutWarehouseService; +import com.ruoyi.oa.domain.vo.SysOaWarehouseDetailVo; +import com.ruoyi.oa.domain.bo.SysOaWarehouseDetailBo; +import com.ruoyi.oa.service.ISysOaWarehouseDetailService; import com.ruoyi.common.core.page.TableDataInfo; /** @@ -37,9 +35,9 @@ import com.ruoyi.common.core.page.TableDataInfo; @RequiredArgsConstructor @RestController @RequestMapping("/oa/oaOutWarehouse") -public class SysOaOutWarehouseController extends BaseController { +public class SysOaWarehouseDetailController extends BaseController { - private final ISysOaOutWarehouseService iSysOaOutWarehouseService; + private final ISysOaWarehouseDetailService iSysOaWarehouseDetailService; @@ -48,8 +46,8 @@ public class SysOaOutWarehouseController extends BaseController { */ @SaCheckPermission("oa:oaOutWarehouse:list") @GetMapping("/list") - public TableDataInfo list(SysOaOutWarehouseBo bo, PageQuery pageQuery) { - return iSysOaOutWarehouseService.queryPageList(bo, pageQuery); + public TableDataInfo list(SysOaWarehouseDetailBo bo, PageQuery pageQuery) { + return iSysOaWarehouseDetailService.queryPageList(bo, pageQuery); } /** @@ -58,9 +56,9 @@ public class SysOaOutWarehouseController extends BaseController { @SaCheckPermission("oa:oaOutWarehouse:export") @Log(title = "仓库出库", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(SysOaOutWarehouseBo bo, HttpServletResponse response) { - List list = iSysOaOutWarehouseService.queryList(bo); - ExcelUtil.exportExcel(list, "仓库出库", SysOaOutWarehouseVo.class, response); + public void export(SysOaWarehouseDetailBo bo, HttpServletResponse response) { + List list = iSysOaWarehouseDetailService.queryList(bo); + ExcelUtil.exportExcel(list, "仓库出库", SysOaWarehouseDetailVo.class, response); } /** @@ -70,9 +68,9 @@ public class SysOaOutWarehouseController extends BaseController { */ @SaCheckPermission("oa:oaOutWarehouse:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { - return R.ok(iSysOaOutWarehouseService.queryById(id)); + return R.ok(iSysOaWarehouseDetailService.queryById(id)); } /** @@ -82,9 +80,9 @@ public class SysOaOutWarehouseController extends BaseController { */ @SaCheckPermission("oa:oaOutWarehouse:query") @GetMapping("/WarehouseIdList/{WarehouseId}") - public TableDataInfo ListByWarehouseId(@NotNull(message = "出库产品ID不能为空") + public TableDataInfo ListByWarehouseId(@NotNull(message = "出库产品ID不能为空") @PathVariable Long WarehouseId) { - return iSysOaOutWarehouseService.queryWarehouseIdList(WarehouseId); + return iSysOaWarehouseDetailService.queryWarehouseIdList(WarehouseId); } /** @@ -94,9 +92,9 @@ public class SysOaOutWarehouseController extends BaseController { */ @SaCheckPermission("oa:oaOutWarehouse:query") @GetMapping("/project/{projectId}") - public TableDataInfo queryOutWarehouseByProjectId(@NotNull(message = "项目名不能为空") + public TableDataInfo queryOutWarehouseByProjectId(@NotNull(message = "项目名不能为空") @PathVariable Long projectId) { - return iSysOaOutWarehouseService.queryOutWarehouseByProjectId(projectId); + return iSysOaWarehouseDetailService.queryOutWarehouseByProjectId(projectId); } @@ -108,22 +106,10 @@ public class SysOaOutWarehouseController extends BaseController { @Log(title = "仓库出库", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody SysOaOutWarehouseBo bo) { - return toAjax(iSysOaOutWarehouseService.insertByBo(bo)); + public R add(@Validated(AddGroup.class) @RequestBody SysOaWarehouseDetailBo bo) { + return toAjax(iSysOaWarehouseDetailService.insertByBo(bo)); } - /** - * 批量新增仓库出库 - */ - @SaCheckPermission("oa:oaOutWarehouse:add") - @Log(title = "仓库批量出库",businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping("/insertOutBatch") - public R addAll(@Validated(AddGroup.class) @RequestBody SysOaOutWarehouseBoList boList) { - return toAjax(iSysOaOutWarehouseService.insertByBoList(boList)); - } - - /** * 修改仓库出库 */ @@ -131,8 +117,8 @@ public class SysOaOutWarehouseController extends BaseController { @Log(title = "仓库出库", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody SysOaOutWarehouseBo bo) { - return toAjax(iSysOaOutWarehouseService.updateByBo(bo)); + public R edit(@Validated(EditGroup.class) @RequestBody SysOaWarehouseDetailBo bo) { + return toAjax(iSysOaWarehouseDetailService.updateByBo(bo)); } /** @@ -145,6 +131,6 @@ public class SysOaOutWarehouseController extends BaseController { @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { - return toAjax(iSysOaOutWarehouseService.deleteWithValidByIds(Arrays.asList(ids), true)); + return toAjax(iSysOaWarehouseDetailService.deleteWithValidByIds(Arrays.asList(ids), true)); } } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaWarehouseMasterController.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaWarehouseMasterController.java index 1fba462..4a6666e 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaWarehouseMasterController.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaWarehouseMasterController.java @@ -1,9 +1,13 @@ package com.ruoyi.oa.controller; +import java.util.ArrayList; import java.util.List; import java.util.Arrays; +import java.util.UUID; import java.util.concurrent.TimeUnit; +import com.ruoyi.oa.domain.bo.SysOaWarehouseBo; +import com.ruoyi.oa.domain.vo.SysOaWarehouseVo; import lombok.RequiredArgsConstructor; import javax.servlet.http.HttpServletResponse; import javax.validation.constraints.*; @@ -82,6 +86,16 @@ public class SysOaWarehouseMasterController extends BaseController { return toAjax(iSysOaWarehouseMasterService.insertByBo(bo)); } + /** + * 新增仓库管理 + */ + @Log(title = "仓库管理", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping("/in") + public R addIn(@Validated(AddGroup.class) @RequestBody SysOaWarehouseBo bo) { + return toAjax(iSysOaWarehouseMasterService.insertInWarehouse(bo)); + } + /** * 修改出库单管理 */ diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/CalendarDay.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/CalendarDay.java new file mode 100644 index 0000000..42967db --- /dev/null +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/CalendarDay.java @@ -0,0 +1,11 @@ +package com.ruoyi.oa.domain; + + +import lombok.Data; + +@Data +public class CalendarDay { + + private String date; // "2025-03-01" 格式 + private Integer type; // 0 工作 +} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaHoliday.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaHoliday.java index 3c3da4e..da7610a 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaHoliday.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaHoliday.java @@ -1,6 +1,7 @@ package com.ruoyi.oa.domain; import com.baomidou.mybatisplus.annotation.*; +import liquibase.pro.packaged.J; import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serializable; @@ -10,6 +11,7 @@ import java.math.BigDecimal; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.core.domain.BaseEntity; +import org.springframework.format.annotation.DateTimeFormat; /** * 休假管理对象 sys_oa_holiday @@ -36,6 +38,8 @@ public class SysOaHoliday extends BaseEntity { /** * 假期日期 */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") private Date holidayTime; /** * 假期名称（如果是周日，值为休息日） diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaOutWarehouse.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaWarehouseDetail.java similarity index 78% rename from ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaOutWarehouse.java rename to ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaWarehouseDetail.java index 0e800c7..24be0e1 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaOutWarehouse.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaWarehouseDetail.java @@ -3,22 +3,19 @@ package com.ruoyi.oa.domain; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; -import java.io.Serializable; -import java.util.Date; -import java.math.BigDecimal; import com.ruoyi.common.core.domain.BaseEntity; /** - * 仓库出库对象 sys_oa_out_warehouse + * 仓库出库对象 sys_oa_warehouse_detail * * @author liuzongkun999 * @date 2024-11-02 */ @Data @EqualsAndHashCode(callSuper = true) -@TableName("sys_oa_out_warehouse") -public class SysOaOutWarehouse extends BaseEntity { +@TableName("sys_oa_warehouse_detail") +public class SysOaWarehouseDetail extends BaseEntity { private static final long serialVersionUID=1L; @@ -49,4 +46,9 @@ public class SysOaOutWarehouse extends BaseEntity { @TableLogic private Integer delFlag; + private Long masterId; + + private Double signPrice; + + } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaWarehouseMaster.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaWarehouseMaster.java index f7d7e30..abe6364 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaWarehouseMaster.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaWarehouseMaster.java @@ -29,6 +29,8 @@ public class SysOaWarehouseMaster extends BaseEntity { */ @TableId(value = "master_id") private Long masterId; + + private String masterNum; /** * 0出库单1入库单 */ diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaHolidayBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaHolidayBo.java index 9bc6826..ef68fa9 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaHolidayBo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaHolidayBo.java @@ -11,6 +11,7 @@ import java.util.Date; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.core.domain.BaseEntity; +import org.springframework.format.annotation.DateTimeFormat; /** * 休假管理业务对象 sys_oa_holiday @@ -36,6 +37,8 @@ public class SysOaHolidayBo extends BaseEntity { /** * 假期日期 */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") private Date holidayTime; /** diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaOutWarehouseBo2.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaOutWarehouseBo2.java index 6e67add..bf877c4 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaOutWarehouseBo2.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaOutWarehouseBo2.java @@ -11,7 +11,7 @@ import lombok.EqualsAndHashCode; import javax.validation.constraints.NotNull; /** - * 仓库出库业务对象 sys_oa_out_warehouse + * 仓库出库业务对象 sys_oa_warehouse_detail * * @author liuzongkun999 * @date 2024-11-02 diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaOutWarehouseBoList.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaOutWarehouseBoList.java index 6863a92..e2f48f7 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaOutWarehouseBoList.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaOutWarehouseBoList.java @@ -8,7 +8,7 @@ import lombok.EqualsAndHashCode; import javax.validation.constraints.NotNull; import java.util.List; /** - * 仓库批量出库业务对象 sys_oa_out_warehouse + * 仓库批量出库业务对象 sys_oa_warehouse_detail * * @author liuzongkun999 * @date 2024-11-05 diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaOutWarehouseBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaWarehouseDetailBo.java similarity index 88% rename from ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaOutWarehouseBo.java rename to ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaWarehouseDetailBo.java index 1c6559f..13349b5 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaOutWarehouseBo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaWarehouseDetailBo.java @@ -8,12 +8,10 @@ import lombok.Data; import lombok.EqualsAndHashCode; import javax.validation.constraints.*; -import java.util.Date; - import com.ruoyi.common.core.domain.BaseEntity; /** - * 仓库出库业务对象 sys_oa_out_warehouse + * 仓库出库业务对象 sys_oa_warehouse_detail * * @author liuzongkun999 * @date 2024-11-02 @@ -21,7 +19,7 @@ import com.ruoyi.common.core.domain.BaseEntity; @Data @EqualsAndHashCode(callSuper = true) -public class SysOaOutWarehouseBo extends BaseEntity { +public class SysOaWarehouseDetailBo extends BaseEntity { /** * 主键id @@ -61,4 +59,8 @@ public class SysOaOutWarehouseBo extends BaseEntity { * 物料名 */ private String warehouseName; + + private Double signPrice; + + private Long masterId; } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaWarehouseMasterBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaWarehouseMasterBo.java index a713ff1..09b6bd2 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaWarehouseMasterBo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaWarehouseMasterBo.java @@ -9,6 +9,8 @@ import javax.validation.constraints.*; import java.util.Date; import java.util.Date; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.core.domain.BaseEntity; @@ -28,6 +30,8 @@ public class SysOaWarehouseMasterBo extends BaseEntity { */ private Long masterId; + private String masterNum; + /** * 0出库单1入库单 */ @@ -53,5 +57,10 @@ public class SysOaWarehouseMasterBo extends BaseEntity { */ private String remark; + /** + * 涉及物料 + */ + private List warehouseList; + } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaHolidayVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaHolidayVo.java index 49291a6..615097f 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaHolidayVo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaHolidayVo.java @@ -54,5 +54,8 @@ public class SysOaHolidayVo { @ExcelProperty(value = "备注") private String remark; + @JsonFormat(pattern = "yyyy-MM-dd") + private Date date; + } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaOutWarehouseListVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaOutWarehouseListVo.java index e542724..527b80c 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaOutWarehouseListVo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaOutWarehouseListVo.java @@ -9,7 +9,7 @@ import java.util.List; /** - * 仓库出库查询对象 sys_oa_out_warehouse + * 仓库出库查询对象 sys_oa_warehouse_detail * * @author liuzongkun999 * @date 2024-11-02 diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaOutWarehouseVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaWarehouseDetailVo.java similarity index 83% rename from ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaOutWarehouseVo.java rename to ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaWarehouseDetailVo.java index 838170e..b6e77ca 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaOutWarehouseVo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaWarehouseDetailVo.java @@ -8,14 +8,14 @@ import lombok.Data; /** - * 仓库出库视图对象 sys_oa_out_warehouse + * 仓库出库视图对象 sys_oa_warehouse_detail * * @author liuzongkun999 * @date 2024-11-02 */ @Data @ExcelIgnoreUnannotated -public class SysOaOutWarehouseVo extends BaseEntity { +public class SysOaWarehouseDetailVo extends BaseEntity { private static final long serialVersionUID = 1L; @@ -61,4 +61,11 @@ public class SysOaOutWarehouseVo extends BaseEntity { /** 项目信息 */ private SysOaProjectVo project; + private Double signPrice; + + private Long masterId; + + private String model; + private String specifications; + } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaWarehouseMasterVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaWarehouseMasterVo.java index d9b92af..e1a162a 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaWarehouseMasterVo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaWarehouseMasterVo.java @@ -8,7 +8,7 @@ import com.ruoyi.common.annotation.ExcelDictFormat; import com.ruoyi.common.convert.ExcelDictConvert; import lombok.Data; import java.util.Date; - +import java.util.List; /** @@ -29,6 +29,12 @@ public class SysOaWarehouseMasterVo { @ExcelProperty(value = "主键id") private Long masterId; + /** + * 出库单编号 + */ + @ExcelProperty(value = "出库单编号") + private String masterNum; + /** * 0出库单1入库单 */ @@ -59,5 +65,12 @@ public class SysOaWarehouseMasterVo { @ExcelProperty(value = "备注") private String remark; + /** + * 出库列表 + */ + private List warehouseList; + + private String projectName; + } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaWarehouseVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaWarehouseVo.java index 1843f64..4f0093e 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaWarehouseVo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaWarehouseVo.java @@ -86,6 +86,4 @@ public class SysOaWarehouseVo extends SysOaWarehouse { private String remark; - - } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/listener/SysOaWarehouseListener.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/listener/SysOaWarehouseListener.java index f746a00..93c705f 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/listener/SysOaWarehouseListener.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/listener/SysOaWarehouseListener.java @@ -7,11 +7,16 @@ import com.alibaba.excel.event.AnalysisEventListener; import com.ruoyi.common.excel.ExcelListener; import com.ruoyi.common.excel.ExcelResult; import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.ValidatorUtils; import com.ruoyi.common.utils.spring.SpringUtils; +import com.ruoyi.oa.domain.SysOaWarehouseMaster; import com.ruoyi.oa.domain.bo.SysOaWarehouseBo; +import com.ruoyi.oa.domain.bo.SysOaWarehouseDetailBo; +import com.ruoyi.oa.domain.bo.SysOaWarehouseMasterBo; import com.ruoyi.oa.domain.vo.SysOaWarehouseVo; import com.ruoyi.oa.service.ISysOaArticleService; +import com.ruoyi.oa.service.ISysOaWarehouseMasterService; import com.ruoyi.oa.service.ISysOaWarehouseService; import lombok.extern.slf4j.Slf4j; @@ -23,15 +28,19 @@ public class SysOaWarehouseListener extends AnalysisEventListener sysOaWarehouseVos; private final StringBuilder successMsg = new StringBuilder(); private final StringBuilder failureMsg = new StringBuilder(); public SysOaWarehouseListener(Boolean isUpdateSupport) { + this.warehouseMasterService = SpringUtils.getBean(ISysOaWarehouseMasterService.class); // String initPassword = SpringUtils.getBean(ISysConfigService.class).selectConfigByKey("sys.user.initPassword"); this.sysOaWarehouseService = SpringUtils.getBean(ISysOaWarehouseService.class); this.isUpdateSupport = isUpdateSupport; @@ -43,12 +52,14 @@ public class SysOaWarehouseListener extends AnalysisEventListener complaintVo = this.sysOaWarehouseService.queryList(bo); try { - // 验证是否存在这个用户 - if (complaintVo.size()<=0) { + // 验证是否存在这个物料 + if (complaintVo.isEmpty()) { SysOaWarehouseBo add = BeanUtil.toBean(sysOaWarehouseVo, SysOaWarehouseBo.class); ValidatorUtils.validate(complaintVo); sysOaWarehouseService.insertByBo(add); @@ -61,11 +72,14 @@ public class SysOaWarehouseListener extends AnalysisEventListener").append(successNum).append("、物料名称： ").append(update.getName()).append(" 更新成功"); } + sysOaWarehouseVos.add(sysOaWarehouseVo); } catch (Exception e) { failureNum++; String msg = "
" + failureNum + "、物料名称： " + sysOaWarehouseVo.getName() + " 导入失败："; @@ -96,7 +110,7 @@ public class SysOaWarehouseListener extends AnalysisEventListener getList() { - return null; + return sysOaWarehouseVos; } @Override diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaOutWarehouseMapper.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaOutWarehouseMapper.java deleted file mode 100644 index 8f7858d..0000000 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaOutWarehouseMapper.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.ruoyi.oa.mapper; - -import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.oa.domain.SysOaOutWarehouse; -import com.ruoyi.oa.domain.bo.SysOaOutWarehouseBo; -import com.ruoyi.oa.domain.bo.SysOaOutWarehouseBo2; -import com.ruoyi.oa.domain.vo.SysOaOutWarehouseListVo; -import com.ruoyi.oa.domain.vo.SysOaOutWarehouseVo; -import com.ruoyi.common.core.mapper.BaseMapperPlus; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; - -import java.util.List; - -/** - * 仓库出库Mapper接口 - * - * @author liuzongkun999 - * @date 2024-11-02 - */ -public interface SysOaOutWarehouseMapper extends BaseMapperPlus { - - /** - * 仓库出库筛选(联查) - */ - List defineSelectList(@Param(value = "bo") SysOaOutWarehouseBo bo, @Param(value = "page") PageQuery pageQuery); - - /** - * 获取分页的Total值 - */ - Long defineQueryTotal(@Param(value = "bo") SysOaOutWarehouseBo bo, @Param(value = "page") PageQuery pageQuery); - - - @Select("select * from sys_oa_out_warehouse where project_id = #{projectId} and del_flag = 0") - List List(@Param("projectId") Long projectId); -} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaProjectMapper.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaProjectMapper.java index 6026f40..c27fda6 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaProjectMapper.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaProjectMapper.java @@ -4,13 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.oa.domain.SysOaOutWarehouse; import com.ruoyi.oa.domain.SysOaProject; import com.ruoyi.oa.domain.bo.SysOaProjectBo; import com.ruoyi.oa.domain.vo.SysOaCostAllVo; -import com.ruoyi.oa.domain.vo.SysOaCostRow; import com.ruoyi.oa.domain.vo.SysOaOutWarehouseListVo; import com.ruoyi.oa.domain.vo.SysOaProjectVo; import com.ruoyi.common.core.mapper.BaseMapperPlus; diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaWarehouseDetailMapper.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaWarehouseDetailMapper.java new file mode 100644 index 0000000..b119f61 --- /dev/null +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaWarehouseDetailMapper.java @@ -0,0 +1,35 @@ +package com.ruoyi.oa.mapper; + +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.oa.domain.SysOaWarehouseDetail; +import com.ruoyi.oa.domain.bo.SysOaWarehouseDetailBo; +import com.ruoyi.oa.domain.vo.SysOaOutWarehouseListVo; +import com.ruoyi.oa.domain.vo.SysOaWarehouseDetailVo; +import com.ruoyi.common.core.mapper.BaseMapperPlus; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * 仓库出库Mapper接口 + * + * @author liuzongkun999 + * @date 2024-11-02 + */ +public interface SysOaWarehouseDetailMapper extends BaseMapperPlus { + + /** + * 仓库出库筛选(联查) + */ + List defineSelectList(@Param(value = "bo") SysOaWarehouseDetailBo bo, @Param(value = "page") PageQuery pageQuery); + + /** + * 获取分页的Total值 + */ + Long defineQueryTotal(@Param(value = "bo") SysOaWarehouseDetailBo bo, @Param(value = "page") PageQuery pageQuery); + + + @Select("select * from sys_oa_warehouse_detail where project_id = #{projectId} and del_flag = 0") + List List(@Param("projectId") Long projectId); +} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaWarehouseMasterMapper.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaWarehouseMasterMapper.java index 52f0323..3e66bb5 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaWarehouseMasterMapper.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaWarehouseMasterMapper.java @@ -1,8 +1,12 @@ package com.ruoyi.oa.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.oa.domain.SysOaWarehouseMaster; import com.ruoyi.oa.domain.vo.SysOaWarehouseMasterVo; import com.ruoyi.common.core.mapper.BaseMapperPlus; +import org.apache.ibatis.annotations.Param; /** * 出库单管理Mapper接口 @@ -12,4 +16,5 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus; */ public interface SysOaWarehouseMasterMapper extends BaseMapperPlus { + Page selectVoPagePlus(@Param("page") Page build, @Param(Constants.WRAPPER) QueryWrapper lqw); } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaHolidayService.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaHolidayService.java index c2bb6fb..befdccc 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaHolidayService.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaHolidayService.java @@ -1,12 +1,12 @@ package com.ruoyi.oa.service; +import com.ruoyi.oa.domain.CalendarDay; import com.ruoyi.oa.domain.vo.SysHolidayVo; import com.ruoyi.oa.domain.vo.SysOaHolidayListVo; import com.ruoyi.oa.domain.vo.SysOaHolidayVo; import com.ruoyi.oa.domain.bo.SysOaHolidayBo; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.domain.PageQuery; -import org.apache.ibatis.annotations.Param; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @@ -81,4 +81,14 @@ public interface ISysOaHolidayService { * @return */ Long queryWorkDayNumByMonth(Date payTime); + + /** + * 首页接口 + * + * @param bo + * @param pageQuery + * @return + */ + List queryOwnList(SysOaHolidayBo bo, PageQuery pageQuery); + } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaProjectService.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaProjectService.java index f1b15c6..711af0f 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaProjectService.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaProjectService.java @@ -1,6 +1,6 @@ package com.ruoyi.oa.service; -import com.ruoyi.oa.domain.bo.SysOaOutWarehouseBo; +import com.ruoyi.oa.domain.bo.SysOaWarehouseDetailBo; import com.ruoyi.oa.domain.vo.SysOaOutWarehouseListVo; import com.ruoyi.oa.domain.vo.SysOaProjectVo; import com.ruoyi.oa.domain.bo.SysOaProjectBo; @@ -49,7 +49,7 @@ public interface ISysOaProjectService { */ Boolean deleteWithValidByIds(Collection ids, Boolean isValid); - TableDataInfo queryOutWarePageList(SysOaOutWarehouseBo bo, PageQuery pageQuery); + TableDataInfo queryOutWarePageList(SysOaWarehouseDetailBo bo, PageQuery pageQuery); /** diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaOutWarehouseService.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaWarehouseDetailService.java similarity index 58% rename from ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaOutWarehouseService.java rename to ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaWarehouseDetailService.java index 13ca21f..c582957 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaOutWarehouseService.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaWarehouseDetailService.java @@ -1,10 +1,9 @@ package com.ruoyi.oa.service; -import com.ruoyi.oa.domain.SysOaOutWarehouse; import com.ruoyi.oa.domain.bo.SysOaOutWarehouseBoList; import com.ruoyi.oa.domain.vo.SysOaOutWarehouseListVo; -import com.ruoyi.oa.domain.vo.SysOaOutWarehouseVo; -import com.ruoyi.oa.domain.bo.SysOaOutWarehouseBo; +import com.ruoyi.oa.domain.vo.SysOaWarehouseDetailVo; +import com.ruoyi.oa.domain.bo.SysOaWarehouseDetailBo; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.domain.PageQuery; @@ -18,34 +17,34 @@ import java.util.List; * @author liuzongkun999 * @date 2024-11-02 */ -public interface ISysOaOutWarehouseService { +public interface ISysOaWarehouseDetailService { /** * 查询仓库出库 */ - SysOaOutWarehouseVo queryById(Long id); + SysOaWarehouseDetailVo queryById(Long id); /** * 查询仓库出库产品id的列表 * * @param WarehouseId 出库产品id */ - TableDataInfo queryWarehouseIdList(Long WarehouseId); + TableDataInfo queryWarehouseIdList(Long WarehouseId); /** * 查询仓库出库列表 */ - TableDataInfo queryPageList(SysOaOutWarehouseBo bo, PageQuery pageQuery); + TableDataInfo queryPageList(SysOaWarehouseDetailBo bo, PageQuery pageQuery); /** * 查询仓库出库列表 */ - List queryList(SysOaOutWarehouseBo bo); + List queryList(SysOaWarehouseDetailBo bo); /** * 新增仓库出库 */ - Boolean insertByBo(SysOaOutWarehouseBo bo); + Boolean insertByBo(SysOaWarehouseDetailBo bo); /** * 仓库批量出库 @@ -55,7 +54,7 @@ public interface ISysOaOutWarehouseService { /** * 修改仓库出库 */ - Boolean updateByBo(SysOaOutWarehouseBo bo); + Boolean updateByBo(SysOaWarehouseDetailBo bo); /** * 校验并批量删除仓库出库信息 @@ -63,6 +62,6 @@ public interface ISysOaOutWarehouseService { Boolean deleteWithValidByIds(Collection ids, Boolean isValid); - TableDataInfo queryOutWarehouseByProjectId(@NotNull(message = "项目名不能为空") Long projectId); + TableDataInfo queryOutWarehouseByProjectId(@NotNull(message = "项目名不能为空") Long projectId); } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaWarehouseMasterService.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaWarehouseMasterService.java index 6f4105f..c41f88b 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaWarehouseMasterService.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaWarehouseMasterService.java @@ -1,6 +1,7 @@ package com.ruoyi.oa.service; import com.ruoyi.oa.domain.SysOaWarehouseMaster; +import com.ruoyi.oa.domain.bo.SysOaWarehouseBo; import com.ruoyi.oa.domain.vo.SysOaWarehouseMasterVo; import com.ruoyi.oa.domain.bo.SysOaWarehouseMasterBo; import com.ruoyi.common.core.page.TableDataInfo; @@ -46,4 +47,11 @@ public interface ISysOaWarehouseMasterService { * 校验并批量删除出库单管理信息 */ Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * 单个入库接口 + * @param bo + * @return + */ + int insertInWarehouse(SysOaWarehouseBo bo); } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaCostServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaCostServiceImpl.java index 2f83a89..7699ace 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaCostServiceImpl.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaCostServiceImpl.java @@ -3,8 +3,6 @@ package com.ruoyi.oa.service.impl; import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.domain.PageQuery; @@ -22,11 +20,7 @@ import org.springframework.stereotype.Service; import com.ruoyi.oa.domain.bo.SysOaCostBo; import com.ruoyi.oa.service.ISysOaCostService; -import java.math.BigDecimal; -import java.math.RoundingMode; import java.util.*; -import java.util.function.Function; -import java.util.stream.Collectors; /** * 项目成本分析Service业务层处理 @@ -47,7 +41,7 @@ public class SysOaCostServiceImpl implements ISysOaCostService { private final SysOaWarehouseMapper warehouseMapper; - private final SysOaOutWarehouseMapper outWarehouseMapper; + private final SysOaWarehouseDetailMapper outWarehouseMapper; private final SysOaAttendanceMapper attendanceMapper; diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaHolidayServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaHolidayServiceImpl.java index d8cb1f3..3b02ed7 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaHolidayServiceImpl.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaHolidayServiceImpl.java @@ -1,6 +1,7 @@ package com.ruoyi.oa.service.impl; import cn.hutool.core.bean.BeanUtil; +import com.ruoyi.common.helper.LoginHelper; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.core.page.TableDataInfo; @@ -8,9 +9,13 @@ import com.ruoyi.common.core.domain.PageQuery; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.ruoyi.oa.domain.CalendarDay; import com.ruoyi.oa.domain.vo.SysHolidayVo; import com.ruoyi.oa.domain.vo.SysOaHolidayListVo; +import com.ruoyi.workflow.domain.FlowRecord; +import com.ruoyi.workflow.service.IWfTaskService; import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.oa.domain.bo.SysOaHolidayBo; import com.ruoyi.oa.domain.vo.SysOaHolidayVo; @@ -20,6 +25,7 @@ import com.ruoyi.oa.service.ISysOaHolidayService; import java.text.SimpleDateFormat; import java.time.LocalDate; +import java.time.LocalTime; import java.time.YearMonth; import java.time.ZoneId; import java.util.*; @@ -36,6 +42,9 @@ public class SysOaHolidayServiceImpl implements ISysOaHolidayService { private final SysOaHolidayMapper baseMapper; + @Autowired + private IWfTaskService taskService; + /** * 查询休假管理 */ @@ -51,6 +60,9 @@ public class SysOaHolidayServiceImpl implements ISysOaHolidayService { public TableDataInfo queryPageList(SysOaHolidayBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + for (SysOaHolidayVo record : result.getRecords()) { + record.setDate(record.getHolidayTime()); + } return TableDataInfo.build(result); } @@ -67,7 +79,11 @@ public class SysOaHolidayServiceImpl implements ISysOaHolidayService { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.eq(bo.getType() != null, SysOaHoliday::getType, bo.getType()); - lqw.eq(bo.getHolidayTime() != null, SysOaHoliday::getHolidayTime, bo.getHolidayTime()); + System.out.println(bo); + if (bo.getHolidayTime() != null) { + System.out.println("今年考了哈士大夫"); + lqw.between(SysOaHoliday::getHolidayTime, getFirstDay(bo.getHolidayTime()),getLastDay(bo.getHolidayTime())); + } lqw.like(StringUtils.isNotBlank(bo.getName()), SysOaHoliday::getName, bo.getName()); return lqw; } @@ -166,7 +182,6 @@ public class SysOaHolidayServiceImpl implements ISysOaHolidayService { Date endDate = DateUtils.addDays(result.getHolidayTime(), days - 1); VoList.add(new SysOaHolidayListVo(result.getHolidayId(), result.getName(), result.getHolidayTime(), endDate, days, result.getType())); } - System.out.println(VoList); return VoList; } @@ -220,7 +235,6 @@ public class SysOaHolidayServiceImpl implements ISysOaHolidayService { StringBuilder sb = new StringBuilder(); for (int i = 0; i < holidayVoList.size(); i++) { // 格式化日期 - System.out.println(holidayVoList.get(i).getHolidayTime()); String formattedDate = SDF.format(holidayVoList.get(i).getHolidayTime()); sb.append(formattedDate); // 在每个日期后面加逗号（最后一个日期后面可选） @@ -244,5 +258,109 @@ public class SysOaHolidayServiceImpl implements ISysOaHolidayService { return baseMapper.queryWorkDayNumByMonth(payTime); } + @Override + public List queryOwnList(SysOaHolidayBo bo, PageQuery pageQuery) { + // 1) 查询普通节假日数据 + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); + + // 把结果先转换成 Map，方便后续“根据日期覆盖type” + // key = "YYYY-MM-DD" + Map dayMap = new HashMap<>(); + for (SysOaHolidayVo holiday : page.getRecords()) { + String dateStr = formatDate(holiday.getHolidayTime()); // 转成 "YYYY-MM-DD" + Integer type = holiday.getType(); // 0,1,2,3 + CalendarDay calendarDay = new CalendarDay(); + calendarDay.setDate(dateStr); + calendarDay.setType(type); + dayMap.put(dateStr, calendarDay); + } + + // 2) 查询 Flowable - 出差(trip)流程 + // 假设 flowableQueryService.getApprovedRecords(userId, "trip") + // 返回类似: List，其中有 startTime、endTime 等 + List tripRecords = taskService.getApprovedRecords(LoginHelper.getUserId(), "trip"); + // 每条记录都代表一段出差区间，逐天设置 type=4 + for (FlowRecord record : tripRecords) { + fillDateRange(dayMap, record.getStartTime(), record.getEndTime(), 4); + } + + // 3) 查询 Flowable - 请假(absence)流程 + List absenceRecords = taskService.getApprovedRecords(LoginHelper.getUserId(), "absence"); + // 每条记录都代表一段请假区间，逐天设置 type=5 + for (FlowRecord record : absenceRecords) { + fillDateRange(dayMap, record.getStartTime(), record.getEndTime(), 5); + } + + // 4) 最终返回列表 (若需要排序，可按日期排序) + List result = new ArrayList<>(dayMap.values()); + result.sort(Comparator.comparing(CalendarDay::getDate)); + return result; + } + + /** + * 获得当月第一天 + */ + private Date getFirstDay(Date holidayTime){ + LocalDate localDate = holidayTime.toInstant() + .atZone(ZoneId.systemDefault()) + .toLocalDate(); + LocalDate firstDay = localDate.withDayOfMonth(1); + return Date.from(firstDay.atStartOfDay(ZoneId.systemDefault()).toInstant()); + } + + /** + * 获得最后一天的最后时刻 + */ + private Date getLastDay(Date holidayTime){ + LocalDate localDate = holidayTime.toInstant() + .atZone(ZoneId.systemDefault()) + .toLocalDate(); + LocalDate lastDay = localDate.withDayOfMonth(localDate.lengthOfMonth()); + return Date.from(lastDay.atTime(LocalTime.MAX).atZone(ZoneId.systemDefault()).toInstant()); + } + + /** + * 将 Date 转为 LocalDate（根据系统默认时区） + */ + private LocalDate convertToLocalDate(Date date) { + return date.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); + } + + /** + * 按 "yyyy-MM-dd" 格式化 Date + */ + private String formatDate(Date date) { + if (date == null) { + return ""; + } + return new SimpleDateFormat("yyyy-MM-dd").format(date); + } + + /** + * 将 [startTime, endTime] 区间内每一天的 type 覆盖为指定的 newType + */ + private void fillDateRange(Map dayMap, Date startTime, Date endTime, int newType) { + // 转成 LocalDate 方便遍历 + LocalDate start = convertToLocalDate(startTime); + LocalDate end = convertToLocalDate(endTime); + + // 逐天循环 + for (LocalDate d = start; !d.isAfter(end); d = d.plusDays(1)) { + String dateStr = d.toString(); // "2025-03-01" + CalendarDay existingDay = dayMap.get(dateStr); + if (existingDay != null) { + // 如果已有记录，就覆盖type + existingDay.setType(newType); + } else { + // 如果没有记录，就新建 + CalendarDay calendarDay = new CalendarDay(); + calendarDay.setDate(dateStr); + calendarDay.setType(newType); + dayMap.put(dateStr, calendarDay); + } + } + } + } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaProjectServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaProjectServiceImpl.java index 3fb0510..a85045a 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaProjectServiceImpl.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaProjectServiceImpl.java @@ -9,7 +9,7 @@ import com.ruoyi.common.core.domain.PageQuery; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.ruoyi.oa.domain.bo.SysOaOutWarehouseBo; +import com.ruoyi.oa.domain.bo.SysOaWarehouseDetailBo; import com.ruoyi.oa.domain.vo.SysOaOutWarehouseListVo; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -123,7 +123,7 @@ public class SysOaProjectServiceImpl implements ISysOaProjectService { * @return */ @Override - public TableDataInfo queryOutWarePageList(SysOaOutWarehouseBo bo, PageQuery pageQuery) { + public TableDataInfo queryOutWarePageList(SysOaWarehouseDetailBo bo, PageQuery pageQuery) { Page page = baseMapper.selectPageOutList(pageQuery.build(), this.buildOutWareQueryWrapper(bo)); return TableDataInfo.build(page); } @@ -153,7 +153,7 @@ public class SysOaProjectServiceImpl implements ISysOaProjectService { return projectVos; } - private QueryWrapper buildOutWareQueryWrapper(SysOaOutWarehouseBo bo) { + private QueryWrapper buildOutWareQueryWrapper(SysOaWarehouseDetailBo bo) { QueryWrapper lqw = Wrappers.query(); lqw.like(StringUtils.isNotBlank(bo.getProjectName()), "sop.projec_name", bo.getProjectName()); lqw.eq(StringUtils.isNotBlank(bo.getWarehouseName()), "sow.name", bo.getWarehouseName()); diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaOutWarehouseServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaWarehouseDetailServiceImpl.java similarity index 66% rename from ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaOutWarehouseServiceImpl.java rename to ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaWarehouseDetailServiceImpl.java index a04e855..e938681 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaOutWarehouseServiceImpl.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaWarehouseDetailServiceImpl.java @@ -1,16 +1,12 @@ package com.ruoyi.oa.service.impl; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.domain.PageQuery; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.ruoyi.oa.domain.SysOaProject; import com.ruoyi.oa.domain.SysOaWarehouse; import com.ruoyi.oa.domain.bo.SysOaOutWarehouseBo2; import com.ruoyi.oa.domain.bo.SysOaOutWarehouseBoList; @@ -18,18 +14,16 @@ import com.ruoyi.oa.domain.vo.SysOaOutWarehouseListVo; import com.ruoyi.oa.domain.vo.SysOaProjectVo; import com.ruoyi.oa.domain.vo.SysOaWarehouseVo; import com.ruoyi.oa.mapper.SysOaProjectMapper; +import com.ruoyi.oa.mapper.SysOaWarehouseDetailMapper; import com.ruoyi.oa.mapper.SysOaWarehouseMapper; -import com.ruoyi.oa.service.ISysOaWarehouseService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.catalina.security.SecurityUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.oa.domain.bo.SysOaOutWarehouseBo; -import com.ruoyi.oa.domain.vo.SysOaOutWarehouseVo; -import com.ruoyi.oa.domain.SysOaOutWarehouse; -import com.ruoyi.oa.mapper.SysOaOutWarehouseMapper; -import com.ruoyi.oa.service.ISysOaOutWarehouseService; +import com.ruoyi.oa.domain.bo.SysOaWarehouseDetailBo; +import com.ruoyi.oa.domain.vo.SysOaWarehouseDetailVo; +import com.ruoyi.oa.domain.SysOaWarehouseDetail; +import com.ruoyi.oa.service.ISysOaWarehouseDetailService; import java.util.*; @@ -44,9 +38,9 @@ import static cn.hutool.core.bean.BeanUtil.*; @Slf4j @RequiredArgsConstructor @Service -public class SysOaOutWarehouseServiceImpl implements ISysOaOutWarehouseService { +public class SysOaWarehouseDetailServiceImpl implements ISysOaWarehouseDetailService { - private final SysOaOutWarehouseMapper baseMapper; + private final SysOaWarehouseDetailMapper baseMapper; @Autowired @@ -60,17 +54,17 @@ public class SysOaOutWarehouseServiceImpl implements ISysOaOutWarehouseService { * 查询仓库出库 */ @Override - public SysOaOutWarehouseVo queryById(Long id){ - SysOaOutWarehouseVo sysOaOutWarehouseVo = baseMapper.selectVoById(id); - SysOaWarehouseVo sysOaWarehouse = warehouseMapper.selectVoByIdAndXml(sysOaOutWarehouseVo.getWarehouseId()); - SysOaProjectVo sysOaProject = projectMapper.selectVoById(sysOaOutWarehouseVo.getProjectId()); - sysOaOutWarehouseVo.setWarehouse(sysOaWarehouse); + public SysOaWarehouseDetailVo queryById(Long id){ + SysOaWarehouseDetailVo sysOaWarehouseDetailVo = baseMapper.selectVoById(id); + SysOaWarehouseVo sysOaWarehouse = warehouseMapper.selectVoByIdAndXml(sysOaWarehouseDetailVo.getWarehouseId()); + SysOaProjectVo sysOaProject = projectMapper.selectVoById(sysOaWarehouseDetailVo.getProjectId()); + sysOaWarehouseDetailVo.setWarehouse(sysOaWarehouse); // 出库可能不关联项目 if (Objects.nonNull(sysOaProject)){ - sysOaOutWarehouseVo.setProject(sysOaProject); + sysOaWarehouseDetailVo.setProject(sysOaProject); } - return sysOaOutWarehouseVo; + return sysOaWarehouseDetailVo; } @@ -80,11 +74,11 @@ public class SysOaOutWarehouseServiceImpl implements ISysOaOutWarehouseService { * @param WarehouseId 出库产品id */ @Override - public TableDataInfo queryWarehouseIdList(Long WarehouseId) { - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(SysOaOutWarehouse::getWarehouseId, WarehouseId); - for (SysOaOutWarehouseVo sysOaOutWarehouseVo : baseMapper.selectVoList(lqw)) { - sysOaOutWarehouseVo.setWarehouseName( warehouseMapper.selectById(sysOaOutWarehouseVo.getWarehouseId()).getName()); + public TableDataInfo queryWarehouseIdList(Long WarehouseId) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(SysOaWarehouseDetail::getWarehouseId, WarehouseId); + for (SysOaWarehouseDetailVo sysOaWarehouseDetailVo : baseMapper.selectVoList(lqw)) { + sysOaWarehouseDetailVo.setWarehouseName( warehouseMapper.selectById(sysOaWarehouseDetailVo.getWarehouseId()).getName()); } return TableDataInfo.build(baseMapper.selectVoList(lqw)); } @@ -95,7 +89,7 @@ public class SysOaOutWarehouseServiceImpl implements ISysOaOutWarehouseService { */ @Override - public TableDataInfo queryPageList(SysOaOutWarehouseBo bo, PageQuery pageQuery) { + public TableDataInfo queryPageList(SysOaWarehouseDetailBo bo, PageQuery pageQuery) { // LambdaQueryWrapper lqw = buildQueryWrapper(bo); // Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); // for (SysOaOutWarehouseVo record : result.getRecords()) { @@ -126,18 +120,18 @@ public class SysOaOutWarehouseServiceImpl implements ISysOaOutWarehouseService { * 查询仓库出库列表 */ @Override - public List queryList(SysOaOutWarehouseBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); + public List queryList(SysOaWarehouseDetailBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); return baseMapper.selectVoList(lqw); } - private LambdaQueryWrapper buildQueryWrapper(SysOaOutWarehouseBo bo) { + private LambdaQueryWrapper buildQueryWrapper(SysOaWarehouseDetailBo bo) { Map params = bo.getParams(); - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(bo.getProjectId() != null, SysOaOutWarehouse::getProjectId, bo.getProjectId()); - lqw.eq(bo.getAmount() != null, SysOaOutWarehouse::getAmount, bo.getAmount()); - lqw.eq(bo.getWarehouseId() != null, SysOaOutWarehouse::getWarehouseId, bo.getWarehouseId()); + lqw.eq(bo.getProjectId() != null, SysOaWarehouseDetail::getProjectId, bo.getProjectId()); + lqw.eq(bo.getAmount() != null, SysOaWarehouseDetail::getAmount, bo.getAmount()); + lqw.eq(bo.getWarehouseId() != null, SysOaWarehouseDetail::getWarehouseId, bo.getWarehouseId()); return lqw; } @@ -146,10 +140,10 @@ public class SysOaOutWarehouseServiceImpl implements ISysOaOutWarehouseService { * 新增仓库出库 */ @Override - public Boolean insertByBo(SysOaOutWarehouseBo bo) { + public Boolean insertByBo(SysOaWarehouseDetailBo bo) { bo.setCreateTime(new Date()); bo.setUpdateTime(new Date()); - SysOaOutWarehouse decrease = toBean(bo, SysOaOutWarehouse.class); + SysOaWarehouseDetail decrease = toBean(bo, SysOaWarehouseDetail.class); validEntityBeforeSave(decrease); SysOaWarehouse warehouse = warehouseMapper.selectById(decrease.getWarehouseId()); @@ -182,13 +176,13 @@ public class SysOaOutWarehouseServiceImpl implements ISysOaOutWarehouseService { if (projectId != null) { list.forEach((sysOaOutWarehouseBo2 -> { sysOaOutWarehouseBo2.setProjectId(projectId); - SysOaOutWarehouseBo sysOaOutWarehouse = toBean(sysOaOutWarehouseBo2, SysOaOutWarehouseBo.class); + SysOaWarehouseDetailBo sysOaOutWarehouse = toBean(sysOaOutWarehouseBo2, SysOaWarehouseDetailBo.class); insertByBo(sysOaOutWarehouse); })); }else{ list.forEach((sysOaOutWarehouseBo2 -> { - SysOaOutWarehouseBo sysOaOutWarehouse = toBean(sysOaOutWarehouseBo2, SysOaOutWarehouseBo.class); + SysOaWarehouseDetailBo sysOaOutWarehouse = toBean(sysOaOutWarehouseBo2, SysOaWarehouseDetailBo.class); insertByBo(sysOaOutWarehouse); })); } @@ -201,16 +195,16 @@ public class SysOaOutWarehouseServiceImpl implements ISysOaOutWarehouseService { * 修改仓库出库 */ @Override - public Boolean updateByBo(SysOaOutWarehouseBo bo) { - SysOaOutWarehouse update = toBean(bo, SysOaOutWarehouse.class); + public Boolean updateByBo(SysOaWarehouseDetailBo bo) { + SysOaWarehouseDetail update = toBean(bo, SysOaWarehouseDetail.class); validEntityBeforeSave(update); // 修改后的数量 Long amount1 = update.getAmount(); //获得 修改前的数量 - SysOaOutWarehouse sysOaOutWarehouse = baseMapper.selectById(update.getId()); - Long amount = sysOaOutWarehouse.getAmount(); + SysOaWarehouseDetail sysOaWarehouseDetail = baseMapper.selectById(update.getId()); + Long amount = sysOaWarehouseDetail.getAmount(); //找出库存表对应的那条数据 的库存数量 LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); @@ -249,7 +243,7 @@ public class SysOaOutWarehouseServiceImpl implements ISysOaOutWarehouseService { /** * 保存前的数据校验 */ - private void validEntityBeforeSave(SysOaOutWarehouse entity){ + private void validEntityBeforeSave(SysOaWarehouseDetail entity){ //TODO 做一些数据校验,如唯一约束 } @@ -264,16 +258,16 @@ public class SysOaOutWarehouseServiceImpl implements ISysOaOutWarehouseService { //需要增加的对应物料数量 - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.in(SysOaOutWarehouse::getId, ids.toArray()); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.in(SysOaWarehouseDetail::getId, ids.toArray()); //出库表中的所有删除的数据 - List sysOaOutWarehouses = baseMapper.selectList(lqw); + List sysOaWarehouseDetails = baseMapper.selectList(lqw); //其中一条 - sysOaOutWarehouses.forEach(sysOaOutWarehouse -> { + sysOaWarehouseDetails.forEach(sysOaWarehouseDetail -> { //选出相对应的 库存表中那一条的数据 - SysOaWarehouse warehouse = warehouseMapper.selectVoByIdAndXml(sysOaOutWarehouse.getWarehouseId()); + SysOaWarehouse warehouse = warehouseMapper.selectVoByIdAndXml(sysOaWarehouseDetail.getWarehouseId()); // 恢复原本出库的数量 - warehouse.setInventory(warehouse.getInventory() + sysOaOutWarehouse.getAmount()); + warehouse.setInventory(warehouse.getInventory() + sysOaWarehouseDetail.getAmount()); warehouseMapper.updateById(warehouse); }); return baseMapper.deleteBatchIds(ids) > 0; @@ -285,14 +279,14 @@ public class SysOaOutWarehouseServiceImpl implements ISysOaOutWarehouseService { * @return */ @Override - public TableDataInfo queryOutWarehouseByProjectId(Long projectId) { - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(SysOaOutWarehouse::getProjectId, projectId); - List sysOaOutWarehouseVos = baseMapper.selectVoList(lqw); - for (SysOaOutWarehouseVo sysOaOutWarehouseVo :sysOaOutWarehouseVos) { - sysOaOutWarehouseVo.setWarehouseName(warehouseMapper.selectVoByIdAndXml((sysOaOutWarehouseVo.getWarehouseId())).getName()); + public TableDataInfo queryOutWarehouseByProjectId(Long projectId) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(SysOaWarehouseDetail::getProjectId, projectId); + List sysOaWarehouseDetailVos = baseMapper.selectVoList(lqw); + for (SysOaWarehouseDetailVo sysOaWarehouseDetailVo : sysOaWarehouseDetailVos) { + sysOaWarehouseDetailVo.setWarehouseName(warehouseMapper.selectVoByIdAndXml((sysOaWarehouseDetailVo.getWarehouseId())).getName()); } - return TableDataInfo.build(sysOaOutWarehouseVos); + return TableDataInfo.build(sysOaWarehouseDetailVos); } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaWarehouseMasterServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaWarehouseMasterServiceImpl.java index 008c46f..76bd0e2 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaWarehouseMasterServiceImpl.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaWarehouseMasterServiceImpl.java @@ -1,12 +1,19 @@ package com.ruoyi.oa.service.impl; import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ruoyi.common.helper.LoginHelper; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.domain.PageQuery; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.ruoyi.oa.domain.bo.SysOaWarehouseBo; +import com.ruoyi.oa.domain.bo.SysOaWarehouseDetailBo; +import com.ruoyi.oa.mapper.SysOaWarehouseDetailMapper; +import com.ruoyi.oa.service.ISysOaWarehouseDetailService; +import com.ruoyi.oa.service.ISysOaWarehouseService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import com.ruoyi.oa.domain.bo.SysOaWarehouseMasterBo; @@ -15,9 +22,7 @@ import com.ruoyi.oa.domain.SysOaWarehouseMaster; import com.ruoyi.oa.mapper.SysOaWarehouseMasterMapper; import com.ruoyi.oa.service.ISysOaWarehouseMasterService; -import java.util.List; -import java.util.Map; -import java.util.Collection; +import java.util.*; /** * 出库单管理Service业务层处理 @@ -31,6 +36,10 @@ public class SysOaWarehouseMasterServiceImpl implements ISysOaWarehouseMasterSer private final SysOaWarehouseMasterMapper baseMapper; + private final ISysOaWarehouseDetailService warehouseDetailService; + + private final ISysOaWarehouseService warehouseService; + /** * 查询出库单管理 */ @@ -44,8 +53,8 @@ public class SysOaWarehouseMasterServiceImpl implements ISysOaWarehouseMasterSer */ @Override public TableDataInfo queryPageList(SysOaWarehouseMasterBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + QueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPagePlus(pageQuery.build(), lqw); return TableDataInfo.build(result); } @@ -54,17 +63,19 @@ public class SysOaWarehouseMasterServiceImpl implements ISysOaWarehouseMasterSer */ @Override public List queryList(SysOaWarehouseMasterBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); + QueryWrapper lqw = buildQueryWrapper(bo); return baseMapper.selectVoList(lqw); } - private LambdaQueryWrapper buildQueryWrapper(SysOaWarehouseMasterBo bo) { + private QueryWrapper buildQueryWrapper(SysOaWarehouseMasterBo bo) { Map params = bo.getParams(); - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(bo.getType() != null, SysOaWarehouseMaster::getType, bo.getType()); - lqw.eq(bo.getProjectId() != null, SysOaWarehouseMaster::getProjectId, bo.getProjectId()); - lqw.eq(bo.getSignTime() != null, SysOaWarehouseMaster::getSignTime, bo.getSignTime()); - lqw.eq(StringUtils.isNotBlank(bo.getSignUser()), SysOaWarehouseMaster::getSignUser, bo.getSignUser()); + QueryWrapper lqw = Wrappers.query(); + lqw.eq(bo.getType() != null, "sowm.type", bo.getType()); + lqw.eq(bo.getProjectId() != null, "sowm.project_id", bo.getProjectId()); + lqw.eq(bo.getSignTime() != null, "sowm.sign_time", bo.getSignTime()); + lqw.like(StringUtils.isNotBlank(bo.getSignUser()), "sowm.sign_user", bo.getSignUser()); + lqw.eq("sowm.del_flag", 0L); + lqw.orderByDesc("sowm.create_time"); return lqw; } @@ -75,9 +86,14 @@ public class SysOaWarehouseMasterServiceImpl implements ISysOaWarehouseMasterSer public Boolean insertByBo(SysOaWarehouseMasterBo bo) { SysOaWarehouseMaster add = BeanUtil.toBean(bo, SysOaWarehouseMaster.class); validEntityBeforeSave(add); + add.setSignUser(LoginHelper.getNickName()); boolean flag = baseMapper.insert(add) > 0; if (flag) { - bo.setMasterId(add.getMasterId()); + // 出库单新增后 新增出库元素同时减去现有的，这里要记录一个出库时单价 + for (SysOaWarehouseDetailBo sysOaWarehouseDetailBo : bo.getWarehouseList()) { + sysOaWarehouseDetailBo.setMasterId(add.getMasterId()); + warehouseDetailService.insertByBo(sysOaWarehouseDetailBo); + } } return flag; } @@ -89,7 +105,16 @@ public class SysOaWarehouseMasterServiceImpl implements ISysOaWarehouseMasterSer public Boolean updateByBo(SysOaWarehouseMasterBo bo) { SysOaWarehouseMaster update = BeanUtil.toBean(bo, SysOaWarehouseMaster.class); validEntityBeforeSave(update); - return baseMapper.updateById(update) > 0; + boolean flag = baseMapper.updateById(update) > 0; + if (flag) { + List warehouseList = bo.getWarehouseList(); + for (SysOaWarehouseDetailBo sysOaWarehouseDetailBo : warehouseList) { + sysOaWarehouseDetailBo.setMasterId(bo.getMasterId()); + warehouseDetailService.insertByBo(sysOaWarehouseDetailBo); + } + + } + return flag; } /** @@ -109,4 +134,27 @@ public class SysOaWarehouseMasterServiceImpl implements ISysOaWarehouseMasterSer } return baseMapper.deleteBatchIds(ids) > 0; } + + @Override + public int insertInWarehouse(SysOaWarehouseBo bo) { + warehouseService.insertByBo(bo); + SysOaWarehouseMaster sysOaWarehouseMaster = new SysOaWarehouseMaster(); + sysOaWarehouseMaster.setMasterNum(UUID.randomUUID().toString()); + sysOaWarehouseMaster.setRemark(bo.getRemark()); + sysOaWarehouseMaster.setCreateBy(LoginHelper.getNickName()); + sysOaWarehouseMaster.setUpdateBy(LoginHelper.getNickName()); + sysOaWarehouseMaster.setSignTime(new Date()); + sysOaWarehouseMaster.setSignUser(LoginHelper.getNickName()); + sysOaWarehouseMaster.setType(1L); + int flag = baseMapper.insert(sysOaWarehouseMaster); + SysOaWarehouseDetailBo sysOaWarehouseDetailBo = new SysOaWarehouseDetailBo(); + sysOaWarehouseDetailBo.setWarehouseId(bo.getId()); + sysOaWarehouseDetailBo.setAmount(bo.getInventory()); + sysOaWarehouseDetailBo.setSignPrice(bo.getPrice()); + sysOaWarehouseDetailBo.setCreateBy(LoginHelper.getNickName()); + sysOaWarehouseDetailBo.setUpdateBy(LoginHelper.getNickName()); + sysOaWarehouseDetailBo.setMasterId(sysOaWarehouseMaster.getMasterId()); + warehouseDetailService.insertByBo(sysOaWarehouseDetailBo); + return flag; + } } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaWarehouseServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaWarehouseServiceImpl.java index c54e371..c054bd6 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaWarehouseServiceImpl.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaWarehouseServiceImpl.java @@ -7,8 +7,7 @@ import com.ruoyi.common.core.domain.PageQuery; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.ruoyi.oa.domain.SysOaOutWarehouse; -import com.ruoyi.oa.mapper.SysOaOutWarehouseMapper; +import com.ruoyi.oa.mapper.SysOaWarehouseDetailMapper; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import com.ruoyi.oa.domain.bo.SysOaWarehouseBo; @@ -17,7 +16,6 @@ import com.ruoyi.oa.domain.SysOaWarehouse; import com.ruoyi.oa.mapper.SysOaWarehouseMapper; import com.ruoyi.oa.service.ISysOaWarehouseService; -import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Collection; @@ -34,7 +32,7 @@ public class SysOaWarehouseServiceImpl implements ISysOaWarehouseService { private final SysOaWarehouseMapper baseMapper; - private final SysOaOutWarehouseMapper outWareMapper; + private final SysOaWarehouseDetailMapper outWareMapper; /** * 查询仓库管理 diff --git a/ruoyi-oa/src/main/resources/mapper/oa/SysOaProjectMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/SysOaProjectMapper.xml index d3da918..0f7abdf 100644 --- a/ruoyi-oa/src/main/resources/mapper/oa/SysOaProjectMapper.xml +++ b/ruoyi-oa/src/main/resources/mapper/oa/SysOaProjectMapper.xml @@ -72,7 +72,7 @@ - + @@ -90,7 +90,7 @@ soow.create_time as out_create_time, sow.name from sys_oa_project sop - left join sys_oa_out_warehouse soow on soow.project_id = sop.project_id + left join sys_oa_warehouse_detail soow on soow.project_id = sop.project_id left join sys_oa_warehouse sow on sow.id = soow.warehouse_id ${ew.getCustomSqlSegment} diff --git a/ruoyi-oa/src/main/resources/mapper/oa/SysOaOutWarehouseMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/SysOaWarehouseDetailMapper.xml similarity index 90% rename from ruoyi-oa/src/main/resources/mapper/oa/SysOaOutWarehouseMapper.xml rename to ruoyi-oa/src/main/resources/mapper/oa/SysOaWarehouseDetailMapper.xml index c24fe95..b87f46e 100644 --- a/ruoyi-oa/src/main/resources/mapper/oa/SysOaOutWarehouseMapper.xml +++ b/ruoyi-oa/src/main/resources/mapper/oa/SysOaWarehouseDetailMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -15,6 +15,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -29,9 +31,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" project.project_name as projectName, warehouse.name as warehouseName, ware.create_time, - ware.create_by + ware.create_by, + ware.master_id, + ware.sign_price from - sys_oa_out_warehouse ware + sys_oa_warehouse_detail ware left join sys_oa_project project on ware.project_id = project.project_id left join sys_oa_warehouse warehouse on warehouse.id = ware.warehouse_id @@ -69,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select count(*) from - sys_oa_out_warehouse ware + sys_oa_warehouse_detail ware left join sys_oa_project project on ware.project_id = project.project_id left join sys_oa_warehouse warehouse on warehouse.id = ware.warehouse_id diff --git a/ruoyi-oa/src/main/resources/mapper/oa/SysOaWarehouseMasterMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/SysOaWarehouseMasterMapper.xml index d97fe6d..ac0538f 100644 --- a/ruoyi-oa/src/main/resources/mapper/oa/SysOaWarehouseMasterMapper.xml +++ b/ruoyi-oa/src/main/resources/mapper/oa/SysOaWarehouseMasterMapper.xml @@ -4,19 +4,48 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + + - - - - - + + + + + + + + + + + + + + diff --git a/ruoyi-system/src/main/java/com/ruoyi/workflow/domain/FlowRecord.java b/ruoyi-system/src/main/java/com/ruoyi/workflow/domain/FlowRecord.java new file mode 100644 index 0000000..4506f00 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/workflow/domain/FlowRecord.java @@ -0,0 +1,14 @@ +package com.ruoyi.workflow.domain; + + +import lombok.Data; + +import java.util.Date; + +@Data +public class FlowRecord { + + private Date startTime; + private Date endTime; + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/IWfTaskService.java b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/IWfTaskService.java index 27c53f9..7fbdda0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/IWfTaskService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/IWfTaskService.java @@ -1,5 +1,6 @@ package com.ruoyi.workflow.service; +import com.ruoyi.workflow.domain.FlowRecord; import com.ruoyi.workflow.domain.bo.WfTaskBo; import org.flowable.bpmn.model.FlowElement; import org.flowable.engine.runtime.ProcessInstance; @@ -114,4 +115,6 @@ public interface IWfTaskService { * @param variables 流程参数 */ void startFirstTask(ProcessInstance processInstance, Map variables); + + public List getApprovedRecords(Long userId, String category); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfTaskServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfTaskServiceImpl.java index 2ba790a..c82368d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfTaskServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfTaskServiceImpl.java @@ -17,6 +17,7 @@ import com.ruoyi.flowable.flow.CustomProcessDiagramGenerator; import com.ruoyi.flowable.flow.FlowableUtils; import com.ruoyi.flowable.utils.ModelUtils; import com.ruoyi.flowable.utils.TaskUtils; +import com.ruoyi.workflow.domain.FlowRecord; import com.ruoyi.workflow.domain.bo.WfTaskBo; import com.ruoyi.workflow.service.IWfCopyService; import com.ruoyi.workflow.service.IWfTaskService; @@ -39,10 +40,12 @@ import org.flowable.image.ProcessDiagramGenerator; import org.flowable.task.api.DelegationState; import org.flowable.task.api.Task; import org.flowable.task.api.history.HistoricTaskInstance; +import org.flowable.variable.api.history.HistoricVariableInstance; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.io.InputStream; +import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -119,15 +122,15 @@ public class WfTaskServiceImpl extends FlowServiceFactory implements IWfTaskServ } // 获取流程实例 ProcessInstance processInstance = runtimeService.createProcessInstanceQuery() - .processInstanceId(taskBo.getProcInsId()) - .singleResult(); + .processInstanceId(taskBo.getProcInsId()) + .singleResult(); if (processInstance == null) { throw new RuntimeException("流程实例不存在，请确认！"); } // 获取流程定义信息 ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery() - .processDefinitionId(task.getProcessDefinitionId()) - .singleResult(); + .processDefinitionId(task.getProcessDefinitionId()) + .singleResult(); identityService.setAuthenticatedUserId(TaskUtils.getUserId()); // 添加审批意见 @@ -141,9 +144,9 @@ public class WfTaskServiceImpl extends FlowServiceFactory implements IWfTaskServ List executions = runtimeService.createExecutionQuery().parentId(task.getProcessInstanceId()).list(); List executionIds = executions.stream().map(Execution::getId).collect(Collectors.toList()); runtimeService.createChangeActivityStateBuilder() - .processInstanceId(task.getProcessInstanceId()) - .moveExecutionsToSingleActivityId(executionIds, endEvent.getId()) - .changeState(); + .processInstanceId(task.getProcessInstanceId()) + .moveExecutionsToSingleActivityId(executionIds, endEvent.getId()) + .changeState(); // 处理抄送用户 if (!copyService.makeCopy(taskBo)) { throw new RuntimeException("抄送任务失败"); @@ -206,8 +209,8 @@ public class WfTaskServiceImpl extends FlowServiceFactory implements IWfTaskServ try { // 1 对 1 或 多 对 1 情况，currentIds 当前要跳转的节点列表(1或多)，targetKey 跳转到的节点(1) runtimeService.createChangeActivityStateBuilder() - .processInstanceId(task.getProcessInstanceId()) - .moveActivityIdsToSingleActivityId(currentIds, bo.getTargetKey()).changeState(); + .processInstanceId(task.getProcessInstanceId()) + .moveActivityIdsToSingleActivityId(currentIds, bo.getTargetKey()).changeState(); } catch (FlowableObjectNotFoundException e) { throw new RuntimeException("未找到流程实例，流程可能已发生变化"); } catch (FlowableException e) { @@ -238,16 +241,16 @@ public class WfTaskServiceImpl extends FlowServiceFactory implements IWfTaskServ BpmnModel bpmnModel = repositoryService.getBpmnModel(processDefinition.getId()); // 查询历史节点实例 List activityInstanceList = historyService.createHistoricActivityInstanceQuery() - .processInstanceId(task.getProcessInstanceId()) - .activityType(BpmnXMLConstants.ELEMENT_TASK_USER) - .finished() - .orderByHistoricActivityInstanceEndTime().asc() - .list(); + .processInstanceId(task.getProcessInstanceId()) + .activityType(BpmnXMLConstants.ELEMENT_TASK_USER) + .finished() + .orderByHistoricActivityInstanceEndTime().asc() + .list(); List activityIdList = activityInstanceList.stream() - .map(HistoricActivityInstance::getActivityId) - .filter(activityId -> !StringUtils.equals(activityId, task.getTaskDefinitionKey())) - .distinct() - .collect(Collectors.toList()); + .map(HistoricActivityInstance::getActivityId) + .filter(activityId -> !StringUtils.equals(activityId, task.getTaskDefinitionKey())) + .distinct() + .collect(Collectors.toList()); // 获取当前任务节点元素 FlowElement source = ModelUtils.getFlowElementById(bpmnModel, task.getTaskDefinitionKey()); List elementList = new ArrayList<>(); @@ -313,7 +316,7 @@ public class WfTaskServiceImpl extends FlowServiceFactory implements IWfTaskServ throw new ServiceException("获取任务失败！"); } StringBuilder commentBuilder = new StringBuilder(LoginHelper.getNickName()) - .append("->"); + .append("->"); String nickName = sysUserService.selectNickNameById(Long.parseLong(bo.getUserId())); if (StringUtils.isNotBlank(nickName)) { commentBuilder.append(nickName); @@ -353,7 +356,7 @@ public class WfTaskServiceImpl extends FlowServiceFactory implements IWfTaskServ throw new ServiceException("获取任务失败！"); } StringBuilder commentBuilder = new StringBuilder(LoginHelper.getNickName()) - .append("->"); + .append("->"); String nickName = sysUserService.selectNickNameById(Long.parseLong(bo.getUserId())); if (StringUtils.isNotBlank(nickName)) { commentBuilder.append(nickName); @@ -392,7 +395,7 @@ public class WfTaskServiceImpl extends FlowServiceFactory implements IWfTaskServ } ProcessInstance processInstance = runtimeService.createProcessInstanceQuery() - .processInstanceId(bo.getProcInsId()).singleResult(); + .processInstanceId(bo.getProcInsId()).singleResult(); BpmnModel bpmnModel = repositoryService.getBpmnModel(processInstance.getProcessDefinitionId()); if (Objects.nonNull(bpmnModel)) { Process process = bpmnModel.getMainProcess(); @@ -404,12 +407,12 @@ public class WfTaskServiceImpl extends FlowServiceFactory implements IWfTaskServ // 获取当前流程最后一个节点 String endId = endNodes.get(0).getId(); List executions = runtimeService.createExecutionQuery() - .parentId(processInstance.getProcessInstanceId()).list(); + .parentId(processInstance.getProcessInstanceId()).list(); List executionIds = new ArrayList<>(); executions.forEach(execution -> executionIds.add(execution.getId())); // 变更流程为已结束状态 runtimeService.createChangeActivityStateBuilder() - .moveExecutionsToSingleActivityId(executionIds, endId).changeState(); + .moveExecutionsToSingleActivityId(executionIds, endId).changeState(); } } } @@ -426,17 +429,17 @@ public class WfTaskServiceImpl extends FlowServiceFactory implements IWfTaskServ String taskId = taskBo.getTaskId(); // 校验流程是否结束 ProcessInstance processInstance = runtimeService.createProcessInstanceQuery() - .processInstanceId(procInsId) - .active() - .singleResult(); - if(ObjectUtil.isNull(processInstance)) { + .processInstanceId(procInsId) + .active() + .singleResult(); + if (ObjectUtil.isNull(processInstance)) { throw new RuntimeException("流程已结束或已挂起，无法执行撤回操作"); } // 获取待撤回任务实例 HistoricTaskInstance currTaskIns = historyService.createHistoricTaskInstanceQuery() - .taskId(taskId) - .taskAssignee(TaskUtils.getUserId()) - .singleResult(); + .taskId(taskId) + .taskAssignee(TaskUtils.getUserId()) + .singleResult(); if (ObjectUtil.isNull(currTaskIns)) { throw new RuntimeException("当前任务不存在，无法执行撤回操作"); } @@ -449,10 +452,10 @@ public class WfTaskServiceImpl extends FlowServiceFactory implements IWfTaskServ // 获取当前节点之后已完成的流程历史节点 List finishedTaskInsList = historyService.createHistoricTaskInstanceQuery() - .processInstanceId(procInsId) - .taskCreatedAfter(currTaskIns.getEndTime()) - .finished() - .list(); + .processInstanceId(procInsId) + .taskCreatedAfter(currTaskIns.getEndTime()) + .finished() + .list(); for (HistoricTaskInstance finishedTaskInstance : finishedTaskInsList) { // 检查已完成流程历史节点是否存在下一级中 if (CollUtil.contains(nextUserTaskKeys, finishedTaskInstance.getTaskDefinitionKey())) { @@ -474,8 +477,8 @@ public class WfTaskServiceImpl extends FlowServiceFactory implements IWfTaskServ } try { runtimeService.createChangeActivityStateBuilder() - .processInstanceId(procInsId) - .moveExecutionsToSingleActivityId(revokeExecutionIds, currTaskIns.getTaskDefinitionKey()).changeState(); + .processInstanceId(procInsId) + .moveExecutionsToSingleActivityId(revokeExecutionIds, currTaskIns.getTaskDefinitionKey()).changeState(); } catch (FlowableObjectNotFoundException e) { throw new RuntimeException("未找到流程实例，流程可能已发生变化"); } catch (FlowableException e) { @@ -507,7 +510,7 @@ public class WfTaskServiceImpl extends FlowServiceFactory implements IWfTaskServ // 获得活动的节点 List highLightedFlowList = historyService.createHistoricActivityInstanceQuery() - .processInstanceId(processId).orderByHistoricActivityInstanceStartTime().asc().list(); + .processInstanceId(processId).orderByHistoricActivityInstanceStartTime().asc().list(); List highLightedFlows = new ArrayList<>(); List highLightedNodes = new ArrayList<>(); @@ -528,7 +531,7 @@ public class WfTaskServiceImpl extends FlowServiceFactory implements IWfTaskServ //获取自定义图片生成器 ProcessDiagramGenerator diagramGenerator = new CustomProcessDiagramGenerator(); return diagramGenerator.generateDiagram(bpmnModel, "png", highLightedNodes, highLightedFlows, configuration.getActivityFontName(), - configuration.getLabelFontName(), configuration.getAnnotationFontName(), configuration.getClassLoader(), 1.0, true); + configuration.getLabelFontName(), configuration.getAnnotationFontName(), configuration.getClassLoader(), 1.0, true); } @@ -541,10 +544,10 @@ public class WfTaskServiceImpl extends FlowServiceFactory implements IWfTaskServ @Override public Map getProcessVariables(String taskId) { HistoricTaskInstance historicTaskInstance = historyService.createHistoricTaskInstanceQuery() - .includeProcessVariables() - .finished() - .taskId(taskId) - .singleResult(); + .includeProcessVariables() + .finished() + .taskId(taskId) + .singleResult(); if (Objects.nonNull(historicTaskInstance)) { return historicTaskInstance.getProcessVariables(); } @@ -553,8 +556,9 @@ public class WfTaskServiceImpl extends FlowServiceFactory implements IWfTaskServ /** * 启动第一个任务 + * * @param processInstance 流程实例 - * @param variables 流程参数 + * @param variables 流程参数 */ @Override public void startFirstTask(ProcessInstance processInstance, Map variables) { @@ -574,15 +578,16 @@ public class WfTaskServiceImpl extends FlowServiceFactory implements IWfTaskServ /** * 指派下一任务审批人 - * @param bpmnModel bpmn模型 + * + * @param bpmnModel bpmn模型 * @param processInsId 流程实例id - * @param userIds 用户ids + * @param userIds 用户ids */ private void assignNextUsers(BpmnModel bpmnModel, String processInsId, String userIds) { // 获取所有节点信息 List list = taskService.createTaskQuery() - .processInstanceId(processInsId) - .list(); + .processInstanceId(processInsId) + .list(); if (list.size() == 0) { return; } @@ -620,4 +625,107 @@ public class WfTaskServiceImpl extends FlowServiceFactory implements IWfTaskServ } } } + + + /** + * 根据 category + userId 查询已审批通过（流程已结束）的记录，提取 startTime, endTime 返回 + * + * @param userId 当前用户ID + * @param category 流程分类 (如 "trip" 出差, "absence" 请假) + * @return 已审批通过的记录列表，每个包含 startTime, endTime + */ + @Override + public List getApprovedRecords(Long userId, String category) { + List result = new ArrayList<>(); + + // 1) 先查找所有 与 category 匹配的流程定义（可能有多个版本） + List definitions = repositoryService.createProcessDefinitionQuery() + .processDefinitionCategory(category) + .latestVersion() // 如果只想用最新版本，可加这一行 + .list(); + + if (definitions == null || definitions.isEmpty()) { + return result; // 没找到对应分类的流程定义，直接返回空 + } + + // 收集所有流程定义ID + List defIds = definitions.stream() + .map(ProcessDefinition::getId) + .collect(Collectors.toList()); + + // 2) 根据流程定义ID列表 + startedBy(userId) + 已结束流程，查流程实例 + for (String defId : defIds) { + List hpiList = historyService.createHistoricProcessInstanceQuery() + .processDefinitionId(defId) + .startedBy(String.valueOf(userId)) + .finished() // 已审批完成 / 已结束 + .list(); + // 3)对每个已结束的流程实例，去找 startTime, endTime 变量 + for (HistoricProcessInstance hpi : hpiList) { + String procInstId = hpi.getId(); + // 3.1) 如果 startTime, endTime 是存流程变量，直接查 HistoricVariableInstance + List varList = historyService.createHistoricVariableInstanceQuery() + .processInstanceId(procInstId) + .list(); + + // 根据你的实际变量名提取 + Date startDate = null; + Date endDate = null; + for (HistoricVariableInstance var : varList) { + if ("startTime".equals(var.getVariableName())) { + // 若你的流程里存的就是 Date 类型，可以直接转 + startDate = (Date) var.getValue(); + } else if ("endTime".equals(var.getVariableName())) { + endDate = (Date) var.getValue(); + } + } + + // 3.2) 或者，如果 startTime, endTime 是 FormProperty，则可用 HistoricDetailQuery + // 下面演示如果在表单属性里 + // (示例仅供参考，实际要看你在模型里是否使用了 ) + /* + List details = historyService.createHistoricDetailQuery() + .processInstanceId(procInstId) + .formProperties() + .list(); + for (HistoricDetail d : details) { + HistoricFormProperty fp = (HistoricFormProperty) d; + if ("startTime".equals(fp.getPropertyId())) { + // 这里可能需要 parse 成 Date + startDate = parseDate(fp.getPropertyValue()); + } else if ("endTime".equals(fp.getPropertyId())) { + endDate = parseDate(fp.getPropertyValue()); + } + } + */ + + // 4) 最后封装到 FlowRecord + if (startDate != null && endDate != null) { + FlowRecord record = new FlowRecord(); + record.setStartTime(startDate); + record.setEndTime(endDate); + // 你还可以记录更多字段，如: record.setCategory(category); + result.add(record); + } + } + } + return result; + } + + /** + * 如果需要解析字符串 => Date，可以用 SimpleDateFormat 或其他方式 + */ + private Date parseDate(String dateStr) { + if (dateStr == null) return null; + try { + return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(dateStr); + } catch (Exception e) { + // 失败再试别的格式 + try { + return new SimpleDateFormat("yyyy-MM-dd").parse(dateStr); + } catch (Exception ignored) { + } + } + return null; + } } diff --git a/script/sql/20241120数据备份/gen_table.sql b/script/sql/20241120数据备份/gen_table.sql index d2409dd..1e6c728 100644 --- a/script/sql/20241120数据备份/gen_table.sql +++ b/script/sql/20241120数据备份/gen_table.sql @@ -10,7 +10,7 @@ INSERT INTO fad_oa.gen_table (table_id, table_name, table_comment, sub_table_nam INSERT INTO fad_oa.gen_table (table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options, create_by, create_time, update_by, update_time, remark) VALUES (1774987912672313345, 'sys_oa_remind', '任务事件提醒表', null, null, 'SysOaRemind', 'crud', 'com.ruoyi.oa', 'oa', 'remind', '事件提醒', 'huangxing', '0', '/', '{"treeCode":null,"treeName":null,"treeParentCode":null,"parentMenuId":"1774989374680858626"}', 'admin', '2024-04-02 10:30:02', 'admin', '2024-04-02 10:52:57', null); INSERT INTO fad_oa.gen_table (table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options, create_by, create_time, update_by, update_time, remark) VALUES (1848275002168209409, 'socket_contact', '通信目录表', null, null, 'SocketContact', 'crud', 'com.ruoyi.system', 'system', 'contact', '通信目录', 'hdka', '0', '/', '{"treeCode":null,"treeName":null,"treeParentCode":null,"parentMenuId":null}', 'admin', '2024-10-21 15:59:27', 'admin', '2024-10-21 16:08:37', null); INSERT INTO fad_oa.gen_table (table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options, create_by, create_time, update_by, update_time, remark) VALUES (1850345960404221953, 'socket_message', '对话信息表', null, null, 'SocketMessage', 'crud', 'com.ruoyi.system', 'system', 'message', '对话信息', 'hdka', '0', '/', '{"treeCode":null,"treeName":null,"treeParentCode":null,"parentMenuId":null}', 'admin', '2024-10-27 09:09:08', 'admin', '2024-10-27 09:17:37', null); -INSERT INTO fad_oa.gen_table (table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options, create_by, create_time, update_by, update_time, remark) VALUES (1852578588693954561, 'sys_oa_out_warehouse', '仓库出库表', null, null, 'SysOaOutWarehouse', 'crud', 'com.ruoyi.oa', 'oa', 'oaOutWarehouse', '仓库出库', 'liuzongkun999', '0', '/', '{"treeCode":null,"treeName":null,"treeParentCode":null,"parentMenuId":"1852933620281430018"}', 'admin', '2024-11-02 12:00:40', 'admin', '2024-11-04 15:47:02', null); +INSERT INTO fad_oa.gen_table (table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options, create_by, create_time, update_by, update_time, remark) VALUES (1852578588693954561, 'sys_oa_warehouse_detail', '仓库出库表', null, null, 'SysOaOutWarehouse', 'crud', 'com.ruoyi.oa', 'oa', 'oaOutWarehouse', '仓库出库', 'liuzongkun999', '0', '/', '{"treeCode":null,"treeName":null,"treeParentCode":null,"parentMenuId":"1852933620281430018"}', 'admin', '2024-11-02 12:00:40', 'admin', '2024-11-04 15:47:02', null); INSERT INTO fad_oa.gen_table (table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options, create_by, create_time, update_by, update_time, remark) VALUES (1852578589482483713, 'sys_oa_warehouse', '仓库管理表', null, null, 'SysOaWarehouse', 'crud', 'com.ruoyi.oa', 'oa', 'oaWarehouse', '库存管理', 'liuzongkun999', '0', '/', '{"treeCode":null,"treeName":null,"treeParentCode":null,"parentMenuId":"1852933620281430018"}', 'admin', '2024-11-02 11:42:55', 'admin', '2024-11-03 12:40:50', null); INSERT INTO fad_oa.gen_table (table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options, create_by, create_time, update_by, update_time, remark) VALUES (1852593527033245697, 'sys_oa_receive_account', '付款账户管理', null, null, 'SysOaReceiveAccount', 'crud', 'com.ruoyi.system', 'system', 'oaReceiveAccount', '付款账户管理', 'hdka', '0', '/', '{"treeCode":null,"treeName":null,"treeParentCode":null,"parentMenuId":3}', 'admin', '2024-11-02 14:07:30', 'admin', '2024-11-02 14:08:54', null); INSERT INTO fad_oa.gen_table (table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options, create_by, create_time, update_by, update_time, remark) VALUES (1852965373587013633, 'sys_oa_worker', '人员管理', null, null, 'SysOaWorker', 'crud', 'com.ruoyi.oa', 'system', 'oaWorker', '人员管理', 'hdka', '0', '/', '{"treeCode":null,"treeName":null,"treeParentCode":null,"parentMenuId":null}', 'admin', '2024-11-03 14:34:56', 'admin', '2024-11-03 14:49:53', null); diff --git a/script/sql/20241120数据备份/sys_oa_out_warehouse.sql b/script/sql/20241120数据备份/sys_oa_out_warehouse.sql index b36660e..a95e49e 100644 --- a/script/sql/20241120数据备份/sys_oa_out_warehouse.sql +++ b/script/sql/20241120数据备份/sys_oa_out_warehouse.sql @@ -1,18 +1,18 @@ -INSERT INTO fad_oa.sys_oa_out_warehouse (id, project_id, amount, remark, warehouse_id, create_time, create_by, update_time, update_by, del_flag) VALUES (1, 1795992349147906049, 131, 'wdawd', 2, '2024-11-05 17:41:41', 'admin', '2024-11-05 17:41:41', 'admin', 0); -INSERT INTO fad_oa.sys_oa_out_warehouse (id, project_id, amount, remark, warehouse_id, create_time, create_by, update_time, update_by, del_flag) VALUES (2, 1852953303521009665, 1, 'wdawd1', 1, '2024-11-05 20:11:01', 'admin', '2024-11-05 20:11:01', 'admin', 2); -INSERT INTO fad_oa.sys_oa_out_warehouse (id, project_id, amount, remark, warehouse_id, create_time, create_by, update_time, update_by, del_flag) VALUES (3, 1852953303521009665, 1, 'wdawd1', 1, '2024-11-05 20:16:02', 'admin', '2024-11-05 20:16:02', 'admin', 0); -INSERT INTO fad_oa.sys_oa_out_warehouse (id, project_id, amount, remark, warehouse_id, create_time, create_by, update_time, update_by, del_flag) VALUES (4, 1852953303521009665, 1, 'wdawd1', 1, '2024-11-05 20:25:52', 'admin', '2024-11-05 20:25:52', 'admin', 0); -INSERT INTO fad_oa.sys_oa_out_warehouse (id, project_id, amount, remark, warehouse_id, create_time, create_by, update_time, update_by, del_flag) VALUES (5, 1852953303521009665, 1, 'wdawd1', 1, '2024-11-05 20:26:51', 'admin', '2024-11-05 20:26:51', 'admin', 0); -INSERT INTO fad_oa.sys_oa_out_warehouse (id, project_id, amount, remark, warehouse_id, create_time, create_by, update_time, update_by, del_flag) VALUES (6, 1852953303521009665, 1, 'wdawd1', 1, '2024-11-05 20:27:43', 'admin', '2024-11-05 20:27:43', 'admin', 2); -INSERT INTO fad_oa.sys_oa_out_warehouse (id, project_id, amount, remark, warehouse_id, create_time, create_by, update_time, update_by, del_flag) VALUES (7, 1852953303521009665, 3, 'wdawd1', 1, '2024-11-05 20:30:22', 'admin', '2024-11-05 20:30:22', 'admin', 2); -INSERT INTO fad_oa.sys_oa_out_warehouse (id, project_id, amount, remark, warehouse_id, create_time, create_by, update_time, update_by, del_flag) VALUES (8, 1852953303521009665, 1, 'wdawd1', 1, '2024-11-05 20:32:39', 'admin', '2024-11-05 20:32:39', 'admin', 0); -INSERT INTO fad_oa.sys_oa_out_warehouse (id, project_id, amount, remark, warehouse_id, create_time, create_by, update_time, update_by, del_flag) VALUES (9, 1852953303521009665, 1, 'wdawd3', 3, '2024-11-05 20:32:39', 'admin', '2024-11-05 20:32:39', 'admin', 0); -INSERT INTO fad_oa.sys_oa_out_warehouse (id, project_id, amount, remark, warehouse_id, create_time, create_by, update_time, update_by, del_flag) VALUES (10, 1852953303521009665, 1, 'wdawd1', 1, '2024-11-05 20:34:02', 'admin', '2024-11-05 20:34:02', 'admin', 0); -INSERT INTO fad_oa.sys_oa_out_warehouse (id, project_id, amount, remark, warehouse_id, create_time, create_by, update_time, update_by, del_flag) VALUES (11, 1852953303521009665, 1, 'test01', 3, '2024-11-05 21:54:28', 'admin', '2024-11-05 21:54:28', 'admin', 2); -INSERT INTO fad_oa.sys_oa_out_warehouse (id, project_id, amount, remark, warehouse_id, create_time, create_by, update_time, update_by, del_flag) VALUES (12, 1852953303521009665, 1, 'test01', 3, '2024-11-05 21:58:59', 'admin', '2024-11-05 21:58:59', 'admin', 2); -INSERT INTO fad_oa.sys_oa_out_warehouse (id, project_id, amount, remark, warehouse_id, create_time, create_by, update_time, update_by, del_flag) VALUES (13, 1852953303521009665, 1, 'test01', 3, '2024-11-05 21:59:55', 'admin', '2024-11-05 21:59:55', 'admin', 0); -INSERT INTO fad_oa.sys_oa_out_warehouse (id, project_id, amount, remark, warehouse_id, create_time, create_by, update_time, update_by, del_flag) VALUES (14, 1852590281594056706, 2, null, 1, '2024-11-06 16:17:05', 'admin', '2024-11-06 16:17:05', 'admin', 2); -INSERT INTO fad_oa.sys_oa_out_warehouse (id, project_id, amount, remark, warehouse_id, create_time, create_by, update_time, update_by, del_flag) VALUES (15, 1852590281594056706, 10, null, 1, '2024-11-06 16:53:08', 'admin', '2024-11-06 16:53:08', 'admin', 0); -INSERT INTO fad_oa.sys_oa_out_warehouse (id, project_id, amount, remark, warehouse_id, create_time, create_by, update_time, update_by, del_flag) VALUES (16, 1852590281594056706, 28, null, 2, '2024-11-06 16:53:08', 'admin', '2024-11-06 16:53:08', 'admin', 0); -INSERT INTO fad_oa.sys_oa_out_warehouse (id, project_id, amount, remark, warehouse_id, create_time, create_by, update_time, update_by, del_flag) VALUES (17, 1856147362642014209, 2, null, 3, '2024-11-16 14:04:19', 'admin', '2024-11-16 14:04:19', 'admin', 0); -INSERT INTO fad_oa.sys_oa_out_warehouse (id, project_id, amount, remark, warehouse_id, create_time, create_by, update_time, update_by, del_flag) VALUES (18, null, 2, null, 3, '2024-11-16 14:09:59', 'admin', '2024-11-16 14:09:59', 'admin', 0); +INSERT INTO fad_oa.sys_oa_warehouse_detail (id, project_id, amount, remark, warehouse_id, create_time, create_by, update_time, update_by, del_flag) VALUES (1, 1795992349147906049, 131, 'wdawd', 2, '2024-11-05 17:41:41', 'admin', '2024-11-05 17:41:41', 'admin', 0); +INSERT INTO fad_oa.sys_oa_warehouse_detail (id, project_id, amount, remark, warehouse_id, create_time, create_by, update_time, update_by, del_flag) VALUES (2, 1852953303521009665, 1, 'wdawd1', 1, '2024-11-05 20:11:01', 'admin', '2024-11-05 20:11:01', 'admin', 2); +INSERT INTO fad_oa.sys_oa_warehouse_detail (id, project_id, amount, remark, warehouse_id, create_time, create_by, update_time, update_by, del_flag) VALUES (3, 1852953303521009665, 1, 'wdawd1', 1, '2024-11-05 20:16:02', 'admin', '2024-11-05 20:16:02', 'admin', 0); +INSERT INTO fad_oa.sys_oa_warehouse_detail (id, project_id, amount, remark, warehouse_id, create_time, create_by, update_time, update_by, del_flag) VALUES (4, 1852953303521009665, 1, 'wdawd1', 1, '2024-11-05 20:25:52', 'admin', '2024-11-05 20:25:52', 'admin', 0); +INSERT INTO fad_oa.sys_oa_warehouse_detail (id, project_id, amount, remark, warehouse_id, create_time, create_by, update_time, update_by, del_flag) VALUES (5, 1852953303521009665, 1, 'wdawd1', 1, '2024-11-05 20:26:51', 'admin', '2024-11-05 20:26:51', 'admin', 0); +INSERT INTO fad_oa.sys_oa_warehouse_detail (id, project_id, amount, remark, warehouse_id, create_time, create_by, update_time, update_by, del_flag) VALUES (6, 1852953303521009665, 1, 'wdawd1', 1, '2024-11-05 20:27:43', 'admin', '2024-11-05 20:27:43', 'admin', 2); +INSERT INTO fad_oa.sys_oa_warehouse_detail (id, project_id, amount, remark, warehouse_id, create_time, create_by, update_time, update_by, del_flag) VALUES (7, 1852953303521009665, 3, 'wdawd1', 1, '2024-11-05 20:30:22', 'admin', '2024-11-05 20:30:22', 'admin', 2); +INSERT INTO fad_oa.sys_oa_warehouse_detail (id, project_id, amount, remark, warehouse_id, create_time, create_by, update_time, update_by, del_flag) VALUES (8, 1852953303521009665, 1, 'wdawd1', 1, '2024-11-05 20:32:39', 'admin', '2024-11-05 20:32:39', 'admin', 0); +INSERT INTO fad_oa.sys_oa_warehouse_detail (id, project_id, amount, remark, warehouse_id, create_time, create_by, update_time, update_by, del_flag) VALUES (9, 1852953303521009665, 1, 'wdawd3', 3, '2024-11-05 20:32:39', 'admin', '2024-11-05 20:32:39', 'admin', 0); +INSERT INTO fad_oa.sys_oa_warehouse_detail (id, project_id, amount, remark, warehouse_id, create_time, create_by, update_time, update_by, del_flag) VALUES (10, 1852953303521009665, 1, 'wdawd1', 1, '2024-11-05 20:34:02', 'admin', '2024-11-05 20:34:02', 'admin', 0); +INSERT INTO fad_oa.sys_oa_warehouse_detail (id, project_id, amount, remark, warehouse_id, create_time, create_by, update_time, update_by, del_flag) VALUES (11, 1852953303521009665, 1, 'test01', 3, '2024-11-05 21:54:28', 'admin', '2024-11-05 21:54:28', 'admin', 2); +INSERT INTO fad_oa.sys_oa_warehouse_detail (id, project_id, amount, remark, warehouse_id, create_time, create_by, update_time, update_by, del_flag) VALUES (12, 1852953303521009665, 1, 'test01', 3, '2024-11-05 21:58:59', 'admin', '2024-11-05 21:58:59', 'admin', 2); +INSERT INTO fad_oa.sys_oa_warehouse_detail (id, project_id, amount, remark, warehouse_id, create_time, create_by, update_time, update_by, del_flag) VALUES (13, 1852953303521009665, 1, 'test01', 3, '2024-11-05 21:59:55', 'admin', '2024-11-05 21:59:55', 'admin', 0); +INSERT INTO fad_oa.sys_oa_warehouse_detail (id, project_id, amount, remark, warehouse_id, create_time, create_by, update_time, update_by, del_flag) VALUES (14, 1852590281594056706, 2, null, 1, '2024-11-06 16:17:05', 'admin', '2024-11-06 16:17:05', 'admin', 2); +INSERT INTO fad_oa.sys_oa_warehouse_detail (id, project_id, amount, remark, warehouse_id, create_time, create_by, update_time, update_by, del_flag) VALUES (15, 1852590281594056706, 10, null, 1, '2024-11-06 16:53:08', 'admin', '2024-11-06 16:53:08', 'admin', 0); +INSERT INTO fad_oa.sys_oa_warehouse_detail (id, project_id, amount, remark, warehouse_id, create_time, create_by, update_time, update_by, del_flag) VALUES (16, 1852590281594056706, 28, null, 2, '2024-11-06 16:53:08', 'admin', '2024-11-06 16:53:08', 'admin', 0); +INSERT INTO fad_oa.sys_oa_warehouse_detail (id, project_id, amount, remark, warehouse_id, create_time, create_by, update_time, update_by, del_flag) VALUES (17, 1856147362642014209, 2, null, 3, '2024-11-16 14:04:19', 'admin', '2024-11-16 14:04:19', 'admin', 0); +INSERT INTO fad_oa.sys_oa_warehouse_detail (id, project_id, amount, remark, warehouse_id, create_time, create_by, update_time, update_by, del_flag) VALUES (18, null, 2, null, 3, '2024-11-16 14:09:59', 'admin', '2024-11-16 14:09:59', 'admin', 0); diff --git a/script/sql/20241120数据备份/sys_oper_log.sql b/script/sql/20241120数据备份/sys_oper_log.sql index c82d52e..ed3b979 100644 --- a/script/sql/20241120数据备份/sys_oper_log.sql +++ b/script/sql/20241120数据备份/sys_oper_log.sql @@ -24,13 +24,13 @@ INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_ INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1851913467930382338, '对话信息', 1, 'com.ruoyi.system.controller.SocketMessageController.add()', 'POST', 1, 'admin', '', '/system/message', '127.0.0.1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"id":21,"contactId":1,"userId":1,"content":"wisgu ?\\n","roomId":0,"remark":null}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-10-31 17:05:52'); INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1851914890235645953, '对话信息', 1, 'com.ruoyi.system.controller.SocketMessageController.add()', 'POST', 1, 'admin', '', '/system/message', '127.0.0.1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"id":22,"contactId":1,"userId":1,"content":"?\\na ","roomId":0,"remark":null}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-10-31 17:11:31'); INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1851915041268338689, '对话信息', 1, 'com.ruoyi.system.controller.SocketMessageController.add()', 'POST', 1, 'admin', '', '/system/message', '127.0.0.1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"id":23,"contactId":1,"userId":1,"content":"a !@123","roomId":0,"remark":null}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-10-31 17:12:07'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1852578590401036289, '代码生成', 6, 'com.ruoyi.generator.controller.GenController.importTableSave()', 'POST', 1, 'admin', '', '/tool/gen/importTable', '127.0.0.1', '内网IP', '"sys_oa_warehouse,sys_oa_out_warehouse"', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-02 13:08:50'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1852578590401036289, '代码生成', 6, 'com.ruoyi.generator.controller.GenController.importTableSave()', 'POST', 1, 'admin', '', '/tool/gen/importTable', '127.0.0.1', '内网IP', '"sys_oa_warehouse,sys_oa_warehouse_detail"', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-02 13:08:50'); INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1852581777747554306, '角色管理', 2, 'com.ruoyi.web.controller.system.SysRoleController.edit()', 'PUT', 1, 'admin', '', '/system/role', '127.0.0.1', '内网IP', '{"createBy":"admin","createTime":"2024-01-05 16:25:40","updateBy":"admin","updateTime":"2024-11-02 13:21:29","roleId":"1743186990678077442","roleName":"总经理","roleKey":"ceo","roleSort":2,"dataScope":"1","menuCheckStrictly":true,"deptCheckStrictly":true,"status":"0","delFlag":"0","remark":null,"flag":false,"menuIds":["1774989374680858626","1774990200023416833","1760944548859858945","1760952042667626498","1774253657994448897","1744021537846177794","1745332746591649794","1745470812190818305","1744021734047330305","1745054570468597761","1744022006375100417","1747294855579742209","1747291275166642178","1744027281597378561",107,"1744026651709386753","1747450819331104770","1747455602796417025",1,118,"1774998680985804801","1774990200023416834","1774990200023416835","1774990200023416836","1848261898990546945",5,125,1180,1181,126,1190,1191,1192,1193,127,1200,1201,128,1210,1211,129,1220,1221,130,1230,"1760952042667626499","1760952042667626500","1760952042667626501","1774253657994448898","1774253657994448899","1774253657994448900","1745332746591649795","1745332746591649796","1745332746591649797","1745332746591649798","1745470812190818306","1745470812190818307","1745470812190818308","1763217716546887682","1745054570468597762","1745054570468597763","1745054570468597764","1747294855579742210","1747294855579742211","1747294855579742212","1746809519695167490","1747291275166642179","1747291275166642180","1747291275166642181",1070,1071,1072,"1747450819331104771","1747450819331104772","1747450819331104773","1747455602796417026","1747455602796417027","1747455602796417028",1130,1131,1132,1133],"deptIds":null,"admin":false}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-02 13:21:30'); INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1852582579396489217, '字典数据', 1, 'com.ruoyi.web.controller.system.SysDictDataController.add()', 'POST', 1, 'admin', '', '/system/dict/data', '127.0.0.1', '内网IP', '{"createBy":"admin","createTime":"2024-11-02 13:24:40","updateBy":"admin","updateTime":"2024-11-02 13:24:40","dictCode":"1852582578998030337","dictSort":0,"dictLabel":"现金转账","dictValue":"3","dictType":"sys_pay_type","cssClass":null,"listClass":"default","isDefault":null,"status":"0","remark":null,"default":false}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-02 13:24:41'); INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1852582643154104321, '字典数据', 1, 'com.ruoyi.web.controller.system.SysDictDataController.add()', 'POST', 1, 'admin', '', '/system/dict/data', '127.0.0.1', '内网IP', '{"createBy":"admin","createTime":"2024-11-02 13:24:56","updateBy":"admin","updateTime":"2024-11-02 13:24:56","dictCode":"1852582642894057473","dictSort":0,"dictLabel":"银行承兑","dictValue":"4","dictType":"sys_pay_type","cssClass":null,"listClass":"default","isDefault":null,"status":"1","remark":null,"default":false}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-02 13:24:56'); INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1852582663060271106, '字典数据', 2, 'com.ruoyi.web.controller.system.SysDictDataController.edit()', 'PUT', 1, 'admin', '', '/system/dict/data', '127.0.0.1', '内网IP', '{"createBy":"admin","createTime":"2024-11-02 13:24:56","updateBy":"admin","updateTime":"2024-11-02 13:25:00","dictCode":"1852582642894057473","dictSort":0,"dictLabel":"银行承兑","dictValue":"4","dictType":"sys_pay_type","cssClass":null,"listClass":"default","isDefault":"N","status":"0","remark":null,"default":false}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-02 13:25:01'); INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1852585973894414337, '代码生成', 2, 'com.ruoyi.generator.controller.GenController.editSave()', 'PUT', 1, 'admin', '', '/tool/gen', '127.0.0.1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":"admin","updateTime":"2024-11-02 13:38:09","params":{"treeCode":null,"treeName":null,"treeParentCode":null,"parentMenuId":3},"tableId":"1852578589482483713","tableName":"sys_oa_warehouse","tableComment":"仓库管理表","subTableName":null,"subTableFkName":null,"className":"SysOaWarehouse","tplCategory":"crud","packageName":"com.ruoyi.system","moduleName":"system","businessName":"oaWarehouse","functionName":"仓库管理","functionAuthor":"ruoyi","genType":"0","genPath":"/","pkColumn":null,"subTable":null,"columns":[{"createBy":"admin","createTime":"2024-11-02 13:08:50","updateBy":"admin","updateTime":"2024-11-02 13:38:09","columnId":"1852578589675421698","tableId":"1852578589482483713","columnName":"id","columnComment":"主键id","columnType":"int","javaType":"Long","javaField":"id","isPk":"1","isIncrement":"1","isRequired":"1","isInsert":null,"isEdit":"1","isList":"1","isQuery":null,"queryType":"EQ","htmlType":"input","dictType":"","sort":1,"required":true,"list":true,"usableColumn":false,"superColumn":false,"pk":true,"insert":false,"edit":true,"capJavaField":"Id","increment":true,"query":false},{"createBy":"admin","createTime":"2024-11-02 13:08:50","updateBy":"admin","updateTime":"2024-11-02 13:38:09","columnId":"1852578589675421699","tableId":"1852578589482483713","columnName":"inventory","columnComment":"库存数量","columnType":"int","javaType":"Long","javaField":"inventory","isPk":"0","isIncrement":"0","isRequired":"1","isInsert":"1","isEdit":"1","isList":"1","isQuery":"1","queryType":"EQ","htmlType":"input","dictType":"","sort":2,"required":true,"list":true,"usableColumn":false,"superColumn":false,"pk":false,"insert":true,"edit":true,"capJavaField":"Inventory","increment":false,"query":true},{"createBy":"admin","createTime":"2024-11-02 13:08:50","updateBy":"admin","updateTime":"2024-11-02 13:38:09","columnId":"1852578589675421700","tableId":"1852578589482483713","columnName":"model","columnComment":"型号","columnType":"varchar(50)","javaType', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-02 13:38:10'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1852586469002641409, '代码生成', 2, 'com.ruoyi.generator.controller.GenController.editSave()', 'PUT', 1, 'admin', '', '/tool/gen', '127.0.0.1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":"admin","updateTime":"2024-11-02 13:40:07","params":{"treeCode":null,"treeName":null,"treeParentCode":null,"parentMenuId":3},"tableId":"1852578588693954561","tableName":"sys_oa_out_warehouse","tableComment":"仓库出库表","subTableName":null,"subTableFkName":null,"className":"SysOaOutWarehouse","tplCategory":"crud","packageName":"com.ruoyi.system","moduleName":"system","businessName":"oaOutWarehouse","functionName":"仓库出库","functionAuthor":"ruoyi","genType":"0","genPath":"/","pkColumn":null,"subTable":null,"columns":[{"createBy":"admin","createTime":"2024-11-02 13:08:50","updateBy":"admin","updateTime":"2024-11-02 13:40:07","columnId":"1852578588954001409","tableId":"1852578588693954561","columnName":"id","columnComment":"主键id","columnType":"int","javaType":"Long","javaField":"id","isPk":"1","isIncrement":"1","isRequired":"1","isInsert":null,"isEdit":"1","isList":"1","isQuery":null,"queryType":"EQ","htmlType":"input","dictType":"","sort":1,"required":true,"list":true,"usableColumn":false,"superColumn":false,"pk":true,"insert":false,"edit":true,"capJavaField":"Id","increment":true,"query":false},{"createBy":"admin","createTime":"2024-11-02 13:08:50","updateBy":"admin","updateTime":"2024-11-02 13:40:08","columnId":"1852578588954001410","tableId":"1852578588693954561","columnName":"project_id","columnComment":"出库后对应的项目id","columnType":"int","javaType":"Long","javaField":"projectId","isPk":"0","isIncrement":"0","isRequired":"1","isInsert":"1","isEdit":"1","isList":"1","isQuery":"1","queryType":"EQ","htmlType":"input","dictType":"","sort":2,"required":true,"list":true,"usableColumn":false,"superColumn":false,"pk":false,"insert":true,"edit":true,"capJavaField":"ProjectId","increment":false,"query":true},{"createBy":"admin","createTime":"2024-11-02 13:08:50","updateBy":"admin","updateTime":"2024-11-02 13:40:08","columnId":"1852578588954001411","tableId":"1852578588693954561","columnName":"amount","columnComment":"出库数量","columnType":"in', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-02 13:40:08'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1852586469002641409, '代码生成', 2, 'com.ruoyi.generator.controller.GenController.editSave()', 'PUT', 1, 'admin', '', '/tool/gen', '127.0.0.1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":"admin","updateTime":"2024-11-02 13:40:07","params":{"treeCode":null,"treeName":null,"treeParentCode":null,"parentMenuId":3},"tableId":"1852578588693954561","tableName":"sys_oa_warehouse_detail","tableComment":"仓库出库表","subTableName":null,"subTableFkName":null,"className":"SysOaOutWarehouse","tplCategory":"crud","packageName":"com.ruoyi.system","moduleName":"system","businessName":"oaOutWarehouse","functionName":"仓库出库","functionAuthor":"ruoyi","genType":"0","genPath":"/","pkColumn":null,"subTable":null,"columns":[{"createBy":"admin","createTime":"2024-11-02 13:08:50","updateBy":"admin","updateTime":"2024-11-02 13:40:07","columnId":"1852578588954001409","tableId":"1852578588693954561","columnName":"id","columnComment":"主键id","columnType":"int","javaType":"Long","javaField":"id","isPk":"1","isIncrement":"1","isRequired":"1","isInsert":null,"isEdit":"1","isList":"1","isQuery":null,"queryType":"EQ","htmlType":"input","dictType":"","sort":1,"required":true,"list":true,"usableColumn":false,"superColumn":false,"pk":true,"insert":false,"edit":true,"capJavaField":"Id","increment":true,"query":false},{"createBy":"admin","createTime":"2024-11-02 13:08:50","updateBy":"admin","updateTime":"2024-11-02 13:40:08","columnId":"1852578588954001410","tableId":"1852578588693954561","columnName":"project_id","columnComment":"出库后对应的项目id","columnType":"int","javaType":"Long","javaField":"projectId","isPk":"0","isIncrement":"0","isRequired":"1","isInsert":"1","isEdit":"1","isList":"1","isQuery":"1","queryType":"EQ","htmlType":"input","dictType":"","sort":2,"required":true,"list":true,"usableColumn":false,"superColumn":false,"pk":false,"insert":true,"edit":true,"capJavaField":"ProjectId","increment":false,"query":true},{"createBy":"admin","createTime":"2024-11-02 13:08:50","updateBy":"admin","updateTime":"2024-11-02 13:40:08","columnId":"1852578588954001411","tableId":"1852578588693954561","columnName":"amount","columnComment":"出库数量","columnType":"in', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-02 13:40:08'); INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1852586502074728450, '代码生成', 8, 'com.ruoyi.generator.controller.GenController.batchGenCode()', 'GET', 1, 'admin', '', '/tool/gen/batchGenCode', '127.0.0.1', '内网IP', '{"tables":"sys_oa_warehouse"}', '', 0, '', '2024-11-02 13:40:16'); INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1852586506168369153, '代码生成', 8, 'com.ruoyi.generator.controller.GenController.batchGenCode()', 'GET', 1, 'admin', '', '/tool/gen/batchGenCode', '127.0.0.1', '内网IP', '{"tables":"sys_oa_warehouse"}', '', 1, 'EL1007E: Property or field \'datasource\' cannot be found on null', '2024-11-02 13:40:17'); INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1852586517476212738, '代码生成', 8, 'com.ruoyi.generator.controller.GenController.batchGenCode()', 'GET', 1, 'admin', '', '/tool/gen/batchGenCode', '127.0.0.1', '内网IP', '{"tables":"sys_oa_warehouse"}', '', 0, '', '2024-11-02 13:40:20'); @@ -38,7 +38,7 @@ INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_ INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1852586984964947970, '代码生成', 8, 'com.ruoyi.generator.controller.GenController.batchGenCode()', 'GET', 1, 'admin', '', '/tool/gen/batchGenCode', '127.0.0.1', '内网IP', '{"tables":"sys_oa_warehouse"}', '', 0, '', '2024-11-02 13:42:11'); INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1852588844357070849, '项目管理', 3, 'com.ruoyi.oa.controller.SysOaProjectController.remove()', 'DELETE', 1, 'admin', '', '/oa/project/1848619184239357954', '127.0.0.1', '内网IP', '{}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-02 13:49:35'); INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1852589779856183298, '代码生成', 2, 'com.ruoyi.generator.controller.GenController.editSave()', 'PUT', 1, 'admin', '', '/tool/gen', '127.0.0.1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":"admin","updateTime":"2024-11-02 13:53:17","params":{"treeCode":null,"treeName":null,"treeParentCode":null,"parentMenuId":"3"},"tableId":"1852578589482483713","tableName":"sys_oa_warehouse","tableComment":"仓库管理表","subTableName":null,"subTableFkName":null,"className":"SysOaWarehouse","tplCategory":"crud","packageName":"com.ruoyi.oa","moduleName":"oa","businessName":"oaWarehouse","functionName":"仓库管理","functionAuthor":"ruoyi","genType":"0","genPath":"/","pkColumn":null,"subTable":null,"columns":[{"createBy":"admin","createTime":"2024-11-02 13:08:50","updateBy":"admin","updateTime":"2024-11-02 13:53:17","columnId":"1852578589675421698","tableId":"1852578589482483713","columnName":"id","columnComment":"主键id","columnType":"int","javaType":"Long","javaField":"id","isPk":"1","isIncrement":"1","isRequired":"1","isInsert":null,"isEdit":"1","isList":"1","isQuery":null,"queryType":"EQ","htmlType":"input","dictType":"","sort":1,"required":true,"list":true,"edit":true,"superColumn":false,"pk":true,"usableColumn":false,"insert":false,"capJavaField":"Id","increment":true,"query":false},{"createBy":"admin","createTime":"2024-11-02 13:08:50","updateBy":"admin","updateTime":"2024-11-02 13:53:17","columnId":"1852578589675421699","tableId":"1852578589482483713","columnName":"inventory","columnComment":"库存数量","columnType":"int","javaType":"Long","javaField":"inventory","isPk":"0","isIncrement":"0","isRequired":"1","isInsert":"1","isEdit":"1","isList":"1","isQuery":"1","queryType":"EQ","htmlType":"input","dictType":"","sort":2,"required":true,"list":true,"edit":true,"superColumn":false,"pk":false,"usableColumn":false,"insert":true,"capJavaField":"Inventory","increment":false,"query":true},{"createBy":"admin","createTime":"2024-11-02 13:08:50","updateBy":"admin","updateTime":"2024-11-02 13:53:17","columnId":"1852578589675421700","tableId":"1852578589482483713","columnName":"model","columnComment":"型号","columnType":"varchar(50)","javaType":"Str', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-02 13:53:18'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1852589841290153985, '代码生成', 2, 'com.ruoyi.generator.controller.GenController.editSave()', 'PUT', 1, 'admin', '', '/tool/gen', '127.0.0.1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":"admin","updateTime":"2024-11-02 13:53:31","params":{"treeCode":null,"treeName":null,"treeParentCode":null,"parentMenuId":"3"},"tableId":"1852578588693954561","tableName":"sys_oa_out_warehouse","tableComment":"仓库出库表","subTableName":null,"subTableFkName":null,"className":"SysOaOutWarehouse","tplCategory":"crud","packageName":"com.ruoyi.oa","moduleName":"oa","businessName":"oaOutWarehouse","functionName":"仓库出库","functionAuthor":"ruoyi","genType":"0","genPath":"/","pkColumn":null,"subTable":null,"columns":[{"createBy":"admin","createTime":"2024-11-02 13:08:50","updateBy":"admin","updateTime":"2024-11-02 13:53:31","columnId":"1852578588954001409","tableId":"1852578588693954561","columnName":"id","columnComment":"主键id","columnType":"int","javaType":"Long","javaField":"id","isPk":"1","isIncrement":"1","isRequired":"1","isInsert":null,"isEdit":"1","isList":"1","isQuery":null,"queryType":"EQ","htmlType":"input","dictType":"","sort":1,"required":true,"list":true,"edit":true,"superColumn":false,"pk":true,"usableColumn":false,"insert":false,"capJavaField":"Id","increment":true,"query":false},{"createBy":"admin","createTime":"2024-11-02 13:08:50","updateBy":"admin","updateTime":"2024-11-02 13:53:32","columnId":"1852578588954001410","tableId":"1852578588693954561","columnName":"project_id","columnComment":"出库后对应的项目id","columnType":"int","javaType":"Long","javaField":"projectId","isPk":"0","isIncrement":"0","isRequired":"1","isInsert":"1","isEdit":"1","isList":"1","isQuery":"1","queryType":"EQ","htmlType":"input","dictType":"","sort":2,"required":true,"list":true,"edit":true,"superColumn":false,"pk":false,"usableColumn":false,"insert":true,"capJavaField":"ProjectId","increment":false,"query":true},{"createBy":"admin","createTime":"2024-11-02 13:08:50","updateBy":"admin","updateTime":"2024-11-02 13:53:32","columnId":"1852578588954001411","tableId":"1852578588693954561","columnName":"amount","columnComment":"出库数量","columnType":"int","ja', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-02 13:53:32'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1852589841290153985, '代码生成', 2, 'com.ruoyi.generator.controller.GenController.editSave()', 'PUT', 1, 'admin', '', '/tool/gen', '127.0.0.1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":"admin","updateTime":"2024-11-02 13:53:31","params":{"treeCode":null,"treeName":null,"treeParentCode":null,"parentMenuId":"3"},"tableId":"1852578588693954561","tableName":"sys_oa_warehouse_detail","tableComment":"仓库出库表","subTableName":null,"subTableFkName":null,"className":"SysOaOutWarehouse","tplCategory":"crud","packageName":"com.ruoyi.oa","moduleName":"oa","businessName":"oaOutWarehouse","functionName":"仓库出库","functionAuthor":"ruoyi","genType":"0","genPath":"/","pkColumn":null,"subTable":null,"columns":[{"createBy":"admin","createTime":"2024-11-02 13:08:50","updateBy":"admin","updateTime":"2024-11-02 13:53:31","columnId":"1852578588954001409","tableId":"1852578588693954561","columnName":"id","columnComment":"主键id","columnType":"int","javaType":"Long","javaField":"id","isPk":"1","isIncrement":"1","isRequired":"1","isInsert":null,"isEdit":"1","isList":"1","isQuery":null,"queryType":"EQ","htmlType":"input","dictType":"","sort":1,"required":true,"list":true,"edit":true,"superColumn":false,"pk":true,"usableColumn":false,"insert":false,"capJavaField":"Id","increment":true,"query":false},{"createBy":"admin","createTime":"2024-11-02 13:08:50","updateBy":"admin","updateTime":"2024-11-02 13:53:32","columnId":"1852578588954001410","tableId":"1852578588693954561","columnName":"project_id","columnComment":"出库后对应的项目id","columnType":"int","javaType":"Long","javaField":"projectId","isPk":"0","isIncrement":"0","isRequired":"1","isInsert":"1","isEdit":"1","isList":"1","isQuery":"1","queryType":"EQ","htmlType":"input","dictType":"","sort":2,"required":true,"list":true,"edit":true,"superColumn":false,"pk":false,"usableColumn":false,"insert":true,"capJavaField":"ProjectId","increment":false,"query":true},{"createBy":"admin","createTime":"2024-11-02 13:08:50","updateBy":"admin","updateTime":"2024-11-02 13:53:32","columnId":"1852578588954001411","tableId":"1852578588693954561","columnName":"amount","columnComment":"出库数量","columnType":"int","ja', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-02 13:53:32'); INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1852589856637112321, '代码生成', 8, 'com.ruoyi.generator.controller.GenController.batchGenCode()', 'GET', 1, 'admin', '', '/tool/gen/batchGenCode', '127.0.0.1', '内网IP', '{"tables":"sys_oa_warehouse"}', '', 0, '', '2024-11-02 13:53:36'); INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1852589857824100353, '代码生成', 8, 'com.ruoyi.generator.controller.GenController.batchGenCode()', 'GET', 1, 'admin', '', '/tool/gen/batchGenCode', '127.0.0.1', '内网IP', '{"tables":"sys_oa_warehouse"}', '', 0, '', '2024-11-02 13:53:36'); INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1852590281786994690, '项目管理', 1, 'com.ruoyi.oa.controller.SysOaProjectController.add()', 'POST', 1, 'admin', '', '/oa/project', '127.0.0.1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"projectId":"1852590281594056706","projectName":"demo项目","projectNum":"2928","projectType":"2","address":"河北科技大学","funds":"200000","functionary":"hdka","beginTime":"2024-11-02 00:00:00","finishTime":"2024-12-11 00:00:00","delivery":"2024-12","guarantee":"12个月","introduction":"测试","projectGrade":"2","projectStatus":null,"contractId":null,"invoiceName":null,"invoiceNumber":null,"invoiceAddress":null,"invoiceBank":null,"bail":"{}","accessory":null,"remark":"测试"}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-02 13:55:17'); @@ -189,14 +189,14 @@ INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_ INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1852631094021713922, '付款账户管理', 1, 'com.ruoyi.oa.controller.SysOaReceiveAccountController.add()', 'POST', 1, 'admin', '', '/system/oaReceiveAccount', '127.0.0.1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"receiveAccountId":null,"receiveAccountName":"输入名称","remark":null,"parentId":-1}', '{"code":200,"msg":"操作成功","data":{"receiveAccountId":730536647,"receiveAccountName":"输入名称","remark":null,"parentId":-1,"children":null,"label":null}}', 0, '', '2024-11-02 16:37:28'); INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1852631110316584962, '付款账户管理', 2, 'com.ruoyi.oa.controller.SysOaReceiveAccountController.edit()', 'PUT', 1, 'admin', '', '/system/oaReceiveAccount', '127.0.0.1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"receiveAccountId":730536647,"receiveAccountName":"333","remark":null,"parentId":-1}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-02 16:37:32'); INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1852631117564342274, '付款账户管理', 3, 'com.ruoyi.oa.controller.SysOaReceiveAccountController.remove()', 'DELETE', 1, 'admin', '', '/system/oaReceiveAccount/730536647', '127.0.0.1', '内网IP', '{}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-02 16:37:33'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1852647796630970369, '代码生成', 2, 'com.ruoyi.generator.controller.GenController.editSave()', 'PUT', 1, 'admin', '', '/tool/gen', '127.0.0.1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":"admin","updateTime":"2024-11-02 17:43:49","params":{"treeCode":null,"treeName":null,"treeParentCode":null,"parentMenuId":"3"},"tableId":"1852578588693954561","tableName":"sys_oa_out_warehouse","tableComment":"仓库出库表","subTableName":null,"subTableFkName":null,"className":"SysOaOutWarehouse","tplCategory":"crud","packageName":"com.ruoyi.oa","moduleName":"oa","businessName":"oaOutWarehouse","functionName":"仓库出库","functionAuthor":"ruoyi","genType":"0","genPath":"/","pkColumn":null,"subTable":null,"columns":[{"createBy":"admin","createTime":"2024-11-02 13:08:50","updateBy":"admin","updateTime":"2024-11-02 17:43:49","columnId":"1852578588954001409","tableId":"1852578588693954561","columnName":"id","columnComment":"主键id","columnType":"int","javaType":"Long","javaField":"id","isPk":"1","isIncrement":"1","isRequired":"1","isInsert":null,"isEdit":"1","isList":"1","isQuery":null,"queryType":"EQ","htmlType":"input","dictType":"","sort":1,"required":true,"list":true,"usableColumn":false,"superColumn":false,"insert":false,"edit":true,"pk":true,"increment":true,"query":false,"capJavaField":"Id"},{"createBy":"admin","createTime":"2024-11-02 13:08:50","updateBy":"admin","updateTime":"2024-11-02 17:43:49","columnId":"1852578588954001410","tableId":"1852578588693954561","columnName":"project_id","columnComment":"出库后对应的项目id","columnType":"int","javaType":"Long","javaField":"projectId","isPk":"0","isIncrement":"0","isRequired":"0","isInsert":"1","isEdit":"1","isList":"1","isQuery":"1","queryType":"EQ","htmlType":"input","dictType":"","sort":2,"required":false,"list":true,"usableColumn":false,"superColumn":false,"insert":true,"edit":true,"pk":false,"increment":false,"query":true,"capJavaField":"ProjectId"},{"createBy":"admin","createTime":"2024-11-02 13:08:50","updateBy":"admin","updateTime":"2024-11-02 17:43:49","columnId":"1852578588954001411","tableId":"1852578588693954561","columnName":"amount","columnComment":"出库数量","columnType":"int","j', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-02 17:43:50'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1852647818957250562, '代码生成', 8, 'com.ruoyi.generator.controller.GenController.batchGenCode()', 'GET', 1, 'admin', '', '/tool/gen/batchGenCode', '127.0.0.1', '内网IP', '{"tables":"sys_oa_out_warehouse"}', '', 0, '', '2024-11-02 17:43:55'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1852647820458811393, '代码生成', 8, 'com.ruoyi.generator.controller.GenController.batchGenCode()', 'GET', 1, 'admin', '', '/tool/gen/batchGenCode', '127.0.0.1', '内网IP', '{"tables":"sys_oa_out_warehouse"}', '', 0, '', '2024-11-02 17:43:56'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1852647796630970369, '代码生成', 2, 'com.ruoyi.generator.controller.GenController.editSave()', 'PUT', 1, 'admin', '', '/tool/gen', '127.0.0.1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":"admin","updateTime":"2024-11-02 17:43:49","params":{"treeCode":null,"treeName":null,"treeParentCode":null,"parentMenuId":"3"},"tableId":"1852578588693954561","tableName":"sys_oa_warehouse_detail","tableComment":"仓库出库表","subTableName":null,"subTableFkName":null,"className":"SysOaOutWarehouse","tplCategory":"crud","packageName":"com.ruoyi.oa","moduleName":"oa","businessName":"oaOutWarehouse","functionName":"仓库出库","functionAuthor":"ruoyi","genType":"0","genPath":"/","pkColumn":null,"subTable":null,"columns":[{"createBy":"admin","createTime":"2024-11-02 13:08:50","updateBy":"admin","updateTime":"2024-11-02 17:43:49","columnId":"1852578588954001409","tableId":"1852578588693954561","columnName":"id","columnComment":"主键id","columnType":"int","javaType":"Long","javaField":"id","isPk":"1","isIncrement":"1","isRequired":"1","isInsert":null,"isEdit":"1","isList":"1","isQuery":null,"queryType":"EQ","htmlType":"input","dictType":"","sort":1,"required":true,"list":true,"usableColumn":false,"superColumn":false,"insert":false,"edit":true,"pk":true,"increment":true,"query":false,"capJavaField":"Id"},{"createBy":"admin","createTime":"2024-11-02 13:08:50","updateBy":"admin","updateTime":"2024-11-02 17:43:49","columnId":"1852578588954001410","tableId":"1852578588693954561","columnName":"project_id","columnComment":"出库后对应的项目id","columnType":"int","javaType":"Long","javaField":"projectId","isPk":"0","isIncrement":"0","isRequired":"0","isInsert":"1","isEdit":"1","isList":"1","isQuery":"1","queryType":"EQ","htmlType":"input","dictType":"","sort":2,"required":false,"list":true,"usableColumn":false,"superColumn":false,"insert":true,"edit":true,"pk":false,"increment":false,"query":true,"capJavaField":"ProjectId"},{"createBy":"admin","createTime":"2024-11-02 13:08:50","updateBy":"admin","updateTime":"2024-11-02 17:43:49","columnId":"1852578588954001411","tableId":"1852578588693954561","columnName":"amount","columnComment":"出库数量","columnType":"int","j', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-02 17:43:50'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1852647818957250562, '代码生成', 8, 'com.ruoyi.generator.controller.GenController.batchGenCode()', 'GET', 1, 'admin', '', '/tool/gen/batchGenCode', '127.0.0.1', '内网IP', '{"tables":"sys_oa_warehouse_detail"}', '', 0, '', '2024-11-02 17:43:55'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1852647820458811393, '代码生成', 8, 'com.ruoyi.generator.controller.GenController.batchGenCode()', 'GET', 1, 'admin', '', '/tool/gen/batchGenCode', '127.0.0.1', '内网IP', '{"tables":"sys_oa_warehouse_detail"}', '', 0, '', '2024-11-02 17:43:56'); INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1852649339769937922, '代码生成', 2, 'com.ruoyi.generator.controller.GenController.editSave()', 'PUT', 1, 'admin', '', '/tool/gen', '127.0.0.1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":"admin","updateTime":"2024-11-02 17:49:57","params":{"treeCode":null,"treeName":null,"treeParentCode":null,"parentMenuId":"3"},"tableId":"1852578589482483713","tableName":"sys_oa_warehouse","tableComment":"仓库管理表","subTableName":null,"subTableFkName":null,"className":"SysOaWarehouse","tplCategory":"crud","packageName":"com.ruoyi.oa","moduleName":"oa","businessName":"oaWarehouse","functionName":"仓库管理","functionAuthor":"liuzongkun999","genType":"0","genPath":"/","pkColumn":null,"subTable":null,"columns":[{"createBy":"admin","createTime":"2024-11-02 13:08:50","updateBy":"admin","updateTime":"2024-11-02 17:49:57","columnId":"1852578589675421698","tableId":"1852578589482483713","columnName":"id","columnComment":"主键id","columnType":"int","javaType":"Long","javaField":"id","isPk":"1","isIncrement":"1","isRequired":"0","isInsert":null,"isEdit":"1","isList":"1","isQuery":null,"queryType":"EQ","htmlType":"input","dictType":"","sort":1,"required":false,"list":true,"usableColumn":false,"superColumn":false,"insert":false,"edit":true,"pk":true,"increment":true,"query":false,"capJavaField":"Id"},{"createBy":"admin","createTime":"2024-11-02 13:08:50","updateBy":"admin","updateTime":"2024-11-02 17:49:57","columnId":"1852578589675421699","tableId":"1852578589482483713","columnName":"inventory","columnComment":"库存数量","columnType":"int","javaType":"Long","javaField":"inventory","isPk":"0","isIncrement":"0","isRequired":"1","isInsert":"1","isEdit":"1","isList":"1","isQuery":"1","queryType":"EQ","htmlType":"input","dictType":"","sort":2,"required":true,"list":true,"usableColumn":false,"superColumn":false,"insert":true,"edit":true,"pk":false,"increment":false,"query":true,"capJavaField":"Inventory"},{"createBy":"admin","createTime":"2024-11-02 13:08:50","updateBy":"admin","updateTime":"2024-11-02 17:49:57","columnId":"1852578589675421700","tableId":"1852578589482483713","columnName":"model","columnComment":"型号","columnType":"varchar(50)","javaT', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-02 17:49:58'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1852649414168502274, '代码生成', 2, 'com.ruoyi.generator.controller.GenController.editSave()', 'PUT', 1, 'admin', '', '/tool/gen', '127.0.0.1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":"admin","updateTime":"2024-11-02 17:50:15","params":{"treeCode":null,"treeName":null,"treeParentCode":null,"parentMenuId":"3"},"tableId":"1852578588693954561","tableName":"sys_oa_out_warehouse","tableComment":"仓库出库表","subTableName":null,"subTableFkName":null,"className":"SysOaOutWarehouse","tplCategory":"crud","packageName":"com.ruoyi.oa","moduleName":"oa","businessName":"oaOutWarehouse","functionName":"仓库出库","functionAuthor":"liuzongkun999","genType":"0","genPath":"/","pkColumn":null,"subTable":null,"columns":[{"createBy":"admin","createTime":"2024-11-02 13:08:50","updateBy":"admin","updateTime":"2024-11-02 17:50:15","columnId":"1852578588954001409","tableId":"1852578588693954561","columnName":"id","columnComment":"主键id","columnType":"int","javaType":"Long","javaField":"id","isPk":"1","isIncrement":"1","isRequired":"1","isInsert":null,"isEdit":"1","isList":"1","isQuery":null,"queryType":"EQ","htmlType":"input","dictType":"","sort":1,"required":true,"list":true,"usableColumn":false,"superColumn":false,"insert":false,"edit":true,"pk":true,"increment":true,"query":false,"capJavaField":"Id"},{"createBy":"admin","createTime":"2024-11-02 13:08:50","updateBy":"admin","updateTime":"2024-11-02 17:50:15","columnId":"1852578588954001410","tableId":"1852578588693954561","columnName":"project_id","columnComment":"出库后对应的项目id","columnType":"int","javaType":"Long","javaField":"projectId","isPk":"0","isIncrement":"0","isRequired":"0","isInsert":"1","isEdit":"1","isList":"1","isQuery":"1","queryType":"EQ","htmlType":"input","dictType":"","sort":2,"required":false,"list":true,"usableColumn":false,"superColumn":false,"insert":true,"edit":true,"pk":false,"increment":false,"query":true,"capJavaField":"ProjectId"},{"createBy":"admin","createTime":"2024-11-02 13:08:50","updateBy":"admin","updateTime":"2024-11-02 17:50:15","columnId":"1852578588954001411","tableId":"1852578588693954561","columnName":"amount","columnComment":"出库数量","columnType":', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-02 17:50:16'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1852649432677965826, '代码生成', 8, 'com.ruoyi.generator.controller.GenController.batchGenCode()', 'GET', 1, 'admin', '', '/tool/gen/batchGenCode', '127.0.0.1', '内网IP', '{"tables":"sys_oa_out_warehouse"}', '', 0, '', '2024-11-02 17:50:20'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1852649433986588674, '代码生成', 8, 'com.ruoyi.generator.controller.GenController.batchGenCode()', 'GET', 1, 'admin', '', '/tool/gen/batchGenCode', '127.0.0.1', '内网IP', '{"tables":"sys_oa_out_warehouse"}', '', 0, '', '2024-11-02 17:50:20'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1852718980542304257, '代码生成', 2, 'com.ruoyi.generator.controller.GenController.editSave()', 'PUT', 1, 'admin', '', '/tool/gen', '127.0.0.1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":"admin","updateTime":"2024-11-02 22:26:41","params":{"treeCode":null,"treeName":null,"treeParentCode":null,"parentMenuId":"3"},"tableId":"1852578588693954561","tableName":"sys_oa_out_warehouse","tableComment":"仓库出库表","subTableName":null,"subTableFkName":null,"className":"SysOaOutWarehouse","tplCategory":"crud","packageName":"com.ruoyi.oa","moduleName":"oa","businessName":"oaOutWarehouse","functionName":"仓库出库","functionAuthor":"liuzongkun999","genType":"0","genPath":"/","pkColumn":null,"subTable":null,"columns":[{"createBy":"admin","createTime":"2024-11-02 13:08:50","updateBy":"admin","updateTime":"2024-11-02 22:26:41","columnId":"1852578588954001409","tableId":"1852578588693954561","columnName":"id","columnComment":"主键id","columnType":"int","javaType":"Long","javaField":"id","isPk":"1","isIncrement":"1","isRequired":"0","isInsert":null,"isEdit":"1","isList":"1","isQuery":null,"queryType":"EQ","htmlType":"input","dictType":"","sort":1,"list":true,"required":false,"edit":true,"insert":false,"usableColumn":false,"pk":true,"superColumn":false,"capJavaField":"Id","query":false,"increment":true},{"createBy":"admin","createTime":"2024-11-02 13:08:50","updateBy":"admin","updateTime":"2024-11-02 22:26:41","columnId":"1852578588954001410","tableId":"1852578588693954561","columnName":"project_id","columnComment":"出库后对应的项目id","columnType":"int","javaType":"Long","javaField":"projectId","isPk":"0","isIncrement":"0","isRequired":"0","isInsert":"1","isEdit":"1","isList":"1","isQuery":"1","queryType":"EQ","htmlType":"input","dictType":"","sort":2,"list":true,"required":false,"edit":true,"insert":true,"usableColumn":false,"pk":false,"superColumn":false,"capJavaField":"ProjectId","query":true,"increment":false},{"createBy":"admin","createTime":"2024-11-02 13:08:50","updateBy":"admin","updateTime":"2024-11-02 22:26:41","columnId":"1852578588954001411","tableId":"1852578588693954561","columnName":"amount","columnComment":"出库数量","columnType"', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-02 22:26:41'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1852649414168502274, '代码生成', 2, 'com.ruoyi.generator.controller.GenController.editSave()', 'PUT', 1, 'admin', '', '/tool/gen', '127.0.0.1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":"admin","updateTime":"2024-11-02 17:50:15","params":{"treeCode":null,"treeName":null,"treeParentCode":null,"parentMenuId":"3"},"tableId":"1852578588693954561","tableName":"sys_oa_warehouse_detail","tableComment":"仓库出库表","subTableName":null,"subTableFkName":null,"className":"SysOaOutWarehouse","tplCategory":"crud","packageName":"com.ruoyi.oa","moduleName":"oa","businessName":"oaOutWarehouse","functionName":"仓库出库","functionAuthor":"liuzongkun999","genType":"0","genPath":"/","pkColumn":null,"subTable":null,"columns":[{"createBy":"admin","createTime":"2024-11-02 13:08:50","updateBy":"admin","updateTime":"2024-11-02 17:50:15","columnId":"1852578588954001409","tableId":"1852578588693954561","columnName":"id","columnComment":"主键id","columnType":"int","javaType":"Long","javaField":"id","isPk":"1","isIncrement":"1","isRequired":"1","isInsert":null,"isEdit":"1","isList":"1","isQuery":null,"queryType":"EQ","htmlType":"input","dictType":"","sort":1,"required":true,"list":true,"usableColumn":false,"superColumn":false,"insert":false,"edit":true,"pk":true,"increment":true,"query":false,"capJavaField":"Id"},{"createBy":"admin","createTime":"2024-11-02 13:08:50","updateBy":"admin","updateTime":"2024-11-02 17:50:15","columnId":"1852578588954001410","tableId":"1852578588693954561","columnName":"project_id","columnComment":"出库后对应的项目id","columnType":"int","javaType":"Long","javaField":"projectId","isPk":"0","isIncrement":"0","isRequired":"0","isInsert":"1","isEdit":"1","isList":"1","isQuery":"1","queryType":"EQ","htmlType":"input","dictType":"","sort":2,"required":false,"list":true,"usableColumn":false,"superColumn":false,"insert":true,"edit":true,"pk":false,"increment":false,"query":true,"capJavaField":"ProjectId"},{"createBy":"admin","createTime":"2024-11-02 13:08:50","updateBy":"admin","updateTime":"2024-11-02 17:50:15","columnId":"1852578588954001411","tableId":"1852578588693954561","columnName":"amount","columnComment":"出库数量","columnType":', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-02 17:50:16'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1852649432677965826, '代码生成', 8, 'com.ruoyi.generator.controller.GenController.batchGenCode()', 'GET', 1, 'admin', '', '/tool/gen/batchGenCode', '127.0.0.1', '内网IP', '{"tables":"sys_oa_warehouse_detail"}', '', 0, '', '2024-11-02 17:50:20'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1852649433986588674, '代码生成', 8, 'com.ruoyi.generator.controller.GenController.batchGenCode()', 'GET', 1, 'admin', '', '/tool/gen/batchGenCode', '127.0.0.1', '内网IP', '{"tables":"sys_oa_warehouse_detail"}', '', 0, '', '2024-11-02 17:50:20'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1852718980542304257, '代码生成', 2, 'com.ruoyi.generator.controller.GenController.editSave()', 'PUT', 1, 'admin', '', '/tool/gen', '127.0.0.1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":"admin","updateTime":"2024-11-02 22:26:41","params":{"treeCode":null,"treeName":null,"treeParentCode":null,"parentMenuId":"3"},"tableId":"1852578588693954561","tableName":"sys_oa_warehouse_detail","tableComment":"仓库出库表","subTableName":null,"subTableFkName":null,"className":"SysOaOutWarehouse","tplCategory":"crud","packageName":"com.ruoyi.oa","moduleName":"oa","businessName":"oaOutWarehouse","functionName":"仓库出库","functionAuthor":"liuzongkun999","genType":"0","genPath":"/","pkColumn":null,"subTable":null,"columns":[{"createBy":"admin","createTime":"2024-11-02 13:08:50","updateBy":"admin","updateTime":"2024-11-02 22:26:41","columnId":"1852578588954001409","tableId":"1852578588693954561","columnName":"id","columnComment":"主键id","columnType":"int","javaType":"Long","javaField":"id","isPk":"1","isIncrement":"1","isRequired":"0","isInsert":null,"isEdit":"1","isList":"1","isQuery":null,"queryType":"EQ","htmlType":"input","dictType":"","sort":1,"list":true,"required":false,"edit":true,"insert":false,"usableColumn":false,"pk":true,"superColumn":false,"capJavaField":"Id","query":false,"increment":true},{"createBy":"admin","createTime":"2024-11-02 13:08:50","updateBy":"admin","updateTime":"2024-11-02 22:26:41","columnId":"1852578588954001410","tableId":"1852578588693954561","columnName":"project_id","columnComment":"出库后对应的项目id","columnType":"int","javaType":"Long","javaField":"projectId","isPk":"0","isIncrement":"0","isRequired":"0","isInsert":"1","isEdit":"1","isList":"1","isQuery":"1","queryType":"EQ","htmlType":"input","dictType":"","sort":2,"list":true,"required":false,"edit":true,"insert":true,"usableColumn":false,"pk":false,"superColumn":false,"capJavaField":"ProjectId","query":true,"increment":false},{"createBy":"admin","createTime":"2024-11-02 13:08:50","updateBy":"admin","updateTime":"2024-11-02 22:26:41","columnId":"1852578588954001411","tableId":"1852578588693954561","columnName":"amount","columnComment":"出库数量","columnType"', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-02 22:26:41'); INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1852933044005031938, '菜单管理', 3, 'com.ruoyi.web.controller.system.SysMenuController.remove()', 'DELETE', 1, 'admin', '', '/system/menu/1848261898990546945', '127.0.0.1', '内网IP', '{}', '{"code":601,"msg":"菜单已分配,不允许删除","data":null}', 0, '', '2024-11-03 12:37:18'); INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1852933069762252801, '菜单管理', 3, 'com.ruoyi.web.controller.system.SysMenuController.remove()', 'DELETE', 1, 'admin', '', '/system/menu/1848261898990546945', '127.0.0.1', '内网IP', '{}', '{"code":601,"msg":"菜单已分配,不允许删除","data":null}', 0, '', '2024-11-03 12:37:24'); INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1852933174930231298, '角色管理', 2, 'com.ruoyi.web.controller.system.SysRoleController.edit()', 'PUT', 1, 'admin', '', '/system/role', '127.0.0.1', '内网IP', '{"createBy":"admin","createTime":"2024-01-05 16:25:40","updateBy":"admin","updateTime":"2024-11-03 12:37:49","roleId":"1743186990678077442","roleName":"总经理","roleKey":"ceo","roleSort":2,"dataScope":"1","menuCheckStrictly":true,"deptCheckStrictly":true,"status":"0","delFlag":"0","remark":null,"flag":false,"menuIds":["1774989374680858626","1774990200023416833","1760944548859858945","1760952042667626498","1774253657994448897","1744021537846177794","1745332746591649794","1745470812190818305","1744021734047330305","1745054570468597761","1744022006375100417","1747294855579742209","1747291275166642178","1744027281597378561",107,"1744026651709386753","1747450819331104770","1747455602796417025",1,118,"1774998680985804801","1774990200023416834","1774990200023416835","1774990200023416836",5,125,1180,1181,126,1190,1191,1192,1193,127,1200,1201,128,1210,1211,129,1220,1221,130,1230,"1760952042667626499","1760952042667626500","1760952042667626501","1774253657994448898","1774253657994448899","1774253657994448900","1745332746591649795","1745332746591649796","1745332746591649797","1745332746591649798","1745470812190818306","1745470812190818307","1745470812190818308","1763217716546887682","1745054570468597762","1745054570468597763","1745054570468597764","1747294855579742210","1747294855579742211","1747294855579742212","1746809519695167490","1747291275166642179","1747291275166642180","1747291275166642181",1070,1071,1072,"1747450819331104771","1747450819331104772","1747450819331104773","1747455602796417026","1747455602796417027","1747455602796417028",1130,1131,1132,1133],"deptIds":null,"admin":false}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-03 12:37:49'); @@ -246,12 +246,12 @@ INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_ INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1852984661559517185, '用户管理', 1, 'com.ruoyi.web.controller.system.SysUserController.add()', 'POST', 1, 'admin', '', '/system/user', '127.0.0.1', '内网IP', '{"createBy":"admin","createTime":"2024-11-03 16:02:24","updateBy":"admin","updateTime":"2024-11-03 16:02:24","userId":"1852984660972314625","deptId":null,"userName":"xxxsad","nickName":"asd","userType":null,"email":null,"phonenumber":null,"sex":null,"avatar":null,"status":"0","delFlag":null,"loginIp":null,"loginDate":null,"remark":null,"dept":null,"roles":null,"roleIds":["1852970465740505090"],"postIds":[],"idCard":null,"bankCard":null,"laborCost":null,"roleId":null,"admin":false}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-03 16:02:25'); INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1852984721038942210, '用户管理', 3, 'com.ruoyi.web.controller.system.SysUserController.remove()', 'DELETE', 1, 'admin', '', '/system/user/1852984660972314625', '127.0.0.1', '内网IP', '{}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-03 16:02:39'); INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1852998383036383234, '项目管理', 2, 'com.ruoyi.oa.controller.SysOaProjectController.edit()', 'PUT', 1, 'admin', '', '/oa/project', '127.0.0.1', '内网IP', '{"createBy":"admin","createTime":"2024-11-03 13:57:48","updateBy":null,"updateTime":null,"projectId":"1852953303521009665","projectName":"dmeo2","projectNum":"22222","projectType":"3","address":"河北科技大学","funds":"20.00","functionary":"s","beginTime":"2024-11-03 00:00:00","finishTime":"2024-12-10 00:00:00","delivery":"1","guarantee":"1","introduction":"1","projectGrade":"2","projectStatus":"0","contractId":null,"invoiceName":null,"invoiceNumber":null,"invoiceAddress":null,"invoiceBank":null,"bail":"{}","accessory":null,"remark":null,"isPostpone":1,"postponeReason":null,"postponeTime":null}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-03 16:56:56'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853343180846039042, '代码生成', 2, 'com.ruoyi.generator.controller.GenController.editSave()', 'PUT', 1, 'admin', '', '/tool/gen', '127.0.0.1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":"admin","updateTime":"2024-11-04 15:47:01","params":{"treeCode":null,"treeName":null,"treeParentCode":null,"parentMenuId":"1852933620281430018"},"tableId":"1852578588693954561","tableName":"sys_oa_out_warehouse","tableComment":"仓库出库表","subTableName":null,"subTableFkName":null,"className":"SysOaOutWarehouse","tplCategory":"crud","packageName":"com.ruoyi.oa","moduleName":"oa","businessName":"oaOutWarehouse","functionName":"仓库出库","functionAuthor":"liuzongkun999","genType":"0","genPath":"/","pkColumn":null,"subTable":null,"columns":[{"createBy":"admin","createTime":"2024-11-02 13:08:50","updateBy":"admin","updateTime":"2024-11-04 15:47:01","columnId":"1852578588954001409","tableId":"1852578588693954561","columnName":"id","columnComment":"主键id","columnType":"int","javaType":"Long","javaField":"id","isPk":"1","isIncrement":"1","isRequired":"0","isInsert":null,"isEdit":"1","isList":"1","isQuery":null,"queryType":"EQ","htmlType":"input","dictType":"","sort":1,"list":true,"required":false,"pk":true,"insert":false,"usableColumn":false,"edit":true,"superColumn":false,"capJavaField":"Id","query":false,"increment":true},{"createBy":"admin","createTime":"2024-11-02 13:08:50","updateBy":"admin","updateTime":"2024-11-04 15:47:01","columnId":"1852578588954001410","tableId":"1852578588693954561","columnName":"project_id","columnComment":"出库后对应的项目id","columnType":"int","javaType":"Long","javaField":"projectId","isPk":"0","isIncrement":"0","isRequired":"0","isInsert":"1","isEdit":"1","isList":"1","isQuery":"1","queryType":"EQ","htmlType":"input","dictType":"","sort":2,"list":true,"required":false,"pk":false,"insert":true,"usableColumn":false,"edit":true,"superColumn":false,"capJavaField":"ProjectId","query":true,"increment":false},{"createBy":"admin","createTime":"2024-11-02 13:08:50","updateBy":"admin","updateTime":"2024-11-04 15:47:01","columnId":"1852578588954001411","tableId":"1852578588693954561","columnName":"amount","columnComment":"', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-04 15:47:02'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853343197656809474, '代码生成', 8, 'com.ruoyi.generator.controller.GenController.batchGenCode()', 'GET', 1, 'admin', '', '/tool/gen/batchGenCode', '127.0.0.1', '内网IP', '{"tables":"sys_oa_out_warehouse"}', '', 0, '', '2024-11-04 15:47:06'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853659004205109249, '仓库出库', 5, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.export()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/export', '127.0.0.1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"id":null,"projectId":null,"amount":null,"remark":null,"warehouseId":null,"warehouseName":null,"projectName":null}', '', 1, 'nested exception is org.apache.ibatis.binding.BindingException: Parameter \'bo\' not found. Available parameters are [ew, param1]', '2024-11-05 12:42:01'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853659117807833090, '仓库出库', 5, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.export()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/export', '127.0.0.1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"id":null,"projectId":null,"amount":null,"remark":null,"warehouseId":null,"warehouseName":null,"projectName":null}', '', 1, 'nested exception is org.apache.ibatis.binding.BindingException: Parameter \'bo\' not found. Available parameters are [ew, param1]', '2024-11-05 12:42:28'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853661065952989185, '仓库出库', 5, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.export()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/export', '127.0.0.1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"id":null,"projectId":1,"amount":null,"remark":null,"warehouseId":null,"warehouseName":null,"projectName":null}', '', 1, 'nested exception is org.apache.ibatis.binding.BindingException: Parameter \'bo\' not found. Available parameters are [ew, param1]', '2024-11-05 12:50:12'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853662243336032257, '仓库出库', 5, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.export()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/export', '127.0.0.1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"id":null,"projectId":1,"amount":null,"remark":null,"warehouseId":null,"warehouseName":null,"projectName":null}', '', 0, '', '2024-11-05 12:54:53'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853343180846039042, '代码生成', 2, 'com.ruoyi.generator.controller.GenController.editSave()', 'PUT', 1, 'admin', '', '/tool/gen', '127.0.0.1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":"admin","updateTime":"2024-11-04 15:47:01","params":{"treeCode":null,"treeName":null,"treeParentCode":null,"parentMenuId":"1852933620281430018"},"tableId":"1852578588693954561","tableName":"sys_oa_warehouse_detail","tableComment":"仓库出库表","subTableName":null,"subTableFkName":null,"className":"SysOaOutWarehouse","tplCategory":"crud","packageName":"com.ruoyi.oa","moduleName":"oa","businessName":"oaOutWarehouse","functionName":"仓库出库","functionAuthor":"liuzongkun999","genType":"0","genPath":"/","pkColumn":null,"subTable":null,"columns":[{"createBy":"admin","createTime":"2024-11-02 13:08:50","updateBy":"admin","updateTime":"2024-11-04 15:47:01","columnId":"1852578588954001409","tableId":"1852578588693954561","columnName":"id","columnComment":"主键id","columnType":"int","javaType":"Long","javaField":"id","isPk":"1","isIncrement":"1","isRequired":"0","isInsert":null,"isEdit":"1","isList":"1","isQuery":null,"queryType":"EQ","htmlType":"input","dictType":"","sort":1,"list":true,"required":false,"pk":true,"insert":false,"usableColumn":false,"edit":true,"superColumn":false,"capJavaField":"Id","query":false,"increment":true},{"createBy":"admin","createTime":"2024-11-02 13:08:50","updateBy":"admin","updateTime":"2024-11-04 15:47:01","columnId":"1852578588954001410","tableId":"1852578588693954561","columnName":"project_id","columnComment":"出库后对应的项目id","columnType":"int","javaType":"Long","javaField":"projectId","isPk":"0","isIncrement":"0","isRequired":"0","isInsert":"1","isEdit":"1","isList":"1","isQuery":"1","queryType":"EQ","htmlType":"input","dictType":"","sort":2,"list":true,"required":false,"pk":false,"insert":true,"usableColumn":false,"edit":true,"superColumn":false,"capJavaField":"ProjectId","query":true,"increment":false},{"createBy":"admin","createTime":"2024-11-02 13:08:50","updateBy":"admin","updateTime":"2024-11-04 15:47:01","columnId":"1852578588954001411","tableId":"1852578588693954561","columnName":"amount","columnComment":"', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-04 15:47:02'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853343197656809474, '代码生成', 8, 'com.ruoyi.generator.controller.GenController.batchGenCode()', 'GET', 1, 'admin', '', '/tool/gen/batchGenCode', '127.0.0.1', '内网IP', '{"tables":"sys_oa_warehouse_detail"}', '', 0, '', '2024-11-04 15:47:06'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853659004205109249, '仓库出库', 5, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.export()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/export', '127.0.0.1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"id":null,"projectId":null,"amount":null,"remark":null,"warehouseId":null,"warehouseName":null,"projectName":null}', '', 1, 'nested exception is org.apache.ibatis.binding.BindingException: Parameter \'bo\' not found. Available parameters are [ew, param1]', '2024-11-05 12:42:01'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853659117807833090, '仓库出库', 5, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.export()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/export', '127.0.0.1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"id":null,"projectId":null,"amount":null,"remark":null,"warehouseId":null,"warehouseName":null,"projectName":null}', '', 1, 'nested exception is org.apache.ibatis.binding.BindingException: Parameter \'bo\' not found. Available parameters are [ew, param1]', '2024-11-05 12:42:28'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853661065952989185, '仓库出库', 5, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.export()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/export', '127.0.0.1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"id":null,"projectId":1,"amount":null,"remark":null,"warehouseId":null,"warehouseName":null,"projectName":null}', '', 1, 'nested exception is org.apache.ibatis.binding.BindingException: Parameter \'bo\' not found. Available parameters are [ew, param1]', '2024-11-05 12:50:12'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853662243336032257, '仓库出库', 5, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.export()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/export', '127.0.0.1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"id":null,"projectId":1,"amount":null,"remark":null,"warehouseId":null,"warehouseName":null,"projectName":null}', '', 0, '', '2024-11-05 12:54:53'); INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853664655885565954, '菜单管理', 1, 'com.ruoyi.web.controller.system.SysMenuController.add()', 'POST', 1, 'admin', '', '/system/menu', '127.0.0.1', '内网IP', '{"createBy":"admin","createTime":"2024-11-05 13:04:27","updateBy":"admin","updateTime":"2024-11-05 13:04:27","parentName":null,"parentId":"1852970227348848642","children":[],"menuId":"1853664655629713410","menuName":"人员考勤","orderNum":1,"path":"attendance","component":null,"queryParam":null,"isFrame":"1","isCache":"0","menuType":"M","visible":"0","status":"0","icon":"date","remark":null}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-05 13:04:28'); INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853664785636360194, '菜单管理', 2, 'com.ruoyi.web.controller.system.SysMenuController.edit()', 'PUT', 1, 'admin', '', '/system/menu', '127.0.0.1', '内网IP', '{"createBy":"admin","createTime":"2024-11-05 13:04:28","updateBy":"admin","updateTime":"2024-11-05 13:04:58","parentName":null,"parentId":"1852970227348848642","children":[],"menuId":"1853664655629713410","menuName":"人员考勤","orderNum":1,"path":"attendance","component":"oa/attendance/index","queryParam":null,"isFrame":"1","isCache":"0","menuType":"C","visible":"0","status":"0","icon":"date","remark":""}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-05 13:04:59'); INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853676949243789314, '用户管理', 1, 'com.ruoyi.web.controller.system.SysUserController.add()', 'POST', 1, 'admin', '', '/system/user', '127.0.0.1', '内网IP', '{"createBy":"admin","createTime":"2024-11-05 13:53:18","updateBy":"admin","updateTime":"2024-11-05 13:53:18","userId":"1853676948782415873","deptId":null,"userName":"liguoyu","nickName":"李国瑜","userType":null,"email":null,"phonenumber":null,"sex":null,"avatar":null,"status":"0","delFlag":null,"loginIp":null,"loginDate":null,"remark":null,"dept":null,"roles":null,"roleIds":["1852970465740505090"],"postIds":[],"idCard":null,"bankCard":null,"laborCost":null,"roleId":null,"admin":false}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-05 13:53:19'); @@ -269,32 +269,32 @@ INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_ INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853701254060974082, '代码生成', 6, 'com.ruoyi.generator.controller.GenController.importTableSave()', 'POST', 1, 'admin', '', '/tool/gen/importTable', '127.0.0.1', '内网IP', '"sys_oa_attendance"', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-05 15:29:54'); INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853701464485011458, '代码生成', 2, 'com.ruoyi.generator.controller.GenController.editSave()', 'PUT', 1, 'admin', '', '/tool/gen', '127.0.0.1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":"admin","updateTime":"2024-11-05 15:30:43","params":{"treeCode":null,"treeName":null,"treeParentCode":null,"parentMenuId":3},"tableId":"1853701253083701250","tableName":"sys_oa_attendance","tableComment":"人员考勤","subTableName":null,"subTableFkName":null,"className":"SysOaAttendance","tplCategory":"crud","packageName":"com.ruoyi.oa","moduleName":"system","businessName":"oaAttendance","functionName":"人员考勤","functionAuthor":"hdka","genType":"0","genPath":"/","pkColumn":null,"subTable":null,"columns":[{"createBy":"admin","createTime":"2024-11-05 15:29:54","updateBy":"admin","updateTime":"2024-11-05 15:30:43","columnId":"1853701253339553793","tableId":"1853701253083701250","columnName":"id","columnComment":"主键id","columnType":"bigint","javaType":"Long","javaField":"id","isPk":"1","isIncrement":"1","isRequired":"0","isInsert":null,"isEdit":"1","isList":"1","isQuery":null,"queryType":"EQ","htmlType":"input","dictType":"","sort":1,"required":false,"list":true,"insert":false,"superColumn":false,"edit":true,"pk":true,"usableColumn":false,"capJavaField":"Id","query":false,"increment":true},{"createBy":"admin","createTime":"2024-11-05 15:29:54","updateBy":"admin","updateTime":"2024-11-05 15:30:43","columnId":"1853701253406662657","tableId":"1853701253083701250","columnName":"user_id","columnComment":"员工id","columnType":"bigint","javaType":"Long","javaField":"userId","isPk":"0","isIncrement":"0","isRequired":"1","isInsert":"1","isEdit":"1","isList":"1","isQuery":"1","queryType":"EQ","htmlType":"input","dictType":"","sort":2,"required":true,"list":true,"insert":true,"superColumn":false,"edit":true,"pk":false,"usableColumn":false,"capJavaField":"UserId","query":true,"increment":false},{"createBy":"admin","createTime":"2024-11-05 15:29:54","updateBy":"admin","updateTime":"2024-11-05 15:30:43","columnId":"1853701253406662658","tableId":"1853701253083701250","columnName":"attendance_day","columnComment":"签到日","columnType":"int","javaType":', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-05 15:30:44'); INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853701633473519618, '代码生成', 8, 'com.ruoyi.generator.controller.GenController.batchGenCode()', 'GET', 1, 'admin', '', '/tool/gen/batchGenCode', '127.0.0.1', '内网IP', '{"tables":"sys_oa_attendance"}', '', 0, '', '2024-11-05 15:31:24'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853711618405949442, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '0:0:0:0:0:0:0:1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":0,"amount":0,"remark":"string"}],"projectId":"string"}', '', 1, '', '2024-11-05 16:11:05'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853712219743313921, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '0:0:0:0:0:0:0:1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":0,"amount":0,"remark":"string"}],"projectId":"string"}', '', 1, '', '2024-11-05 16:13:28'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853712457157697537, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '0:0:0:0:0:0:0:1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":0,"amount":0,"remark":"string"}],"projectId":"string"}', '', 1, '', '2024-11-05 16:14:25'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853712493794942978, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '0:0:0:0:0:0:0:1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":0,"amount":0,"remark":"string"}],"projectId":"string"}', '', 1, '', '2024-11-05 16:14:33'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853712516721008641, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '0:0:0:0:0:0:0:1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":0,"amount":0,"remark":"string"}],"projectId":"string"}', '', 1, '', '2024-11-05 16:14:39'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853713330571096066, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '0:0:0:0:0:0:0:1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":0,"amount":0,"remark":"string"}],"projectId":"string"}', '{"code":500,"msg":"操作失败","data":null}', 0, '', '2024-11-05 16:17:53'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853713661946294273, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '0:0:0:0:0:0:0:1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":0,"amount":0,"remark":"string"}],"projectId":"string"}', '{"code":500,"msg":"操作失败","data":null}', 0, '', '2024-11-05 16:19:12'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853718578580746241, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '0:0:0:0:0:0:0:1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":0,"amount":0,"remark":"string"}],"projectId":"string"}', '{"code":500,"msg":"操作失败","data":null}', 0, '', '2024-11-05 16:38:44'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853718719677132802, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '0:0:0:0:0:0:0:1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":0,"amount":0,"remark":"string"}],"projectId":"string"}', '{"code":500,"msg":"操作失败","data":null}', 0, '', '2024-11-05 16:39:18'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853732474532175873, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '0:0:0:0:0:0:0:1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":0,"amount":0,"remark":"string","projectId":"string"}],"projectId":"string"}', '', 1, ' +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853711618405949442, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '0:0:0:0:0:0:0:1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":0,"amount":0,"remark":"string"}],"projectId":"string"}', '', 1, '', '2024-11-05 16:11:05'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853712219743313921, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '0:0:0:0:0:0:0:1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":0,"amount":0,"remark":"string"}],"projectId":"string"}', '', 1, '', '2024-11-05 16:13:28'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853712457157697537, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '0:0:0:0:0:0:0:1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":0,"amount":0,"remark":"string"}],"projectId":"string"}', '', 1, '', '2024-11-05 16:14:25'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853712493794942978, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '0:0:0:0:0:0:0:1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":0,"amount":0,"remark":"string"}],"projectId":"string"}', '', 1, '', '2024-11-05 16:14:33'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853712516721008641, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '0:0:0:0:0:0:0:1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":0,"amount":0,"remark":"string"}],"projectId":"string"}', '', 1, '', '2024-11-05 16:14:39'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853713330571096066, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '0:0:0:0:0:0:0:1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":0,"amount":0,"remark":"string"}],"projectId":"string"}', '{"code":500,"msg":"操作失败","data":null}', 0, '', '2024-11-05 16:17:53'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853713661946294273, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '0:0:0:0:0:0:0:1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":0,"amount":0,"remark":"string"}],"projectId":"string"}', '{"code":500,"msg":"操作失败","data":null}', 0, '', '2024-11-05 16:19:12'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853718578580746241, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '0:0:0:0:0:0:0:1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":0,"amount":0,"remark":"string"}],"projectId":"string"}', '{"code":500,"msg":"操作失败","data":null}', 0, '', '2024-11-05 16:38:44'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853718719677132802, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '0:0:0:0:0:0:0:1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":0,"amount":0,"remark":"string"}],"projectId":"string"}', '{"code":500,"msg":"操作失败","data":null}', 0, '', '2024-11-05 16:39:18'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853732474532175873, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '0:0:0:0:0:0:0:1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":0,"amount":0,"remark":"string","projectId":"string"}],"projectId":"string"}', '', 1, ' ### Error updating database. Cause: java.sql.SQLSyntaxErrorException: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near \'\' at line 2 ### The error may exist in file [C:\\Users\\liuzongkun828\\Desktop\\study\\javaweb\\fad_oa\\ruoyi-oa\\target\\classes\\mapper\\oa\\SysOaOutWarehouseMapper.xml] ### The error may involve defaultParameterMap ### The error occurred while setting parameters -### SQL: insert into sys_oa_out_warehouse (project_id, amount, remark, warehouse_id, create_time, create_by, update_time, update_by) ( +### SQL: insert into sys_oa_warehouse_detail (project_id, amount, remark, warehouse_id, create_time, create_by, update_time, update_by) ( ### Cause: java.sql.SQLSyntaxErrorException: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near \'\' at line 2 ; bad SQL grammar []; nested exception is java.sql.SQLSyntaxErrorException: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near \'\' at line 2', '2024-11-05 17:33:57'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853733187148619778, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '0:0:0:0:0:0:0:1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":0,"amount":0,"remark":"string","projectId":"string"}],"projectId":"string"}', '', 1, 'Unparseable number: "string"', '2024-11-05 17:36:47'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853733278320205826, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '0:0:0:0:0:0:0:1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":0,"amount":0,"remark":"wdawd","projectId":"string"}],"projectId":"string"}', '', 1, 'Unparseable number: "string"', '2024-11-05 17:37:09'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853733291280605186, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '0:0:0:0:0:0:0:1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":0,"amount":0,"remark":"wdawd","projectId":"dwadawfw"}],"projectId":"dwadawfw"}', '', 1, 'Unparseable number: "dwadawfw"', '2024-11-05 17:37:12'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853733187148619778, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '0:0:0:0:0:0:0:1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":0,"amount":0,"remark":"string","projectId":"string"}],"projectId":"string"}', '', 1, 'Unparseable number: "string"', '2024-11-05 17:36:47'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853733278320205826, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '0:0:0:0:0:0:0:1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":0,"amount":0,"remark":"wdawd","projectId":"string"}],"projectId":"string"}', '', 1, 'Unparseable number: "string"', '2024-11-05 17:37:09'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853733291280605186, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '0:0:0:0:0:0:0:1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":0,"amount":0,"remark":"wdawd","projectId":"dwadawfw"}],"projectId":"dwadawfw"}', '', 1, 'Unparseable number: "dwadawfw"', '2024-11-05 17:37:12'); INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853733846508494849, '人员考勤', 1, 'com.ruoyi.oa.controller.SysOaAttendanceController.add()', 'POST', 1, 'admin', '', '/oa/oaAttendance', '127.0.0.1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"id":"1853733846210699265","userId":"1852979651773759489","attendanceDay":7,"projectId":"1852590281594056706","dayLength":1.0,"hour":null,"remark":null}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-05 17:39:24'); INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853733944785231874, '人员考勤', 1, 'com.ruoyi.oa.controller.SysOaAttendanceController.add()', 'POST', 1, 'admin', '', '/oa/oaAttendance', '127.0.0.1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"id":"1853733944655208450","userId":"1852979651773759489","attendanceDay":5,"projectId":"1795992349147906049","dayLength":1.0,"hour":null,"remark":null}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-05 17:39:48'); INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853734013093666818, '人员考勤', 1, 'com.ruoyi.oa.controller.SysOaAttendanceController.add()', 'POST', 1, 'admin', '', '/oa/oaAttendance', '127.0.0.1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"id":"1853734012900728834","userId":"1852979651773759489","attendanceDay":10,"projectId":"1852590281594056706","dayLength":1.0,"hour":null,"remark":null}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-05 17:40:04'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853734045299023874, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '0:0:0:0:0:0:0:1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":0,"amount":0,"remark":"wdawd","projectId":"dwadawfw"}],"projectId":"dwadawfw"}', '', 1, 'Unparseable number: "dwadawfw"', '2024-11-05 17:40:12'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853734375743070209, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '0:0:0:0:0:0:0:1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":0,"amount":0,"remark":"wdawd","projectId":"dwadawfw"}],"projectId":"dwadawfw"}', '', 1, 'Unparseable number: "dwadawfw"', '2024-11-05 17:41:31'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853734418986344449, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '0:0:0:0:0:0:0:1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":0,"amount":0,"remark":"wdawd","projectId":"0"}],"projectId":"0"}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-05 17:41:41'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853734045299023874, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '0:0:0:0:0:0:0:1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":0,"amount":0,"remark":"wdawd","projectId":"dwadawfw"}],"projectId":"dwadawfw"}', '', 1, 'Unparseable number: "dwadawfw"', '2024-11-05 17:40:12'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853734375743070209, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '0:0:0:0:0:0:0:1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":0,"amount":0,"remark":"wdawd","projectId":"dwadawfw"}],"projectId":"dwadawfw"}', '', 1, 'Unparseable number: "dwadawfw"', '2024-11-05 17:41:31'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853734418986344449, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '0:0:0:0:0:0:0:1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":0,"amount":0,"remark":"wdawd","projectId":"0"}],"projectId":"0"}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-05 17:41:41'); INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853736723314479106, '人员考勤', 1, 'com.ruoyi.oa.controller.SysOaAttendanceController.add()', 'POST', 1, 'admin', '', '/oa/oaAttendance', '127.0.0.1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"id":"1853736722999906306","userId":"1852979651773759489","attendanceDay":7,"projectId":"1852590281594056706","dayLength":1.0,"hour":null,"remark":null}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-05 17:50:50'); INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853737509519986689, '人员考勤', 1, 'com.ruoyi.oa.controller.SysOaAttendanceController.add()', 'POST', 1, 'admin', '', '/oa/oaAttendance', '127.0.0.1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"id":"1853737509394157570","userId":"1852979651773759489","attendanceDay":5,"projectId":"1852953303521009665","dayLength":1.0,"hour":null,"remark":null}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-05 17:53:58'); INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853738488072081409, '人员考勤', 1, 'com.ruoyi.oa.controller.SysOaAttendanceController.add()', 'POST', 1, 'admin', '', '/oa/oaAttendance', '127.0.0.1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"id":"1853738487879143425","userId":"1853676948782415873","attendanceDay":7,"projectId":"1852590281594056706","dayLength":1.0,"hour":null,"remark":null}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-05 17:57:51'); @@ -323,45 +323,45 @@ INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_ INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853752469444628481, '人员考勤', 1, 'com.ruoyi.oa.controller.SysOaAttendanceController.add()', 'POST', 1, 'admin', '', '/oa/oaAttendance', '127.0.0.1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"id":null,"userId":"1853676948782415873","attendanceDay":7,"projectId":"1795992349147906049","dayLength":1.0,"hour":null,"remark":null}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-05 18:53:24'); INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853752558615531521, '项目管理', 2, 'com.ruoyi.oa.controller.SysOaProjectController.edit()', 'PUT', 1, 'admin', '', '/oa/project', '127.0.0.1', '内网IP', '{"createBy":"admin","createTime":"2024-11-02 13:55:17","updateBy":null,"updateTime":null,"projectId":"1852590281594056706","projectName":"demo项目","projectNum":"2928","projectType":"2","address":"河北科技大学","funds":"200000.00","functionary":"hdka","beginTime":"2024-11-02 00:00:00","finishTime":"2024-12-11 00:00:00","delivery":"2024-12","guarantee":"12个月","introduction":"测试","projectGrade":"2","projectStatus":"0","contractId":null,"invoiceName":null,"invoiceNumber":null,"invoiceAddress":null,"invoiceBank":null,"bail":"{}","accessory":null,"remark":"测试","isPostpone":0,"postponeReason":null,"postponeTime":null,"color":"#FF1AFF"}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-05 18:53:46'); INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853753260406476802, '字典数据', 1, 'com.ruoyi.web.controller.system.SysDictDataController.add()', 'POST', 1, 'admin', '', '/system/dict/data', '127.0.0.1', '内网IP', '{"createBy":"admin","createTime":"2024-11-05 18:56:32","updateBy":"admin","updateTime":"2024-11-05 18:56:32","dictCode":"1853753260138041346","dictSort":0,"dictLabel":"1/4天","dictValue":"0.25","dictType":"work_time_length","cssClass":null,"listClass":"default","isDefault":null,"status":"0","remark":null,"default":false}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-05 18:56:33'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853771999098753026, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '0:0:0:0:0:0:0:1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":1,"amount":1,"remark":"wdawd1","projectId":"1852953303521009665"},{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":2,"amount":2,"remark":"wdawd2","projectId":"1852953303521009665"},{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":3,"amount":1,"remark":"wdawd3","projectId":null}],"projectId":"1852953303521009665"}', '', 1, '', '2024-11-05 20:11:01'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853773261877858306, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '0:0:0:0:0:0:0:1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":1,"amount":1,"remark":"wdawd1","projectId":"1852953303521009665"},{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":2,"amount":2,"remark":"wdawd2","projectId":"1852953303521009665"},{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":3,"amount":1,"remark":"wdawd3","projectId":null}],"projectId":"1852953303521009665"}', '', 1, '', '2024-11-05 20:16:02'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853771999098753026, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '0:0:0:0:0:0:0:1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":1,"amount":1,"remark":"wdawd1","projectId":"1852953303521009665"},{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":2,"amount":2,"remark":"wdawd2","projectId":"1852953303521009665"},{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":3,"amount":1,"remark":"wdawd3","projectId":null}],"projectId":"1852953303521009665"}', '', 1, '', '2024-11-05 20:11:01'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853773261877858306, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '0:0:0:0:0:0:0:1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":1,"amount":1,"remark":"wdawd1","projectId":"1852953303521009665"},{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":2,"amount":2,"remark":"wdawd2","projectId":"1852953303521009665"},{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":3,"amount":1,"remark":"wdawd3","projectId":null}],"projectId":"1852953303521009665"}', '', 1, '', '2024-11-05 20:16:02'); INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853776599335899137, '仓库管理', 2, 'com.ruoyi.oa.controller.SysOaWarehouseController.edit()', 'PUT', 1, 'admin', '', '/oa/oaWarehouse', '127.0.0.1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"id":3,"inventory":200,"model":"444","unit":"2","name":"3","brand":"3","specifications":"3","remark":"3"}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-05 20:29:17'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853777445146660866, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '0:0:0:0:0:0:0:1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":1,"amount":1,"remark":"wdawd1","projectId":"1852953303521009665"},{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":3,"amount":1,"remark":"wdawd3","projectId":"1852953303521009665"}],"projectId":"1852953303521009665"}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-05 20:32:39'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853777445146660866, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '0:0:0:0:0:0:0:1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":1,"amount":1,"remark":"wdawd1","projectId":"1852953303521009665"},{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":3,"amount":1,"remark":"wdawd3","projectId":"1852953303521009665"}],"projectId":"1852953303521009665"}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-05 20:32:39'); INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853778286243024898, '仓库管理', 1, 'com.ruoyi.oa.controller.SysOaWarehouseController.add()', 'POST', 1, 'admin', '', '/oa/oaWarehouse', '127.0.0.1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"id":6,"inventory":305,"model":"K1","unit":"根","name":"我","brand":"","specifications":"红色","remark":"1"}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-05 20:36:00'); INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853778521455398913, '仓库管理', 5, 'com.ruoyi.oa.controller.SysOaWarehouseController.export()', 'POST', 1, 'admin', '', '/oa/oaWarehouse/export', '127.0.0.1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"id":null,"inventory":null,"model":null,"unit":null,"name":null,"brand":null,"specifications":null,"remark":null}', '', 0, '', '2024-11-05 20:36:56'); INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853779867059425281, '仓库管理', 1, 'com.ruoyi.oa.controller.SysOaWarehouseController.add()', 'POST', 1, 'admin', '', '/oa/oaWarehouse', '127.0.0.1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"id":7,"inventory":561,"model":"ADA型","unit":"个","name":"开关","brand":"洪溪","specifications":"16mm","remark":"挺长的"}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-05 20:42:17'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853797375782952961, '仓库出库', 3, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaOutWarehouse/1', '127.0.0.1', '内网IP', '{}', '{"code":500,"msg":"操作失败","data":null}', 0, '', '2024-11-05 21:51:51'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853797472600072193, '仓库出库', 3, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaOutWarehouse/1', '127.0.0.1', '内网IP', '{}', '{"code":500,"msg":"操作失败","data":null}', 0, '', '2024-11-05 21:52:14'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853797635074826241, '仓库出库', 3, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaOutWarehouse/2', '127.0.0.1', '内网IP', '{}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-05 21:52:53'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853798034724888578, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '0:0:0:0:0:0:0:1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":3,"amount":1,"remark":"test01","projectId":"1852953303521009665"}],"projectId":"1852953303521009665"}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-05 21:54:28'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853798463567306753, '仓库出库', 3, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaOutWarehouse/9', '127.0.0.1', '内网IP', '{}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-05 21:56:10'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853799170265587713, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '0:0:0:0:0:0:0:1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":3,"amount":1,"remark":"test01","projectId":"1852953303521009665"}],"projectId":"1852953303521009665"}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-05 21:58:59'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853799407705137154, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '0:0:0:0:0:0:0:1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":3,"amount":1,"remark":"test01","projectId":"1852953303521009665"}],"projectId":"1852953303521009665"}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-05 21:59:55'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853799510545276930, '仓库出库', 3, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaOutWarehouse/9', '127.0.0.1', '内网IP', '{}', '{"code":500,"msg":"操作失败","data":null}', 0, '', '2024-11-05 22:00:20'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853799526416523266, '仓库出库', 3, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaOutWarehouse/9', '127.0.0.1', '内网IP', '{}', '{"code":500,"msg":"操作失败","data":null}', 0, '', '2024-11-05 22:00:24'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853801746696511489, '仓库出库', 3, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaOutWarehouse/1', '0:0:0:0:0:0:0:1', '内网IP', '{}', '{"code":500,"msg":"操作失败","data":null}', 0, '', '2024-11-05 22:09:13'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853801763100434434, '仓库出库', 3, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaOutWarehouse/13', '0:0:0:0:0:0:0:1', '内网IP', '{}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-05 22:09:17'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853803450326327298, '仓库出库', 3, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaOutWarehouse/12', '0:0:0:0:0:0:0:1', '内网IP', '{}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-05 22:15:59'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853804259562840066, '仓库出库', 3, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaOutWarehouse/11', '0:0:0:0:0:0:0:1', '内网IP', '{}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-05 22:19:12'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853804303246516226, '仓库出库', 3, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaOutWarehouse/11', '0:0:0:0:0:0:0:1', '内网IP', '{}', '{"code":500,"msg":"操作失败","data":null}', 0, '', '2024-11-05 22:19:23'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853806989584982018, '仓库出库', 3, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaOutWarehouse/11', '0:0:0:0:0:0:0:1', '内网IP', '{}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-05 22:30:03'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853809688342732801, '仓库出库', 3, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaOutWarehouse/12', '0:0:0:0:0:0:0:1', '内网IP', '{}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-05 22:40:46'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853810285632593921, '仓库出库', 3, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaOutWarehouse/13', '0:0:0:0:0:0:0:1', '内网IP', '{}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-05 22:43:09'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853811381474226177, '仓库出库', 3, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaOutWarehouse/13', '0:0:0:0:0:0:0:1', '内网IP', '{}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-05 22:47:30'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853811527767355393, '仓库出库', 3, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaOutWarehouse/12', '0:0:0:0:0:0:0:1', '内网IP', '{}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-05 22:48:05'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853811989358899201, '仓库出库', 3, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaOutWarehouse/11', '0:0:0:0:0:0:0:1', '内网IP', '{}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-05 22:49:55'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853812952039747586, '仓库出库', 3, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaOutWarehouse/11', '0:0:0:0:0:0:0:1', '内网IP', '{}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-05 22:53:45'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853813285340114946, '仓库出库', 3, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaOutWarehouse/12', '0:0:0:0:0:0:0:1', '内网IP', '{}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-05 22:55:04'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853813727096795137, '仓库出库', 3, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaOutWarehouse/13', '0:0:0:0:0:0:0:1', '内网IP', '{}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-05 22:56:49'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1854047337840762882, '仓库出库', 3, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaOutWarehouse/2', '127.0.0.1', '内网IP', '{}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-06 14:25:07'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1854047353527459842, '仓库出库', 3, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaOutWarehouse/2', '127.0.0.1', '内网IP', '{}', '{"code":500,"msg":"操作失败","data":null}', 0, '', '2024-11-06 14:25:10'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1854047691378647042, '仓库出库', 3, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaOutWarehouse/6', '127.0.0.1', '内网IP', '{}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-06 14:26:31'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1854047706255843329, '仓库出库', 3, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaOutWarehouse/12', '127.0.0.1', '内网IP', '{}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-06 14:26:34'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1854047890415149058, '仓库出库', 3, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaOutWarehouse/11', '127.0.0.1', '内网IP', '{}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-06 14:27:18'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1854048518692528129, '仓库出库', 3, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaOutWarehouse/7', '127.0.0.1', '内网IP', '{}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-06 14:29:48'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1854075519410700290, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '192.168.31.58', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":1,"amount":2,"remark":null,"projectId":"1852590281594056706"}],"projectId":"1852590281594056706"}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-06 16:17:06'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1854075693885358082, '仓库出库', 3, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaOutWarehouse/14', '192.168.31.58', '内网IP', '{}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-06 16:17:47'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1854084590394212353, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '192.168.31.58', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":1,"amount":10,"remark":null,"projectId":"1852590281594056706"},{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":2,"amount":28,"remark":null,"projectId":"1852590281594056706"}],"projectId":"1852590281594056706"}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-06 16:53:08'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853797375782952961, '仓库出库', 3, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaOutWarehouse/1', '127.0.0.1', '内网IP', '{}', '{"code":500,"msg":"操作失败","data":null}', 0, '', '2024-11-05 21:51:51'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853797472600072193, '仓库出库', 3, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaOutWarehouse/1', '127.0.0.1', '内网IP', '{}', '{"code":500,"msg":"操作失败","data":null}', 0, '', '2024-11-05 21:52:14'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853797635074826241, '仓库出库', 3, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaOutWarehouse/2', '127.0.0.1', '内网IP', '{}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-05 21:52:53'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853798034724888578, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '0:0:0:0:0:0:0:1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":3,"amount":1,"remark":"test01","projectId":"1852953303521009665"}],"projectId":"1852953303521009665"}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-05 21:54:28'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853798463567306753, '仓库出库', 3, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaOutWarehouse/9', '127.0.0.1', '内网IP', '{}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-05 21:56:10'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853799170265587713, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '0:0:0:0:0:0:0:1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":3,"amount":1,"remark":"test01","projectId":"1852953303521009665"}],"projectId":"1852953303521009665"}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-05 21:58:59'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853799407705137154, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '0:0:0:0:0:0:0:1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":3,"amount":1,"remark":"test01","projectId":"1852953303521009665"}],"projectId":"1852953303521009665"}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-05 21:59:55'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853799510545276930, '仓库出库', 3, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaOutWarehouse/9', '127.0.0.1', '内网IP', '{}', '{"code":500,"msg":"操作失败","data":null}', 0, '', '2024-11-05 22:00:20'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853799526416523266, '仓库出库', 3, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaOutWarehouse/9', '127.0.0.1', '内网IP', '{}', '{"code":500,"msg":"操作失败","data":null}', 0, '', '2024-11-05 22:00:24'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853801746696511489, '仓库出库', 3, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaOutWarehouse/1', '0:0:0:0:0:0:0:1', '内网IP', '{}', '{"code":500,"msg":"操作失败","data":null}', 0, '', '2024-11-05 22:09:13'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853801763100434434, '仓库出库', 3, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaOutWarehouse/13', '0:0:0:0:0:0:0:1', '内网IP', '{}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-05 22:09:17'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853803450326327298, '仓库出库', 3, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaOutWarehouse/12', '0:0:0:0:0:0:0:1', '内网IP', '{}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-05 22:15:59'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853804259562840066, '仓库出库', 3, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaOutWarehouse/11', '0:0:0:0:0:0:0:1', '内网IP', '{}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-05 22:19:12'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853804303246516226, '仓库出库', 3, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaOutWarehouse/11', '0:0:0:0:0:0:0:1', '内网IP', '{}', '{"code":500,"msg":"操作失败","data":null}', 0, '', '2024-11-05 22:19:23'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853806989584982018, '仓库出库', 3, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaOutWarehouse/11', '0:0:0:0:0:0:0:1', '内网IP', '{}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-05 22:30:03'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853809688342732801, '仓库出库', 3, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaOutWarehouse/12', '0:0:0:0:0:0:0:1', '内网IP', '{}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-05 22:40:46'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853810285632593921, '仓库出库', 3, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaOutWarehouse/13', '0:0:0:0:0:0:0:1', '内网IP', '{}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-05 22:43:09'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853811381474226177, '仓库出库', 3, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaOutWarehouse/13', '0:0:0:0:0:0:0:1', '内网IP', '{}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-05 22:47:30'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853811527767355393, '仓库出库', 3, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaOutWarehouse/12', '0:0:0:0:0:0:0:1', '内网IP', '{}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-05 22:48:05'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853811989358899201, '仓库出库', 3, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaOutWarehouse/11', '0:0:0:0:0:0:0:1', '内网IP', '{}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-05 22:49:55'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853812952039747586, '仓库出库', 3, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaOutWarehouse/11', '0:0:0:0:0:0:0:1', '内网IP', '{}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-05 22:53:45'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853813285340114946, '仓库出库', 3, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaOutWarehouse/12', '0:0:0:0:0:0:0:1', '内网IP', '{}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-05 22:55:04'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1853813727096795137, '仓库出库', 3, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaOutWarehouse/13', '0:0:0:0:0:0:0:1', '内网IP', '{}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-05 22:56:49'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1854047337840762882, '仓库出库', 3, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaOutWarehouse/2', '127.0.0.1', '内网IP', '{}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-06 14:25:07'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1854047353527459842, '仓库出库', 3, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaOutWarehouse/2', '127.0.0.1', '内网IP', '{}', '{"code":500,"msg":"操作失败","data":null}', 0, '', '2024-11-06 14:25:10'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1854047691378647042, '仓库出库', 3, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaOutWarehouse/6', '127.0.0.1', '内网IP', '{}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-06 14:26:31'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1854047706255843329, '仓库出库', 3, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaOutWarehouse/12', '127.0.0.1', '内网IP', '{}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-06 14:26:34'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1854047890415149058, '仓库出库', 3, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaOutWarehouse/11', '127.0.0.1', '内网IP', '{}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-06 14:27:18'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1854048518692528129, '仓库出库', 3, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaOutWarehouse/7', '127.0.0.1', '内网IP', '{}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-06 14:29:48'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1854075519410700290, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '192.168.31.58', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":1,"amount":2,"remark":null,"projectId":"1852590281594056706"}],"projectId":"1852590281594056706"}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-06 16:17:06'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1854075693885358082, '仓库出库', 3, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaOutWarehouse/14', '192.168.31.58', '内网IP', '{}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-06 16:17:47'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1854084590394212353, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '192.168.31.58', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":1,"amount":10,"remark":null,"projectId":"1852590281594056706"},{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":2,"amount":28,"remark":null,"projectId":"1852590281594056706"}],"projectId":"1852590281594056706"}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-06 16:53:08'); INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1854085917304225793, '角色管理', 2, 'com.ruoyi.web.controller.system.SysRoleController.edit()', 'PUT', 1, 'admin', '', '/system/role', '192.168.31.58', '内网IP', '{"createBy":"admin","createTime":"2024-01-05 16:25:40","updateBy":"admin","updateTime":"2024-11-06 16:58:24","roleId":"1743186990678077442","roleName":"总经理","roleKey":"ceo","roleSort":2,"dataScope":"1","menuCheckStrictly":true,"deptCheckStrictly":true,"status":"0","delFlag":"0","remark":null,"flag":false,"menuIds":["1774989374680858626","1774990200023416833","1760944548859858945","1760952042667626498","1774253657994448897","1744021537846177794","1745332746591649794","1745470812190818305","1744021734047330305","1745054570468597761","1744022006375100417","1747294855579742209","1747291275166642178","1744027281597378561",107,"1744026651709386753","1747450819331104770","1747455602796417025","1743192653017837569","1774998680985804801","1774990200023416834","1774990200023416835","1774990200023416836",5,125,1180,1181,126,1190,1191,1192,1193,127,1200,1201,128,1210,1211,129,1220,1221,130,1230,"1760952042667626499","1760952042667626500","1760952042667626501","1774253657994448898","1774253657994448899","1774253657994448900","1745332746591649795","1745332746591649796","1745332746591649797","1745332746591649798","1745470812190818306","1745470812190818307","1745470812190818308","1763217716546887682","1745054570468597762","1745054570468597763","1745054570468597764","1747294855579742210","1747294855579742211","1747294855579742212","1746809519695167490","1747291275166642179","1747291275166642180","1747291275166642181",1070,1071,1072,"1747450819331104771","1747450819331104772","1747450819331104773","1747455602796417026","1747455602796417027","1747455602796417028",1,100,1001,1002,1003,1004,1005,1006,1007,109,1100,1101,1102,103,1030,1031,1032,1033,104,1040,1041,1042,1043,1044,108,500,1080,1081,1082,501,1090,1091,1092,1093,118,1130,1131,1132,1133,1134,1135,105,1050,1051,1052,1053,1054,"1852933620281430018","1852933963887202305","1852933963887202306","1852933963887202307","1852933963887202308","1852933963887202309","1852933963887202310","1853343196679536641","1853343196679536642","1853343', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-06 16:58:25'); INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1855144916691210242, '代码生成', 6, 'com.ruoyi.generator.controller.GenController.importTableSave()', 'POST', 1, 'admin', '', '/tool/gen/importTable', '10.0.212.117', '内网IP', '"sys_oa_task_user"', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-09 15:06:30'); INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1855145100598857729, '代码生成', 2, 'com.ruoyi.generator.controller.GenController.editSave()', 'PUT', 1, 'admin', '', '/tool/gen', '10.0.212.117', '内网IP', '{"createBy":null,"createTime":null,"updateBy":"admin","updateTime":"2024-11-09 15:07:13","params":{"treeCode":null,"treeName":null,"treeParentCode":null,"parentMenuId":3},"tableId":"1855144915911069697","tableName":"sys_oa_task_user","tableComment":"任务工人","subTableName":null,"subTableFkName":null,"className":"SysOaTaskUser","tplCategory":"crud","packageName":"com.ruoyi.oa","moduleName":"system","businessName":"oaTaskUser","functionName":"任务工人","functionAuthor":"hdka","genType":"0","genPath":"/","pkColumn":null,"subTable":null,"columns":[{"createBy":"admin","createTime":"2024-11-09 15:06:30","updateBy":"admin","updateTime":"2024-11-09 15:07:13","columnId":"1855144916305334273","tableId":"1855144915911069697","columnName":"user_id","columnComment":"主键","columnType":"bigint","javaType":"Long","javaField":"userId","isPk":"0","isIncrement":"0","isRequired":"1","isInsert":"1","isEdit":"1","isList":"1","isQuery":"1","queryType":"EQ","htmlType":"input","dictType":"","sort":1,"required":true,"list":true,"insert":true,"edit":true,"usableColumn":false,"pk":false,"superColumn":false,"capJavaField":"UserId","increment":false,"query":true},{"createBy":"admin","createTime":"2024-11-09 15:06:30","updateBy":"admin","updateTime":"2024-11-09 15:07:13","columnId":"1855144916305334274","tableId":"1855144915911069697","columnName":"task_id","columnComment":"任务键","columnType":"bigint","javaType":"Long","javaField":"taskId","isPk":"1","isIncrement":"0","isRequired":"1","isInsert":null,"isEdit":"1","isList":"1","isQuery":null,"queryType":"EQ","htmlType":"input","dictType":"","sort":2,"required":true,"list":true,"insert":false,"edit":true,"usableColumn":false,"pk":true,"superColumn":false,"capJavaField":"TaskId","increment":false,"query":false}],"options":"{\\"treeCode\\":null,\\"treeName\\":null,\\"treeParentCode\\":null,\\"parentMenuId\\":3}","remark":null,"treeCode":null,"treeParentCode":null,"treeName":null,"menuIds":null,"parentMenuId":"3","parentMenuName":null,"sub":false,"tree":false,"crud":t', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-09 15:07:14'); @@ -414,25 +414,25 @@ INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_ INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1857249911728799746, '菜单管理', 2, 'com.ruoyi.web.controller.system.SysMenuController.edit()', 'PUT', 1, 'admin', '', '/system/menu', '127.0.0.1', '内网IP', '{"createBy":"admin","createTime":"2024-11-15 09:19:05","updateBy":"admin","updateTime":"2024-11-15 10:30:59","parentName":null,"parentId":"1745332746591649794","children":[],"menuId":"1857231813911019521","menuName":"项目结项","orderNum":0,"path":"closure/:id","component":"oa/closure/index","queryParam":null,"isFrame":"1","isCache":"0","menuType":"C","visible":"1","status":"0","icon":"#","remark":""}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-15 10:31:00'); INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1857354151243587586, '任务管理', 1, 'com.ruoyi.oa.controller.SysOaTaskController.add()', 'POST', 1, 'admin', '', '/oa/task', '127.0.0.1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"taskId":"1857354149481979905","projectId":"1856147362642014209","taskTitle":"tasl","taskType":"1","taskGrade":"2","collaborator":"wangyu","beginTime":"2024-11-15 17:24:47","finishTime":"2024-11-22 00:00:00","content":"

添加任务

","accessory":null,"workerList":["1852979651773759489","1853676948782415873"],"remark":null}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-15 17:25:12'); INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1857374384704462850, '菜单管理', 2, 'com.ruoyi.web.controller.system.SysMenuController.edit()', 'PUT', 1, 'admin', '', '/system/menu', '192.168.31.59', '内网IP', '{"createBy":"admin","createTime":"2024-02-23 08:27:52","updateBy":"admin","updateTime":"2024-11-15 18:45:36","parentName":null,"parentId":0,"children":[],"menuId":"1760944548859858945","menuName":"投标管理","orderNum":4,"path":"bid","component":null,"queryParam":null,"isFrame":"1","isCache":"0","menuType":"M","visible":"1","status":"1","icon":"documentation","remark":""}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-15 18:45:36'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1857665746603626498, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '127.0.0.1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":1,"amount":null,"remark":null,"projectId":"1856147362642014209"},{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":3,"amount":2,"remark":null,"projectId":null}],"projectId":"1856147362642014209"}', '', 1, '', '2024-11-16 14:03:22'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1857665986136133634, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '127.0.0.1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":3,"amount":2,"remark":null,"projectId":"1856147362642014209"}],"projectId":"1856147362642014209"}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-16 14:04:20'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1857666939182772226, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '127.0.0.1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":3,"amount":2,"remark":null,"projectId":null}],"projectId":null}', '', 1, ' +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1857665746603626498, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '127.0.0.1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":1,"amount":null,"remark":null,"projectId":"1856147362642014209"},{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":3,"amount":2,"remark":null,"projectId":null}],"projectId":"1856147362642014209"}', '', 1, '', '2024-11-16 14:03:22'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1857665986136133634, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '127.0.0.1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":3,"amount":2,"remark":null,"projectId":"1856147362642014209"}],"projectId":"1856147362642014209"}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-16 14:04:20'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1857666939182772226, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '127.0.0.1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":3,"amount":2,"remark":null,"projectId":null}],"projectId":null}', '', 1, ' ### Error updating database. Cause: java.sql.SQLException: Field \'project_id\' doesn\'t have a default value ### The error may exist in com/ruoyi/oa/mapper/SysOaOutWarehouseMapper.java (best guess) -### The error may involve com.ruoyi.oa.mapper.SysOaOutWarehouseMapper.insert-Inline +### The error may involve com.ruoyi.oa.mapper.SysOaWarehouseDetailMapper.insert-Inline ### The error occurred while setting parameters -### SQL: INSERT INTO sys_oa_out_warehouse ( amount, warehouse_id, create_by, create_time, update_by, update_time ) VALUES ( ?, ?, ?, ?, ?, ? ) +### SQL: INSERT INTO sys_oa_warehouse_detail ( amount, warehouse_id, create_by, create_time, update_by, update_time ) VALUES ( ?, ?, ?, ?, ?, ? ) ### Cause: java.sql.SQLException: Field \'project_id\' doesn\'t have a default value ; Field \'project_id\' doesn\'t have a default value; nested exception is java.sql.SQLException: Field \'project_id\' doesn\'t have a default value', '2024-11-16 14:08:07'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1857667257261891585, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '127.0.0.1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":3,"amount":2,"remark":null,"projectId":null}],"projectId":null}', '', 1, ' +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1857667257261891585, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '127.0.0.1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":3,"amount":2,"remark":null,"projectId":null}],"projectId":null}', '', 1, ' ### Error updating database. Cause: java.sql.SQLException: Field \'project_id\' doesn\'t have a default value ### The error may exist in com/ruoyi/oa/mapper/SysOaOutWarehouseMapper.java (best guess) -### The error may involve com.ruoyi.oa.mapper.SysOaOutWarehouseMapper.insert-Inline +### The error may involve com.ruoyi.oa.mapper.SysOaWarehouseDetailMapper.insert-Inline ### The error occurred while setting parameters -### SQL: INSERT INTO sys_oa_out_warehouse ( amount, warehouse_id, create_by, create_time, update_by, update_time ) VALUES ( ?, ?, ?, ?, ?, ? ) +### SQL: INSERT INTO sys_oa_warehouse_detail ( amount, warehouse_id, create_by, create_time, update_by, update_time ) VALUES ( ?, ?, ?, ?, ?, ? ) ### Cause: java.sql.SQLException: Field \'project_id\' doesn\'t have a default value ; Field \'project_id\' doesn\'t have a default value; nested exception is java.sql.SQLException: Field \'project_id\' doesn\'t have a default value', '2024-11-16 14:09:23'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1857667410567897090, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '127.0.0.1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":3,"amount":2,"remark":null,"projectId":null}],"projectId":null}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-16 14:09:59'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1857667410567897090, '仓库批量出库', 1, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.addAll()', 'POST', 1, 'admin', '', '/oa/oaOutWarehouse/insertOutBatch', '127.0.0.1', '内网IP', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"outWareHouseList":[{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"warehouseId":3,"amount":2,"remark":null,"projectId":null}],"projectId":null}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-16 14:09:59'); INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1857669782367174658, '仓库管理', 3, 'com.ruoyi.oa.controller.SysOaWarehouseController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaWarehouse/1', '127.0.0.1', '内网IP', '{}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-16 14:19:25'); INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1857670304289533953, '仓库管理', 3, 'com.ruoyi.oa.controller.SysOaWarehouseController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaWarehouse/1', '127.0.0.1', '内网IP', '{}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-16 14:21:29'); INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1857670940146053121, '仓库管理', 3, 'com.ruoyi.oa.controller.SysOaWarehouseController.remove()', 'DELETE', 1, 'admin', '', '/oa/oaWarehouse/1', '127.0.0.1', '内网IP', '{}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-16 14:24:01'); @@ -440,7 +440,7 @@ INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_ INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1857749015726678017, '角色管理', 2, 'com.ruoyi.web.controller.system.SysRoleController.edit()', 'PUT', 1, 'admin', '', '/system/role', '127.0.0.1', '内网IP', '{"createBy":"admin","createTime":"2024-01-05 16:25:40","updateBy":"admin","updateTime":"2024-11-16 19:34:14","roleId":"1743186990678077442","roleName":"总经理","roleKey":"ceo","roleSort":2,"dataScope":"1","menuCheckStrictly":true,"deptCheckStrictly":true,"status":"0","delFlag":"0","remark":null,"flag":false,"menuIds":["1744021537846177794","1745332746591649794","1857231813911019521","1745332746591649795","1745332746591649796","1745332746591649797","1745332746591649798","1745332746591649799","1745470812190818305","1745470812190818306","1745470812190818307","1745470812190818308","1745470812190818309","1745470812190818310","1744022006375100417","1747294855579742209","1747294855579742210","1747294855579742211","1747294855579742212","1747294855579742213","1747294855579742214","1746809519695167490","1747291275166642178","1747291275166642179","1747291275166642180","1747291275166642181","1747291275166642182","1747291275166642183","1852933620281430018","1852933963887202305","1852933963887202306","1852933963887202307","1852933963887202308","1852933963887202309","1852933963887202310","1853343196679536641","1853343196679536642","1853343196679536643","1853343196679536644","1853343196679536645","1853343196679536646","1760944548859858945","1760952042667626498","1760952042667626499","1760952042667626500","1760952042667626501","1760952042667626502","1760952042667626503","1774253657994448897","1774253657994448898","1774253657994448899","1774253657994448900","1774253657994448901","1774253657994448902","1852970227348848642","1852970966469099522","1853664655629713410","1744021734047330305","1763217716546887682","1745054570468597761","1745054570468597762","1745054570468597763","1745054570468597764","1745054570468597765","1745054570468597766",4,121,1140,1141,1142,1143,122,1150,1151,1152,1153,1154,123,1160,1161,1162,1163,1164,1165,1166,1167,1168,124,1170,1171,1172,5,125,1180,1181,126,1190,1191,1192,1193,127,1200,1201,128,1210,1211,129,1220,1221,130,1230,"1774989374680858626","1774998680985804', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-16 19:34:15'); INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1857749273340829698, '角色管理', 2, 'com.ruoyi.web.controller.system.SysRoleController.edit()', 'PUT', 1, 'admin', '', '/system/role', '127.0.0.1', '内网IP', '{"createBy":"admin","createTime":"2024-01-05 16:25:40","updateBy":"admin","updateTime":"2024-11-16 19:35:16","roleId":"1743186990678077442","roleName":"总经理","roleKey":"ceo","roleSort":2,"dataScope":"1","menuCheckStrictly":true,"deptCheckStrictly":true,"status":"0","delFlag":"0","remark":null,"flag":false,"menuIds":["1744021537846177794","1745332746591649794","1857231813911019521","1745332746591649795","1745332746591649796","1745332746591649797","1745332746591649798","1745332746591649799","1745470812190818305","1745470812190818306","1745470812190818307","1745470812190818308","1745470812190818309","1745470812190818310","1744022006375100417","1747294855579742209","1747294855579742210","1747294855579742211","1747294855579742212","1747294855579742213","1747294855579742214","1746809519695167490","1747291275166642178","1747291275166642179","1747291275166642180","1747291275166642181","1747291275166642182","1747291275166642183","1852933620281430018","1852933963887202305","1852933963887202306","1852933963887202307","1852933963887202308","1852933963887202309","1852933963887202310","1853343196679536641","1853343196679536642","1853343196679536643","1853343196679536644","1853343196679536645","1853343196679536646","1760944548859858945","1760952042667626498","1760952042667626499","1760952042667626500","1760952042667626501","1760952042667626502","1760952042667626503","1774253657994448897","1774253657994448898","1774253657994448899","1774253657994448900","1774253657994448901","1774253657994448902","1852970227348848642","1852970966469099522","1853664655629713410","1744021734047330305","1763217716546887682","1745054570468597761","1745054570468597762","1745054570468597763","1745054570468597764","1745054570468597765","1745054570468597766",4,121,1140,1141,1142,1143,122,1150,1151,1152,1153,1154,123,1160,1161,1162,1163,1164,1165,1166,1167,1168,124,1170,1171,1172,5,125,1180,1181,126,1190,1191,1192,1193,127,1200,1201,128,1210,1211,129,1220,1221,130,1230,"1774989374680858626","1774998680985804', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-16 19:35:17'); INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1857753361048104961, '人员考勤', 1, 'com.ruoyi.oa.controller.SysOaAttendanceController.add()', 'POST', 1, 'boss', '', '/oa/oaAttendance', '61.182.70.30', '中国|河北省|石家庄市|联通', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"id":"1857753360817418242","userId":"1853676948782415873","attendanceDay":25,"projectId":"1856147362642014209","dayLength":1.0,"hour":null,"remark":null}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-16 19:51:31'); -INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1857753784186269698, '仓库出库', 5, 'com.ruoyi.oa.controller.SysOaOutWarehouseController.export()', 'POST', 1, 'boss', '', '/oa/oaOutWarehouse/export', '112.224.70.102', '中国|山东省|济南市|联通', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"id":null,"projectId":null,"amount":null,"remark":null,"warehouseId":null,"projectName":null,"warehouseName":null}', '', 0, '', '2024-11-16 19:53:12'); +INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1857753784186269698, '仓库出库', 5, 'com.ruoyi.oa.controller.SysOaWarehouseDetailController.export()', 'POST', 1, 'boss', '', '/oa/oaOutWarehouse/export', '112.224.70.102', '中国|山东省|济南市|联通', '{"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"id":null,"projectId":null,"amount":null,"remark":null,"warehouseId":null,"projectName":null,"warehouseName":null}', '', 0, '', '2024-11-16 19:53:12'); INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1858042499685117953, '通知公告', 3, 'com.ruoyi.web.controller.system.SysNoticeController.remove()', 'DELETE', 1, 'boss', '', '/system/notice/1757607279297990658', '153.119.227.6', '中国|山东省|济南市|电信', '{}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-17 15:00:27'); INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1858042515778662401, '通知公告', 3, 'com.ruoyi.web.controller.system.SysNoticeController.remove()', 'DELETE', 1, 'boss', '', '/system/notice/1757607965616148481', '153.119.227.6', '中国|山东省|济南市|电信', '{}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-17 15:00:31'); INSERT INTO fad_oa.sys_oper_log (oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, oper_time) VALUES (1858042527254278146, '通知公告', 3, 'com.ruoyi.web.controller.system.SysNoticeController.remove()', 'DELETE', 1, 'boss', '', '/system/notice/1757607615190437889', '153.119.227.6', '中国|山东省|济南市|电信', '{}', '{"code":200,"msg":"操作成功","data":null}', 0, '', '2024-11-17 15:00:34'); diff --git a/script/sql/20241120表结构备份/sys_oa_out_warehouse.sql b/script/sql/20241120表结构备份/sys_oa_out_warehouse.sql index a2b525e..42cd54e 100644 --- a/script/sql/20241120表结构备份/sys_oa_out_warehouse.sql +++ b/script/sql/20241120表结构备份/sys_oa_out_warehouse.sql @@ -1,4 +1,4 @@ -create table fad_oa.sys_oa_out_warehouse +create table fad_oa.sys_oa_warehouse_detail ( id bigint auto_increment comment '主键id' primary key,