From a9b4d5ddd6f5b0c6c8bf5dd46326da018ffde0f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <2178503051@qq.com> Date: Thu, 25 Jun 2026 10:53:27 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E7=9B=98=E5=BA=93?= =?UTF-8?q?=E5=92=8C=E7=BB=B4=E4=BF=AE=E8=AE=A1=E5=88=92=E5=88=9D=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flow/domain/bo/EqpMaintenancePlanBo.java | 5 + .../klp/flow/domain/bo/InvCountPlanBo.java | 5 + klp-ui/src/api/flow/countDiscrepancy.js | 44 + klp-ui/src/api/flow/countPlan.js | 44 + klp-ui/src/api/flow/countPlanWarehouse.js | 44 + klp-ui/src/api/flow/maintenancePlan.js | 44 + .../src/api/flow/maintenancePlanAbnormal.js | 44 + klp-ui/src/api/flow/maintenancePlanDetail.js | 44 + klp-ui/src/api/flow/planExecuteRel.js | 8 +- .../ActualWarehouseL1L2Select/index.vue | 102 + .../src/views/wms/post/InvCount/approval.vue | 661 ++++++ .../InvCount/components/CountFlowSection.vue | 149 ++ .../src/views/wms/post/InvCount/execute.vue | 759 ++++++ klp-ui/src/views/wms/post/InvCount/index.vue | 2062 +++++++++++++++++ klp-ui/src/views/wms/post/eqp/approval.vue | 282 +++ klp-ui/src/views/wms/post/eqp/execute.vue | 342 +++ klp-ui/src/views/wms/post/eqp/index.vue | 666 ++++++ 17 files changed, 5303 insertions(+), 2 deletions(-) create mode 100644 klp-ui/src/api/flow/countDiscrepancy.js create mode 100644 klp-ui/src/api/flow/countPlan.js create mode 100644 klp-ui/src/api/flow/countPlanWarehouse.js create mode 100644 klp-ui/src/api/flow/maintenancePlan.js create mode 100644 klp-ui/src/api/flow/maintenancePlanAbnormal.js create mode 100644 klp-ui/src/api/flow/maintenancePlanDetail.js create mode 100644 klp-ui/src/components/KLPService/ActualWarehouseL1L2Select/index.vue create mode 100644 klp-ui/src/views/wms/post/InvCount/approval.vue create mode 100644 klp-ui/src/views/wms/post/InvCount/components/CountFlowSection.vue create mode 100644 klp-ui/src/views/wms/post/InvCount/execute.vue create mode 100644 klp-ui/src/views/wms/post/InvCount/index.vue create mode 100644 klp-ui/src/views/wms/post/eqp/approval.vue create mode 100644 klp-ui/src/views/wms/post/eqp/execute.vue create mode 100644 klp-ui/src/views/wms/post/eqp/index.vue diff --git a/klp-flow/src/main/java/com/klp/flow/domain/bo/EqpMaintenancePlanBo.java b/klp-flow/src/main/java/com/klp/flow/domain/bo/EqpMaintenancePlanBo.java index ed8b44d1c..426112fc6 100644 --- a/klp-flow/src/main/java/com/klp/flow/domain/bo/EqpMaintenancePlanBo.java +++ b/klp-flow/src/main/java/com/klp/flow/domain/bo/EqpMaintenancePlanBo.java @@ -8,6 +8,7 @@ import javax.validation.constraints.*; import java.math.BigDecimal; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; /** * 维修计划主业务对象 eqp_maintenance_plan @@ -58,11 +59,15 @@ public class EqpMaintenancePlanBo extends BaseEntity { /** * 计划开始时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd hh:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss") private Date plannedStartTime; /** * 计划结束时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd hh:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss") private Date plannedEndTime; /** diff --git a/klp-flow/src/main/java/com/klp/flow/domain/bo/InvCountPlanBo.java b/klp-flow/src/main/java/com/klp/flow/domain/bo/InvCountPlanBo.java index ce8bf1a3b..5864a1401 100644 --- a/klp-flow/src/main/java/com/klp/flow/domain/bo/InvCountPlanBo.java +++ b/klp-flow/src/main/java/com/klp/flow/domain/bo/InvCountPlanBo.java @@ -7,6 +7,7 @@ import javax.validation.constraints.*; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; /** * 盘库计划主业务对象 inv_count_plan @@ -37,11 +38,15 @@ public class InvCountPlanBo extends BaseEntity { /** * 盘库日期 */ + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") private Date countDate; /** * 截止时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd hh:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss") private Date deadlineTime; /** diff --git a/klp-ui/src/api/flow/countDiscrepancy.js b/klp-ui/src/api/flow/countDiscrepancy.js new file mode 100644 index 000000000..448c2fb24 --- /dev/null +++ b/klp-ui/src/api/flow/countDiscrepancy.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询盘库差异记录列表 +export function listCountDiscrepancy(query) { + return request({ + url: '/flow/countDiscrepancy/list', + method: 'get', + params: query + }) +} + +// 查询盘库差异记录详细 +export function getCountDiscrepancy(discrepancyId) { + return request({ + url: '/flow/countDiscrepancy/' + discrepancyId, + method: 'get' + }) +} + +// 新增盘库差异记录 +export function addCountDiscrepancy(data) { + return request({ + url: '/flow/countDiscrepancy', + method: 'post', + data: data + }) +} + +// 修改盘库差异记录 +export function updateCountDiscrepancy(data) { + return request({ + url: '/flow/countDiscrepancy', + method: 'put', + data: data + }) +} + +// 删除盘库差异记录 +export function delCountDiscrepancy(discrepancyId) { + return request({ + url: '/flow/countDiscrepancy/' + discrepancyId, + method: 'delete' + }) +} diff --git a/klp-ui/src/api/flow/countPlan.js b/klp-ui/src/api/flow/countPlan.js new file mode 100644 index 000000000..41324116c --- /dev/null +++ b/klp-ui/src/api/flow/countPlan.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询盘库计划主列表 +export function listCountPlan(query) { + return request({ + url: '/flow/countPlan/list', + method: 'get', + params: query + }) +} + +// 查询盘库计划主详细 +export function getCountPlan(planId) { + return request({ + url: '/flow/countPlan/' + planId, + method: 'get' + }) +} + +// 新增盘库计划主 +export function addCountPlan(data) { + return request({ + url: '/flow/countPlan', + method: 'post', + data: data + }) +} + +// 修改盘库计划主 +export function updateCountPlan(data) { + return request({ + url: '/flow/countPlan', + method: 'put', + data: data + }) +} + +// 删除盘库计划主 +export function delCountPlan(planId) { + return request({ + url: '/flow/countPlan/' + planId, + method: 'delete' + }) +} diff --git a/klp-ui/src/api/flow/countPlanWarehouse.js b/klp-ui/src/api/flow/countPlanWarehouse.js new file mode 100644 index 000000000..9d3d52f20 --- /dev/null +++ b/klp-ui/src/api/flow/countPlanWarehouse.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询盘库计划-库区关联列表 +export function listCountPlanWarehouse(query) { + return request({ + url: '/flow/countPlanWarehouse/list', + method: 'get', + params: query + }) +} + +// 查询盘库计划-库区关联详细 +export function getCountPlanWarehouse(relId) { + return request({ + url: '/flow/countPlanWarehouse/' + relId, + method: 'get' + }) +} + +// 新增盘库计划-库区关联 +export function addCountPlanWarehouse(data) { + return request({ + url: '/flow/countPlanWarehouse', + method: 'post', + data: data + }) +} + +// 修改盘库计划-库区关联 +export function updateCountPlanWarehouse(data) { + return request({ + url: '/flow/countPlanWarehouse', + method: 'put', + data: data + }) +} + +// 删除盘库计划-库区关联 +export function delCountPlanWarehouse(relId) { + return request({ + url: '/flow/countPlanWarehouse/' + relId, + method: 'delete' + }) +} diff --git a/klp-ui/src/api/flow/maintenancePlan.js b/klp-ui/src/api/flow/maintenancePlan.js new file mode 100644 index 000000000..715229cd6 --- /dev/null +++ b/klp-ui/src/api/flow/maintenancePlan.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询维修计划主列表 +export function listMaintenancePlan(query) { + return request({ + url: '/flow/maintenancePlan/list', + method: 'get', + params: query + }) +} + +// 查询维修计划主详细 +export function getMaintenancePlan(planId) { + return request({ + url: '/flow/maintenancePlan/' + planId, + method: 'get' + }) +} + +// 新增维修计划主 +export function addMaintenancePlan(data) { + return request({ + url: '/flow/maintenancePlan', + method: 'post', + data: data + }) +} + +// 修改维修计划主 +export function updateMaintenancePlan(data) { + return request({ + url: '/flow/maintenancePlan', + method: 'put', + data: data + }) +} + +// 删除维修计划主 +export function delMaintenancePlan(planId) { + return request({ + url: '/flow/maintenancePlan/' + planId, + method: 'delete' + }) +} diff --git a/klp-ui/src/api/flow/maintenancePlanAbnormal.js b/klp-ui/src/api/flow/maintenancePlanAbnormal.js new file mode 100644 index 000000000..3009abdb8 --- /dev/null +++ b/klp-ui/src/api/flow/maintenancePlanAbnormal.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询维修计划-异常记录关联列表 +export function listMaintenancePlanAbnormal(query) { + return request({ + url: '/flow/maintenancePlanAbnormal/list', + method: 'get', + params: query + }) +} + +// 查询维修计划-异常记录关联详细 +export function getMaintenancePlanAbnormal(relId) { + return request({ + url: '/flow/maintenancePlanAbnormal/' + relId, + method: 'get' + }) +} + +// 新增维修计划-异常记录关联 +export function addMaintenancePlanAbnormal(data) { + return request({ + url: '/flow/maintenancePlanAbnormal', + method: 'post', + data: data + }) +} + +// 修改维修计划-异常记录关联 +export function updateMaintenancePlanAbnormal(data) { + return request({ + url: '/flow/maintenancePlanAbnormal', + method: 'put', + data: data + }) +} + +// 删除维修计划-异常记录关联 +export function delMaintenancePlanAbnormal(relId) { + return request({ + url: '/flow/maintenancePlanAbnormal/' + relId, + method: 'delete' + }) +} diff --git a/klp-ui/src/api/flow/maintenancePlanDetail.js b/klp-ui/src/api/flow/maintenancePlanDetail.js new file mode 100644 index 000000000..d055d4d94 --- /dev/null +++ b/klp-ui/src/api/flow/maintenancePlanDetail.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询维修计划明细列表 +export function listMaintenancePlanDetail(query) { + return request({ + url: '/flow/maintenancePlanDetail/list', + method: 'get', + params: query + }) +} + +// 查询维修计划明细详细 +export function getMaintenancePlanDetail(detailId) { + return request({ + url: '/flow/maintenancePlanDetail/' + detailId, + method: 'get' + }) +} + +// 新增维修计划明细 +export function addMaintenancePlanDetail(data) { + return request({ + url: '/flow/maintenancePlanDetail', + method: 'post', + data: data + }) +} + +// 修改维修计划明细 +export function updateMaintenancePlanDetail(data) { + return request({ + url: '/flow/maintenancePlanDetail', + method: 'put', + data: data + }) +} + +// 删除维修计划明细 +export function delMaintenancePlanDetail(detailId) { + return request({ + url: '/flow/maintenancePlanDetail/' + detailId, + method: 'delete' + }) +} diff --git a/klp-ui/src/api/flow/planExecuteRel.js b/klp-ui/src/api/flow/planExecuteRel.js index 9a058f822..aba303bfd 100644 --- a/klp-ui/src/api/flow/planExecuteRel.js +++ b/klp-ui/src/api/flow/planExecuteRel.js @@ -16,18 +16,22 @@ export function getPlanExecuteRel(relId) { } export function addPlanExecuteRel(data) { + // 剔除掉rejectMark字段 + const { rejectMark, ...payload } = { ...data }; return request({ url: '/flow/planExecuteRel', method: 'post', - data: data + data: payload }) } export function updatePlanExecuteRel(data) { + // 剔除掉rejectMark字段 + const { rejectMark, ...payload } = { ...data }; return request({ url: '/flow/planExecuteRel', method: 'put', - data: data + data: payload }) } diff --git a/klp-ui/src/components/KLPService/ActualWarehouseL1L2Select/index.vue b/klp-ui/src/components/KLPService/ActualWarehouseL1L2Select/index.vue new file mode 100644 index 000000000..d415828b2 --- /dev/null +++ b/klp-ui/src/components/KLPService/ActualWarehouseL1L2Select/index.vue @@ -0,0 +1,102 @@ + + + diff --git a/klp-ui/src/views/wms/post/InvCount/approval.vue b/klp-ui/src/views/wms/post/InvCount/approval.vue new file mode 100644 index 000000000..a12a0edb8 --- /dev/null +++ b/klp-ui/src/views/wms/post/InvCount/approval.vue @@ -0,0 +1,661 @@ + + + + + diff --git a/klp-ui/src/views/wms/post/InvCount/components/CountFlowSection.vue b/klp-ui/src/views/wms/post/InvCount/components/CountFlowSection.vue new file mode 100644 index 000000000..2856a6bc7 --- /dev/null +++ b/klp-ui/src/views/wms/post/InvCount/components/CountFlowSection.vue @@ -0,0 +1,149 @@ + + + + + diff --git a/klp-ui/src/views/wms/post/InvCount/execute.vue b/klp-ui/src/views/wms/post/InvCount/execute.vue new file mode 100644 index 000000000..ececc1d5a --- /dev/null +++ b/klp-ui/src/views/wms/post/InvCount/execute.vue @@ -0,0 +1,759 @@ + + + + + diff --git a/klp-ui/src/views/wms/post/InvCount/index.vue b/klp-ui/src/views/wms/post/InvCount/index.vue new file mode 100644 index 000000000..6b5b3c707 --- /dev/null +++ b/klp-ui/src/views/wms/post/InvCount/index.vue @@ -0,0 +1,2062 @@ + + + + + diff --git a/klp-ui/src/views/wms/post/eqp/approval.vue b/klp-ui/src/views/wms/post/eqp/approval.vue new file mode 100644 index 000000000..5cdfa9ab2 --- /dev/null +++ b/klp-ui/src/views/wms/post/eqp/approval.vue @@ -0,0 +1,282 @@ + + + + + diff --git a/klp-ui/src/views/wms/post/eqp/execute.vue b/klp-ui/src/views/wms/post/eqp/execute.vue new file mode 100644 index 000000000..ddb6af688 --- /dev/null +++ b/klp-ui/src/views/wms/post/eqp/execute.vue @@ -0,0 +1,342 @@ + + + + + diff --git a/klp-ui/src/views/wms/post/eqp/index.vue b/klp-ui/src/views/wms/post/eqp/index.vue new file mode 100644 index 000000000..a3b573f35 --- /dev/null +++ b/klp-ui/src/views/wms/post/eqp/index.vue @@ -0,0 +1,666 @@ + + + + +