DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

Browse Source
This commit is contained in:
Joshi
2025-07-18 13:59:53 +08:00
parent b4eca3a3f8 1ef306f163
commit 51ad700169
15 changed files with 158 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
klp-wms/src/main/java/com/klp/controller/WmsOrderDetailController.java
View File

@@ -37,6 +37,14 @@ public class WmsOrderDetailController extends BaseController {
private final IWmsOrderDetailService iWmsOrderDetailService;
/**
* 根据订单ID查询订单明细列表
*/
@GetMapping("/listByOrderId/{orderId}")
public R<List<WmsOrderDetailVo>> listByOrderId(@PathVariable Long orderId) {
List<WmsOrderDetailVo> list = iWmsOrderDetailService.queryListByOrderId(orderId);
return R.ok(list);
}
/**
* 查询订单明细列表
*/

3
klp-wms/src/main/java/com/klp/controller/WmsRawMaterialController.java
View File

@@ -69,7 +69,6 @@ public class WmsRawMaterialController extends BaseController {
/**
* 新增原材料
*/
@SaCheckPermission("klp:rawMaterial:add")
@Log(title = "原材料", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@@ -80,7 +79,6 @@ public class WmsRawMaterialController extends BaseController {
/**
* 修改原材料
*/
@SaCheckPermission("klp:rawMaterial:edit")
@Log(title = "原材料", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
@@ -93,7 +91,6 @@ public class WmsRawMaterialController extends BaseController {
*
* @param rawMaterialIds 主键串
*/
@SaCheckPermission("klp:rawMaterial:remove")
@Log(title = "原材料", businessType = BusinessType.DELETE)
@DeleteMapping("/{rawMaterialIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")

6
klp-wms/src/main/java/com/klp/controller/WmsSchedulePlanController.java
View File

@@ -40,7 +40,6 @@ public class WmsSchedulePlanController extends BaseController {
/**
* 查询排产计划列表
*/
@SaCheckPermission("klp:schedulePlan:list")
@GetMapping("/list")
public TableDataInfo<WmsSchedulePlanVo> list(WmsSchedulePlanBo bo, PageQuery pageQuery) {
return iWmsSchedulePlanService.queryPageList(bo, pageQuery);
@@ -49,7 +48,6 @@ public class WmsSchedulePlanController extends BaseController {
/**
* 导出排产计划列表
*/
@SaCheckPermission("klp:schedulePlan:export")
@Log(title = "排产计划", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(WmsSchedulePlanBo bo, HttpServletResponse response) {
@@ -62,7 +60,6 @@ public class WmsSchedulePlanController extends BaseController {
*
* @param planId 主键
*/
@SaCheckPermission("klp:schedulePlan:query")
@GetMapping("/{planId}")
public R<WmsSchedulePlanVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long planId) {
@@ -72,7 +69,6 @@ public class WmsSchedulePlanController extends BaseController {
/**
* 新增排产计划
*/
@SaCheckPermission("klp:schedulePlan:add")
@Log(title = "排产计划", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@@ -83,7 +79,6 @@ public class WmsSchedulePlanController extends BaseController {
/**
* 修改排产计划
*/
@SaCheckPermission("klp:schedulePlan:edit")
@Log(title = "排产计划", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
@@ -96,7 +91,6 @@ public class WmsSchedulePlanController extends BaseController {
*
* @param planIds 主键串
*/
@SaCheckPermission("klp:schedulePlan:remove")
@Log(title = "排产计划", businessType = BusinessType.DELETE)
@DeleteMapping("/{planIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")

6
klp-wms/src/main/java/com/klp/controller/WmsSchedulePlanDetailController.java
View File

@@ -40,7 +40,6 @@ public class WmsSchedulePlanDetailController extends BaseController {
/**
* 查询排产计划明细列表
*/
@SaCheckPermission("klp:schedulePlanDetail:list")
@GetMapping("/list")
public TableDataInfo<WmsSchedulePlanDetailVo> list(WmsSchedulePlanDetailBo bo, PageQuery pageQuery) {
return iWmsSchedulePlanDetailService.queryPageList(bo, pageQuery);
@@ -49,7 +48,6 @@ public class WmsSchedulePlanDetailController extends BaseController {
/**
* 导出排产计划明细列表
*/
@SaCheckPermission("klp:schedulePlanDetail:export")
@Log(title = "排产计划明细", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(WmsSchedulePlanDetailBo bo, HttpServletResponse response) {
@@ -62,7 +60,6 @@ public class WmsSchedulePlanDetailController extends BaseController {
*
* @param detailId 主键
*/
@SaCheckPermission("klp:schedulePlanDetail:query")
@GetMapping("/{detailId}")
public R<WmsSchedulePlanDetailVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long detailId) {
@@ -72,7 +69,6 @@ public class WmsSchedulePlanDetailController extends BaseController {
/**
* 新增排产计划明细
*/
@SaCheckPermission("klp:schedulePlanDetail:add")
@Log(title = "排产计划明细", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@@ -83,7 +79,6 @@ public class WmsSchedulePlanDetailController extends BaseController {
/**
* 修改排产计划明细
*/
@SaCheckPermission("klp:schedulePlanDetail:edit")
@Log(title = "排产计划明细", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
@@ -96,7 +91,6 @@ public class WmsSchedulePlanDetailController extends BaseController {
*
* @param detailIds 主键串
*/
@SaCheckPermission("klp:schedulePlanDetail:remove")
@Log(title = "排产计划明细", businessType = BusinessType.DELETE)
@DeleteMapping("/{detailIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")

6
klp-wms/src/main/java/com/klp/controller/WmsStockController.java
View File

@@ -40,7 +40,6 @@ public class WmsStockController extends BaseController {
/**
* 查询库存：原材料/产品与库区/库位的存放关系列表
*/
@SaCheckPermission("klp:stock:list")
@GetMapping("/list")
public TableDataInfo<WmsStockVo> list(WmsStockBo bo, PageQuery pageQuery) {
return iWmsStockService.queryPageList(bo, pageQuery);
@@ -49,7 +48,6 @@ public class WmsStockController extends BaseController {
/**
* 导出库存：原材料/产品与库区/库位的存放关系列表
*/
@SaCheckPermission("klp:stock:export")
@Log(title = "库存：原材料/产品与库区/库位的存放关系", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(WmsStockBo bo, HttpServletResponse response) {
@@ -62,7 +60,6 @@ public class WmsStockController extends BaseController {
*
* @param stockId 主键
*/
@SaCheckPermission("klp:stock:query")
@GetMapping("/{stockId}")
public R<WmsStockVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long stockId) {
@@ -72,7 +69,6 @@ public class WmsStockController extends BaseController {
/**
* 新增库存：原材料/产品与库区/库位的存放关系
*/
@SaCheckPermission("klp:stock:add")
@Log(title = "库存：原材料/产品与库区/库位的存放关系", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@@ -83,7 +79,6 @@ public class WmsStockController extends BaseController {
/**
* 修改库存：原材料/产品与库区/库位的存放关系
*/
@SaCheckPermission("klp:stock:edit")
@Log(title = "库存：原材料/产品与库区/库位的存放关系", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
@@ -96,7 +91,6 @@ public class WmsStockController extends BaseController {
*
* @param stockIds 主键串
*/
@SaCheckPermission("klp:stock:remove")
@Log(title = "库存：原材料/产品与库区/库位的存放关系", businessType = BusinessType.DELETE)
@DeleteMapping("/{stockIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")

7
klp-wms/src/main/java/com/klp/controller/WmsStockIoController.java
View File

@@ -40,7 +40,6 @@ public class WmsStockIoController extends BaseController {
/**
* 查询出入库单主列表
*/
@SaCheckPermission("klp:stockIo:list")
@GetMapping("/list")
public TableDataInfo<WmsStockIoVo> list(WmsStockIoBo bo, PageQuery pageQuery) {
return iWmsStockIoService.queryPageList(bo, pageQuery);
@@ -49,7 +48,6 @@ public class WmsStockIoController extends BaseController {
/**
* 导出出入库单主列表
*/
@SaCheckPermission("klp:stockIo:export")
@Log(title = "出入库单主", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(WmsStockIoBo bo, HttpServletResponse response) {
@@ -62,7 +60,6 @@ public class WmsStockIoController extends BaseController {
*
* @param stockIoId 主键
*/
@SaCheckPermission("klp:stockIo:query")
@GetMapping("/{stockIoId}")
public R<WmsStockIoVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long stockIoId) {
@@ -72,7 +69,6 @@ public class WmsStockIoController extends BaseController {
/**
* 新增出入库单主
*/
@SaCheckPermission("klp:stockIo:add")
@Log(title = "出入库单主", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@@ -83,7 +79,6 @@ public class WmsStockIoController extends BaseController {
/**
* 修改出入库单主
*/
@SaCheckPermission("klp:stockIo:edit")
@Log(title = "出入库单主", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
@@ -96,7 +91,6 @@ public class WmsStockIoController extends BaseController {
*
* @param stockIoIds 主键串
*/
@SaCheckPermission("klp:stockIo:remove")
@Log(title = "出入库单主", businessType = BusinessType.DELETE)
@DeleteMapping("/{stockIoIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@@ -107,7 +101,6 @@ public class WmsStockIoController extends BaseController {
/**
* 审核出入库/移库单
*/
@SaCheckPermission("klp:stockIo:audit")
@Log(title = "出入库单主", businessType = BusinessType.UPDATE)
@PostMapping("/audit/{stockIoId}")
public R<Void> audit(@NotNull(message = "主键不能为空") @PathVariable Long stockIoId) {

6
klp-wms/src/main/java/com/klp/controller/WmsStockIoDetailController.java
View File

@@ -40,7 +40,6 @@ public class WmsStockIoDetailController extends BaseController {
/**
* 查询出入库单明细列表
*/
@SaCheckPermission("klp:stockIoDetail:list")
@GetMapping("/list")
public TableDataInfo<WmsStockIoDetailVo> list(WmsStockIoDetailBo bo, PageQuery pageQuery) {
return iWmsStockIoDetailService.queryPageList(bo, pageQuery);
@@ -49,7 +48,6 @@ public class WmsStockIoDetailController extends BaseController {
/**
* 导出出入库单明细列表
*/
@SaCheckPermission("klp:stockIoDetail:export")
@Log(title = "出入库单明细", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(WmsStockIoDetailBo bo, HttpServletResponse response) {
@@ -62,7 +60,6 @@ public class WmsStockIoDetailController extends BaseController {
*
* @param detailId 主键
*/
@SaCheckPermission("klp:stockIoDetail:query")
@GetMapping("/{detailId}")
public R<WmsStockIoDetailVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long detailId) {
@@ -72,7 +69,6 @@ public class WmsStockIoDetailController extends BaseController {
/**
* 新增出入库单明细
*/
@SaCheckPermission("klp:stockIoDetail:add")
@Log(title = "出入库单明细", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@@ -83,7 +79,6 @@ public class WmsStockIoDetailController extends BaseController {
/**
* 修改出入库单明细
*/
@SaCheckPermission("klp:stockIoDetail:edit")
@Log(title = "出入库单明细", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
@@ -96,7 +91,6 @@ public class WmsStockIoDetailController extends BaseController {
*
* @param detailIds 主键串
*/
@SaCheckPermission("klp:stockIoDetail:remove")
@Log(title = "出入库单明细", businessType = BusinessType.DELETE)
@DeleteMapping("/{detailIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")

6
klp-wms/src/main/java/com/klp/controller/WmsWarehouseController.java
View File

@@ -39,7 +39,6 @@ public class WmsWarehouseController extends BaseController {
/**
* 查询仓库/库区/库位自关联列表
*/
@SaCheckPermission("klp:warehouse:list")
@GetMapping("/list")
public R<List<WmsWarehouseVo>> list(WmsWarehouseBo bo) {
List<WmsWarehouseVo> list = iWmsWarehouseService.queryList(bo);
@@ -49,7 +48,6 @@ public class WmsWarehouseController extends BaseController {
/**
* 导出仓库/库区/库位自关联列表
*/
@SaCheckPermission("klp:warehouse:export")
@Log(title = "仓库/库区/库位自关联", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(WmsWarehouseBo bo, HttpServletResponse response) {
@@ -62,7 +60,6 @@ public class WmsWarehouseController extends BaseController {
*
* @param warehouseId 主键
*/
@SaCheckPermission("klp:warehouse:query")
@GetMapping("/{warehouseId}")
public R<WmsWarehouseVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long warehouseId) {
@@ -72,7 +69,6 @@ public class WmsWarehouseController extends BaseController {
/**
* 新增仓库/库区/库位自关联
*/
@SaCheckPermission("klp:warehouse:add")
@Log(title = "仓库/库区/库位自关联", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@@ -83,7 +79,6 @@ public class WmsWarehouseController extends BaseController {
/**
* 修改仓库/库区/库位自关联
*/
@SaCheckPermission("klp:warehouse:edit")
@Log(title = "仓库/库区/库位自关联", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
@@ -96,7 +91,6 @@ public class WmsWarehouseController extends BaseController {
*
* @param warehouseIds 主键串
*/
@SaCheckPermission("klp:warehouse:remove")
@Log(title = "仓库/库区/库位自关联", businessType = BusinessType.DELETE)
@DeleteMapping("/{warehouseIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")

6
klp-wms/src/main/java/com/klp/mapper/WmsOrderDetailMapper.java
View File

@@ -4,6 +4,8 @@ import com.klp.domain.WmsOrderDetail;
import com.klp.domain.vo.WmsOrderDetailVo;
import com.klp.common.core.mapper.BaseMapperPlus;
import java.util.List;
/**
* 订单明细Mapper接口
*
@@ -12,4 +14,8 @@ import com.klp.common.core.mapper.BaseMapperPlus;
*/
public interface WmsOrderDetailMapper extends BaseMapperPlus<WmsOrderDetailMapper, WmsOrderDetail, WmsOrderDetailVo> {
/**
* 根据订单ID查询订单明细VO列表
*/
List<WmsOrderDetailVo> selectVoListByOrderId(Long orderId);
}

5
klp-wms/src/main/java/com/klp/service/IWmsOrderDetailService.java
View File

@@ -32,6 +32,11 @@ public interface IWmsOrderDetailService {
*/
List<WmsOrderDetailVo> queryList(WmsOrderDetailBo bo);
/**
* 根据订单ID查询订单明细列表
*/
List<WmsOrderDetailVo> queryListByOrderId(Long orderId);
/**
* 新增订单明细
*/

5
klp-wms/src/main/java/com/klp/service/impl/WmsOrderDetailServiceImpl.java
View File

@@ -58,6 +58,11 @@ public class WmsOrderDetailServiceImpl implements IWmsOrderDetailService {
return baseMapper.selectVoList(lqw);
}
@Override
public List<WmsOrderDetailVo> queryListByOrderId(Long orderId) {
return baseMapper.selectVoListByOrderId(orderId);
}
private LambdaQueryWrapper<WmsOrderDetail> buildQueryWrapper(WmsOrderDetailBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<WmsOrderDetail> lqw = Wrappers.lambdaQuery();