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

59
klp-ui/src/views/wms/category/index.vue
View File

@@ -1,6 +1,16 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="分类类型(base_material|surface_treatment|customer_req|spec_packaging)" prop="categoryType">
<el-select v-model="queryParams.categoryType" placeholder="请选择分类类型(base_material|surface_treatment|customer_req|spec_packaging)" clearable>
<el-option
v-for="dict in dict.type.category_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="分类编码" prop="categoryCode">
<el-input
v-model="queryParams.categoryCode"
@@ -26,12 +36,14 @@
/>
</el-form-item>
<el-form-item label="是否启用(0=否,1=是)" prop="isEnabled">
<el-input
v-model="queryParams.isEnabled"
placeholder="请输入是否启用(0=否,1=是)"
clearable
@keyup.enter.native="handleQuery"
/>
<el-select v-model="queryParams.isEnabled" placeholder="请选择是否启用(0=否,1=是)" clearable>
<el-option
v-for="dict in dict.type.common_swicth"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -88,12 +100,20 @@
<el-table v-loading="loading" :data="categoryList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="分类主键ID" align="center" prop="categoryId" v-if="true"/>
<el-table-column label="分类类型(base_material|surface_treatment|customer_req|spec_packaging)" align="center" prop="categoryType" />
<el-table-column label="分类类型(base_material|surface_treatment|customer_req|spec_packaging)" align="center" prop="categoryType">
<template slot-scope="scope">
<dict-tag :options="dict.type.category_type" :value="scope.row.categoryType"/>
</template>
</el-table-column>
<el-table-column label="分类编码" align="center" prop="categoryCode" />
<el-table-column label="分类名称" align="center" prop="categoryName" />
<el-table-column label="分类描述" align="center" prop="categoryDesc" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="是否启用(0=否,1=是)" align="center" prop="isEnabled" />
<el-table-column label="是否启用(0=否,1=是)" align="center" prop="isEnabled">
<template slot-scope="scope">
<dict-tag :options="dict.type.common_swicth" :value="scope.row.isEnabled"/>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@@ -125,6 +145,16 @@
<!-- 添加或修改通用分类对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="分类类型(base_material|surface_treatment|customer_req|spec_packaging)" prop="categoryType">
<el-select v-model="form.categoryType" placeholder="请选择分类类型(base_material|surface_treatment|customer_req|spec_packaging)">
<el-option
v-for="dict in dict.type.category_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="分类编码" prop="categoryCode">
<el-input v-model="form.categoryCode" placeholder="请输入分类编码" />
</el-form-item>
@@ -138,7 +168,14 @@
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
<el-form-item label="是否启用(0=否,1=是)" prop="isEnabled">
<el-input v-model="form.isEnabled" placeholder="请输入是否启用(0=否,1=是)" />
<el-select v-model="form.isEnabled" placeholder="请选择是否启用(0=否,1=是)">
<el-option
v-for="dict in dict.type.common_swicth"
:key="dict.value"
:label="dict.label"
:value="parseInt(dict.value)"
></el-option>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -154,6 +191,7 @@ import { listCategory, getCategory, delCategory, addCategory, updateCategory } f
export default {
name: "Category",
dicts: ['common_swicth', 'category_type'],
data() {
return {
// 按钮loading
@@ -199,9 +237,6 @@ export default {
categoryName: [
{ required: true, message: "分类名称不能为空", trigger: "blur" }
],
categoryDesc: [
{ required: true, message: "分类描述不能为空", trigger: "blur" }
],
}
};
},

42
klp-ui/src/views/wms/product/index.vue
View File

@@ -284,27 +284,27 @@ export default {
owner: [
{ required: true, message: "负责人不能为空", trigger: "blur" }
],
baseMaterialId: [
{ required: true, message: "基础材质分类ID不能为空", trigger: "blur" }
],
surfaceTreatmentId: [
{ required: true, message: "表面处理分类ID不能为空", trigger: "blur" }
],
customerReqId: [
{ required: true, message: "客户需求分类ID不能为空", trigger: "blur" }
],
packagingId: [
{ required: true, message: "包装分类ID不能为空", trigger: "blur" }
],
thickness: [
{ required: true, message: "厚度不能为空", trigger: "blur" }
],
width: [
{ required: true, message: "宽度不能为空", trigger: "blur" }
],
innerDiameter: [
{ required: true, message: "内径不能为空", trigger: "blur" }
],
// baseMaterialId: [
// { required: true, message: "基础材质分类ID不能为空", trigger: "blur" }
// ],
// surfaceTreatmentId: [
// { required: true, message: "表面处理分类ID不能为空", trigger: "blur" }
// ],
// customerReqId: [
// { required: true, message: "客户需求分类ID不能为空", trigger: "blur" }
// ],
// packagingId: [
// { required: true, message: "包装分类ID不能为空", trigger: "blur" }
// ],
// thickness: [
// { required: true, message: "厚度不能为空", trigger: "blur" }
// ],
// width: [
// { required: true, message: "宽度不能为空", trigger: "blur" }
// ],
// innerDiameter: [
// { required: true, message: "内径不能为空", trigger: "blur" }
// ],
}
};
},

99
klp-ui/src/views/wms/warehouse/index.vue
View File

