diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsHppInStockDetailController.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsHppInStockDetailController.java new file mode 100644 index 00000000..0be068e0 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsHppInStockDetailController.java @@ -0,0 +1,117 @@ +package org.dromara.wms.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.dromara.wms.domain.bo.WmsHppInStockDetailBo; +import org.dromara.wms.domain.vo.WmsHppInStockDetailVo; +import org.dromara.wms.service.IWmsHppInStockDetailService; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 半制品入库 + * 前端访问路由地址为:/system/hppInStockDetail + * + * @author LionLi + * @date 2025-01-14 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/hppInStockDetail") +public class WmsHppInStockDetailController extends BaseController { + + private final IWmsHppInStockDetailService wmsHppInStockDetailService; + + /** + * 查询半制品入库列表 + */ + @SaCheckPermission("system:hppInStockDetail:list") + @GetMapping("/list") + public TableDataInfo list(WmsHppInStockDetailBo bo, PageQuery pageQuery) { + return wmsHppInStockDetailService.queryPageList(bo, pageQuery); + } + + /** + * 导出半制品入库列表 + */ + @SaCheckPermission("system:hppInStockDetail:export") + @Log(title = "半制品入库", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WmsHppInStockDetailBo bo, HttpServletResponse response) { + List list = wmsHppInStockDetailService.queryList(bo); + ExcelUtil.exportExcel(list, "半制品入库", WmsHppInStockDetailVo.class, response); + } + + /** + * 获取半制品入库详细信息 + * + * @param objId 主键 + */ + @SaCheckPermission("system:hppInStockDetail:query") + @GetMapping("/{objId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long objId) { + return R.ok(wmsHppInStockDetailService.queryById(objId)); + } + + /** + * 新增半制品入库 + */ + @SaCheckPermission("system:hppInStockDetail:add") + @Log(title = "半制品入库", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@RequestBody WmsHppInStockDetailBo bo) { + return toAjax(wmsHppInStockDetailService.insertByBo(bo)); + } + + /** + * 修改半制品入库 + */ + @SaCheckPermission("system:hppInStockDetail:edit") + @Log(title = "半制品入库", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@RequestBody WmsHppInStockDetailBo bo) { + return toAjax(wmsHppInStockDetailService.updateByBo(bo)); + } + + /** + * 删除半制品入库 + * + * @param objIds 主键串 + */ + @SaCheckPermission("system:hppInStockDetail:remove") + @Log(title = "半制品入库", businessType = BusinessType.DELETE) + @DeleteMapping("/{objIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] objIds) { + return toAjax(wmsHppInStockDetailService.deleteWithValidByIds(List.of(objIds), true)); + } + + + /** + * 下拉框查询半制品入库列表 + */ + + @GetMapping("getWmsHppInStockDetailList") + public R> getWmsHppInStockDetaillist(WmsHppInStockDetailBo bo) { + List list = wmsHppInStockDetailService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsHppOutStockDetailController.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsHppOutStockDetailController.java new file mode 100644 index 00000000..1b51f604 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsHppOutStockDetailController.java @@ -0,0 +1,117 @@ +package org.dromara.wms.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.dromara.wms.domain.bo.WmsHppOutStockDetailBo; +import org.dromara.wms.domain.vo.WmsHppOutStockDetailVo; +import org.dromara.wms.service.IWmsHppOutStockDetailService; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 半成品出库 + * 前端访问路由地址为:/system/hppOutStockDetail + * + * @author LionLi + * @date 2025-01-14 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/hppOutStockDetail") +public class WmsHppOutStockDetailController extends BaseController { + + private final IWmsHppOutStockDetailService wmsHppOutStockDetailService; + + /** + * 查询半成品出库列表 + */ + @SaCheckPermission("system:hppOutStockDetail:list") + @GetMapping("/list") + public TableDataInfo list(WmsHppOutStockDetailBo bo, PageQuery pageQuery) { + return wmsHppOutStockDetailService.queryPageList(bo, pageQuery); + } + + /** + * 导出半成品出库列表 + */ + @SaCheckPermission("system:hppOutStockDetail:export") + @Log(title = "半成品出库", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WmsHppOutStockDetailBo bo, HttpServletResponse response) { + List list = wmsHppOutStockDetailService.queryList(bo); + ExcelUtil.exportExcel(list, "半成品出库", WmsHppOutStockDetailVo.class, response); + } + + /** + * 获取半成品出库详细信息 + * + * @param objId 主键 + */ + @SaCheckPermission("system:hppOutStockDetail:query") + @GetMapping("/{objId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long objId) { + return R.ok(wmsHppOutStockDetailService.queryById(objId)); + } + + /** + * 新增半成品出库 + */ + @SaCheckPermission("system:hppOutStockDetail:add") + @Log(title = "半成品出库", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@RequestBody WmsHppOutStockDetailBo bo) { + return toAjax(wmsHppOutStockDetailService.insertByBo(bo)); + } + + /** + * 修改半成品出库 + */ + @SaCheckPermission("system:hppOutStockDetail:edit") + @Log(title = "半成品出库", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@RequestBody WmsHppOutStockDetailBo bo) { + return toAjax(wmsHppOutStockDetailService.updateByBo(bo)); + } + + /** + * 删除半成品出库 + * + * @param objIds 主键串 + */ + @SaCheckPermission("system:hppOutStockDetail:remove") + @Log(title = "半成品出库", businessType = BusinessType.DELETE) + @DeleteMapping("/{objIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] objIds) { + return toAjax(wmsHppOutStockDetailService.deleteWithValidByIds(List.of(objIds), true)); + } + + + /** + * 下拉框查询半成品出库列表 + */ + + @GetMapping("getWmsHppOutStockDetailList") + public R> getWmsHppOutStockDetaillist(WmsHppOutStockDetailBo bo) { + List list = wmsHppOutStockDetailService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsHppStorageDetailController.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsHppStorageDetailController.java new file mode 100644 index 00000000..20dd91e5 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsHppStorageDetailController.java @@ -0,0 +1,116 @@ +package org.dromara.wms.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.dromara.wms.domain.bo.WmsHppStorageDetailBo; +import org.dromara.wms.domain.vo.WmsHppStorageDetailVo; +import org.dromara.wms.service.IWmsHppStorageDetailService; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 半成品库存 + * 前端访问路由地址为:/system/hppStorageDetail + * + * @author LionLi + * @date 2025-01-14 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/hppStorageDetail") +public class WmsHppStorageDetailController extends BaseController { + + private final IWmsHppStorageDetailService wmsHppStorageDetailService; + + /** + * 查询半成品库存列表 + */ + @SaCheckPermission("system:hppStorageDetail:list") + @GetMapping("/list") + public TableDataInfo list(WmsHppStorageDetailBo bo, PageQuery pageQuery) { + return wmsHppStorageDetailService.queryPageList(bo, pageQuery); + } + + /** + * 导出半成品库存列表 + */ + @SaCheckPermission("system:hppStorageDetail:export") + @Log(title = "半成品库存", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WmsHppStorageDetailBo bo, HttpServletResponse response) { + List list = wmsHppStorageDetailService.queryList(bo); + ExcelUtil.exportExcel(list, "半成品库存", WmsHppStorageDetailVo.class, response); + } + + /** + * 获取半成品库存详细信息 + * + * @param objId 主键 + */ + @SaCheckPermission("system:hppStorageDetail:query") + @GetMapping("/{objId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long objId) { + return R.ok(wmsHppStorageDetailService.queryById(objId)); + } + + /** + * 新增半成品库存 + */ + @SaCheckPermission("system:hppStorageDetail:add") + @Log(title = "半成品库存", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@RequestBody WmsHppStorageDetailBo bo) { + return toAjax(wmsHppStorageDetailService.insertByBo(bo)); + } + + /** + * 修改半成品库存 + */ + @SaCheckPermission("system:hppStorageDetail:edit") + @Log(title = "半成品库存", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@RequestBody WmsHppStorageDetailBo bo) { + return toAjax(wmsHppStorageDetailService.updateByBo(bo)); + } + + /** + * 删除半成品库存 + * + * @param objIds 主键串 + */ + @SaCheckPermission("system:hppStorageDetail:remove") + @Log(title = "半成品库存", businessType = BusinessType.DELETE) + @DeleteMapping("/{objIds}") + public R remove(@PathVariable Long[] objIds) { + return toAjax(wmsHppStorageDetailService.deleteWithValidByIds(List.of(objIds), true)); + } + + + /** + * 下拉框查询半成品库存列表 + */ + + @GetMapping("getWmsHppStorageDetailList") + public R> getWmsHppStorageDetaillist(WmsHppStorageDetailBo bo) { + List list = wmsHppStorageDetailService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsHppStoreController.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsHppStoreController.java new file mode 100644 index 00000000..4215e291 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsHppStoreController.java @@ -0,0 +1,115 @@ +package org.dromara.wms.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.dromara.wms.domain.bo.WmsHppStoreBo; +import org.dromara.wms.domain.vo.WmsHppStoreVo; +import org.dromara.wms.service.IWmsHppStoreService; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 【请填写功能名称】 + * 前端访问路由地址为:/system/hppStore + * + * @author LionLi + * @date 2025-01-14 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/hppStore") +public class WmsHppStoreController extends BaseController { + + private final IWmsHppStoreService wmsHppStoreService; + + /** + * 查询【请填写功能名称】列表 + */ + @SaCheckPermission("system:hppStore:list") + @GetMapping("/list") + public TableDataInfo list(WmsHppStoreBo bo, PageQuery pageQuery) { + return wmsHppStoreService.queryPageList(bo, pageQuery); + } + + /** + * 导出【请填写功能名称】列表 + */ + @SaCheckPermission("system:hppStore:export") + @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WmsHppStoreBo bo, HttpServletResponse response) { + List list = wmsHppStoreService.queryList(bo); + ExcelUtil.exportExcel(list, "【请填写功能名称】", WmsHppStoreVo.class, response); + } + + /** + * 获取【请填写功能名称】详细信息 + * + * @param + */ + @SaCheckPermission("system:hppStore:query") + @GetMapping("/{objId}") + public R getInfo(@PathVariable Long objId) { + return R.ok(wmsHppStoreService.queryById(objId)); + } + + /** + * 新增【请填写功能名称】 + */ + @SaCheckPermission("system:hppStore:add") + @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@RequestBody WmsHppStoreBo bo) { + return toAjax(wmsHppStoreService.insertByBo(bo)); + } + + /** + * 修改【请填写功能名称】 + */ + @SaCheckPermission("system:hppStore:edit") + @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@RequestBody WmsHppStoreBo bo) { + return toAjax(wmsHppStoreService.updateByBo(bo)); + } + + /** + * 删除【请填写功能名称】 + * + * @param + */ + @SaCheckPermission("system:hppStore:remove") + @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE) + @DeleteMapping("/{objId}") + public R remove(@PathVariable Long[] objId) { + return toAjax(wmsHppStoreService.deleteWithValidByIds(List.of(objId), true)); + } + + + /** + * 下拉框查询【请填写功能名称】列表 + */ + + @GetMapping("getWmsHppStoreList") + public R> getWmsHppStorelist(WmsHppStoreBo bo) { + List list = wmsHppStoreService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsHppStorePlaceController.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsHppStorePlaceController.java new file mode 100644 index 00000000..8d6f3b8d --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsHppStorePlaceController.java @@ -0,0 +1,117 @@ +package org.dromara.wms.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.dromara.wms.domain.bo.WmsHppStorePlaceBo; +import org.dromara.wms.domain.vo.WmsHppStorePlaceVo; +import org.dromara.wms.service.IWmsHppStorePlaceService; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 半成品库位 + * 前端访问路由地址为:/system/hppStorePlace + * + * @author LionLi + * @date 2025-01-14 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/hppStorePlace") +public class WmsHppStorePlaceController extends BaseController { + + private final IWmsHppStorePlaceService wmsHppStorePlaceService; + + /** + * 查询半成品库位列表 + */ + @SaCheckPermission("system:hppStorePlace:list") + @GetMapping("/list") + public TableDataInfo list(WmsHppStorePlaceBo bo, PageQuery pageQuery) { + return wmsHppStorePlaceService.queryPageList(bo, pageQuery); + } + + /** + * 导出半成品库位列表 + */ + @SaCheckPermission("system:hppStorePlace:export") + @Log(title = "半成品库位", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WmsHppStorePlaceBo bo, HttpServletResponse response) { + List list = wmsHppStorePlaceService.queryList(bo); + ExcelUtil.exportExcel(list, "半成品库位", WmsHppStorePlaceVo.class, response); + } + + /** + * 获取半成品库位详细信息 + * + * @param objId 主键 + */ + @SaCheckPermission("system:hppStorePlace:query") + @GetMapping("/{objId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long objId) { + return R.ok(wmsHppStorePlaceService.queryById(objId)); + } + + /** + * 新增半成品库位 + */ + @SaCheckPermission("system:hppStorePlace:add") + @Log(title = "半成品库位", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@RequestBody WmsHppStorePlaceBo bo) { + return toAjax(wmsHppStorePlaceService.insertByBo(bo)); + } + + /** + * 修改半成品库位 + */ + @SaCheckPermission("system:hppStorePlace:edit") + @Log(title = "半成品库位", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@RequestBody WmsHppStorePlaceBo bo) { + return toAjax(wmsHppStorePlaceService.updateByBo(bo)); + } + + /** + * 删除半成品库位 + * + * @param objIds 主键串 + */ + @SaCheckPermission("system:hppStorePlace:remove") + @Log(title = "半成品库位", businessType = BusinessType.DELETE) + @DeleteMapping("/{objIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] objIds) { + return toAjax(wmsHppStorePlaceService.deleteWithValidByIds(List.of(objIds), true)); + } + + + /** + * 下拉框查询半成品库位列表 + */ + + @GetMapping("getWmsHppStorePlaceList") + public R> getWmsHppStorePlacelist(WmsHppStorePlaceBo bo) { + List list = wmsHppStorePlaceService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsHsmToolingController.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsHsmToolingController.java new file mode 100644 index 00000000..d080e9ed --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsHsmToolingController.java @@ -0,0 +1,117 @@ +package org.dromara.wms.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.dromara.wms.domain.bo.WmsHsmToolingBo; +import org.dromara.wms.domain.vo.WmsHsmToolingVo; +import org.dromara.wms.service.IWmsHsmToolingService; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 半成品工装 + * 前端访问路由地址为:/system/hsmTooling + * + * @author LionLi + * @date 2025-01-14 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/hsmTooling") +public class WmsHsmToolingController extends BaseController { + + private final IWmsHsmToolingService wmsHsmToolingService; + + /** + * 查询半成品工装列表 + */ + @SaCheckPermission("system:hsmTooling:list") + @GetMapping("/list") + public TableDataInfo list(WmsHsmToolingBo bo, PageQuery pageQuery) { + return wmsHsmToolingService.queryPageList(bo, pageQuery); + } + + /** + * 导出半成品工装列表 + */ + @SaCheckPermission("system:hsmTooling:export") + @Log(title = "半成品工装", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WmsHsmToolingBo bo, HttpServletResponse response) { + List list = wmsHsmToolingService.queryList(bo); + ExcelUtil.exportExcel(list, "半成品工装", WmsHsmToolingVo.class, response); + } + + /** + * 获取半成品工装详细信息 + * + * @param OBJID 主键 + */ + @SaCheckPermission("system:hsmTooling:query") + @GetMapping("/{OBJID}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long OBJID) { + return R.ok(wmsHsmToolingService.queryById(OBJID)); + } + + /** + * 新增半成品工装 + */ + @SaCheckPermission("system:hsmTooling:add") + @Log(title = "半成品工装", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@RequestBody WmsHsmToolingBo bo) { + return toAjax(wmsHsmToolingService.insertByBo(bo)); + } + + /** + * 修改半成品工装 + */ + @SaCheckPermission("system:hsmTooling:edit") + @Log(title = "半成品工装", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@RequestBody WmsHsmToolingBo bo) { + return toAjax(wmsHsmToolingService.updateByBo(bo)); + } + + /** + * 删除半成品工装 + * + * @param OBJIDs 主键串 + */ + @SaCheckPermission("system:hsmTooling:remove") + @Log(title = "半成品工装", businessType = BusinessType.DELETE) + @DeleteMapping("/{OBJIDs}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] OBJIDs) { + return toAjax(wmsHsmToolingService.deleteWithValidByIds(List.of(OBJIDs), true)); + } + + + /** + * 下拉框查询半成品工装列表 + */ + + @GetMapping("getWmsHsmToolingList") + public R> getWmsHsmToolinglist(WmsHsmToolingBo bo) { + List list = wmsHsmToolingService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsHppInStockDetail.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsHppInStockDetail.java new file mode 100644 index 00000000..ee215a43 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsHppInStockDetail.java @@ -0,0 +1,99 @@ +package org.dromara.wms.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 半制品入库对象 wms_hpp_in_stock_detail + * + * @author LionLi + * @date 2025-01-14 + */ +@Data +@TableName("wms_hpp_in_stock_detail") +public class WmsHppInStockDetail{ + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + private Long objId; + + /** + * 流水卡号 + */ + private String cardNo; + + /** + * 工装架子号 + */ + private String shelfNo; + + /** + * 库位id + */ + private Long storePlaceId; + + /** + * 品级编号,0:合格,1:不合格 + */ + private String gradeCode; + + /** + * 产品类别：0：半成品，1：成型 + */ + private String productCategory; + + /** + * 物料 + */ + private Long materialId; + + /** + * 物料规格 + */ + private String materialSpec; + private String materialCode; + + /** + * 入库类型,0:半制品产出,2:入半制品线边库3:入成型线边库 + */ + private String instockType; + /** + * 租户id + */ + private String tenantId; + @TableField(fill = FieldFill.INSERT) + private String createBy; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private Date createTime; + + /** + * 更新者 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private String updateBy; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Date updateTime; + private BigDecimal instockNum; + @TableField(exist = false) + private String storePlaceCode; + + +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsHppOutStockDetail.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsHppOutStockDetail.java new file mode 100644 index 00000000..0203efd3 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsHppOutStockDetail.java @@ -0,0 +1,89 @@ +package org.dromara.wms.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; +import java.util.Date; + +/** + * 半成品出库对象 wms_hpp_out_stock_detail + * + * @author LionLi + * @date 2025-01-14 + */ +@Data +@TableName("wms_hpp_out_stock_detail") +public class WmsHppOutStockDetail{ + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(type = IdType.AUTO) + private Long objId; + + /** + * 流水卡号 + */ + private String cardNo; + + /** + * 工装架子号 + */ + private String shelfNo; + + /** + * 库位id + */ + private Long storePlaceId; + + /** + * 品级编号,0:合格,1:不合格 + */ + private String gradeCode; + + /** + * 出库类型 + */ + private String outType; + + /** + * 目的库位 + */ + private Long targetStorePlaceId; + /** + * 租户id + */ + private String tenantId; + @TableField(fill = FieldFill.INSERT) + private String createBy; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private Date createTime; + + /** + * 更新者 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private String updateBy; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Date updateTime; + @TableField(exist = false) + private String storePlaceCode; + @TableField(exist = false) + private String targertStorePlaceCode; + + +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsHppStorageDetail.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsHppStorageDetail.java new file mode 100644 index 00000000..05310cef --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsHppStorageDetail.java @@ -0,0 +1,95 @@ +package org.dromara.wms.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 半成品库存对象 wms_hpp_storage_detail + * + * @author LionLi + * @date 2025-01-14 + */ +@Data +@TableName("wms_hpp_storage_detail") +public class WmsHppStorageDetail { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableId(type = IdType.AUTO) + private Long objId; + + /** + * 流水卡号 + */ + private String cardNo; + + /** + * 工装架子号 + */ + private String shelfNo; + + /** + * 入库类型 + */ + private String instockType; + + /** + * 物料Id + */ + private Long materialId; + + /** + * 库位id + */ + private Long storePlaceId; + + /** + * 密炼来料数量 + */ + private BigDecimal sourceNum; + + /** + * 库存数量 + */ + private BigDecimal storageNum; + /** + * 租户id + */ + private String tenantId; + @TableField(fill = FieldFill.INSERT) + private String createBy; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private Date createTime; + + /** + * 更新者 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private String updateBy; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Date updateTime; + @TableField(exist = false) + private String storePlaceCode; + + private String materialCode; + + +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsHppStore.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsHppStore.java new file mode 100644 index 00000000..c68ccfdf --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsHppStore.java @@ -0,0 +1,91 @@ +package org.dromara.wms.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; +import java.util.Date; + +/** + * 【请填写功能名称】对象 wms_hpp_store + * + * @author LionLi + * @date 2025-01-14 + */ +@Data +@TableName("wms_hpp_store") +public class WmsHppStore{ + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableId(type = IdType.AUTO) + private Long objId; + + /** + * 仓库名 + */ + private String storeName; + + /** + * 仓库代码 + */ + private String storeCode; + + /** + * 仓库类型 + */ + private Long storeType; + + /** + * 使用状态 + */ + private String usedFlag; + + /** + * sap代码 + */ + private String sapCode; + + /** + * 仓库等级 + */ + private String storeLevel; + + /** + * 上级目录 + */ + private String storeHigherLevel; + /** + * 租户id + */ + private String tenantId; + @TableField(fill = FieldFill.INSERT) + private String createBy; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private Date createTime; + + /** + * 更新者 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private String updateBy; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Date updateTime; + + + +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsHppStorePlace.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsHppStorePlace.java new file mode 100644 index 00000000..5fc91f5c --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsHppStorePlace.java @@ -0,0 +1,85 @@ +package org.dromara.wms.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; +import java.util.Date; + +/** + * 半成品库位对象 wms_hpp_store_place + * + * @author LionLi + * @date 2025-01-14 + */ +@Data +@TableName("wms_hpp_store_place") +public class WmsHppStorePlace{ + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(type = IdType.AUTO) + private Long objId; + + /** + * 库位名 + */ + private String storePlaceName; + + /** + * 库位代码 + */ + private String storePlaceCode; + + /** + * 仓库id + */ + private Long storeId; + + /** + * 使用状态 + */ + private String usedFlag; + + /** + * 特殊库位 + */ + private String specitialType; + + /** + * 位置类型 + */ + private String positionType; + /** + * 租户id + */ + private String tenantId; + @TableField(fill = FieldFill.INSERT) + private String createBy; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private Date createTime; + + /** + * 更新者 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private String updateBy; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Date updateTime; + + +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsHsmTooling.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsHsmTooling.java new file mode 100644 index 00000000..bd313ca8 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsHsmTooling.java @@ -0,0 +1,73 @@ +package org.dromara.wms.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.io.Serial; + +/** + * 半成品工装对象 wms_hsm_tooling + * + * @author LionLi + * @date 2025-01-14 + */ +@Data +@TableName("wms_hsm_tooling") +public class WmsHsmTooling { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * $column.columnComment + */ + @TableId(type = IdType.AUTO) + private Long objId; + + /** + * $column.columnComment + */ + private String createdBy; + + /** + * $column.columnComment + */ + private Date createdTime; + + /** + * $column.columnComment + */ + private String updatedBy; + + /** + * $column.columnComment + */ + private Date updatedTime; + + /** + * $column.columnComment + */ + private String toolingBarcode; + + /** + * $column.columnComment + */ + private String toolingRfidBarcode; + + /** + * $column.columnComment + */ + private String toolingType; + + /** + * $column.columnComment + */ + private String isUsed; + private String tenantId; + + +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsHppInStockDetailBo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsHppInStockDetailBo.java new file mode 100644 index 00000000..93a85d85 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsHppInStockDetailBo.java @@ -0,0 +1,84 @@ +package org.dromara.wms.domain.bo; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import org.dromara.wms.domain.WmsHppInStockDetail; + +import java.math.BigDecimal; + +/** + * 半制品入库业务对象 wms_hpp_in_stock_detail + * + * @author LionLi + * @date 2025-01-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = WmsHppInStockDetail.class, reverseConvertGenerate = false) +public class WmsHppInStockDetailBo extends BaseEntity { + + /** + * 主键id + */ + @NotNull(message = "主键id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long objId; + + /** + * 流水卡号 + */ + @NotBlank(message = "流水卡号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String cardNo; + + /** + * 工装架子号 + */ + @NotBlank(message = "工装架子号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String shelfNo; + + /** + * 库位id + */ + @NotNull(message = "库位id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long storePlaceId; + + /** + * 品级编号,0:合格,1:不合格 + */ + @NotBlank(message = "品级编号,0:合格,1:不合格不能为空", groups = { AddGroup.class, EditGroup.class }) + private String gradeCode; + + /** + * 产品类别：0：半成品，1：成型 + */ + @NotBlank(message = "产品类别：0：半成品，1：成型不能为空", groups = { AddGroup.class, EditGroup.class }) + private String productCategory; + + /** + * 物料 + */ + @NotNull(message = "物料不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long materialId; + + /** + * 物料规格 + */ + @NotBlank(message = "物料规格不能为空", groups = { AddGroup.class, EditGroup.class }) + private String materialSpec; + private String materialCode; + + /** + * 入库类型,0:半制品产出,2:入半制品线边库3:入成型线边库 + */ + @NotBlank(message = "入库类型,0:半制品产出,2:入半制品线边库3:入成型线边库不能为空", groups = { AddGroup.class, EditGroup.class }) + private String instockType; + + private BigDecimal instockNum; + + + +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsHppOutStockDetailBo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsHppOutStockDetailBo.java new file mode 100644 index 00000000..8b82f8b3 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsHppOutStockDetailBo.java @@ -0,0 +1,66 @@ +package org.dromara.wms.domain.bo; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import org.dromara.wms.domain.WmsHppOutStockDetail; + +/** + * 半成品出库业务对象 wms_hpp_out_stock_detail + * + * @author LionLi + * @date 2025-01-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = WmsHppOutStockDetail.class, reverseConvertGenerate = false) +public class WmsHppOutStockDetailBo extends BaseEntity { + + /** + * 主键id + */ + @NotNull(message = "主键id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long objId; + + /** + * 流水卡号 + */ + @NotBlank(message = "流水卡号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String cardNo; + + /** + * 工装架子号 + */ + @NotBlank(message = "工装架子号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String shelfNo; + + /** + * 库位id + */ + @NotNull(message = "库位id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long storePlaceId; + + /** + * 品级编号,0:合格,1:不合格 + */ + @NotBlank(message = "品级编号,0:合格,1:不合格不能为空", groups = { AddGroup.class, EditGroup.class }) + private String gradeCode; + + /** + * 出库类型 + */ + @NotBlank(message = "出库类型不能为空", groups = { AddGroup.class, EditGroup.class }) + private String outType; + + /** + * 目的库位 + */ + @NotNull(message = "目的库位不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long targetStorePlaceId; + + +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsHppStorageDetailBo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsHppStorageDetailBo.java new file mode 100644 index 00000000..6ea1d10e --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsHppStorageDetailBo.java @@ -0,0 +1,75 @@ +package org.dromara.wms.domain.bo; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import org.dromara.wms.domain.WmsHppStorageDetail; + +import java.math.BigDecimal; + +/** + * 半成品库存业务对象 wms_hpp_storage_detail + * + * @author LionLi + * @date 2025-01-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = WmsHppStorageDetail.class, reverseConvertGenerate = false) +public class WmsHppStorageDetailBo extends BaseEntity { + + /** + * 主键 + */ + @NotNull(message = "主键不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long objId; + + /** + * 流水卡号 + */ + @NotBlank(message = "流水卡号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String cardNo; + + /** + * 工装架子号 + */ + @NotBlank(message = "工装架子号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String shelfNo; + + /** + * 入库类型 + */ + @NotBlank(message = "入库类型不能为空", groups = { AddGroup.class, EditGroup.class }) + private String instockType; + + /** + * 物料Id + */ + @NotNull(message = "物料Id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long materialId; + + /** + * 库位id + */ + @NotNull(message = "库位id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long storePlaceId; + + /** + * 密炼来料数量 + */ + @NotNull(message = "密炼来料数量不能为空", groups = { AddGroup.class, EditGroup.class }) + private BigDecimal sourceNum; + + /** + * 库存数量 + */ + @NotNull(message = "库存数量不能为空", groups = { AddGroup.class, EditGroup.class }) + private BigDecimal storageNum; + private String materialCode; + + +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsHppStoreBo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsHppStoreBo.java new file mode 100644 index 00000000..25192d7b --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsHppStoreBo.java @@ -0,0 +1,72 @@ +package org.dromara.wms.domain.bo; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import org.dromara.wms.domain.WmsHppStore; + +/** + * 【请填写功能名称】业务对象 wms_hpp_store + * + * @author LionLi + * @date 2025-01-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = WmsHppStore.class, reverseConvertGenerate = false) +public class WmsHppStoreBo extends BaseEntity { + + /** + * 主键 + */ + @NotNull(message = "主键不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long objId; + + /** + * 仓库名 + */ + @NotBlank(message = "仓库名不能为空", groups = { AddGroup.class, EditGroup.class }) + private String storeName; + + /** + * 仓库代码 + */ + @NotBlank(message = "仓库代码不能为空", groups = { AddGroup.class, EditGroup.class }) + private String storeCode; + + /** + * 仓库类型 + */ + @NotNull(message = "仓库类型不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long storeType; + + /** + * 使用状态 + */ + @NotBlank(message = "使用状态不能为空", groups = { AddGroup.class, EditGroup.class }) + private String usedFlag; + + /** + * sap代码 + */ + @NotBlank(message = "sap代码不能为空", groups = { AddGroup.class, EditGroup.class }) + private String sapCode; + + /** + * 仓库等级 + */ + @NotNull(message = "仓库等级不能为空", groups = { AddGroup.class, EditGroup.class }) + private String storeLevel; + + /** + * 上级目录 + */ + @NotNull(message = "上级目录不能为空", groups = { AddGroup.class, EditGroup.class }) + private String storeHigherLevel; + + +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsHppStorePlaceBo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsHppStorePlaceBo.java new file mode 100644 index 00000000..fea15f02 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsHppStorePlaceBo.java @@ -0,0 +1,66 @@ +package org.dromara.wms.domain.bo; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import org.dromara.wms.domain.WmsHppStorePlace; + +/** + * 半成品库位业务对象 wms_hpp_store_place + * + * @author LionLi + * @date 2025-01-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = WmsHppStorePlace.class, reverseConvertGenerate = false) +public class WmsHppStorePlaceBo extends BaseEntity { + + /** + * 主键id + */ + @NotNull(message = "主键id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long objId; + + /** + * 库位名 + */ + @NotBlank(message = "库位名不能为空", groups = { AddGroup.class, EditGroup.class }) + private String storePlaceName; + + /** + * 库位代码 + */ + @NotBlank(message = "库位代码不能为空", groups = { AddGroup.class, EditGroup.class }) + private String storePlaceCode; + + /** + * 仓库id + */ + @NotNull(message = "仓库id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long storeId; + + /** + * 使用状态 + */ + @NotBlank(message = "使用状态不能为空", groups = { AddGroup.class, EditGroup.class }) + private String usedFlag; + + /** + * 特殊库位 + */ + @NotBlank(message = "特殊库位不能为空", groups = { AddGroup.class, EditGroup.class }) + private String specitialType; + + /** + * 位置类型 + */ + @NotBlank(message = "位置类型不能为空", groups = { AddGroup.class, EditGroup.class }) + private String positionType; + + +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsHsmToolingBo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsHsmToolingBo.java new file mode 100644 index 00000000..deee16cb --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsHsmToolingBo.java @@ -0,0 +1,84 @@ +package org.dromara.wms.domain.bo; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.dromara.wms.domain.WmsHsmTooling; + +/** + * 半成品工装业务对象 wms_hsm_tooling + * + * @author LionLi + * @date 2025-01-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = WmsHsmTooling.class, reverseConvertGenerate = false) +public class WmsHsmToolingBo extends BaseEntity { + + /** + * $column.columnComment + */ + @NotNull(message = "$column.columnComment不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long objId; + + /** + * $column.columnComment + */ + @NotBlank(message = "$column.columnComment不能为空", groups = { AddGroup.class, EditGroup.class }) + private String createdBy; + + /** + * $column.columnComment + */ + @NotNull(message = "$column.columnComment不能为空", groups = { AddGroup.class, EditGroup.class }) + private Date createdTime; + + /** + * $column.columnComment + */ + @NotBlank(message = "$column.columnComment不能为空", groups = { AddGroup.class, EditGroup.class }) + private String updatedBy; + + /** + * $column.columnComment + */ + @NotNull(message = "$column.columnComment不能为空", groups = { AddGroup.class, EditGroup.class }) + private Date updatedTime; + + /** + * $column.columnComment + */ + @NotBlank(message = "$column.columnComment不能为空", groups = { AddGroup.class, EditGroup.class }) + private String toolingBarcode; + + /** + * $column.columnComment + */ + @NotBlank(message = "$column.columnComment不能为空", groups = { AddGroup.class, EditGroup.class }) + private String toolingRfidBarcode; + + /** + * $column.columnComment + */ + @NotBlank(message = "$column.columnComment不能为空", groups = { AddGroup.class, EditGroup.class }) + private String toolingType; + + /** + * $column.columnComment + */ + @NotBlank(message = "$column.columnComment不能为空", groups = { AddGroup.class, EditGroup.class }) + private String isUsed; + /** + * 租户id + */ + private String tenantId; + + +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsOutstockRecordBo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsOutstockRecordBo.java index 91b4a7fb..e8bd1f94 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsOutstockRecordBo.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsOutstockRecordBo.java @@ -73,5 +73,6 @@ public class WmsOutstockRecordBo extends BaseEntity { private java.math.BigDecimal returnQty; private String returnFlag; + private String returnLocationCode; } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsHppInStockDetailVo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsHppInStockDetailVo.java new file mode 100644 index 00000000..17d21a30 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsHppInStockDetailVo.java @@ -0,0 +1,115 @@ +package org.dromara.wms.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.wms.domain.WmsHppInStockDetail; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + + + +/** + * 半制品入库视图对象 wms_hpp_in_stock_detail + * + * @author LionLi + * @date 2025-01-14 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = WmsHppInStockDetail.class) +public class WmsHppInStockDetailVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @ExcelProperty(value = "主键id") + private Long objId; + + /** + * 流水卡号 + */ + @ExcelProperty(value = "流水卡号") + private String cardNo; + + /** + * 工装架子号 + */ + @ExcelProperty(value = "工装架子号") + private String shelfNo; + + /** + * 库位id + */ + @ExcelProperty(value = "库位id") + private Long storePlaceId; + + /** + * 品级编号,0:合格,1:不合格 + */ + @ExcelProperty(value = "品级编号,0:合格,1:不合格") + private String gradeCode; + + /** + * 产品类别：0：半成品，1：成型 + */ + @ExcelProperty(value = "产品类别：0：半成品，1：成型") + private String productCategory; + + /** + * 物料 + */ + @ExcelProperty(value = "物料") + private Long materialId; + + /** + * 物料规格 + */ + @ExcelProperty(value = "物料规格") + private String materialSpec; + + /** + * 入库类型,0:半制品产出,2:入半制品线边库3:入成型线边库 + */ + @ExcelProperty(value = "入库类型,0:半制品产出,2:入半制品线边库3:入成型线边库") + private String instockType; + /** + * 租户id + */ + private String tenantId; + @TableField(fill = FieldFill.INSERT) + private String createBy; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private Date createTime; + + /** + * 更新者 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private String updateBy; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Date updateTime; + private BigDecimal instockNum; + private String storePlaceCode; + private String materialCode; + +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsHppOutStockDetailVo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsHppOutStockDetailVo.java new file mode 100644 index 00000000..a425472c --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsHppOutStockDetailVo.java @@ -0,0 +1,102 @@ +package org.dromara.wms.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.wms.domain.WmsHppOutStockDetail; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 半成品出库视图对象 wms_hpp_out_stock_detail + * + * @author LionLi + * @date 2025-01-14 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = WmsHppOutStockDetail.class) +public class WmsHppOutStockDetailVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @ExcelProperty(value = "主键id") + private Long objId; + + /** + * 流水卡号 + */ + @ExcelProperty(value = "流水卡号") + private String cardNo; + + /** + * 工装架子号 + */ + @ExcelProperty(value = "工装架子号") + private String shelfNo; + + /** + * 库位id + */ + @ExcelProperty(value = "库位id") + private Long storePlaceId; + + /** + * 品级编号,0:合格,1:不合格 + */ + @ExcelProperty(value = "品级编号,0:合格,1:不合格") + private String gradeCode; + + /** + * 出库类型 + */ + @ExcelProperty(value = "出库类型") + private String outType; + + /** + * 目的库位 + */ + @ExcelProperty(value = "目的库位") + private Long targetStorePlaceId; + /** + * 租户id + */ + private String tenantId; + @TableField(fill = FieldFill.INSERT) + private String createBy; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private Date createTime; + + /** + * 更新者 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private String updateBy; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Date updateTime; + private String storePlaceCode; + private String targertStorePlaceCode; + + +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsHppStorageDetailVo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsHppStorageDetailVo.java new file mode 100644 index 00000000..1cb13ee8 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsHppStorageDetailVo.java @@ -0,0 +1,111 @@ +package org.dromara.wms.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.wms.domain.WmsHppStorageDetail; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + + + +/** + * 半成品库存视图对象 wms_hpp_storage_detail + * + * @author LionLi + * @date 2025-01-14 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = WmsHppStorageDetail.class) +public class WmsHppStorageDetailVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ExcelProperty(value = "主键") + private Long objId; + + /** + * 流水卡号 + */ + @ExcelProperty(value = "流水卡号") + private String cardNo; + + /** + * 工装架子号 + */ + @ExcelProperty(value = "工装架子号") + private String shelfNo; + + /** + * 入库类型 + */ + @ExcelProperty(value = "入库类型") + private String instockType; + + /** + * 物料Id + */ + @ExcelProperty(value = "物料Id") + private Long materialId; + + /** + * 库位id + */ + @ExcelProperty(value = "库位id") + private Long storePlaceId; + + /** + * 密炼来料数量 + */ + @ExcelProperty(value = "密炼来料数量") + private BigDecimal sourceNum; + + /** + * 库存数量 + */ + @ExcelProperty(value = "库存数量") + private BigDecimal storageNum; + + /** + * 租户id + */ + private String tenantId; + @TableField(fill = FieldFill.INSERT) + private String createBy; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private Date createTime; + + /** + * 更新者 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private String updateBy; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Date updateTime; + private String storePlaceCode; + private String materialCode; + + + +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsHppStorePlaceVo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsHppStorePlaceVo.java new file mode 100644 index 00000000..4ef2efa3 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsHppStorePlaceVo.java @@ -0,0 +1,100 @@ +package org.dromara.wms.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.wms.domain.WmsHppStorePlace; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 半成品库位视图对象 wms_hpp_store_place + * + * @author LionLi + * @date 2025-01-14 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = WmsHppStorePlace.class) +public class WmsHppStorePlaceVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @ExcelProperty(value = "主键id") + private Long objId; + + /** + * 库位名 + */ + @ExcelProperty(value = "库位名") + private String storePlaceName; + + /** + * 库位代码 + */ + @ExcelProperty(value = "库位代码") + private String storePlaceCode; + + /** + * 仓库id + */ + @ExcelProperty(value = "仓库id") + private Long storeId; + + /** + * 使用状态 + */ + @ExcelProperty(value = "使用状态") + private String usedFlag; + + /** + * 特殊库位 + */ + @ExcelProperty(value = "特殊库位") + private String specitialType; + + /** + * 位置类型 + */ + @ExcelProperty(value = "位置类型") + private String positionType; + /** + * 租户id + */ + private String tenantId; + @TableField(fill = FieldFill.INSERT) + private String createBy; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private Date createTime; + + /** + * 更新者 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private String updateBy; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Date updateTime; + + +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsHppStoreVo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsHppStoreVo.java new file mode 100644 index 00000000..0e169007 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsHppStoreVo.java @@ -0,0 +1,108 @@ +package org.dromara.wms.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.wms.domain.WmsHppStore; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 【请填写功能名称】视图对象 wms_hpp_store + * + * @author LionLi + * @date 2025-01-14 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = WmsHppStore.class) +public class WmsHppStoreVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ExcelProperty(value = "主键") + private Long objId; + + /** + * 仓库名 + */ + @ExcelProperty(value = "仓库名") + private String storeName; + + /** + * 仓库代码 + */ + @ExcelProperty(value = "仓库代码") + private String storeCode; + + /** + * 仓库类型 + */ + @ExcelProperty(value = "仓库类型") + private Long storeType; + + /** + * 使用状态 + */ + @ExcelProperty(value = "使用状态") + private String usedFlag; + + /** + * sap代码 + */ + @ExcelProperty(value = "sap代码") + private String sapCode; + + /** + * 仓库等级 + */ + @ExcelProperty(value = "仓库等级") + private String storeLevel; + + /** + * 上级目录 + */ + @ExcelProperty(value = "上级目录") + private String storeHigherLevel; + + /** + * 租户id + */ + private String tenantId; + @TableField(fill = FieldFill.INSERT) + private String createBy; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private Date createTime; + + /** + * 更新者 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private String updateBy; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Date updateTime; + + + +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsHsmToolingVo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsHsmToolingVo.java new file mode 100644 index 00000000..6975186c --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsHsmToolingVo.java @@ -0,0 +1,104 @@ +package org.dromara.wms.domain.vo; + +import java.util.Date; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.wms.domain.WmsHsmTooling; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 半成品工装视图对象 wms_hsm_tooling + * + * @author LionLi + * @date 2025-01-14 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = WmsHsmTooling.class) +public class WmsHsmToolingVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * $column.columnComment + */ + @ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "$column.readConverterExp()") + private Long objId; + + /** + * $column.columnComment + */ + @ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "$column.readConverterExp()") + private String createdBy; + + /** + * $column.columnComment + */ + @ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "$column.readConverterExp()") + private Date createdTime; + + /** + * $column.columnComment + */ + @ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "$column.readConverterExp()") + private String updatedBy; + + /** + * $column.columnComment + */ + @ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "$column.readConverterExp()") + private Date updatedTime; + + /** + * $column.columnComment + */ + @ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "$column.readConverterExp()") + private String toolingBarcode; + + /** + * $column.columnComment + */ + @ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "$column.readConverterExp()") + private String tenantId; + + /** + * $column.columnComment + */ + @ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "$column.readConverterExp()") + private String toolingRfidBarcode; + + /** + * $column.columnComment + */ + @ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "$column.readConverterExp()") + private String toolingType; + + /** + * $column.columnComment + */ + @ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "$column.readConverterExp()") + private String isUsed; + + + +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsHppInStockDetailMapper.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsHppInStockDetailMapper.java new file mode 100644 index 00000000..0f6d5dbe --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsHppInStockDetailMapper.java @@ -0,0 +1,15 @@ +package org.dromara.wms.mapper; + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.wms.domain.WmsHppInStockDetail; +import org.dromara.wms.domain.vo.WmsHppInStockDetailVo; + +/** + * 半制品入库Mapper接口 + * + * @author LionLi + * @date 2025-01-14 + */ +public interface WmsHppInStockDetailMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsHppOutStockDetailMapper.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsHppOutStockDetailMapper.java new file mode 100644 index 00000000..9d062fdb --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsHppOutStockDetailMapper.java @@ -0,0 +1,15 @@ +package org.dromara.wms.mapper; + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.wms.domain.WmsHppOutStockDetail; +import org.dromara.wms.domain.vo.WmsHppOutStockDetailVo; + +/** + * 半成品出库Mapper接口 + * + * @author LionLi + * @date 2025-01-14 + */ +public interface WmsHppOutStockDetailMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsHppStorageDetailMapper.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsHppStorageDetailMapper.java new file mode 100644 index 00000000..4753bae4 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsHppStorageDetailMapper.java @@ -0,0 +1,16 @@ +package org.dromara.wms.mapper; + + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.wms.domain.WmsHppStorageDetail; +import org.dromara.wms.domain.vo.WmsHppStorageDetailVo; + +/** + * 半成品库存Mapper接口 + * + * @author LionLi + * @date 2025-01-14 + */ +public interface WmsHppStorageDetailMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsHppStoreMapper.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsHppStoreMapper.java new file mode 100644 index 00000000..88cb2ab8 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsHppStoreMapper.java @@ -0,0 +1,15 @@ +package org.dromara.wms.mapper; + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.wms.domain.WmsHppStore; +import org.dromara.wms.domain.vo.WmsHppStoreVo; + +/** + * 【请填写功能名称】Mapper接口 + * + * @author LionLi + * @date 2025-01-14 + */ +public interface WmsHppStoreMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsHppStorePlaceMapper.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsHppStorePlaceMapper.java new file mode 100644 index 00000000..fff1889a --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsHppStorePlaceMapper.java @@ -0,0 +1,15 @@ +package org.dromara.wms.mapper; + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.wms.domain.WmsHppStorePlace; +import org.dromara.wms.domain.vo.WmsHppStorePlaceVo; + +/** + * 半成品库位Mapper接口 + * + * @author LionLi + * @date 2025-01-14 + */ +public interface WmsHppStorePlaceMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsHsmToolingMapper.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsHsmToolingMapper.java new file mode 100644 index 00000000..2f726200 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsHsmToolingMapper.java @@ -0,0 +1,15 @@ +package org.dromara.wms.mapper; + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.wms.domain.WmsHsmTooling; +import org.dromara.wms.domain.vo.WmsHsmToolingVo; + +/** + * 半成品工装Mapper接口 + * + * @author LionLi + * @date 2025-01-14 + */ +public interface WmsHsmToolingMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsHppInStockDetailService.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsHppInStockDetailService.java new file mode 100644 index 00000000..42a6e442 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsHppInStockDetailService.java @@ -0,0 +1,68 @@ +package org.dromara.wms.service; + +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.wms.domain.bo.WmsHppInStockDetailBo; +import org.dromara.wms.domain.vo.WmsHppInStockDetailVo; + +import java.util.Collection; +import java.util.List; + +/** + * 半制品入库Service接口 + * + * @author LionLi + * @date 2025-01-14 + */ +public interface IWmsHppInStockDetailService { + + /** + * 查询半制品入库 + * + * @param objId 主键 + * @return 半制品入库 + */ + WmsHppInStockDetailVo queryById(Long objId); + + /** + * 分页查询半制品入库列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 半制品入库分页列表 + */ + TableDataInfo queryPageList(WmsHppInStockDetailBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的半制品入库列表 + * + * @param bo 查询条件 + * @return 半制品入库列表 + */ + List queryList(WmsHppInStockDetailBo bo); + + /** + * 新增半制品入库 + * + * @param bo 半制品入库 + * @return 是否新增成功 + */ + Boolean insertByBo(WmsHppInStockDetailBo bo); + + /** + * 修改半制品入库 + * + * @param bo 半制品入库 + * @return 是否修改成功 + */ + Boolean updateByBo(WmsHppInStockDetailBo bo); + + /** + * 校验并批量删除半制品入库信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsHppOutStockDetailService.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsHppOutStockDetailService.java new file mode 100644 index 00000000..c5763915 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsHppOutStockDetailService.java @@ -0,0 +1,68 @@ +package org.dromara.wms.service; + +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.wms.domain.bo.WmsHppOutStockDetailBo; +import org.dromara.wms.domain.vo.WmsHppOutStockDetailVo; + +import java.util.Collection; +import java.util.List; + +/** + * 半成品出库Service接口 + * + * @author LionLi + * @date 2025-01-14 + */ +public interface IWmsHppOutStockDetailService { + + /** + * 查询半成品出库 + * + * @param objId 主键 + * @return 半成品出库 + */ + WmsHppOutStockDetailVo queryById(Long objId); + + /** + * 分页查询半成品出库列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 半成品出库分页列表 + */ + TableDataInfo queryPageList(WmsHppOutStockDetailBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的半成品出库列表 + * + * @param bo 查询条件 + * @return 半成品出库列表 + */ + List queryList(WmsHppOutStockDetailBo bo); + + /** + * 新增半成品出库 + * + * @param bo 半成品出库 + * @return 是否新增成功 + */ + Boolean insertByBo(WmsHppOutStockDetailBo bo); + + /** + * 修改半成品出库 + * + * @param bo 半成品出库 + * @return 是否修改成功 + */ + Boolean updateByBo(WmsHppOutStockDetailBo bo); + + /** + * 校验并批量删除半成品出库信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsHppStorageDetailService.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsHppStorageDetailService.java new file mode 100644 index 00000000..7c285578 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsHppStorageDetailService.java @@ -0,0 +1,69 @@ +package org.dromara.wms.service; + + +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.wms.domain.bo.WmsHppStorageDetailBo; +import org.dromara.wms.domain.vo.WmsHppStorageDetailVo; + +import java.util.Collection; +import java.util.List; + +/** + * 半成品库存Service接口 + * + * @author LionLi + * @date 2025-01-14 + */ +public interface IWmsHppStorageDetailService { + + /** + * 查询半成品库存 + * + * @param objId 主键 + * @return 半成品库存 + */ + WmsHppStorageDetailVo queryById(Long objId); + + /** + * 分页查询半成品库存列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 半成品库存分页列表 + */ + TableDataInfo queryPageList(WmsHppStorageDetailBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的半成品库存列表 + * + * @param bo 查询条件 + * @return 半成品库存列表 + */ + List queryList(WmsHppStorageDetailBo bo); + + /** + * 新增半成品库存 + * + * @param bo 半成品库存 + * @return 是否新增成功 + */ + Boolean insertByBo(WmsHppStorageDetailBo bo); + + /** + * 修改半成品库存 + * + * @param bo 半成品库存 + * @return 是否修改成功 + */ + Boolean updateByBo(WmsHppStorageDetailBo bo); + + /** + * 校验并批量删除半成品库存信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsHppStorePlaceService.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsHppStorePlaceService.java new file mode 100644 index 00000000..cd9ddf95 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsHppStorePlaceService.java @@ -0,0 +1,69 @@ +package org.dromara.wms.service; + + +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.wms.domain.bo.WmsHppStorePlaceBo; +import org.dromara.wms.domain.vo.WmsHppStorePlaceVo; + +import java.util.Collection; +import java.util.List; + +/** + * 半成品库位Service接口 + * + * @author LionLi + * @date 2025-01-14 + */ +public interface IWmsHppStorePlaceService { + + /** + * 查询半成品库位 + * + * @param objId 主键 + * @return 半成品库位 + */ + WmsHppStorePlaceVo queryById(Long objId); + + /** + * 分页查询半成品库位列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 半成品库位分页列表 + */ + TableDataInfo queryPageList(WmsHppStorePlaceBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的半成品库位列表 + * + * @param bo 查询条件 + * @return 半成品库位列表 + */ + List queryList(WmsHppStorePlaceBo bo); + + /** + * 新增半成品库位 + * + * @param bo 半成品库位 + * @return 是否新增成功 + */ + Boolean insertByBo(WmsHppStorePlaceBo bo); + + /** + * 修改半成品库位 + * + * @param bo 半成品库位 + * @return 是否修改成功 + */ + Boolean updateByBo(WmsHppStorePlaceBo bo); + + /** + * 校验并批量删除半成品库位信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsHppStoreService.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsHppStoreService.java new file mode 100644 index 00000000..a0cedb40 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsHppStoreService.java @@ -0,0 +1,68 @@ +package org.dromara.wms.service; + +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.wms.domain.bo.WmsHppStoreBo; +import org.dromara.wms.domain.vo.WmsHppStoreVo; + +import java.util.Collection; +import java.util.List; + +/** + * 【请填写功能名称】Service接口 + * + * @author LionLi + * @date 2025-01-14 + */ +public interface IWmsHppStoreService { + + /** + * 查询【请填写功能名称】 + * + * @param createBy 主键 + * @return 【请填写功能名称】 + */ + WmsHppStoreVo queryById(Long objId); + + /** + * 分页查询【请填写功能名称】列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 【请填写功能名称】分页列表 + */ + TableDataInfo queryPageList(WmsHppStoreBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的【请填写功能名称】列表 + * + * @param bo 查询条件 + * @return 【请填写功能名称】列表 + */ + List queryList(WmsHppStoreBo bo); + + /** + * 新增【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否新增成功 + */ + Boolean insertByBo(WmsHppStoreBo bo); + + /** + * 修改【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否修改成功 + */ + Boolean updateByBo(WmsHppStoreBo bo); + + /** + * 校验并批量删除【请填写功能名称】信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsHsmToolingService.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsHsmToolingService.java new file mode 100644 index 00000000..75ff56a8 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsHsmToolingService.java @@ -0,0 +1,68 @@ +package org.dromara.wms.service; + +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.wms.domain.bo.WmsHsmToolingBo; +import org.dromara.wms.domain.vo.WmsHsmToolingVo; + +import java.util.Collection; +import java.util.List; + +/** + * 半成品工装Service接口 + * + * @author LionLi + * @date 2025-01-14 + */ +public interface IWmsHsmToolingService { + + /** + * 查询半成品工装 + * + * @param OBJID 主键 + * @return 半成品工装 + */ + WmsHsmToolingVo queryById(Long objId); + + /** + * 分页查询半成品工装列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 半成品工装分页列表 + */ + TableDataInfo queryPageList(WmsHsmToolingBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的半成品工装列表 + * + * @param bo 查询条件 + * @return 半成品工装列表 + */ + List queryList(WmsHsmToolingBo bo); + + /** + * 新增半成品工装 + * + * @param bo 半成品工装 + * @return 是否新增成功 + */ + Boolean insertByBo(WmsHsmToolingBo bo); + + /** + * 修改半成品工装 + * + * @param bo 半成品工装 + * @return 是否修改成功 + */ + Boolean updateByBo(WmsHsmToolingBo bo); + + /** + * 校验并批量删除半成品工装信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/BaseMaterialInfoServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/BaseMaterialInfoServiceImpl.java index 1e7cdb26..71e25541 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/BaseMaterialInfoServiceImpl.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/BaseMaterialInfoServiceImpl.java @@ -159,7 +159,9 @@ public class BaseMaterialInfoServiceImpl implements IBaseMaterialInfoService { @Override public List materialList(BaseMaterialInfo materialInfo) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(BaseMaterialInfo::getMaterialCategories,materialInfo.getMaterialCategories()); + if (materialInfo.getMaterialCategories()!=null){ + wrapper.eq(BaseMaterialInfo::getMaterialCategories,materialInfo.getMaterialCategories()); + } return baseMapper.selectVoList(wrapper); } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsBaseLocationServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsBaseLocationServiceImpl.java index cecad89e..4c898947 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsBaseLocationServiceImpl.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsBaseLocationServiceImpl.java @@ -73,7 +73,9 @@ public class WmsBaseLocationServiceImpl implements IWmsBaseLocationService { @Override public List queryVoList(WmsBaseLocationBo bo) { LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); - lqw.eq(WmsBaseLocation::getWarehouseId,bo.getWarehouseId()); + if (bo.getWarehouseId()!=null){ + lqw.eq(WmsBaseLocation::getWarehouseId,bo.getWarehouseId()); + } return baseMapper.selectVoList(lqw); } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsHppInStockDetailServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsHppInStockDetailServiceImpl.java new file mode 100644 index 00000000..a80ff42b --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsHppInStockDetailServiceImpl.java @@ -0,0 +1,142 @@ +package org.dromara.wms.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.toolkit.JoinWrappers; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.dromara.wms.domain.WmsHppInStockDetail; +import org.dromara.wms.domain.WmsHppStorePlace; +import org.dromara.wms.domain.bo.WmsHppInStockDetailBo; +import org.dromara.wms.domain.vo.WmsHppInStockDetailVo; +import org.dromara.wms.mapper.WmsHppInStockDetailMapper; +import org.dromara.wms.service.IWmsHppInStockDetailService; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 半制品入库Service业务层处理 + * + * @author LionLi + * @date 2025-01-14 + */ +@RequiredArgsConstructor +@Service +public class WmsHppInStockDetailServiceImpl implements IWmsHppInStockDetailService { + + private final WmsHppInStockDetailMapper baseMapper; + + /** + * 查询半制品入库 + * + * @param objId 主键 + * @return 半制品入库 + */ + @Override + public WmsHppInStockDetailVo queryById(Long objId){ + return baseMapper.selectVoById(objId); + } + + /** + * 分页查询半制品入库列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 半制品入库分页列表 + */ + @Override + public TableDataInfo queryPageList(WmsHppInStockDetailBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的半制品入库列表 + * + * @param bo 查询条件 + * @return 半制品入库列表 + */ + @Override + public List queryList(WmsHppInStockDetailBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(WmsHppInStockDetailBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(WmsHppInStockDetail.class) + .selectAll(WmsHppInStockDetail.class).select(WmsHppStorePlace::getStorePlaceCode) + .leftJoin(WmsHppStorePlace.class,WmsHppStorePlace::getObjId,WmsHppInStockDetail::getStorePlaceId) + .eq(bo.getObjId() != null, WmsHppInStockDetail::getObjId, bo.getObjId()) + .eq(StringUtils.isNotBlank(bo.getCardNo()), WmsHppInStockDetail::getCardNo, bo.getCardNo()) + .eq(StringUtils.isNotBlank(bo.getShelfNo()), WmsHppInStockDetail::getShelfNo, bo.getShelfNo()) + .eq(bo.getStorePlaceId() != null, WmsHppInStockDetail::getStorePlaceId, bo.getStorePlaceId()) + .eq(StringUtils.isNotBlank(bo.getGradeCode()), WmsHppInStockDetail::getGradeCode, bo.getGradeCode()) + .eq(StringUtils.isNotBlank(bo.getProductCategory()), WmsHppInStockDetail::getProductCategory, bo.getProductCategory()) + .eq(bo.getMaterialId() != null, WmsHppInStockDetail::getMaterialId, bo.getMaterialId()) + .eq(StringUtils.isNotBlank(bo.getMaterialSpec()), WmsHppInStockDetail::getMaterialSpec, bo.getMaterialSpec()) + .eq(StringUtils.isNotBlank(bo.getInstockType()), WmsHppInStockDetail::getInstockType, bo.getInstockType()) + .orderByDesc(WmsHppInStockDetail::getCreateTime); + return lqw; + } + + /** + * 新增半制品入库 + * + * @param bo 半制品入库 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(WmsHppInStockDetailBo bo) { + WmsHppInStockDetail add = MapstructUtils.convert(bo, WmsHppInStockDetail.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setObjId(add.getObjId()); + } + return flag; + } + + /** + * 修改半制品入库 + * + * @param bo 半制品入库 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(WmsHppInStockDetailBo bo) { + WmsHppInStockDetail update = MapstructUtils.convert(bo, WmsHppInStockDetail.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(WmsHppInStockDetail entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除半制品入库信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsHppOutStockDetailServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsHppOutStockDetailServiceImpl.java new file mode 100644 index 00000000..b690e95c --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsHppOutStockDetailServiceImpl.java @@ -0,0 +1,144 @@ +package org.dromara.wms.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.toolkit.JoinWrappers; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.dromara.wms.domain.WmsBaseWarehouse; +import org.dromara.wms.domain.WmsHppOutStockDetail; +import org.dromara.wms.domain.WmsHppStorePlace; +import org.dromara.wms.domain.bo.WmsHppOutStockDetailBo; +import org.dromara.wms.domain.vo.WmsAllocateOrderVo; +import org.dromara.wms.domain.vo.WmsHppOutStockDetailVo; +import org.dromara.wms.mapper.WmsHppOutStockDetailMapper; +import org.dromara.wms.service.IWmsHppOutStockDetailService; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 半成品出库Service业务层处理 + * + * @author LionLi + * @date 2025-01-14 + */ +@RequiredArgsConstructor +@Service +public class WmsHppOutStockDetailServiceImpl implements IWmsHppOutStockDetailService { + + private final WmsHppOutStockDetailMapper baseMapper; + + /** + * 查询半成品出库 + * + * @param objId 主键 + * @return 半成品出库 + */ + @Override + public WmsHppOutStockDetailVo queryById(Long objId){ + return baseMapper.selectVoById(objId); + } + + /** + * 分页查询半成品出库列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 半成品出库分页列表 + */ + @Override + public TableDataInfo queryPageList(WmsHppOutStockDetailBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的半成品出库列表 + * + * @param bo 查询条件 + * @return 半成品出库列表 + */ + @Override + public List queryList(WmsHppOutStockDetailBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(WmsHppOutStockDetailBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(WmsHppOutStockDetail.class) + .selectAll(WmsHppOutStockDetail.class) + .selectAs("a", WmsHppStorePlace::getStorePlaceCode, WmsHppOutStockDetailVo::getStorePlaceCode) + .selectAs("b", WmsHppStorePlace::getStorePlaceCode, WmsHppOutStockDetailVo::getTargertStorePlaceCode) + .leftJoin(WmsHppStorePlace.class,"a",WmsHppStorePlace::getObjId,WmsHppOutStockDetail::getStorePlaceId) + .leftJoin(WmsHppStorePlace.class,"b",WmsHppStorePlace::getObjId,WmsHppOutStockDetail::getTargetStorePlaceId) + .eq(bo.getObjId() != null, WmsHppOutStockDetail::getObjId, bo.getObjId()) + .eq(StringUtils.isNotBlank(bo.getCardNo()), WmsHppOutStockDetail::getCardNo, bo.getCardNo()) + .eq(StringUtils.isNotBlank(bo.getShelfNo()), WmsHppOutStockDetail::getShelfNo, bo.getShelfNo()) + .eq(bo.getStorePlaceId() != null, WmsHppOutStockDetail::getStorePlaceId, bo.getStorePlaceId()) + .eq(StringUtils.isNotBlank(bo.getGradeCode()), WmsHppOutStockDetail::getGradeCode, bo.getGradeCode()) + .eq(StringUtils.isNotBlank(bo.getOutType()), WmsHppOutStockDetail::getOutType, bo.getOutType()) + .eq(bo.getTargetStorePlaceId() != null, WmsHppOutStockDetail::getTargetStorePlaceId, bo.getTargetStorePlaceId()) + .orderByDesc(WmsHppOutStockDetail::getCreateTime); + return lqw; + } + + /** + * 新增半成品出库 + * + * @param bo 半成品出库 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(WmsHppOutStockDetailBo bo) { + WmsHppOutStockDetail add = MapstructUtils.convert(bo, WmsHppOutStockDetail.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setObjId(add.getObjId()); + } + return flag; + } + + /** + * 修改半成品出库 + * + * @param bo 半成品出库 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(WmsHppOutStockDetailBo bo) { + WmsHppOutStockDetail update = MapstructUtils.convert(bo, WmsHppOutStockDetail.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(WmsHppOutStockDetail entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除半成品出库信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsHppStorageDetailServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsHppStorageDetailServiceImpl.java new file mode 100644 index 00000000..68785f42 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsHppStorageDetailServiceImpl.java @@ -0,0 +1,142 @@ +package org.dromara.wms.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.toolkit.JoinWrappers; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.dromara.wms.domain.WmsHppInStockDetail; +import org.dromara.wms.domain.WmsHppStorageDetail; +import org.dromara.wms.domain.WmsHppStorePlace; +import org.dromara.wms.domain.bo.WmsHppStorageDetailBo; +import org.dromara.wms.domain.vo.WmsHppStorageDetailVo; +import org.dromara.wms.mapper.WmsHppStorageDetailMapper; +import org.dromara.wms.service.IWmsHppStorageDetailService; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 半成品库存Service业务层处理 + * + * @author LionLi + * @date 2025-01-14 + */ +@RequiredArgsConstructor +@Service +public class WmsHppStorageDetailServiceImpl implements IWmsHppStorageDetailService { + + private final WmsHppStorageDetailMapper baseMapper; + + /** + * 查询半成品库存 + * + * @param objId 主键 + * @return 半成品库存 + */ + @Override + public WmsHppStorageDetailVo queryById(Long objId){ + return baseMapper.selectVoById(objId); + } + + /** + * 分页查询半成品库存列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 半成品库存分页列表 + */ + @Override + public TableDataInfo queryPageList(WmsHppStorageDetailBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的半成品库存列表 + * + * @param bo 查询条件 + * @return 半成品库存列表 + */ + @Override + public List queryList(WmsHppStorageDetailBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(WmsHppStorageDetailBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(WmsHppStorageDetail.class) + .selectAll(WmsHppStorageDetail.class).select(WmsHppStorePlace::getStorePlaceCode) + .leftJoin(WmsHppStorePlace.class,WmsHppStorePlace::getObjId, WmsHppStorageDetail::getStorePlaceId) + .eq(bo.getObjId() != null, WmsHppStorageDetail::getObjId, bo.getObjId()) + .eq(StringUtils.isNotBlank(bo.getCardNo()), WmsHppStorageDetail::getCardNo, bo.getCardNo()) + .eq(StringUtils.isNotBlank(bo.getShelfNo()), WmsHppStorageDetail::getShelfNo, bo.getShelfNo()) + .eq(StringUtils.isNotBlank(bo.getInstockType()), WmsHppStorageDetail::getInstockType, bo.getInstockType()) + .eq(bo.getMaterialId() != null, WmsHppStorageDetail::getMaterialId, bo.getMaterialId()) + .eq(bo.getStorePlaceId() != null, WmsHppStorageDetail::getStorePlaceId, bo.getStorePlaceId()) + .eq(bo.getSourceNum() != null, WmsHppStorageDetail::getSourceNum, bo.getSourceNum()) + .eq(bo.getStorageNum() != null, WmsHppStorageDetail::getStorageNum, bo.getStorageNum()) + .orderByDesc(WmsHppStorageDetail::getCreateTime); + return lqw; + } + + /** + * 新增半成品库存 + * + * @param bo 半成品库存 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(WmsHppStorageDetailBo bo) { + WmsHppStorageDetail add = MapstructUtils.convert(bo, WmsHppStorageDetail.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setObjId(add.getObjId()); + } + return flag; + } + + /** + * 修改半成品库存 + * + * @param bo 半成品库存 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(WmsHppStorageDetailBo bo) { + WmsHppStorageDetail update = MapstructUtils.convert(bo, WmsHppStorageDetail.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(WmsHppStorageDetail entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除半成品库存信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsHppStorePlaceServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsHppStorePlaceServiceImpl.java new file mode 100644 index 00000000..0ccbb1db --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsHppStorePlaceServiceImpl.java @@ -0,0 +1,138 @@ +package org.dromara.wms.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.toolkit.JoinWrappers; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.dromara.wms.domain.WmsHppStorePlace; +import org.dromara.wms.domain.bo.WmsHppStorePlaceBo; +import org.dromara.wms.domain.vo.WmsHppStorePlaceVo; +import org.dromara.wms.mapper.WmsHppStorePlaceMapper; +import org.dromara.wms.service.IWmsHppStorePlaceService; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 半成品库位Service业务层处理 + * + * @author LionLi + * @date 2025-01-14 + */ +@RequiredArgsConstructor +@Service +public class WmsHppStorePlaceServiceImpl implements IWmsHppStorePlaceService { + + private final WmsHppStorePlaceMapper baseMapper; + + /** + * 查询半成品库位 + * + * @param objId 主键 + * @return 半成品库位 + */ + @Override + public WmsHppStorePlaceVo queryById(Long objId){ + return baseMapper.selectVoById(objId); + } + + /** + * 分页查询半成品库位列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 半成品库位分页列表 + */ + @Override + public TableDataInfo queryPageList(WmsHppStorePlaceBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的半成品库位列表 + * + * @param bo 查询条件 + * @return 半成品库位列表 + */ + @Override + public List queryList(WmsHppStorePlaceBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(WmsHppStorePlaceBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(WmsHppStorePlace.class) + .selectAll(WmsHppStorePlace.class) + .eq(bo.getObjId() != null, WmsHppStorePlace::getObjId, bo.getObjId()) + .like(StringUtils.isNotBlank(bo.getStorePlaceName()), WmsHppStorePlace::getStorePlaceName, bo.getStorePlaceName()) + .eq(StringUtils.isNotBlank(bo.getStorePlaceCode()), WmsHppStorePlace::getStorePlaceCode, bo.getStorePlaceCode()) + .eq(bo.getStoreId() != null, WmsHppStorePlace::getStoreId, bo.getStoreId()) + .eq(StringUtils.isNotBlank(bo.getUsedFlag()), WmsHppStorePlace::getUsedFlag, bo.getUsedFlag()) + .eq(StringUtils.isNotBlank(bo.getSpecitialType()), WmsHppStorePlace::getSpecitialType, bo.getSpecitialType()) + .eq(StringUtils.isNotBlank(bo.getPositionType()), WmsHppStorePlace::getPositionType, bo.getPositionType()) + .orderByDesc(WmsHppStorePlace::getCreateTime); + return lqw; + } + + /** + * 新增半成品库位 + * + * @param bo 半成品库位 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(WmsHppStorePlaceBo bo) { + WmsHppStorePlace add = MapstructUtils.convert(bo, WmsHppStorePlace.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setObjId(add.getObjId()); + } + return flag; + } + + /** + * 修改半成品库位 + * + * @param bo 半成品库位 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(WmsHppStorePlaceBo bo) { + WmsHppStorePlace update = MapstructUtils.convert(bo, WmsHppStorePlace.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(WmsHppStorePlace entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除半成品库位信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsHppStoreServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsHppStoreServiceImpl.java new file mode 100644 index 00000000..a663331b --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsHppStoreServiceImpl.java @@ -0,0 +1,139 @@ +package org.dromara.wms.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.toolkit.JoinWrappers; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.dromara.wms.domain.WmsHppStore; +import org.dromara.wms.domain.bo.WmsHppStoreBo; +import org.dromara.wms.domain.vo.WmsHppStoreVo; +import org.dromara.wms.mapper.WmsHppStoreMapper; +import org.dromara.wms.service.IWmsHppStoreService; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 【请填写功能名称】Service业务层处理 + * + * @author LionLi + * @date 2025-01-14 + */ +@RequiredArgsConstructor +@Service +public class WmsHppStoreServiceImpl implements IWmsHppStoreService { + + private final WmsHppStoreMapper baseMapper; + + /** + * 查询【请填写功能名称】 + * + * @param createBy 主键 + * @return 【请填写功能名称】 + */ + @Override + public WmsHppStoreVo queryById(Long objId){ + return baseMapper.selectVoById(objId); + } + + /** + * 分页查询【请填写功能名称】列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 【请填写功能名称】分页列表 + */ + @Override + public TableDataInfo queryPageList(WmsHppStoreBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的【请填写功能名称】列表 + * + * @param bo 查询条件 + * @return 【请填写功能名称】列表 + */ + @Override + public List queryList(WmsHppStoreBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(WmsHppStoreBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(WmsHppStore.class) + .selectAll(WmsHppStore.class) + .eq(bo.getObjId() != null, WmsHppStore::getObjId, bo.getObjId()) + .like(StringUtils.isNotBlank(bo.getStoreName()), WmsHppStore::getStoreName, bo.getStoreName()) + .eq(StringUtils.isNotBlank(bo.getStoreCode()), WmsHppStore::getStoreCode, bo.getStoreCode()) + .eq(bo.getStoreType() != null, WmsHppStore::getStoreType, bo.getStoreType()) + .eq(StringUtils.isNotBlank(bo.getUsedFlag()), WmsHppStore::getUsedFlag, bo.getUsedFlag()) + .eq(StringUtils.isNotBlank(bo.getSapCode()), WmsHppStore::getSapCode, bo.getSapCode()) + .eq(bo.getStoreLevel() != null, WmsHppStore::getStoreLevel, bo.getStoreLevel()) + .eq(bo.getStoreHigherLevel() != null, WmsHppStore::getStoreHigherLevel, bo.getStoreHigherLevel()) + .orderByDesc(WmsHppStore::getCreateTime); + return lqw; + } + + /** + * 新增【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(WmsHppStoreBo bo) { + WmsHppStore add = MapstructUtils.convert(bo, WmsHppStore.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setObjId(add.getObjId()); + } + return flag; + } + + /** + * 修改【请填写功能名称】 + * + * @param bo 【请填写功能名称】 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(WmsHppStoreBo bo) { + WmsHppStore update = MapstructUtils.convert(bo, WmsHppStore.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(WmsHppStore entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除【请填写功能名称】信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsHsmToolingServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsHsmToolingServiceImpl.java new file mode 100644 index 00000000..0e1f3a7d --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsHsmToolingServiceImpl.java @@ -0,0 +1,143 @@ +package org.dromara.wms.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.toolkit.JoinWrappers; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.dromara.wms.domain.WmsHsmTooling; +import org.dromara.wms.domain.bo.WmsHsmToolingBo; +import org.dromara.wms.domain.vo.WmsHsmToolingVo; +import org.dromara.wms.mapper.WmsHsmToolingMapper; +import org.dromara.wms.service.IWmsHsmToolingService; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 半成品工装Service业务层处理 + * + * @author LionLi + * @date 2025-01-14 + */ +@RequiredArgsConstructor +@Service +public class WmsHsmToolingServiceImpl implements IWmsHsmToolingService { + + private final WmsHsmToolingMapper baseMapper; + + /** + * 查询半成品工装 + * + * @param + * @return 半成品工装 + */ + @Override + public WmsHsmToolingVo queryById(Long objId){ + return baseMapper.selectVoById(objId); + } + + /** + * 分页查询半成品工装列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 半成品工装分页列表 + */ + @Override + public TableDataInfo queryPageList(WmsHsmToolingBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的半成品工装列表 + * + * @param bo 查询条件 + * @return 半成品工装列表 + */ + @Override + public List queryList(WmsHsmToolingBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(WmsHsmToolingBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(WmsHsmTooling.class) + .selectAll(WmsHsmTooling.class) + .eq(bo.getObjId() != null, WmsHsmTooling::getObjId, bo.getObjId()) + .eq(StringUtils.isNotBlank(bo.getCreatedBy()), WmsHsmTooling::getCreatedBy, bo.getCreatedBy()) + .eq(bo.getCreatedTime() != null, WmsHsmTooling::getCreatedTime, bo.getCreatedTime()) + .eq(StringUtils.isNotBlank(bo.getUpdatedBy()), WmsHsmTooling::getUpdatedBy, bo.getUpdatedBy()) + .eq(bo.getUpdatedTime() != null, WmsHsmTooling::getUpdatedTime, bo.getUpdatedTime()) + .eq(StringUtils.isNotBlank(bo.getToolingBarcode()), WmsHsmTooling::getToolingBarcode, bo.getToolingBarcode()) + .eq(StringUtils.isNotBlank(bo.getTenantId()), WmsHsmTooling::getTenantId, bo.getTenantId()) + .eq(StringUtils.isNotBlank(bo.getToolingRfidBarcode()), WmsHsmTooling::getToolingRfidBarcode, bo.getToolingRfidBarcode()) + .eq(StringUtils.isNotBlank(bo.getToolingType()), WmsHsmTooling::getToolingType, bo.getToolingType()) + .eq(StringUtils.isNotBlank(bo.getIsUsed()), WmsHsmTooling::getIsUsed, bo.getIsUsed()) + .orderByDesc(WmsHsmTooling::getCreatedTime); + return lqw; + } + + /** + * 新增半成品工装 + * + * @param bo 半成品工装 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(WmsHsmToolingBo bo) { + WmsHsmTooling add = MapstructUtils.convert(bo, WmsHsmTooling.class); + add.setCreatedTime(new Date()); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setObjId(add.getObjId()); + } + return flag; + } + + /** + * 修改半成品工装 + * + * @param bo 半成品工装 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(WmsHsmToolingBo bo) { + WmsHsmTooling update = MapstructUtils.convert(bo, WmsHsmTooling.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(WmsHsmTooling entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除半成品工装信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInstockDetailServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInstockDetailServiceImpl.java index 4b68976e..107ac34b 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInstockDetailServiceImpl.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInstockDetailServiceImpl.java @@ -120,6 +120,8 @@ public class WmsInstockDetailServiceImpl implements IWmsInstockDetailService { WmsInstockDetail add = MapstructUtils.convert(detailBo, WmsInstockDetail.class); add.setMaterialCode(baseMaterialInfoVos.get(0).getMaterialCode()); add.setMaterialName(baseMaterialInfoVos.get(0).getMaterialName()); + add.setMaterialSpe(baseMaterialInfoVos.get(0).getMaterialSpec()); + add.setUnitName(baseMaterialInfoVos.get(0).getMaterialUnit()); a += baseMapper.insert(add); } return a>0; diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsOutstockRecordServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsOutstockRecordServiceImpl.java index 02029e1e..692c31ec 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsOutstockRecordServiceImpl.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsOutstockRecordServiceImpl.java @@ -132,6 +132,8 @@ public class WmsOutstockRecordServiceImpl implements IWmsOutstockRecordService { } WmsReturnOrderBo wmsReturnOrder = new WmsReturnOrderBo(); BeanUtils.copyProperties(bo,wmsReturnOrder); + wmsReturnOrder.setPlanLocationCode(bo.getLocationCode()); + wmsReturnOrder.setReturnLocationCode(bo.getReturnLocationCode()); wmsReturnOrder.setPlanAmount(bo.getReturnQty()); return wmsReturnOrderService.insertByBo(wmsReturnOrder); diff --git a/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsHppInStockDetailMapper.xml b/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsHppInStockDetailMapper.xml new file mode 100644 index 00000000..9062cbca --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsHppInStockDetailMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsHppOutStockDetailMapper.xml b/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsHppOutStockDetailMapper.xml new file mode 100644 index 00000000..793d6afd --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsHppOutStockDetailMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsHppStoreMapper.xml b/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsHppStoreMapper.xml new file mode 100644 index 00000000..aaf790ce --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsHppStoreMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsHppStorePlaceMapper.xml b/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsHppStorePlaceMapper.xml new file mode 100644 index 00000000..f08a7e3a --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsHppStorePlaceMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsHsmToolingMapper.xml b/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsHsmToolingMapper.xml new file mode 100644 index 00000000..ff9f7d00 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsHsmToolingMapper.xml @@ -0,0 +1,7 @@ + + + + +