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

klp-ui/src/views/wms/rxgood/index.vue

@@ -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">

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

@@ -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: {

klp-wms/src/main/java/com/klp/controller/WmsExpressController.java

@@ -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;

klp-wms/src/main/java/com/klp/controller/WmsExpressQuestionController.java

@@ -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;

klp-wms/src/main/java/com/klp/controller/WmsReportDetailController.java

@@ -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;

klp-wms/src/main/java/com/klp/controller/WmsReportSummaryController.java

@@ -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;

klp-wms/src/main/java/com/klp/domain/WmsExpress.java

@@ -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;

klp-wms/src/main/java/com/klp/domain/WmsExpressQuestion.java

@@ -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;

klp-wms/src/main/java/com/klp/domain/WmsReportDetail.java

@@ -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;

klp-wms/src/main/java/com/klp/domain/WmsReportSummary.java

@@ -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;

klp-wms/src/main/resources/mapper/klp/WmsReportSummaryMapper.xml

@@ -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>