@@ -1,45 +1,53 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="父节点ID" prop="parentId">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="上级节点" prop="parentId">
<el-input
v-model="queryParams.parentId"
placeholder="请输入父节点ID"
placeholder="请选择上级节点"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="仓库/库区编码" prop="warehouseCode">
<el-form-item label="仓库编码" prop="warehouseCode">
<el-input
v-model="queryParams.warehouseCode"
placeholder="请输入仓库/库区编码"
placeholder="请输入仓库编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="仓库/库区名称" prop="warehouseName">
<el-form-item label="仓库名称" prop="warehouseName">
<el-input
v-model="queryParams.warehouseName"
placeholder="请输入仓库/库区名称"
placeholder="请输入仓库名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="同级排序号" prop="sortNo">
<el-form-item label="仓库类型" prop="warehouseType">
<el-select v-model="queryParams.warehouseType" placeholder="请选择仓库类型" clearable>
<el-option
v-for="dict in dict.type.warehouse_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="排序号" prop="sortNo">
<el-input
v-model="queryParams.sortNo"
placeholder="请输入同级排序号"
placeholder="请输入排序号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="是否启用" prop="isEnabled">
<el-input
v-model="queryParams.isEnabled"
placeholder="请输入是否启用"
clearable
@keyup.enter.native="handleQuery"
/>
<el-form-item label="启用状态" prop="isEnabled">
<el-select v-model="queryParams.isEnabled" placeholder="请选择启用状态" clearable>
<el-option label="启用" :value="1" />
<el-option label="禁用" :value="0" />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -78,12 +86,20 @@
:default-expand-all="isExpandAll"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
>
<el-table-column label="父节点ID" prop="parentId" />
<el-table-column label="仓库/库区编码" align="center" prop="warehouseCode" />
<el-table-column label="仓库/库区名称" align="center" prop="warehouseName" />
<el-table-column label="类型：0=仓库，1=库区，2=库位，…" align="center" prop="warehouseType" />
<el-table-column label="同级排序号" align="center" prop="sortNo" />
<el-table-column label="是否启用" align="center" prop="isEnabled" />
<el-table-column label="上级节点" prop="parentId" />
<el-table-column label="仓库编码" align="center" prop="warehouseCode" />
<el-table-column label="仓库名称" align="center" prop="warehouseName" />
<el-table-column label="仓库类型" align="center" prop="warehouseType">
<template slot-scope="scope">
<dict-tag :options="dict.type.warehouse_type" :value="scope.row.warehouseType"/>
</template>
</el-table-column>
<el-table-column label="排序号" align="center" prop="sortNo" />
<el-table-column label="启用状态" align="center" prop="isEnabled">
<template slot-scope="scope">
<span>{{ scope.row.isEnabled == 1 ? '启用' : '禁用' }}</span>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
@@ -92,21 +108,18 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['klp:warehouse:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-plus"
@click="handleAdd(scope.row)"
v-hasPermi="['klp:warehouse:add']"
>新增</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['klp:warehouse:remove']"
>删除</el-button>
</template>
</el-table-column>
@@ -114,21 +127,34 @@
<!-- 添加或修改仓库/库区/库位自关联对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="父节点ID" prop="parentId">
<treeselect v-model="form.parentId" :options="warehouseOptions" :normalizer="normalizer" placeholder="请选择父节点ID" />
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="上级节点" prop="parentId">
<treeselect v-model="form.parentId" :options="warehouseOptions" :normalizer="normalizer" placeholder="请选择上级节点" />
</el-form-item>
<el-form-item label="仓库/库区编码" prop="warehouseCode">
<el-input v-model="form.warehouseCode" placeholder="请输入仓库/库区编码" />
<el-form-item label="仓库编码" prop="warehouseCode">
<el-input v-model="form.warehouseCode" placeholder="请输入仓库编码" />
</el-form-item>
<el-form-item label="仓库/库区名称" prop="warehouseName">
<el-input v-model="form.warehouseName" placeholder="请输入仓库/库区名称" />
<el-form-item label="仓库名称" prop="warehouseName">
<el-input v-model="form.warehouseName" placeholder="请输入仓库名称" />
</el-form-item>
<el-form-item label="同级排序号" prop="sortNo">
<el-input v-model="form.sortNo" placeholder="请输入同级排序号" />
<el-form-item label="仓库类型" prop="warehouseType">
<el-select v-model="form.warehouseType" placeholder="请选择仓库类型">
<el-option
v-for="dict in dict.type.warehouse_type"
:key="dict.value"
:label="dict.label"
:value="parseInt(dict.value)"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="是否启用" prop="isEnabled">
<el-input v-model="form.isEnabled" placeholder="请输入是否启用" />
<el-form-item label="排序号" prop="sortNo">
<el-input v-model="form.sortNo" placeholder="请输入排序号" />
</el-form-item>
<el-form-item label="启用状态" prop="isEnabled">
<el-select v-model="form.isEnabled" placeholder="请选择启用状态">
<el-option label="启用" :value="1" />
<el-option label="禁用" :value="0" />
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
@@ -149,6 +175,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
name: "Warehouse",
dicts: ['warehouse_type'],
components: {
Treeselect
},

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();

3
klp-wms/src/main/resources/mapper/klp/WmsOrderDetailMapper.xml
View File

@@ -18,5 +18,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateBy" column="update_by"/>
</resultMap>
<select id="selectVoListByOrderId" resultType="com.klp.domain.vo.WmsOrderDetailVo">
SELECT * FROM wms_order_detail WHERE order_id = #{orderId} AND del_flag = 0
</select>
</mapper>