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-08-12 10:12:29 +08:00
parent 47cff10785 05feba2bec
commit 73d507b08a
11 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
klp-ui/src/views/wms/rxgood/index.vue
View File

@@ -104,7 +104,7 @@
</template>
</el-table-column>
<el-table-column label="经办人" align="center" prop="reporter" />
<el-table-column label="涉及项目" align="center" prop="projectName" />
<!-- <el-table-column label="涉及项目" align="center" prop="projectName" />-->
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">

4
klp-ui/src/views/wms/stock/panels/bar.vue
View File

@@ -132,10 +132,6 @@ export default {
const interval = Math.ceil(maxValue / 5); // 将刻度分为5份
const option = {
title: {
text: this.selectedWarehouseId ? '当前仓库及子仓库物料TOP10' : '全部仓库物料TOP10',
left: 'center'
},
tooltip: {
trigger: 'axis',
axisPointer: {

2
klp-wms/src/main/java/com/klp/controller/WmsExpressController.java
View File

@@ -33,7 +33,7 @@ import java.util.List;
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/oa/express")
@RequestMapping("/wms/express")
public class WmsExpressController extends BaseController {
private final IWmsExpressService iWmsExpressService;

2
klp-wms/src/main/java/com/klp/controller/WmsExpressQuestionController.java
View File

@@ -32,7 +32,7 @@ import java.util.List;
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/oa/expressQuestion")
@RequestMapping("/wms/expressQuestion")
public class WmsExpressQuestionController extends BaseController {
private final IWmsExpressQuestionService IWmsExpressQuestionService;

2
klp-wms/src/main/java/com/klp/controller/WmsReportDetailController.java
View File

@@ -32,7 +32,7 @@ import java.util.List;
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/system/reportDetail")
@RequestMapping("/wms/reportDetail")
public class WmsReportDetailController extends BaseController {
private final IWmsReportDetailService IWmsReportDetailService;

2
klp-wms/src/main/java/com/klp/controller/WmsReportSummaryController.java
View File

@@ -32,7 +32,7 @@ import java.util.List;
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/system/reportSummary")
@RequestMapping("/wms/reportSummary")
public class WmsReportSummaryController extends BaseController {
private final IWmsReportSummaryService IWmsReportSummaryService;

2
klp-wms/src/main/java/com/klp/domain/WmsExpress.java
View File

@@ -17,7 +17,7 @@ import java.util.Date;
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("oa_express")
@TableName("wms_express")
public class WmsExpress extends BaseEntity {
private static final long serialVersionUID=1L;

2
klp-wms/src/main/java/com/klp/domain/WmsExpressQuestion.java
View File

@@ -17,7 +17,7 @@ import java.util.Date;
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("oa_express_question")
@TableName("wms_express_question")
public class WmsExpressQuestion extends BaseEntity {
private static final long serialVersionUID=1L;

2
klp-wms/src/main/java/com/klp/domain/WmsReportDetail.java
View File

@@ -15,7 +15,7 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("oa_report_detail")
@TableName("wms_report_detail")
public class WmsReportDetail extends BaseEntity {
private static final long serialVersionUID=1L;

2
klp-wms/src/main/java/com/klp/domain/WmsReportSummary.java
View File

@@ -17,7 +17,7 @@ import java.util.Date;
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("oa_report_summary")
@TableName("wms_report_summary")
public class WmsReportSummary extends BaseEntity {
private static final long serialVersionUID=1L;

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

@@ -45,9 +45,6 @@
<if test="bo.reporter != null and bo.reporter != ''">
AND s.reporter LIKE CONCAT('%', #{bo.reporter}, '%')
</if>
<if test="bo.projectId != null">
AND s.project_id = #{bo.projectId}
</if>
<if test="bo.type != null">
AND s.type = #{bo.type}
</if>