diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/result/OrderTransResult.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/result/OrderTransResult.java index 74de06f..2fe4ce1 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/result/OrderTransResult.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/result/OrderTransResult.java @@ -270,6 +270,51 @@ public class OrderTransResult { */ private String orderStatus; + /** + * 下单人客户 Id；cst_customer.id + */ + private Long customerId; + + /** + * 下单时间 + */ + private LocalDateTime orderTime; + + /** + * 产品 Id + */ + private Long goodsId; + + /** + * 产品名称 + */ + private String goodsName; + + /** + * 产品编码 + */ + private String goodsSn; + + /** + * 产品类型 Id + */ + private Long goodsCategoryId; + + /** + * 产品类型名称 + */ + private String goodsCategoryName; + + /** + * 预估量 + */ + private Integer estimatedQuantity; + + /** + * 单位 + */ + private String unit; + } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/constant/PurchaseOrderStatus.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/constant/PurchaseOrderStatus.java new file mode 100644 index 0000000..9aa053d --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/constant/PurchaseOrderStatus.java @@ -0,0 +1,27 @@ +package com.njzscloud.dispose.wh.constant; + +import com.njzscloud.common.core.ienum.DictStr; +import lombok.Getter; +import lombok.RequiredArgsConstructor; +/** + * 字典代码：purchase_order_status + * 字典名称：状态 + * @author ljw + */ +@Getter +@RequiredArgsConstructor +public enum PurchaseOrderStatus implements DictStr { + + JinXingZhong("JinXingZhong", "进行中"), + + YiDaoHuo("YiDaoHuo", "已到货"), + + YiRuKu("YiRuKu", "已入库"), + + YiQuXiao("YiQuXiao", "已取消"), + + ; + private final String val; + + private final String txt; +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/constant/SalesOrderStatus.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/constant/SalesOrderStatus.java new file mode 100644 index 0000000..749ebea --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/constant/SalesOrderStatus.java @@ -0,0 +1,27 @@ +package com.njzscloud.dispose.wh.constant; + +import com.njzscloud.common.core.ienum.DictStr; +import lombok.Getter; +import lombok.RequiredArgsConstructor; +/** + * 字典代码：sales_order_status + * 字典名称：状态 + * @author ljw + */ +@Getter +@RequiredArgsConstructor +public enum SalesOrderStatus implements DictStr { + + JinXingZhong("JinXingZhong", "进行中"), + + YiFaHuo("YiFaHuo", "已发货"), + + YiChuKu("YiChuKu", "已出库"), + + YiQuXiao("YiQuXiao", "已取消"), + + ; + private final String val; + + private final String txt; +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/controller/InOrderController.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/controller/InOrderController.java new file mode 100644 index 0000000..0c6dc4a --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/controller/InOrderController.java @@ -0,0 +1,70 @@ +package com.njzscloud.dispose.wh.controller; + +import com.njzscloud.common.core.utils.R; +import com.njzscloud.common.mp.support.PageParam; +import com.njzscloud.common.mp.support.PageResult; +import com.njzscloud.dispose.wh.pojo.entity.InOrderEntity; +import com.njzscloud.dispose.wh.pojo.param.AddInOrderParam; +import com.njzscloud.dispose.wh.pojo.param.SearchInOrderParam; +import com.njzscloud.dispose.wh.pojo.result.SearchInOrderResult; +import com.njzscloud.dispose.wh.service.InOrderService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 入库单 + * @author ljw + */ +@Slf4j +@RestController +@RequestMapping("/in_order") +@RequiredArgsConstructor +public class InOrderController { + private final InOrderService inOrderService; + + /** + * 新增 + */ + @PostMapping("/add") + public R add(@RequestBody AddInOrderParam addInOrderParam) { + inOrderService.add(addInOrderParam); + return R.success(); + } + + /** + * 修改 + */ + @PostMapping("/modify") + public R modify(@RequestBody InOrderEntity inOrderEntity) { + inOrderService.modify(inOrderEntity); + return R.success(); + } + + /** + * 删除 + */ + @PostMapping("/del") + public R del(@RequestBody List ids) { + inOrderService.del(ids); + return R.success(); + } + + /** + * 详情 + */ + @GetMapping("/detail") + public R detail(@RequestParam("id") Long id) { + return R.success(inOrderService.detail(id)); + } + + /** + * 分页查询 + */ + @GetMapping("/paging") + public R> paging(PageParam pageParam, SearchInOrderParam searchInOrderParam) { + return R.success(inOrderService.paging(pageParam, searchInOrderParam)); + } +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/controller/InventoryController.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/controller/InventoryController.java new file mode 100644 index 0000000..2c36b89 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/controller/InventoryController.java @@ -0,0 +1,71 @@ +package com.njzscloud.dispose.wh.controller; + +import com.njzscloud.common.core.utils.R; +import com.njzscloud.common.mp.support.PageParam; +import com.njzscloud.common.mp.support.PageResult; +import com.njzscloud.dispose.wh.pojo.entity.InventoryEntity; +import com.njzscloud.dispose.wh.pojo.param.AddInventoryParam; +import com.njzscloud.dispose.wh.pojo.param.SearchInventoryParam; +import com.njzscloud.dispose.wh.pojo.result.SearchInventoryResult; +import com.njzscloud.dispose.wh.service.InventoryService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 库存信息 + * + * @author ljw + */ +@Slf4j +@RestController +@RequestMapping("/inventory") +@RequiredArgsConstructor +public class InventoryController { + private final InventoryService inventoryService; + + /** + * 新增 + */ + @PostMapping("/add") + public R add(@RequestBody AddInventoryParam addInventoryParam) { + inventoryService.add(addInventoryParam); + return R.success(); + } + + /** + * 修改 + */ + @PostMapping("/modify") + public R modify(@RequestBody InventoryEntity inventoryEntity) { + inventoryService.modify(inventoryEntity); + return R.success(); + } + + /** + * 删除 + */ + @PostMapping("/del") + public R del(@RequestBody List ids) { + inventoryService.del(ids); + return R.success(); + } + + /** + * 详情 + */ + @GetMapping("/detail") + public R detail(@RequestParam("id") Long id) { + return R.success(inventoryService.detail(id)); + } + + /** + * 分页查询 + */ + @GetMapping("/paging") + public R> paging(PageParam pageParam, SearchInventoryParam param) { + return R.success(inventoryService.paging(pageParam, param)); + } +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/controller/OutOrderController.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/controller/OutOrderController.java new file mode 100644 index 0000000..c277d96 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/controller/OutOrderController.java @@ -0,0 +1,70 @@ +package com.njzscloud.dispose.wh.controller; + +import com.njzscloud.common.core.utils.R; +import com.njzscloud.common.mp.support.PageParam; +import com.njzscloud.common.mp.support.PageResult; +import com.njzscloud.dispose.wh.pojo.entity.OutOrderEntity; +import com.njzscloud.dispose.wh.pojo.param.AddOutOrderParam; +import com.njzscloud.dispose.wh.pojo.param.SearchOutOrderParam; +import com.njzscloud.dispose.wh.pojo.result.SearchOutOrderResult; +import com.njzscloud.dispose.wh.service.OutOrderService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 出库单 + * @author ljw + */ +@Slf4j +@RestController +@RequestMapping("/out_order") +@RequiredArgsConstructor +public class OutOrderController { + private final OutOrderService outOrderService; + + /** + * 新增 + */ + @PostMapping("/add") + public R add(@RequestBody AddOutOrderParam addOutOrderParam) { + outOrderService.add(addOutOrderParam); + return R.success(); + } + + /** + * 修改 + */ + @PostMapping("/modify") + public R modify(@RequestBody OutOrderEntity outOrderEntity) { + outOrderService.modify(outOrderEntity); + return R.success(); + } + + /** + * 删除 + */ + @PostMapping("/del") + public R del(@RequestBody List ids) { + outOrderService.del(ids); + return R.success(); + } + + /** + * 详情 + */ + @GetMapping("/detail") + public R detail(@RequestParam("id") Long id) { + return R.success(outOrderService.detail(id)); + } + + /** + * 分页查询 + */ + @GetMapping("/paging") + public R> paging(PageParam pageParam, SearchOutOrderParam searchOutOrderParam) { + return R.success(outOrderService.paging(pageParam, searchOutOrderParam)); + } +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/controller/PurchaseOrderController.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/controller/PurchaseOrderController.java new file mode 100644 index 0000000..a656e79 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/controller/PurchaseOrderController.java @@ -0,0 +1,68 @@ +package com.njzscloud.dispose.wh.controller; + +import com.njzscloud.common.core.utils.R; +import com.njzscloud.common.mp.support.PageParam; +import com.njzscloud.common.mp.support.PageResult; +import com.njzscloud.dispose.wh.pojo.entity.PurchaseOrderEntity; +import com.njzscloud.dispose.wh.service.PurchaseOrderService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 采购单 + * + * @author ljw + */ +@Slf4j +@RestController +@RequestMapping("/purchase_order") +@RequiredArgsConstructor +public class PurchaseOrderController { + private final PurchaseOrderService purchaseOrderService; + + /** + * 新增 + */ + @PostMapping("/add") + public R add(@RequestBody PurchaseOrderEntity entity) { + purchaseOrderService.add(entity); + return R.success(); + } + + /** + * 修改 + */ + @PostMapping("/modify") + public R modify(@RequestBody PurchaseOrderEntity purchaseOrderEntity) { + purchaseOrderService.modify(purchaseOrderEntity); + return R.success(); + } + + /** + * 删除 + */ + @PostMapping("/del") + public R del(@RequestBody List ids) { + purchaseOrderService.del(ids); + return R.success(); + } + + /** + * 详情 + */ + @GetMapping("/detail") + public R detail(@RequestParam("id") Long id) { + return R.success(purchaseOrderService.detail(id)); + } + + /** + * 分页查询 + */ + @GetMapping("/paging") + public R> paging(PageParam pageParam, PurchaseOrderEntity orderEntity) { + return R.success(purchaseOrderService.paging(pageParam, orderEntity)); + } +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/controller/SalesOrderController.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/controller/SalesOrderController.java new file mode 100644 index 0000000..2588d0e --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/controller/SalesOrderController.java @@ -0,0 +1,69 @@ +package com.njzscloud.dispose.wh.controller; + +import com.njzscloud.common.core.utils.R; +import com.njzscloud.common.mp.support.PageParam; +import com.njzscloud.common.mp.support.PageResult; +import com.njzscloud.dispose.wh.pojo.entity.SalesOrderEntity; +import com.njzscloud.dispose.wh.pojo.param.AddSalesOrderParam; +import com.njzscloud.dispose.wh.service.SalesOrderService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 销售单 + * + * @author ljw + */ +@Slf4j +@RestController +@RequestMapping("/sales_order") +@RequiredArgsConstructor +public class SalesOrderController { + private final SalesOrderService salesOrderService; + + /** + * 新增 + */ + @PostMapping("/add") + public R add(@RequestBody AddSalesOrderParam addSalesOrderParam) { + salesOrderService.add(addSalesOrderParam); + return R.success(); + } + + /** + * 修改 + */ + @PostMapping("/modify") + public R modify(@RequestBody SalesOrderEntity salesOrderEntity) { + salesOrderService.modify(salesOrderEntity); + return R.success(); + } + + /** + * 删除 + */ + @PostMapping("/del") + public R del(@RequestBody List ids) { + salesOrderService.del(ids); + return R.success(); + } + + /** + * 详情 + */ + @GetMapping("/detail") + public R detail(@RequestParam("id") Long id) { + return R.success(salesOrderService.detail(id)); + } + + /** + * 分页查询 + */ + @GetMapping("/paging") + public R> paging(PageParam pageParam, SalesOrderEntity orderEntity) { + return R.success(salesOrderService.paging(pageParam, orderEntity)); + } +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/controller/WarehouseCheckDetailController.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/controller/WarehouseCheckDetailController.java new file mode 100644 index 0000000..1927379 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/controller/WarehouseCheckDetailController.java @@ -0,0 +1,70 @@ +package com.njzscloud.dispose.wh.controller; + +import com.njzscloud.common.core.utils.R; +import com.njzscloud.common.mp.support.PageParam; +import com.njzscloud.common.mp.support.PageResult; +import com.njzscloud.dispose.wh.pojo.entity.WarehouseCheckDetailEntity; +import com.njzscloud.dispose.wh.pojo.param.AddWarehouseCheckDetailParam; +import com.njzscloud.dispose.wh.pojo.param.SearchWarehouseCheckDetailParam; +import com.njzscloud.dispose.wh.pojo.result.SearchWarehouseCheckDetailResult; +import com.njzscloud.dispose.wh.service.WarehouseCheckDetailService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 库存盘点明细 + * @author ljw + */ +@Slf4j +@RestController +@RequestMapping("/warehouse_check_detail") +@RequiredArgsConstructor +public class WarehouseCheckDetailController { + private final WarehouseCheckDetailService warehouseCheckDetailService; + + /** + * 新增 + */ + @PostMapping("/add") + public R add(@RequestBody AddWarehouseCheckDetailParam addWarehouseCheckDetailParam) { + warehouseCheckDetailService.add(addWarehouseCheckDetailParam); + return R.success(); + } + + /** + * 修改 + */ + @PostMapping("/modify") + public R modify(@RequestBody WarehouseCheckDetailEntity warehouseCheckDetailEntity) { + warehouseCheckDetailService.modify(warehouseCheckDetailEntity); + return R.success(); + } + + /** + * 删除 + */ + @PostMapping("/del") + public R del(@RequestBody List ids) { + warehouseCheckDetailService.del(ids); + return R.success(); + } + + /** + * 详情 + */ + @GetMapping("/detail") + public R detail(@RequestParam("id") Long id) { + return R.success(warehouseCheckDetailService.detail(id)); + } + + /** + * 分页查询 + */ + @GetMapping("/paging") + public R> paging(PageParam pageParam, SearchWarehouseCheckDetailParam searchWarehouseCheckDetailParam) { + return R.success(warehouseCheckDetailService.paging(pageParam, searchWarehouseCheckDetailParam)); + } +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/controller/WarehouseCheckPlanController.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/controller/WarehouseCheckPlanController.java new file mode 100644 index 0000000..974a36f --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/controller/WarehouseCheckPlanController.java @@ -0,0 +1,70 @@ +package com.njzscloud.dispose.wh.controller; + +import com.njzscloud.common.core.utils.R; +import com.njzscloud.common.mp.support.PageParam; +import com.njzscloud.common.mp.support.PageResult; +import com.njzscloud.dispose.wh.pojo.entity.WarehouseCheckPlanEntity; +import com.njzscloud.dispose.wh.pojo.param.AddWarehouseCheckPlanParam; +import com.njzscloud.dispose.wh.pojo.param.SearchWarehouseCheckPlanParam; +import com.njzscloud.dispose.wh.pojo.result.SearchWarehouseCheckPlanResult; +import com.njzscloud.dispose.wh.service.WarehouseCheckPlanService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 库存盘点计划 + * @author ljw + */ +@Slf4j +@RestController +@RequestMapping("/warehouse_check_plan") +@RequiredArgsConstructor +public class WarehouseCheckPlanController { + private final WarehouseCheckPlanService warehouseCheckPlanService; + + /** + * 新增 + */ + @PostMapping("/add") + public R add(@RequestBody AddWarehouseCheckPlanParam addWarehouseCheckPlanParam) { + warehouseCheckPlanService.add(addWarehouseCheckPlanParam); + return R.success(); + } + + /** + * 修改 + */ + @PostMapping("/modify") + public R modify(@RequestBody WarehouseCheckPlanEntity warehouseCheckPlanEntity) { + warehouseCheckPlanService.modify(warehouseCheckPlanEntity); + return R.success(); + } + + /** + * 删除 + */ + @PostMapping("/del") + public R del(@RequestBody List ids) { + warehouseCheckPlanService.del(ids); + return R.success(); + } + + /** + * 详情 + */ + @GetMapping("/detail") + public R detail(@RequestParam("id") Long id) { + return R.success(warehouseCheckPlanService.detail(id)); + } + + /** + * 分页查询 + */ + @GetMapping("/paging") + public R> paging(PageParam pageParam, SearchWarehouseCheckPlanParam searchWarehouseCheckPlanParam) { + return R.success(warehouseCheckPlanService.paging(pageParam, searchWarehouseCheckPlanParam)); + } +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/controller/WarehouseController.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/controller/WarehouseController.java new file mode 100644 index 0000000..4d032e5 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/controller/WarehouseController.java @@ -0,0 +1,69 @@ +package com.njzscloud.dispose.wh.controller; + +import com.njzscloud.common.core.utils.R; +import com.njzscloud.common.mp.support.PageParam; +import com.njzscloud.common.mp.support.PageResult; +import com.njzscloud.dispose.wh.pojo.entity.WarehouseEntity; +import com.njzscloud.dispose.wh.pojo.param.AddWarehouseParam; +import com.njzscloud.dispose.wh.service.WarehouseService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 仓库信息 + * + * @author ljw + */ +@Slf4j +@RestController +@RequestMapping("/warehouse") +@RequiredArgsConstructor +public class WarehouseController { + private final WarehouseService warehouseService; + + /** + * 新增 + */ + @PostMapping("/add") + public R add(@RequestBody AddWarehouseParam addWarehouseParam) { + warehouseService.add(addWarehouseParam); + return R.success(); + } + + /** + * 修改 + */ + @PostMapping("/modify") + public R modify(@RequestBody WarehouseEntity warehouseEntity) { + warehouseService.modify(warehouseEntity); + return R.success(); + } + + /** + * 删除 + */ + @PostMapping("/del") + public R del(@RequestBody List ids) { + warehouseService.del(ids); + return R.success(); + } + + /** + * 详情 + */ + @GetMapping("/detail") + public R detail(@RequestParam("id") Long id) { + return R.success(warehouseService.detail(id)); + } + + /** + * 分页查询 + */ + @GetMapping("/paging") + public R> paging(PageParam pageParam, WarehouseEntity warehouseEntity) { + return R.success(warehouseService.paging(pageParam, warehouseEntity)); + } +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/mapper/InOrderMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/mapper/InOrderMapper.java new file mode 100644 index 0000000..3f02298 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/mapper/InOrderMapper.java @@ -0,0 +1,20 @@ +package com.njzscloud.dispose.wh.mapper; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.njzscloud.dispose.wh.pojo.entity.InOrderEntity; +import com.njzscloud.dispose.wh.pojo.result.SearchInOrderResult; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * 入库单 + */ +@Mapper +public interface InOrderMapper extends BaseMapper { + IPage paging(Page page, @Param("ew") QueryWrapper ew); + + SearchInOrderResult detail(@Param("id") Long id); +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/mapper/InventoryMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/mapper/InventoryMapper.java new file mode 100644 index 0000000..0e6eb23 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/mapper/InventoryMapper.java @@ -0,0 +1,20 @@ +package com.njzscloud.dispose.wh.mapper; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.njzscloud.dispose.wh.pojo.entity.InventoryEntity; +import com.njzscloud.dispose.wh.pojo.result.SearchInventoryResult; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * 库存信息 + */ +@Mapper +public interface InventoryMapper extends BaseMapper { + IPage paging(Page page, @Param("ew") QueryWrapper ew); + + SearchInventoryResult detail(@Param("id") Long id); +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/mapper/OutOrderMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/mapper/OutOrderMapper.java new file mode 100644 index 0000000..acaa27b --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/mapper/OutOrderMapper.java @@ -0,0 +1,21 @@ +package com.njzscloud.dispose.wh.mapper; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.njzscloud.dispose.wh.pojo.entity.OutOrderEntity; +import com.njzscloud.dispose.wh.pojo.result.SearchOutOrderResult; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * 出库单 + * @author ljw + */ +@Mapper +public interface OutOrderMapper extends BaseMapper { + IPage paging(Page page, @Param("ew") QueryWrapper ew); + + SearchOutOrderResult detail(@Param("id") Long id); +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/mapper/PurchaseOrderMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/mapper/PurchaseOrderMapper.java new file mode 100644 index 0000000..5d0232e --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/mapper/PurchaseOrderMapper.java @@ -0,0 +1,14 @@ +package com.njzscloud.dispose.wh.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njzscloud.dispose.wh.pojo.entity.PurchaseOrderEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 采购单 + * + * @author ljw + */ +@Mapper +public interface PurchaseOrderMapper extends BaseMapper { +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/mapper/SalesOrderMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/mapper/SalesOrderMapper.java new file mode 100644 index 0000000..7f9dcc6 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/mapper/SalesOrderMapper.java @@ -0,0 +1,14 @@ +package com.njzscloud.dispose.wh.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njzscloud.dispose.wh.pojo.entity.SalesOrderEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 销售单 + * + * @author ljw + */ +@Mapper +public interface SalesOrderMapper extends BaseMapper { +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/mapper/WarehouseCheckDetailMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/mapper/WarehouseCheckDetailMapper.java new file mode 100644 index 0000000..4cb7df4 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/mapper/WarehouseCheckDetailMapper.java @@ -0,0 +1,20 @@ +package com.njzscloud.dispose.wh.mapper; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.njzscloud.dispose.wh.pojo.entity.WarehouseCheckDetailEntity; +import com.njzscloud.dispose.wh.pojo.result.SearchWarehouseCheckDetailResult; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * 库存盘点明细 + */ +@Mapper +public interface WarehouseCheckDetailMapper extends BaseMapper { + IPage paging(Page page, @Param("ew") QueryWrapper ew); + + SearchWarehouseCheckDetailResult detail(@Param("id") Long id); +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/mapper/WarehouseCheckPlanMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/mapper/WarehouseCheckPlanMapper.java new file mode 100644 index 0000000..aad5ad7 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/mapper/WarehouseCheckPlanMapper.java @@ -0,0 +1,20 @@ +package com.njzscloud.dispose.wh.mapper; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.njzscloud.dispose.wh.pojo.entity.WarehouseCheckPlanEntity; +import com.njzscloud.dispose.wh.pojo.result.SearchWarehouseCheckPlanResult; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * 库存盘点计划 + */ +@Mapper +public interface WarehouseCheckPlanMapper extends BaseMapper { + IPage paging(Page page, @Param("ew") QueryWrapper ew); + + SearchWarehouseCheckPlanResult detail(@Param("id") Long id); +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/mapper/WarehouseMapper.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/mapper/WarehouseMapper.java new file mode 100644 index 0000000..8fd47c5 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/mapper/WarehouseMapper.java @@ -0,0 +1,13 @@ +package com.njzscloud.dispose.wh.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njzscloud.dispose.wh.pojo.entity.WarehouseEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 仓库信息 + * @author ljw + */ +@Mapper +public interface WarehouseMapper extends BaseMapper { +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/entity/InOrderEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/entity/InOrderEntity.java new file mode 100644 index 0000000..9c0207e --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/entity/InOrderEntity.java @@ -0,0 +1,137 @@ +package com.njzscloud.dispose.wh.pojo.entity; + +import com.baomidou.mybatisplus.annotation.*; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; + +/** + * 入库单 + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +@TableName("wh_in_order") +public class InOrderEntity { + + /** + * Id + */ + @TableId(type = IdType.ASSIGN_ID) + private Long id; + + /** + * 编号 + */ + private String sn; + + /** + * 责任人 Id；sys_user.id + */ + private Long responsibleId; + + /** + * 仓库 Id；wh_warehouse.id + */ + private Long warehouseId; + + /** + * 存放位置 + */ + private String location; + + /** + * 入库时间 + */ + private LocalDateTime inTime; + + /** + * 单据类型，XiaoShou-->销售、CaiGou-->采购、QiTa-->其他 + */ + private String orderCategory; + + /** + * 采购单 Id；wh_purchase_order.id + */ + private Long orderId; + + /** + * 采购单单号；wh_purchase_order.sn + */ + private String orderSn; + + /** + * 产品分类 Id + */ + private Long goodsCategoryId; + + /** + * 分类名称 + */ + private String goodsCategoryName; + + /** + * 产品 Id + */ + private Long goodsId; + + /** + * 产品名称 + */ + private String goodsName; + + /** + * 商品编码 + */ + private String goodSn; + + /** + * 数量 + */ + private Integer quantity; + + /** + * 计量单位；字典代码：unit + */ + private String unit; + + /** + * 备注 + */ + private String memo; + + /** + * 创建人 Id；sys_user.id + */ + @TableField(fill = FieldFill.INSERT) + private Long creatorId; + + /** + * 修改人 Id；sys_user.id + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Long modifierId; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; + + /** + * 修改时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private LocalDateTime modifyTime; + + /** + * 是否删除；0-->未删除、1-->已删除 + */ + @TableLogic + private Boolean deleted; + +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/entity/InventoryEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/entity/InventoryEntity.java new file mode 100644 index 0000000..7e9ced0 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/entity/InventoryEntity.java @@ -0,0 +1,97 @@ +package com.njzscloud.dispose.wh.pojo.entity; + +import com.baomidou.mybatisplus.annotation.*; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; + +/** + * 库存信息 + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +@TableName("wh_inventory") +public class InventoryEntity { + + /** + * Id + */ + @TableId(type = IdType.ASSIGN_ID) + private Long id; + + /** + * 仓库 Id + */ + private Long warehouseId; + + /** + * 产品 Id + */ + private Long goodsId; + + /** + * 存放位置 + */ + private String location; + + /** + * 当前库存数量 + */ + private Integer stockQuantity; + + /** + * 锁定数量 + */ + private Integer lockQuantity; + + /** + * 总量 + */ + private Integer totalQuantity; + + /** + * 剩余量 + */ + private Integer remainingQuantity; + + /** + * 计量单位；字典代码：unit + */ + private String unit; + + /** + * 创建人 Id；sys_user.id + */ + @TableField(fill = FieldFill.INSERT) + private Long creatorId; + + /** + * 修改人 Id；sys_user.id + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Long modifierId; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; + + /** + * 修改时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private LocalDateTime modifyTime; + + /** + * 是否删除；0-->未删除、1-->已删除 + */ + @TableLogic + private Boolean deleted; + +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/entity/OutOrderEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/entity/OutOrderEntity.java new file mode 100644 index 0000000..88b4129 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/entity/OutOrderEntity.java @@ -0,0 +1,137 @@ +package com.njzscloud.dispose.wh.pojo.entity; + +import com.baomidou.mybatisplus.annotation.*; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; + +/** + * 出库单 + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +@TableName("wh_out_order") +public class OutOrderEntity { + + /** + * Id + */ + @TableId(type = IdType.ASSIGN_ID) + private Long id; + + /** + * 编号 + */ + private String sn; + + /** + * 责任人 Id；sys_user.id + */ + private Long responsibleId; + + /** + * 仓库 Id；wh_warehouse.id + */ + private Long warehouseId; + + /** + * 存放位置 + */ + private String location; + + /** + * 出库时间 + */ + private LocalDateTime outTime; + + /** + * 单据类型，XiaoShou-->销售、CaiGou-->采购、QiTa-->其他 + */ + private String orderCategory; + + /** + * 销售单 Id；wh_sales_order.id + */ + private Long orderId; + + /** + * 销售单号；wh_sales_order.sn + */ + private String orderSn; + + /** + * 产品分类 Id + */ + private Long goodsCategoryId; + + /** + * 分类名称 + */ + private String goodsCategoryName; + + /** + * 产品 Id + */ + private Long goodsId; + + /** + * 产品名称 + */ + private String goodsName; + + /** + * 商品编码 + */ + private String goodSn; + + /** + * 数量 + */ + private Integer quantity; + + /** + * 计量单位；字典代码：unit + */ + private String unit; + + /** + * 备注 + */ + private String memo; + + /** + * 创建人 Id；sys_user.id + */ + @TableField(fill = FieldFill.INSERT) + private Long creatorId; + + /** + * 修改人 Id；sys_user.id + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Long modifierId; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; + + /** + * 修改时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private LocalDateTime modifyTime; + + /** + * 是否删除；0-->未删除、1-->已删除 + */ + @TableLogic + private Boolean deleted; + +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/entity/PurchaseOrderEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/entity/PurchaseOrderEntity.java new file mode 100644 index 0000000..21b9d7b --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/entity/PurchaseOrderEntity.java @@ -0,0 +1,131 @@ +package com.njzscloud.dispose.wh.pojo.entity; + +import com.baomidou.mybatisplus.annotation.*; +import com.njzscloud.dispose.wh.constant.PurchaseOrderStatus; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.math.BigDecimal; +import java.time.LocalDate; +import java.time.LocalDateTime; + +/** + * 采购单 + * @author ljw + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +@TableName("wh_purchase_order") +public class PurchaseOrderEntity { + + /** + * Id + */ + @TableId(type = IdType.ASSIGN_ID) + private Long id; + + /** + * 编号 + */ + private String sn; + + /** + * 状态，JinXingZhong-->进行中、YiDaoHuo-->已到货、YiRuKu-->已入库、YiQuXiao-->已取消 + */ + private PurchaseOrderStatus purchaseOrderStatus; + + /** + * 供货客户 Id + */ + private Long customerId; + + /** + * 采购日期 + */ + private LocalDate purchaseDate; + + /** + * 到货日期 + */ + private LocalDate arrivalDate; + + /** + * 产品分类 Id + */ + private Long goodsCategoryId; + + /** + * 分类名称 + */ + private String goodsCategoryName; + + /** + * 产品 Id + */ + private Long goodsId; + + /** + * 产品名称 + */ + private String goodsName; + + /** + * 商品编码 + */ + private String goodSn; + + /** + * 数量 + */ + private Integer quantity; + + /** + * 计量单位；字典代码：unit + */ + private String unit; + + /** + * 总金额；单位：元 + */ + private BigDecimal totalMoney; + + /** + * 备注 + */ + private String memo; + + /** + * 创建人 Id；sys_user.id + */ + @TableField(fill = FieldFill.INSERT) + private Long creatorId; + + /** + * 修改人 Id；sys_user.id + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Long modifierId; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; + + /** + * 修改时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private LocalDateTime modifyTime; + + /** + * 是否删除；0-->未删除、1-->已删除 + */ + @TableLogic + private Boolean deleted; + +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/entity/SalesOrderEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/entity/SalesOrderEntity.java new file mode 100644 index 0000000..450efa4 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/entity/SalesOrderEntity.java @@ -0,0 +1,131 @@ +package com.njzscloud.dispose.wh.pojo.entity; + +import com.baomidou.mybatisplus.annotation.*; +import com.njzscloud.dispose.wh.constant.SalesOrderStatus; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.math.BigDecimal; +import java.time.LocalDate; +import java.time.LocalDateTime; + +/** + * 销售单 + * @author ljw + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +@TableName("wh_sales_order") +public class SalesOrderEntity { + + /** + * Id + */ + @TableId(type = IdType.ASSIGN_ID) + private Long id; + + /** + * 编号 + */ + private String sn; + + /** + * 状态，JinXingZhong-->进行中、YiFaHuo-->已发货、YiChuKu-->已出库、YiQuXiao-->已取消 + */ + private SalesOrderStatus salesOrderStatus; + + /** + * 购买方客户 Id + */ + private Long customerId; + + /** + * 下单日期 + */ + private LocalDate orderDate; + + /** + * 发货日期 + */ + private LocalDate shipmentDate; + + /** + * 产品分类 Id + */ + private Long goodsCategoryId; + + /** + * 分类名称 + */ + private String goodsCategoryName; + + /** + * 产品 Id + */ + private Long goodsId; + + /** + * 产品名称 + */ + private String goodsName; + + /** + * 商品编码 + */ + private String goodSn; + + /** + * 数量 + */ + private Integer quantity; + + /** + * 计量单位；字典代码：unit + */ + private String unit; + + /** + * 总金额；单位：元 + */ + private BigDecimal totalMoney; + + /** + * 备注 + */ + private String memo; + + /** + * 创建人 Id；sys_user.id + */ + @TableField(fill = FieldFill.INSERT) + private Long creatorId; + + /** + * 修改人 Id；sys_user.id + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Long modifierId; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; + + /** + * 修改时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private LocalDateTime modifyTime; + + /** + * 是否删除；0-->未删除、1-->已删除 + */ + @TableLogic + private Boolean deleted; + +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/entity/WarehouseCheckDetailEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/entity/WarehouseCheckDetailEntity.java new file mode 100644 index 0000000..52baa3f --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/entity/WarehouseCheckDetailEntity.java @@ -0,0 +1,117 @@ +package com.njzscloud.dispose.wh.pojo.entity; + +import com.baomidou.mybatisplus.annotation.*; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; + +/** + * 库存盘点明细 + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +@TableName("wh_warehouse_check_detail") +public class WarehouseCheckDetailEntity { + + /** + * 主键 + */ + @TableId(type = IdType.ASSIGN_ID) + private Long id; + + /** + * 盘点计划 Id；wh_warehouse_check_plan.id + */ + private Long checkPlanId; + + /** + * 产品分类 Id + */ + private Long goodsCategoryId; + + /** + * 分类名称 + */ + private String goodsCategoryName; + + /** + * 产品 Id + */ + private Long goodsId; + + /** + * 产品名称 + */ + private String goodsName; + + /** + * 商品编码 + */ + private String goodSn; + + /** + * 系统库存 + */ + private Integer systemQuantity; + + /** + * 实际库存 + */ + private Integer actualQuantity; + + /** + * 差异数量 + */ + private Integer differenceQuantity; + + /** + * 计量单位；字典代码：unit + */ + private String unit; + + /** + * 处理建议 + */ + private String suggestion; + + /** + * 盘点时间 + */ + private LocalDateTime checkTime; + + /** + * 创建人 Id；sys_user.id + */ + @TableField(fill = FieldFill.INSERT) + private Long creatorId; + + /** + * 修改人 Id；sys_user.id + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Long modifierId; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; + + /** + * 修改时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private LocalDateTime modifyTime; + + /** + * 是否删除；0-->未删除、1-->已删除 + */ + @TableLogic + private Boolean deleted; + +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/entity/WarehouseCheckPlanEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/entity/WarehouseCheckPlanEntity.java new file mode 100644 index 0000000..1d87074 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/entity/WarehouseCheckPlanEntity.java @@ -0,0 +1,87 @@ +package com.njzscloud.dispose.wh.pojo.entity; + +import com.baomidou.mybatisplus.annotation.*; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; + +/** + * 库存盘点计划 + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +@TableName("wh_warehouse_check_plan") +public class WarehouseCheckPlanEntity { + + /** + * Id + */ + @TableId(type = IdType.ASSIGN_ID) + private Long id; + + /** + * 编号 + */ + private String sn; + + /** + * 状态，DaiZhiXing-->待执行、ZhiXingZhong-->执行中、WanCheng-->完成、QuXiao-->取消 + */ + private String planStatus; + + /** + * 盘点仓库 Id + */ + private Long warehouseId; + + /** + * 计划完成时间 + */ + private LocalDateTime planCompleteTime; + + /** + * 实际完成时间 + */ + private LocalDateTime completeTime; + + /** + * 备注 + */ + private String memo; + + /** + * 创建人 Id；sys_user.id + */ + @TableField(fill = FieldFill.INSERT) + private Long creatorId; + + /** + * 修改人 Id；sys_user.id + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Long modifierId; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; + + /** + * 修改时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private LocalDateTime modifyTime; + + /** + * 是否删除；0-->未删除、1-->已删除 + */ + @TableLogic + private Boolean deleted; + +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/entity/WarehouseEntity.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/entity/WarehouseEntity.java new file mode 100644 index 0000000..dd7ac6d --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/entity/WarehouseEntity.java @@ -0,0 +1,67 @@ +package com.njzscloud.dispose.wh.pojo.entity; + +import com.baomidou.mybatisplus.annotation.*; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; + +/** + * 仓库信息 + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +@TableName("wh_warehouse") +public class WarehouseEntity { + + /** + * Id + */ + @TableId(type = IdType.ASSIGN_ID) + private Long id; + + /** + * 仓库名称 + */ + private String warehouseName; + + /** + * 位置 + */ + private String location; + + /** + * 创建人 Id；sys_user.id + */ + @TableField(fill = FieldFill.INSERT) + private Long creatorId; + + /** + * 修改人 Id；sys_user.id + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Long modifierId; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; + + /** + * 修改时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private LocalDateTime modifyTime; + + /** + * 是否删除；0-->未删除、1-->已删除 + */ + @TableLogic + private Boolean deleted; + +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/AddInOrderParam.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/AddInOrderParam.java new file mode 100644 index 0000000..2644932 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/AddInOrderParam.java @@ -0,0 +1,101 @@ +package com.njzscloud.dispose.wh.pojo.param; + +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; + +/** + * 入库单 + * + * @author ljw + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class AddInOrderParam { + + /** + * 编号 + */ + private String sn; + + /** + * 责任人 Id；sys_user.id + */ + private Long responsibleId; + + /** + * 仓库 Id；wh_warehouse.id + */ + private Long warehouseId; + + /** + * 存放位置 + */ + private String location; + + /** + * 入库时间 + */ + private LocalDateTime inTime; + + /** + * 单据类型，XiaoShou-->销售、CaiGou-->采购、QiTa-->其他 + */ + private String orderCategory; + + /** + * 采购单 Id；wh_purchase_order.id + */ + private Long orderId; + + /** + * 采购单单号；wh_purchase_order.sn + */ + private String orderSn; + + /** + * 产品分类 Id + */ + private Long goodsCategoryId; + + /** + * 分类名称 + */ + private String goodsCategoryName; + + /** + * 产品 Id + */ + private Long goodsId; + + /** + * 产品名称 + */ + private String goodsName; + + /** + * 商品编码 + */ + private String goodSn; + + /** + * 数量 + */ + private Integer quantity; + + /** + * 计量单位；字典代码：unit + */ + private String unit; + + /** + * 备注 + */ + private String memo; + +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/AddInventoryParam.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/AddInventoryParam.java new file mode 100644 index 0000000..ede7cef --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/AddInventoryParam.java @@ -0,0 +1,55 @@ +package com.njzscloud.dispose.wh.pojo.param; + +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +/** + * 库存信息 + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class AddInventoryParam { + /** + * 仓库 Id + */ + private Long warehouseId; + + /** + * 产品 Id + */ + private Long goodsId; + + /** + * 存放位置 + */ + private String location; + + /** + * 当前库存数量 + */ + private Integer stockQuantity; + + /** + * 锁定数量 + */ + private Integer lockQuantity; + + /** + * 总量 + */ + private Integer totalQuantity; + + /** + * 剩余量 + */ + private Integer remainingQuantity; + + /** + * 计量单位；字典代码：unit + */ + private String unit; +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/AddOutOrderParam.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/AddOutOrderParam.java new file mode 100644 index 0000000..db081b3 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/AddOutOrderParam.java @@ -0,0 +1,97 @@ +package com.njzscloud.dispose.wh.pojo.param; + +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; + +/** + * 出库单 + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class AddOutOrderParam { + /** + * 编号 + */ + private String sn; + + /** + * 责任人 Id；sys_user.id + */ + private Long responsibleId; + + /** + * 仓库 Id；wh_warehouse.id + */ + private Long warehouseId; + + /** + * 存放位置 + */ + private String location; + + /** + * 出库时间 + */ + private LocalDateTime outTime; + + /** + * 单据类型，XiaoShou-->销售、CaiGou-->采购、QiTa-->其他 + */ + private String orderCategory; + + /** + * 销售单 Id；wh_sales_order.id + */ + private Long orderId; + + /** + * 销售单号；wh_sales_order.sn + */ + private String orderSn; + + /** + * 产品分类 Id + */ + private Long goodsCategoryId; + + /** + * 分类名称 + */ + private String goodsCategoryName; + + /** + * 产品 Id + */ + private Long goodsId; + + /** + * 产品名称 + */ + private String goodsName; + + /** + * 商品编码 + */ + private String goodSn; + + /** + * 数量 + */ + private Integer quantity; + + /** + * 计量单位；字典代码：unit + */ + private String unit; + + /** + * 备注 + */ + private String memo; +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/AddSalesOrderParam.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/AddSalesOrderParam.java new file mode 100644 index 0000000..50053c9 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/AddSalesOrderParam.java @@ -0,0 +1,92 @@ +package com.njzscloud.dispose.wh.pojo.param; + +import com.njzscloud.dispose.wh.constant.SalesOrderStatus; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.math.BigDecimal; +import java.time.LocalDate; + +/** + * 销售单 + * @author ljw + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class AddSalesOrderParam { + + /** + * 编号 + */ + private String sn; + + /** + * 状态，JinXingZhong-->进行中、YiFaHuo-->已发货、YiChuKu-->已出库、YiQuXiao-->已取消 + */ + private SalesOrderStatus salesOrderStatus; + + /** + * 购买方客户 Id + */ + private Long customerId; + + /** + * 下单日期 + */ + private LocalDate orderDate; + + /** + * 发货日期 + */ + private LocalDate shipmentDate; + + /** + * 产品分类 Id + */ + private Long goodsCategoryId; + + /** + * 分类名称 + */ + private String goodsCategoryName; + + /** + * 产品 Id + */ + private Long goodsId; + + /** + * 产品名称 + */ + private String goodsName; + + /** + * 商品编码 + */ + private String goodSn; + + /** + * 数量 + */ + private Integer quantity; + + /** + * 计量单位；字典代码：unit + */ + private String unit; + + /** + * 总金额；单位：元 + */ + private BigDecimal totalMoney; + + /** + * 备注 + */ + private String memo; + +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/AddWarehouseCheckDetailParam.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/AddWarehouseCheckDetailParam.java new file mode 100644 index 0000000..a877a35 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/AddWarehouseCheckDetailParam.java @@ -0,0 +1,78 @@ +package com.njzscloud.dispose.wh.pojo.param; + +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; + +/** + * 库存盘点明细 + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class AddWarehouseCheckDetailParam { + /** + * 盘点计划 Id；wh_warehouse_check_plan.id + */ + private Long checkPlanId; + + /** + * 产品分类 Id + */ + private Long goodsCategoryId; + + /** + * 分类名称 + */ + private String goodsCategoryName; + + /** + * 产品 Id + */ + private Long goodsId; + + /** + * 产品名称 + */ + private String goodsName; + + /** + * 商品编码 + */ + private String goodSn; + + /** + * 系统库存 + */ + private Integer systemQuantity; + + /** + * 实际库存 + */ + private Integer actualQuantity; + + /** + * 差异数量 + */ + private Integer differenceQuantity; + + /** + * 计量单位；字典代码：unit + */ + private String unit; + + /** + * 处理建议 + */ + private String suggestion; + + /** + * 盘点时间 + */ + private LocalDateTime checkTime; + +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/AddWarehouseCheckPlanParam.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/AddWarehouseCheckPlanParam.java new file mode 100644 index 0000000..ecbfec5 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/AddWarehouseCheckPlanParam.java @@ -0,0 +1,48 @@ +package com.njzscloud.dispose.wh.pojo.param; + +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; + +/** + * 库存盘点计划 + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class AddWarehouseCheckPlanParam { + /** + * 编号 + */ + private String sn; + + /** + * 状态，DaiZhiXing-->待执行、ZhiXingZhong-->执行中、WanCheng-->完成、QuXiao-->取消 + */ + private String planStatus; + + /** + * 盘点仓库 Id + */ + private Long warehouseId; + + /** + * 计划完成时间 + */ + private LocalDateTime planCompleteTime; + + /** + * 实际完成时间 + */ + private LocalDateTime completeTime; + + /** + * 备注 + */ + private String memo; + +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/AddWarehouseParam.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/AddWarehouseParam.java new file mode 100644 index 0000000..ae6f9fe --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/AddWarehouseParam.java @@ -0,0 +1,28 @@ +package com.njzscloud.dispose.wh.pojo.param; + +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +/** + * 仓库信息 + * @author ljw + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class AddWarehouseParam { + + /** + * 仓库名称 + */ + private String warehouseName; + + /** + * 位置 + */ + private String location; + +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/SearchInOrderParam.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/SearchInOrderParam.java new file mode 100644 index 0000000..e294343 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/SearchInOrderParam.java @@ -0,0 +1,37 @@ +package com.njzscloud.dispose.wh.pojo.param; + +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +/** + * 入库单 + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class SearchInOrderParam { + /** + * 编号 + */ + private String sn; + + /** + * 仓库 Id；wh_warehouse.id + */ + private Long warehouseId; + + /** + * 产品 Id + */ + private Long goodsId; + + /** + * 单据类型，XiaoShou-->销售、CaiGou-->采购、QiTa-->其他 + */ + private String orderCategory; + + private String keywords; +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/SearchInventoryParam.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/SearchInventoryParam.java new file mode 100644 index 0000000..2470df8 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/SearchInventoryParam.java @@ -0,0 +1,44 @@ +package com.njzscloud.dispose.wh.pojo.param; + +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +/** + * 库存信息 + * + * @author ljw + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class SearchInventoryParam { + + /** + * 仓库 Id + */ + private Long warehouseId; + + /** + * 仓库名称 + */ + private String warehouseName; + + /** + * 产品 Id + */ + private Long goodsId; + + /** + * 产品名称 + */ + private String goodsName; + + /** + * 存放位置 + */ + private String location; + +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/SearchOutOrderParam.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/SearchOutOrderParam.java new file mode 100644 index 0000000..e67b5b6 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/SearchOutOrderParam.java @@ -0,0 +1,38 @@ +package com.njzscloud.dispose.wh.pojo.param; + +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +/** + * 出库单 + * @author ljw + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class SearchOutOrderParam { + /** + * 编号 + */ + private String sn; + + /** + * 仓库 Id；wh_warehouse.id + */ + private Long warehouseId; + + /** + * 产品 Id + */ + private Long goodsId; + + /** + * 单据类型，XiaoShou-->销售、CaiGou-->采购、QiTa-->其他 + */ + private String orderCategory; + + private String keywords; +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/SearchSalesOrderParam.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/SearchSalesOrderParam.java new file mode 100644 index 0000000..e11954a --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/SearchSalesOrderParam.java @@ -0,0 +1,28 @@ +package com.njzscloud.dispose.wh.pojo.param; + +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +/** + * 销售单 + * @author ljw + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class SearchSalesOrderParam { + + /** + * 状态，JinXingZhong-->进行中、YiFaHuo-->已发货、YiChuKu-->已出库、YiQuXiao-->已取消 + */ + private String salesOrderStatus; + + /** + * 编号 + */ + private String sn; + +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/SearchWarehouseCheckDetailParam.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/SearchWarehouseCheckDetailParam.java new file mode 100644 index 0000000..4b6892a --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/SearchWarehouseCheckDetailParam.java @@ -0,0 +1,27 @@ +package com.njzscloud.dispose.wh.pojo.param; + +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +/** + * 库存盘点明细 + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class SearchWarehouseCheckDetailParam { + + /** + * 关键字 + */ + private String keywords; + + /** + * 盘点计划 Id；wh_warehouse_check_plan.id + */ + private Long checkPlanId; + +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/SearchWarehouseCheckPlanParam.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/SearchWarehouseCheckPlanParam.java new file mode 100644 index 0000000..0f8f720 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/param/SearchWarehouseCheckPlanParam.java @@ -0,0 +1,32 @@ +package com.njzscloud.dispose.wh.pojo.param; + +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +/** + * 库存盘点计划 + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class SearchWarehouseCheckPlanParam { + + /** + * 关键字 + */ + private String keywords; + + /** + * 状态，DaiZhiXing-->待执行、ZhiXingZhong-->执行中、WanCheng-->完成、QuXiao-->取消 + */ + private String planStatus; + + /** + * 盘点仓库 Id + */ + private Long warehouseId; + +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/result/SearchInOrderResult.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/result/SearchInOrderResult.java new file mode 100644 index 0000000..0305e58 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/result/SearchInOrderResult.java @@ -0,0 +1,132 @@ +package com.njzscloud.dispose.wh.pojo.result; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; + +/** + * 入库单 + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class SearchInOrderResult { + + /** + * Id + */ + @TableId(type = IdType.ASSIGN_ID) + private Long id; + + /** + * 编号 + */ + private String sn; + + /** + * 责任人 Id；sys_user.id + */ + private Long responsibleId; + + /** + * 仓库 Id；wh_warehouse.id + */ + private Long warehouseId; + + /** + * 存放位置 + */ + private String location; + + /** + * 入库时间 + */ + private LocalDateTime inTime; + + /** + * 单据类型，XiaoShou-->销售、CaiGou-->采购、QiTa-->其他 + */ + private String orderCategory; + + /** + * 采购单 Id；wh_purchase_order.id + */ + private Long orderId; + + /** + * 采购单单号；wh_purchase_order.sn + */ + private String orderSn; + + /** + * 产品分类 Id + */ + private Long goodsCategoryId; + + /** + * 分类名称 + */ + private String goodsCategoryName; + + /** + * 产品 Id + */ + private Long goodsId; + + /** + * 产品名称 + */ + private String goodsName; + + /** + * 商品编码 + */ + private String goodSn; + + /** + * 数量 + */ + private Integer quantity; + + /** + * 计量单位；字典代码：unit + */ + private String unit; + + /** + * 备注 + */ + private String memo; + + /** + * 创建人 Id；sys_user.id + */ + private Long creatorId; + + /** + * 修改人 Id；sys_user.id + */ + private Long modifierId; + + /** + * 创建时间 + */ + private LocalDateTime createTime; + + /** + * 修改时间 + */ + private LocalDateTime modifyTime; + + /** + * 是否删除；0-->未删除、1-->已删除 + */ + private Boolean deleted; + +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/result/SearchInventoryResult.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/result/SearchInventoryResult.java new file mode 100644 index 0000000..c6cfd29 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/result/SearchInventoryResult.java @@ -0,0 +1,108 @@ +package com.njzscloud.dispose.wh.pojo.result; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; + +/** + * 库存信息 + * @author ljw + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class SearchInventoryResult { + + /** + * Id + */ + @TableId(type = IdType.ASSIGN_ID) + private Long id; + + /** + * 仓库 Id + */ + private Long warehouseId; + + /** + * 产品 Id + */ + private Long goodsId; + + /** + * 存放位置 + */ + private String location; + + /** + * 当前库存数量 + */ + private Integer stockQuantity; + + /** + * 锁定数量 + */ + private Integer lockQuantity; + + /** + * 总量 + */ + private Integer totalQuantity; + + /** + * 剩余量 + */ + private Integer remainingQuantity; + + /** + * 计量单位；字典代码：unit + */ + private String unit; + + /** + * 创建人 Id；sys_user.id + */ + private Long creatorId; + + /** + * 修改人 Id；sys_user.id + */ + private Long modifierId; + + /** + * 创建时间 + */ + private LocalDateTime createTime; + + /** + * 修改时间 + */ + private LocalDateTime modifyTime; + + /** + * 是否删除；0-->未删除、1-->已删除 + */ + private Boolean deleted; + + /** + * 仓库名称 + */ + private String warehouseName; + + /** + * 产品名称 + */ + private String goodsName; + + /** + * 仓库位置 + */ + private String warehouseLocation; + +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/result/SearchOutOrderResult.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/result/SearchOutOrderResult.java new file mode 100644 index 0000000..8d78e0c --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/result/SearchOutOrderResult.java @@ -0,0 +1,132 @@ +package com.njzscloud.dispose.wh.pojo.result; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; + +/** + * 出库单 + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class SearchOutOrderResult { + + /** + * Id + */ + @TableId(type = IdType.ASSIGN_ID) + private Long id; + + /** + * 编号 + */ + private String sn; + + /** + * 责任人 Id；sys_user.id + */ + private Long responsibleId; + + /** + * 仓库 Id；wh_warehouse.id + */ + private Long warehouseId; + + /** + * 存放位置 + */ + private String location; + + /** + * 出库时间 + */ + private LocalDateTime outTime; + + /** + * 单据类型，XiaoShou-->销售、CaiGou-->采购、QiTa-->其他 + */ + private String orderCategory; + + /** + * 销售单 Id；wh_sales_order.id + */ + private Long orderId; + + /** + * 销售单号；wh_sales_order.sn + */ + private String orderSn; + + /** + * 产品分类 Id + */ + private Long goodsCategoryId; + + /** + * 分类名称 + */ + private String goodsCategoryName; + + /** + * 产品 Id + */ + private Long goodsId; + + /** + * 产品名称 + */ + private String goodsName; + + /** + * 商品编码 + */ + private String goodSn; + + /** + * 数量 + */ + private Integer quantity; + + /** + * 计量单位；字典代码：unit + */ + private String unit; + + /** + * 备注 + */ + private String memo; + + /** + * 创建人 Id；sys_user.id + */ + private Long creatorId; + + /** + * 修改人 Id；sys_user.id + */ + private Long modifierId; + + /** + * 创建时间 + */ + private LocalDateTime createTime; + + /** + * 修改时间 + */ + private LocalDateTime modifyTime; + + /** + * 是否删除；0-->未删除、1-->已删除 + */ + private Boolean deleted; + +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/result/SearchWarehouseCheckDetailResult.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/result/SearchWarehouseCheckDetailResult.java new file mode 100644 index 0000000..8162090 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/result/SearchWarehouseCheckDetailResult.java @@ -0,0 +1,107 @@ +package com.njzscloud.dispose.wh.pojo.result; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; + +/** + * 库存盘点明细 + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class SearchWarehouseCheckDetailResult { + + /** + * 主键 + */ + @TableId(type = IdType.ASSIGN_ID) + private Long id; + + /** + * 盘点计划 Id；wh_warehouse_check_plan.id + */ + private Long checkPlanId; + + /** + * 产品分类 Id + */ + private Long goodsCategoryId; + + /** + * 分类名称 + */ + private String goodsCategoryName; + + /** + * 产品 Id + */ + private Long goodsId; + + /** + * 产品名称 + */ + private String goodsName; + + /** + * 商品编码 + */ + private String goodSn; + + /** + * 系统库存 + */ + private Integer systemQuantity; + + /** + * 实际库存 + */ + private Integer actualQuantity; + + /** + * 差异数量 + */ + private Integer differenceQuantity; + + /** + * 计量单位；字典代码：unit + */ + private String unit; + + /** + * 处理建议 + */ + private String suggestion; + + /** + * 盘点时间 + */ + private LocalDateTime checkTime; + + /** + * 创建人 Id；sys_user.id + */ + private Long creatorId; + + /** + * 修改人 Id；sys_user.id + */ + private Long modifierId; + + /** + * 创建时间 + */ + private LocalDateTime createTime; + + /** + * 修改时间 + */ + private LocalDateTime modifyTime; + +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/result/SearchWarehouseCheckPlanResult.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/result/SearchWarehouseCheckPlanResult.java new file mode 100644 index 0000000..8959107 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/pojo/result/SearchWarehouseCheckPlanResult.java @@ -0,0 +1,77 @@ +package com.njzscloud.dispose.wh.pojo.result; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.time.LocalDateTime; + +/** + * 库存盘点计划 + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class SearchWarehouseCheckPlanResult { + + /** + * Id + */ + @TableId(type = IdType.ASSIGN_ID) + private Long id; + + /** + * 编号 + */ + private String sn; + + /** + * 状态，DaiZhiXing-->待执行、ZhiXingZhong-->执行中、WanCheng-->完成、QuXiao-->取消 + */ + private String planStatus; + + /** + * 盘点仓库 Id + */ + private Long warehouseId; + + /** + * 计划完成时间 + */ + private LocalDateTime planCompleteTime; + + /** + * 实际完成时间 + */ + private LocalDateTime completeTime; + + /** + * 备注 + */ + private String memo; + + /** + * 创建人 Id；sys_user.id + */ + private Long creatorId; + + /** + * 修改人 Id；sys_user.id + */ + private Long modifierId; + + /** + * 创建时间 + */ + private LocalDateTime createTime; + + /** + * 修改时间 + */ + private LocalDateTime modifyTime; + +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/service/InOrderService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/service/InOrderService.java new file mode 100644 index 0000000..3afb0b5 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/service/InOrderService.java @@ -0,0 +1,85 @@ +package com.njzscloud.dispose.wh.service; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njzscloud.common.mp.support.PageParam; +import com.njzscloud.common.mp.support.PageResult; +import com.njzscloud.dispose.wh.mapper.InOrderMapper; +import com.njzscloud.dispose.wh.pojo.entity.InOrderEntity; +import com.njzscloud.dispose.wh.pojo.param.AddInOrderParam; +import com.njzscloud.dispose.wh.pojo.param.SearchInOrderParam; +import com.njzscloud.dispose.wh.pojo.result.SearchInOrderResult; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 入库单 + * @author ljw + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class InOrderService extends ServiceImpl { + + /** + * 新增 + */ + @Transactional(rollbackFor = Exception.class) + public void add(AddInOrderParam addInOrderParam) { + InOrderEntity entity = BeanUtil.copyProperties(addInOrderParam, InOrderEntity.class); + this.save(entity); + } + + /** + * 修改 + */ + public void modify(InOrderEntity inOrderEntity) { + this.updateById(inOrderEntity); + } + + /** + * 删除 + */ + @Transactional(rollbackFor = Exception.class) + public void del(List ids) { + this.removeBatchByIds(ids); + } + + /** + * 详情 + */ + public SearchInOrderResult detail(Long id) { + return baseMapper.detail(id); + } + + /** + * 分页查询 + */ + public PageResult paging(PageParam pageParam, SearchInOrderParam searchInOrderParam) { + String sn = searchInOrderParam.getSn(); + Long warehouseId = searchInOrderParam.getWarehouseId(); + Long goodsId = searchInOrderParam.getGoodsId(); + String orderCategory = searchInOrderParam.getOrderCategory(); + String keywords = searchInOrderParam.getKeywords(); + return PageResult.of(baseMapper.paging(pageParam.toPage(), Wrappers.query() + .eq("a.deleted", 0) + .eq(StrUtil.isNotBlank(sn), "a.sn", sn) + .eq(warehouseId != null, "a.warehouse_id", warehouseId) + .eq(goodsId != null, "a.goods_id", goodsId) + .eq(StrUtil.isNotBlank(orderCategory), "a.order_category", orderCategory) + .and(StrUtil.isNotBlank(keywords), it -> it + .like("a.location", keywords) + .or().like("a.order_sn", keywords) + .or().like("a.goods_name", keywords) + .or().like("a.good_sn", keywords) + .or().like("a.memo", keywords) + ) + )); + } +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/service/InventoryService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/service/InventoryService.java new file mode 100644 index 0000000..9340434 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/service/InventoryService.java @@ -0,0 +1,77 @@ +package com.njzscloud.dispose.wh.service; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njzscloud.common.mp.support.PageParam; +import com.njzscloud.common.mp.support.PageResult; +import com.njzscloud.dispose.wh.mapper.InventoryMapper; +import com.njzscloud.dispose.wh.pojo.entity.InventoryEntity; +import com.njzscloud.dispose.wh.pojo.param.AddInventoryParam; +import com.njzscloud.dispose.wh.pojo.param.SearchInventoryParam; +import com.njzscloud.dispose.wh.pojo.result.SearchInventoryResult; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 库存信息 + * + * @author ljw + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class InventoryService extends ServiceImpl { + + /** + * 新增 + */ + @Transactional(rollbackFor = Exception.class) + public void add(AddInventoryParam addInventoryParam) { + InventoryEntity entity = BeanUtil.copyProperties(addInventoryParam, InventoryEntity.class); + this.save(entity); + } + + /** + * 修改 + */ + public void modify(InventoryEntity inventoryEntity) { + this.updateById(inventoryEntity); + } + + /** + * 删除 + */ + @Transactional(rollbackFor = Exception.class) + public void del(List ids) { + this.removeBatchByIds(ids); + } + + /** + * 详情 + */ + public SearchInventoryResult detail(Long id) { + return baseMapper.detail(id); + } + + /** + * 分页查询 + */ + public PageResult paging(PageParam pageParam, SearchInventoryParam param) { + Long warehouseId = param.getWarehouseId(); + Long goodsId = param.getGoodsId(); + return PageResult.of(baseMapper.paging(pageParam.toPage(), Wrappers.query() + .eq("wi.deleted", 0) + .eq(warehouseId != null, "wi.warehouse_id", warehouseId) + .like(StrUtil.isNotBlank(param.getWarehouseName()), "ww.warehouse_name", param.getWarehouseName()) + .eq(goodsId != null, "wi.goods_id", goodsId) + .like(StrUtil.isNotBlank(param.getGoodsName()), "gg.goods_name", param.getGoodsName()) + .like(StrUtil.isNotBlank(param.getLocation()), "wi.location", param.getLocation()) + )); + } +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/service/OutOrderService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/service/OutOrderService.java new file mode 100644 index 0000000..29a51a3 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/service/OutOrderService.java @@ -0,0 +1,87 @@ +package com.njzscloud.dispose.wh.service; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njzscloud.common.mp.support.PageParam; +import com.njzscloud.common.mp.support.PageResult; +import com.njzscloud.dispose.wh.mapper.OutOrderMapper; +import com.njzscloud.dispose.wh.pojo.entity.OutOrderEntity; +import com.njzscloud.dispose.wh.pojo.param.AddOutOrderParam; +import com.njzscloud.dispose.wh.pojo.param.SearchOutOrderParam; +import com.njzscloud.dispose.wh.pojo.result.SearchOutOrderResult; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 出库单 + * + * @author ljw + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class OutOrderService extends ServiceImpl { + + /** + * 新增 + */ + @Transactional(rollbackFor = Exception.class) + public void add(AddOutOrderParam addOutOrderParam) { + OutOrderEntity entity = BeanUtil.copyProperties(addOutOrderParam, OutOrderEntity.class); + this.save(entity); + } + + /** + * 修改 + */ + public void modify(OutOrderEntity outOrderEntity) { + this.updateById(outOrderEntity); + } + + /** + * 删除 + */ + @Transactional(rollbackFor = Exception.class) + public void del(List ids) { + this.removeBatchByIds(ids); + } + + /** + * 详情 + */ + public SearchOutOrderResult detail(Long id) { + return baseMapper.detail(id); + } + + /** + * 分页查询 + */ + public PageResult paging(PageParam pageParam, SearchOutOrderParam searchOutOrderParam) { + String sn = searchOutOrderParam.getSn(); + Long warehouseId = searchOutOrderParam.getWarehouseId(); + Long goodsId = searchOutOrderParam.getGoodsId(); + String orderCategory = searchOutOrderParam.getOrderCategory(); + String keywords = searchOutOrderParam.getKeywords(); + return PageResult.of(baseMapper.paging(pageParam.toPage(), Wrappers.query() + .eq("a.deleted", 0) + .eq(StrUtil.isNotBlank(sn), "a.sn", sn) + .eq(warehouseId != null, "a.warehouse_id", warehouseId) + .eq(goodsId != null, "a.goods_id", goodsId) + .eq(StrUtil.isNotBlank(orderCategory), "a.order_category", orderCategory) + .and(StrUtil.isNotBlank(keywords), it -> it + .like("a.location", keywords) + .or().like("a.order_sn", keywords) + .or().like("a.goods_name", keywords) + .or().like("a.good_sn", keywords) + .or().like("a.memo", keywords) + ) + )); + } + +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/service/PurchaseOrderService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/service/PurchaseOrderService.java new file mode 100644 index 0000000..88105a6 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/service/PurchaseOrderService.java @@ -0,0 +1,103 @@ +package com.njzscloud.dispose.wh.service; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njzscloud.common.mp.support.PageParam; +import com.njzscloud.common.mp.support.PageResult; +import com.njzscloud.common.sn.support.SnUtil; +import com.njzscloud.dispose.cst.order.mapper.OrderTransMapper; +import com.njzscloud.dispose.cst.order.pojo.result.OrderTransResult; +import com.njzscloud.dispose.wh.constant.PurchaseOrderStatus; +import com.njzscloud.dispose.wh.mapper.PurchaseOrderMapper; +import com.njzscloud.dispose.wh.pojo.entity.PurchaseOrderEntity; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDate; +import java.util.List; + +/** + * 采购单 + * + * @author ljw + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class PurchaseOrderService extends ServiceImpl { + + private final OrderTransMapper orderTransMapper; + + /** + * 新增 + */ + @Transactional(rollbackFor = Exception.class) + public void add(PurchaseOrderEntity orderEntity) { + orderEntity.setSn(this.generateSn()); + this.save(orderEntity); + } + + @Transactional(rollbackFor = Exception.class) + public void add(Long transOrderId) { + OrderTransResult orderTrans = orderTransMapper.getById(transOrderId); + this.add(BeanUtil.copyProperties(orderTrans, PurchaseOrderEntity.class) + .setSn(this.generateSn()) + .setPurchaseOrderStatus(PurchaseOrderStatus.YiDaoHuo) + .setPurchaseDate(orderTrans.getOrderTime().toLocalDate()) + .setArrivalDate(LocalDate.now()) + .setQuantity(orderTrans.getEstimatedQuantity()) + .setTotalMoney(orderTrans.getSettleMoney()) + .setMemo("")); + } + + /** + * 修改 + */ + public void modify(PurchaseOrderEntity purchaseOrderEntity) { + this.updateById(purchaseOrderEntity); + } + + /** + * 删除 + */ + @Transactional(rollbackFor = Exception.class) + public void del(List ids) { + this.removeBatchByIds(ids); + } + + /** + * 详情 + */ + public PurchaseOrderEntity detail(Long id) { + return this.getById(id); + } + + /** + * 分页查询 + */ + public PageResult paging(PageParam pageParam, PurchaseOrderEntity entity) { + return PageResult.of(this.page(pageParam.toPage(), Wrappers.query(entity) + .eq("deleted", Boolean.FALSE) + .like(StrUtil.isNotBlank(entity.getSn()), "sn", entity.getSn()) + .eq(entity.getPurchaseOrderStatus() != null, "purchase_order_status", entity.getPurchaseOrderStatus()))); + } + + /** + * 生成订单号 + * + * @return sn 订单号 + */ + public String generateSn() { + String sn = SnUtil.next("Purchase-SN"); + if (this.exists(Wrappers.lambdaQuery().eq(PurchaseOrderEntity::getSn, sn) + .eq(PurchaseOrderEntity::getDeleted, Boolean.FALSE))) { + this.generateSn(); + } + return sn; + } + +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/service/SalesOrderService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/service/SalesOrderService.java new file mode 100644 index 0000000..663bf64 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/service/SalesOrderService.java @@ -0,0 +1,105 @@ +package com.njzscloud.dispose.wh.service; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njzscloud.common.mp.support.PageParam; +import com.njzscloud.common.mp.support.PageResult; +import com.njzscloud.common.sn.support.SnUtil; +import com.njzscloud.dispose.cst.order.mapper.OrderTransMapper; +import com.njzscloud.dispose.cst.order.pojo.result.OrderTransResult; +import com.njzscloud.dispose.wh.constant.SalesOrderStatus; +import com.njzscloud.dispose.wh.mapper.SalesOrderMapper; +import com.njzscloud.dispose.wh.pojo.entity.SalesOrderEntity; +import com.njzscloud.dispose.wh.pojo.param.AddSalesOrderParam; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDate; +import java.util.List; + +/** + * 销售单 + * + * @author ljw + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class SalesOrderService extends ServiceImpl { + + private final OrderTransMapper orderTransMapper; + + /** + * 新增 + */ + @Transactional(rollbackFor = Exception.class) + public void add(AddSalesOrderParam param) { + SalesOrderEntity entity = BeanUtil.copyProperties(param, SalesOrderEntity.class); + entity.setSn(this.generateSn()); + this.save(entity); + } + + @Transactional(rollbackFor = Exception.class) + public void add(Long transOrderId) { + OrderTransResult orderTrans = orderTransMapper.getById(transOrderId); + this.add(BeanUtil.copyProperties(orderTrans, AddSalesOrderParam.class) + .setSn(this.generateSn()) + .setSalesOrderStatus(SalesOrderStatus.YiFaHuo) + .setOrderDate(orderTrans.getOrderTime().toLocalDate()) + .setShipmentDate(LocalDate.now()) + .setQuantity(orderTrans.getEstimatedQuantity()) + .setTotalMoney(orderTrans.getSettleMoney()) + .setMemo("")); + } + + /** + * 修改 + */ + public void modify(SalesOrderEntity salesOrderEntity) { + this.updateById(salesOrderEntity); + } + + /** + * 删除 + */ + @Transactional(rollbackFor = Exception.class) + public void del(List ids) { + this.removeBatchByIds(ids); + } + + /** + * 详情 + */ + public SalesOrderEntity detail(Long id) { + return this.getById(id); + } + + /** + * 分页查询 + */ + public PageResult paging(PageParam pageParam, SalesOrderEntity entity) { + return PageResult.of(this.page(pageParam.toPage(), Wrappers.query(entity) + .eq("deleted", Boolean.FALSE) + .like(StrUtil.isNotBlank(entity.getSn()), "sn", entity.getSn()) + .eq(entity.getSalesOrderStatus() != null, "purchase_order_status", entity.getSalesOrderStatus()))); + } + + /** + * 生成订单号 + * + * @return sn 订单号 + */ + public String generateSn() { + String sn = SnUtil.next("Sales-SN"); + if (this.exists(Wrappers.lambdaQuery().eq(SalesOrderEntity::getSn, sn) + .eq(SalesOrderEntity::getDeleted, Boolean.FALSE))) { + this.generateSn(); + } + return sn; + } + +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/service/WarehouseCheckDetailService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/service/WarehouseCheckDetailService.java new file mode 100644 index 0000000..7634df6 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/service/WarehouseCheckDetailService.java @@ -0,0 +1,78 @@ +package com.njzscloud.dispose.wh.service; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njzscloud.common.mp.support.PageParam; +import com.njzscloud.common.mp.support.PageResult; +import com.njzscloud.dispose.wh.mapper.WarehouseCheckDetailMapper; +import com.njzscloud.dispose.wh.pojo.entity.WarehouseCheckDetailEntity; +import com.njzscloud.dispose.wh.pojo.param.AddWarehouseCheckDetailParam; +import com.njzscloud.dispose.wh.pojo.param.SearchWarehouseCheckDetailParam; +import com.njzscloud.dispose.wh.pojo.result.SearchWarehouseCheckDetailResult; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 库存盘点明细 + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class WarehouseCheckDetailService extends ServiceImpl { + + /** + * 新增 + */ + @Transactional(rollbackFor = Exception.class) + public void add(AddWarehouseCheckDetailParam addWarehouseCheckDetailParam) { + WarehouseCheckDetailEntity entity = BeanUtil + .copyProperties(addWarehouseCheckDetailParam, WarehouseCheckDetailEntity.class); + this.save(entity); + } + + /** + * 修改 + */ + public void modify(WarehouseCheckDetailEntity warehouseCheckDetailEntity) { + this.updateById(warehouseCheckDetailEntity); + } + + /** + * 删除 + */ + @Transactional(rollbackFor = Exception.class) + public void del(List ids) { + this.removeBatchByIds(ids); + } + + /** + * 详情 + */ + public SearchWarehouseCheckDetailResult detail(Long id) { + return baseMapper.detail(id); + } + + /** + * 分页查询 + */ + public PageResult paging(PageParam pageParam, SearchWarehouseCheckDetailParam searchWarehouseCheckDetailParam) { + String keywords = searchWarehouseCheckDetailParam.getKeywords(); + Long checkPlanId = searchWarehouseCheckDetailParam.getCheckPlanId(); + return PageResult.of(baseMapper.paging(pageParam.toPage(), Wrappers.query() + .eq("deleted", 0) + .and(StrUtil.isNotBlank(keywords), it -> it + .like("goods_name", keywords) + .or().like("good_sn", keywords) + .or().like("goods_category_name", keywords) + ) + .eq(checkPlanId != null, "check_plan_id", checkPlanId) + )); + } + +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/service/WarehouseCheckPlanService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/service/WarehouseCheckPlanService.java new file mode 100644 index 0000000..c82f348 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/service/WarehouseCheckPlanService.java @@ -0,0 +1,79 @@ +package com.njzscloud.dispose.wh.service; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njzscloud.common.mp.support.PageParam; +import com.njzscloud.common.mp.support.PageResult; +import com.njzscloud.dispose.wh.mapper.WarehouseCheckPlanMapper; +import com.njzscloud.dispose.wh.pojo.entity.WarehouseCheckPlanEntity; +import com.njzscloud.dispose.wh.pojo.param.AddWarehouseCheckPlanParam; +import com.njzscloud.dispose.wh.pojo.param.SearchWarehouseCheckPlanParam; +import com.njzscloud.dispose.wh.pojo.result.SearchWarehouseCheckPlanResult; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 库存盘点计划 + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class WarehouseCheckPlanService extends ServiceImpl { + + /** + * 新增 + */ + @Transactional(rollbackFor = Exception.class) + public void add(AddWarehouseCheckPlanParam addWarehouseCheckPlanParam) { + WarehouseCheckPlanEntity entity = BeanUtil + .copyProperties(addWarehouseCheckPlanParam, WarehouseCheckPlanEntity.class); + this.save(entity); + } + + /** + * 修改 + */ + public void modify(WarehouseCheckPlanEntity warehouseCheckPlanEntity) { + this.updateById(warehouseCheckPlanEntity); + } + + /** + * 删除 + */ + @Transactional(rollbackFor = Exception.class) + public void del(List ids) { + this.removeBatchByIds(ids); + } + + /** + * 详情 + */ + public SearchWarehouseCheckPlanResult detail(Long id) { + return baseMapper.detail(id); + } + + /** + * 分页查询 + */ + public PageResult paging(PageParam pageParam, SearchWarehouseCheckPlanParam searchWarehouseCheckPlanParam) { + String keywords = searchWarehouseCheckPlanParam.getKeywords(); + String planStatus = searchWarehouseCheckPlanParam.getPlanStatus(); + Long warehouseId = searchWarehouseCheckPlanParam.getWarehouseId(); + return PageResult.of(baseMapper.paging(pageParam.toPage(), Wrappers.query() + .eq("deleted", 0) + .and(StrUtil.isNotBlank(keywords), it -> it + .like("sn", keywords) + .or().like("memo", keywords) + ) + .eq(planStatus != null, "plan_status", planStatus) + .eq(warehouseId != null, "warehouse_id", warehouseId) + )); + } + +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/service/WarehouseService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/service/WarehouseService.java new file mode 100644 index 0000000..8460a7e --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/wh/service/WarehouseService.java @@ -0,0 +1,70 @@ +package com.njzscloud.dispose.wh.service; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njzscloud.common.mp.support.PageParam; +import com.njzscloud.common.mp.support.PageResult; +import com.njzscloud.dispose.wh.mapper.WarehouseMapper; +import com.njzscloud.dispose.wh.pojo.entity.WarehouseEntity; +import com.njzscloud.dispose.wh.pojo.param.AddWarehouseParam; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 仓库信息 + * + * @author ljw + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class WarehouseService extends ServiceImpl { + + /** + * 新增 + */ + @Transactional(rollbackFor = Exception.class) + public void add(AddWarehouseParam addWarehouseParam) { + WarehouseEntity entity = BeanUtil.copyProperties(addWarehouseParam, WarehouseEntity.class); + this.save(entity); + } + + /** + * 修改 + */ + public void modify(WarehouseEntity warehouseEntity) { + this.updateById(warehouseEntity); + } + + /** + * 删除 + */ + @Transactional(rollbackFor = Exception.class) + public void del(List ids) { + this.removeBatchByIds(ids); + } + + /** + * 详情 + */ + public WarehouseEntity detail(Long id) { + return this.getById(id); + } + + /** + * 分页查询 + */ + public PageResult paging(PageParam pageParam, WarehouseEntity warehouseEntity) { + String warehouseName = warehouseEntity.getWarehouseName(); + return PageResult.of(this.page(pageParam.toPage(), Wrappers.query(warehouseEntity) + .eq("deleted", Boolean.FALSE) + .like(StrUtil.isNotBlank(warehouseName), "warehouse_name", warehouseName))); + } + +} diff --git a/njzscloud-svr/src/main/resources/mapper/cst/order/OrderMapper.xml b/njzscloud-svr/src/main/resources/mapper/cst/order/OrderMapper.xml deleted file mode 100644 index 085f7af..0000000 --- a/njzscloud-svr/src/main/resources/mapper/cst/order/OrderMapper.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - id, sn, project_id, user_id, customer_id, contacts, phone, order_time, - order_category, order_status, finish_time, trans_org_id, trans_customer_id, - assignment_trans_time, station_id, station_name, trans_distance, - estimated_quantity, estimated_train_num, goods_id, goods_name, unit, - customer_memo, creator_id, modifier_id, create_time, modify_time, deleted - - - - - - - - - diff --git a/njzscloud-svr/src/main/resources/mapper/cst/order/OrderTransMapper.xml b/njzscloud-svr/src/main/resources/mapper/cst/order/OrderTransMapper.xml index 2d819d4..e77cbea 100644 --- a/njzscloud-svr/src/main/resources/mapper/cst/order/OrderTransMapper.xml +++ b/njzscloud-svr/src/main/resources/mapper/cst/order/OrderTransMapper.xml @@ -49,6 +49,14 @@ + + + + + + + + @@ -97,14 +105,25 @@ co.trans_org_id AS trans_org_id, co.trans_customer_id AS trans_customer_id, co.assignment_trans_time AS assignment_trans_time, - co.order_status + co.order_status, + co.customer_id, + co.order_time, + co.goods_id, + co.goods_name, + co.estimated_quantity, + co.unit, + gg.goods_category_id, + gg.sn AS goods_sn, + ggc.category_name AS goods_category_name @@ -112,7 +131,9 @@ SELECT FROM cst_order_trans cot - left join cst_order co on co.id = cot.order_id + LEFT JOIN cst_order co on co.id = cot.order_id + LEFT JOIN gds_goods gg on gg.id = co.goods_id + LEFT JOIN gds_goods_category ggc on ggc.id = gg.goods_category_id ${ew.customSqlSegment} diff --git a/njzscloud-svr/src/main/resources/mapper/wh/InOrderMapper.xml b/njzscloud-svr/src/main/resources/mapper/wh/InOrderMapper.xml new file mode 100644 index 0000000..fbd9558 --- /dev/null +++ b/njzscloud-svr/src/main/resources/mapper/wh/InOrderMapper.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + wio.id AS id, + wio.sn AS sn, + wio.responsible_id AS responsible_id, + wio.warehouse_id AS warehouse_id, + wio.location AS location, + wio.in_time AS in_time, + wio.order_category AS order_category, + wio.order_id AS order_id, + wio.order_sn AS order_sn, + wio.goods_category_id AS goods_category_id, + wio.goods_category_name AS goods_category_name, + wio.goods_id AS goods_id, + wio.goods_name AS goods_name, + wio.good_sn AS good_sn, + wio.quantity AS quantity, + wio.unit AS unit, + wio.memo AS memo, + wio.creator_id AS creator_id, + wio.modifier_id AS modifier_id, + wio.create_time AS create_time, + wio.modify_time AS modify_time, + wio.deleted AS deleted + + + + + + diff --git a/njzscloud-svr/src/main/resources/mapper/wh/InventoryMapper.xml b/njzscloud-svr/src/main/resources/mapper/wh/InventoryMapper.xml new file mode 100644 index 0000000..0b11043 --- /dev/null +++ b/njzscloud-svr/src/main/resources/mapper/wh/InventoryMapper.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + wi.id AS id, + wi.warehouse_id AS warehouse_id, + wi.goods_id AS goods_id, + wi.location AS location, + wi.stock_quantity AS stock_quantity, + wi.lock_quantity AS lock_quantity, + wi.total_quantity AS total_quantity, + wi.remaining_quantity AS remaining_quantity, + wi.unit AS unit, + wi.creator_id AS creator_id, + wi.modifier_id AS modifier_id, + wi.create_time AS create_time, + wi.modify_time AS modify_time, + wi.deleted AS deleted, + ww.warehouse_name, + ww.location AS warehouse_location, + gg.goods_name + + + + + + diff --git a/njzscloud-svr/src/main/resources/mapper/wh/OutOrderMapper.xml b/njzscloud-svr/src/main/resources/mapper/wh/OutOrderMapper.xml new file mode 100644 index 0000000..f05e3c3 --- /dev/null +++ b/njzscloud-svr/src/main/resources/mapper/wh/OutOrderMapper.xml @@ -0,0 +1,47 @@ + + + + + + SELECT id, + sn, + responsible_id, + warehouse_id, + location, + out_time, + order_category, + order_id, + order_sn, + goods_category_id, + goods_category_name, + goods_id, + goods_name, + good_sn, + quantity, + unit, + memo, + creator_id, + modifier_id, + create_time, + modify_time + FROM wh_out_order + + + + + + + + + diff --git a/njzscloud-svr/src/main/resources/mapper/wh/WarehouseCheckDetailMapper.xml b/njzscloud-svr/src/main/resources/mapper/wh/WarehouseCheckDetailMapper.xml new file mode 100644 index 0000000..d4f1ce7 --- /dev/null +++ b/njzscloud-svr/src/main/resources/mapper/wh/WarehouseCheckDetailMapper.xml @@ -0,0 +1,43 @@ + + + + + + SELECT id, + check_plan_id, + goods_category_id, + goods_category_name, + goods_id, + goods_name, + good_sn, + system_quantity, + actual_quantity, + difference_quantity, + unit, + suggestion, + check_time, + creator_id, + modifier_id, + create_time, + modify_time + FROM wh_warehouse_check_detail + + + + + + + + + diff --git a/njzscloud-svr/src/main/resources/mapper/wh/WarehouseCheckPlanMapper.xml b/njzscloud-svr/src/main/resources/mapper/wh/WarehouseCheckPlanMapper.xml new file mode 100644 index 0000000..1c427ab --- /dev/null +++ b/njzscloud-svr/src/main/resources/mapper/wh/WarehouseCheckPlanMapper.xml @@ -0,0 +1,37 @@ + + + + + + SELECT id, + sn, + plan_status, + warehouse_id, + plan_complete_time, + complete_time, + memo, + creator_id, + modifier_id, + create_time, + modify_time + FROM wh_warehouse_check_plan + + + + + + + + +