From 22e4231a930ab72c31ed2ba866e075d29dbccffa Mon Sep 17 00:00:00 2001
From: lyd <1419499670@qq.com>
Date: Mon, 31 Oct 2022 15:31:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../org/nl/modules/system/domain/User.java | 3 ++
.../impl/WorkprocedureiosServiceOutImpl.java | 2 +-
.../service/wql/ST_WorkprocedureiosOut_01.wql | 2 -
wms/qd/src/components/Crud/crud.js | 2 +-
.../src/views/wms/database/material/index.vue | 12 +++---
wms/qd/src/views/wms/sch/task/index.vue | 38 +++++--------------
wms/qd/src/views/wms/st/in/index.vue | 4 +-
wms/qd/src/views/wms/st/ivt/index.vue | 36 +++++-------------
wms/qd/src/views/wms/st/out/index.vue | 6 +--
9 files changed, 35 insertions(+), 70 deletions(-)
diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/modules/system/domain/User.java b/wms/hd/nladmin-system/src/main/java/org/nl/modules/system/domain/User.java
index 39d5210..03239cf 100644
--- a/wms/hd/nladmin-system/src/main/java/org/nl/modules/system/domain/User.java
+++ b/wms/hd/nladmin-system/src/main/java/org/nl/modules/system/domain/User.java
@@ -18,6 +18,8 @@ package org.nl.modules.system.domain;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
+import org.hibernate.annotations.NotFound;
+import org.hibernate.annotations.NotFoundAction;
import org.nl.base.BaseEntity;
import javax.persistence.*;
@@ -62,6 +64,7 @@ public class User extends BaseEntity implements Serializable {
@OneToOne
@JoinColumn(name = "dept_id")
+ @NotFound(action= NotFoundAction.IGNORE)
@ApiModelProperty(value = "用户部门")
private Dept dept;
diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/out/service/impl/WorkprocedureiosServiceOutImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/out/service/impl/WorkprocedureiosServiceOutImpl.java
index afcc4d1..c63be67 100644
--- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/out/service/impl/WorkprocedureiosServiceOutImpl.java
+++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/out/service/impl/WorkprocedureiosServiceOutImpl.java
@@ -284,7 +284,7 @@ public class WorkprocedureiosServiceOutImpl implements WorkprocedureiosOutServic
map.put("material_id", material_id);
map.put("is_full", is_full);
map.put("ivt_workprocedure_id", ivt_workprocedure_id);
- JSONObject json = WQL.getWO("ST_WorkprocedureiosOut_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "structivt.pcsn desc");
+ JSONObject json = WQL.getWO("ST_WorkprocedureiosOut_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "structivt.stockrecord_id desc");
return json;
}
diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/out/service/wql/ST_WorkprocedureiosOut_01.wql b/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/out/service/wql/ST_WorkprocedureiosOut_01.wql
index 0b217f2..2500258 100644
--- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/out/service/wql/ST_WorkprocedureiosOut_01.wql
+++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/out/service/wql/ST_WorkprocedureiosOut_01.wql
@@ -49,7 +49,6 @@
c.material_name,
p1.point_name AS start_point_name,
p2.point_name AS end_point_name,
- unit.unit_name,
cust.cust_name
FROM
ST_IVT_workProcedureIOS a
@@ -57,7 +56,6 @@
LEFT JOIN md_me_material c ON c.material_id = a.material_id
LEFT JOIN sch_base_point p1 ON a.start_point_code = p1.point_code
LEFT JOIN sch_base_point p2 ON a.end_point_code = p2.point_code
- LEFT JOIN md_pb_measureunit unit ON a.qty_unit_id = unit.unit_id
LEFT JOIN md_cs_customerbase cust ON a.cust_id = cust.cust_id
WHERE
a.is_delete = '0' and a.io_type = '1'
diff --git a/wms/qd/src/components/Crud/crud.js b/wms/qd/src/components/Crud/crud.js
index 53b5187..7765726 100644
--- a/wms/qd/src/components/Crud/crud.js
+++ b/wms/qd/src/components/Crud/crud.js
@@ -52,7 +52,7 @@ function CRUD(options) {
add: true,
edit: true,
del: true,
- download: true,
+ download: false,
reset: true
},
// 自定义一些扩展属性
diff --git a/wms/qd/src/views/wms/database/material/index.vue b/wms/qd/src/views/wms/database/material/index.vue
index 6e3a89f..a509271 100644
--- a/wms/qd/src/views/wms/database/material/index.vue
+++ b/wms/qd/src/views/wms/database/material/index.vue
@@ -47,7 +47,7 @@
-
+
@@ -75,13 +75,13 @@
-
-
+
+
-
-
+
+
@@ -203,7 +203,7 @@ export default {
{ required: true, message: '物料类型不能为空', trigger: 'blur' }
],
stewing_time: [
- { required: true, message: '静止时间不能为空', trigger: 'blur' }
+ { required: true, message: '静置时间不能为空', trigger: 'blur' }
]
}
}
diff --git a/wms/qd/src/views/wms/sch/task/index.vue b/wms/qd/src/views/wms/sch/task/index.vue
index d91bbb6..cdaea99 100644
--- a/wms/qd/src/views/wms/sch/task/index.vue
+++ b/wms/qd/src/views/wms/sch/task/index.vue
@@ -136,7 +136,7 @@
>
-
+
{{ dict.label.sch_task_type[scope.row.task_type] }}
@@ -146,12 +146,12 @@
{{ dict.label.task_status[scope.row.task_status] }}
-
+
-
-
+
+
-
+
@@ -170,18 +170,7 @@
-
-
-
-
-
- 完成
- 取消
- 拉回
- 重发
- 详情
-
-
+ 完成
@@ -284,16 +273,9 @@ export default {
}
this.crud.toQuery()
},
- beforeHandleCommand(index, row, command) {
- return {
- 'index': index,
- 'row': row,
- 'command': command
- }
- },
- handleCommand(command) {
+ handleCommand(row, command) {
let method_name = ''
- switch (command.command) {
+ switch (command) {
case 'a':// 完成
method_name = 'forceFinish'
break
@@ -311,11 +293,11 @@ export default {
break
}
if (method_name === 'view') {
- this.view(command.row)
+ this.view(row)
return
}
const data = {
- task_id: command.row.task_id,
+ task_id: row.task_id,
method_name: method_name
}
crudTask.operation(data).then(res => {
diff --git a/wms/qd/src/views/wms/st/in/index.vue b/wms/qd/src/views/wms/st/in/index.vue
index 5f2172f..de1aada 100644
--- a/wms/qd/src/views/wms/st/in/index.vue
+++ b/wms/qd/src/views/wms/st/in/index.vue
@@ -398,7 +398,7 @@
@select-all="onSelectAll"
>
-
+
{{ scope.row.bill_code }}
@@ -424,7 +424,7 @@
-
+
{{ dict.label.sch_area_type[scope.row.start_area] }}
diff --git a/wms/qd/src/views/wms/st/ivt/index.vue b/wms/qd/src/views/wms/st/ivt/index.vue
index e8df515..9b0a85f 100644
--- a/wms/qd/src/views/wms/st/ivt/index.vue
+++ b/wms/qd/src/views/wms/st/ivt/index.vue
@@ -73,10 +73,10 @@
-
+
-
+
@@ -90,8 +90,8 @@
-
-
+
+
-
-
-
-
-
-
- 强制完成
-
-
+ 强制完成
@@ -179,9 +169,9 @@ export default {
},
isStationary(val) {
if (val === '0') {
- return '静止完成'
+ return '静置完成'
} else {
- return '静止中'
+ return '静置中'
}
},
isFull(val) {
@@ -191,16 +181,8 @@ export default {
return '否'
}
},
- beforeHandleCommand(index, row, command) {
- return {
- 'index': index,
- 'row': row,
- 'command': command
- }
- },
- handleCommand(command) {
- console.log(command.row)
- crudStructivt.finishStationary(command.row).then(res => {
+ handleCommand(row) {
+ crudStructivt.finishStationary(row).then(res => {
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
})
diff --git a/wms/qd/src/views/wms/st/out/index.vue b/wms/qd/src/views/wms/st/out/index.vue
index dc1e826..be95969 100644
--- a/wms/qd/src/views/wms/st/out/index.vue
+++ b/wms/qd/src/views/wms/st/out/index.vue
@@ -310,7 +310,7 @@
-
+
@@ -319,13 +319,13 @@
-
+
{{ dict.label.sch_area_type[scope.row.start_area] }}
-
+
{{ dict.label.sch_area_type[scope.row.end_area] }}