root/rongLiJiaNai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码更新

Browse Source
This commit is contained in:
lyd
2022-10-31 15:31:56 +08:00
parent 1f13b2a218
commit 22e4231a93
9 changed files with 35 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wms/hd/nladmin-system/src/main/java/org/nl/modules/system/domain/User.java
View File

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

2
wms/hd/nladmin-system/src/main/java/org/nl/wms/st/out/service/impl/WorkprocedureiosServiceOutImpl.java
View File

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

2
wms/hd/nladmin-system/src/main/java/org/nl/wms/st/out/service/wql/ST_WorkprocedureiosOut_01.wql
View File

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

2
wms/qd/src/components/Crud/crud.js
View File

@@ -52,7 +52,7 @@ function CRUD(options) {
add: true,
edit: true,
del: true,
download: true,
download: false,
reset: true
},
// 自定义一些扩展属性

12
wms/qd/src/views/wms/database/material/index.vue
View File

@@ -47,7 +47,7 @@
<label slot="label">木托盘类型</label>
<el-input v-model="form.vehicle_type" style="width: 370px;" />
</el-form-item>
<el-form-item label="静止时间" prop="stewing_time">
<el-form-item label="静置时间" prop="stewing_time">
<el-input v-model="form.stewing_time" oninput="value=value.replace(/[^\d]/g,'')" style="width: 370px;" />
</el-form-item>
<el-form-item label="外文名称">
@@ -75,13 +75,13 @@
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" />
<el-table-column prop="material_code" label="物料编码" />
<el-table-column prop="material_name" label="产品名称 " />
<el-table-column prop="material_code" label="物料编码" min-width="120" show-overflow-tooltip/>
<el-table-column prop="material_name" label="产品名称 " min-width="150" show-overflow-tooltip/>
<el-table-column prop="material_spec" label="规格" />
<el-table-column prop="material_model" label="型号" />
<el-table-column prop="material_type" label="物料类型" />
<el-table-column prop="vehicle_type" label="木托盘类型" />
<el-table-column prop="stewing_time" label="静止时间(小时)" width="110" />
<el-table-column prop="vehicle_type" label="木托盘类型" min-width="100"/>
<el-table-column prop="stewing_time" label="静置时间(小时)" width="110" />
<el-table-column prop="english_name" label="外文名称" />
<el-table-column prop="create_name" label="创建人" />
<el-table-column prop="create_time" label="创建时间" width="150" />
@@ -203,7 +203,7 @@ export default {
{ required: true, message: '物料类型不能为空', trigger: 'blur' }
],
stewing_time: [
{ required: true, message: '静止时间不能为空', trigger: 'blur' }
{ required: true, message: '静置时间不能为空', trigger: 'blur' }
]
}
}

38
wms/qd/src/views/wms/sch/task/index.vue
View File

@@ -136,7 +136,7 @@
>
<el-table-column type="selection" width="55" />
<el-table-column prop="task_code" label="任务编码" />
<el-table-column prop="task_type" label="任务类型" width="80px">
<el-table-column prop="task_type" label="任务类型" width="100">
<template slot-scope="scope">
{{ dict.label.sch_task_type[scope.row.task_type] }}
</template>
@@ -146,12 +146,12 @@
{{ dict.label.task_status[scope.row.task_status] }}
</template>
</el-table-column>
<el-table-column prop="start_area_name" label="起始区域" width="95" show-overflow-tooltip />
<el-table-column prop="start_area_name" label="起始区域" width="120" show-overflow-tooltip />
<el-table-column prop="start_point_code" label="起点编码" width="110px" />
<el-table-column prop="start_point_name" label="起点名称" width="105px" show-overflow-tooltip />
<el-table-column prop="next_area_name" label="下一区域" width="95" show-overflow-tooltip />
<el-table-column prop="start_point_name" label="起点名称" min-width="150" show-overflow-tooltip />
<el-table-column prop="next_area_name" label="下一区域" width="120" show-overflow-tooltip />
<el-table-column prop="next_point_code" label="终点编码" width="110px" />
<el-table-column prop="next_point_name" label="终点名称" width="105px" show-overflow-tooltip />
<el-table-column prop="next_point_name" label="终点名称" width="150" show-overflow-tooltip />
<el-table-column prop="vehicle_code" label="载具编码" width="80px" />
<el-table-column v-if="false" prop="finished_type" label="任务完成类型" width="120px">
<template slot-scope="scope">
@@ -170,18 +170,7 @@
</el-table-column>
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<el-dropdown trigger="click" @command="handleCommand">
<span class="el-dropdown-link">
<i class="el-icon-menu" />
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :disabled="scope.row.task_status === '07'" :command="beforeHandleCommand(scope.$index, scope.row,'a')">完成</el-dropdown-item>
<el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'b')">取消</el-dropdown-item>
<el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'c')">拉回</el-dropdown-item>
<el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'d')">重发</el-dropdown-item>
<el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'e')">详情</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<el-button type="text" icon="el-icon-success" @click="handleCommand(scope.row, 'a')">完成</el-button>
</template>
</el-table-column>
</el-table>
@@ -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 => {

4
wms/qd/src/views/wms/st/in/index.vue
View File

@@ -398,7 +398,7 @@
@select-all="onSelectAll"
>
<el-table-column :selectable="checkboxT" type="selection" width="55" />
<el-table-column prop="bill_code" label="单据编号" width="120">
<el-table-column prop="bill_code" label="单据编号" width="130">
<template slot-scope="scope">
<el-link type="warning" @click="lookUp(scope.row)">{{ scope.row.bill_code }}</el-link>
</template>
@@ -424,7 +424,7 @@
</template>
</el-table-column>
<el-table-column prop="unit_name" label="数量单位" />
<el-table-column prop="start_point_name" label="起始点位" width="120" />
<el-table-column prop="start_point_name" label="起始点位" width="140" />
<el-table-column prop="start_area" label="起始区域" width="120">
<template slot-scope="scope">
{{ dict.label.sch_area_type[scope.row.start_area] }}

36
wms/qd/src/views/wms/st/ivt/index.vue
View File

@@ -73,10 +73,10 @@
<el-table-column v-if="false" prop="struct_id" label="仓位标识" />
<el-table-column prop="sect_name" label="所属库区" width="120" />
<el-table-column prop="struct_code" label="仓位编码" />
<el-table-column prop="struct_name" label="仓位名称" />
<el-table-column prop="struct_name" label="仓位名称" min-width="120"/>
<el-table-column prop="vehicle_code" label="载具号" />
<el-table-column v-if="false" prop="material_id" label="物料标识" />
<el-table-column prop="material_code" label="物料编码" />
<el-table-column prop="material_code" label="物料编码" min-width="120"/>
<el-table-column prop="material_name" label="物料名称" />
<el-table-column prop="workprocedure_name" label="物料工序" />
<el-table-column prop="is_full" label="是否满托">
@@ -90,8 +90,8 @@
</template>
</el-table-column>
<el-table-column prop="instorage_time" label="入库时间" width="150" />
<el-table-column prop="stewing_time" label="静置时间(分钟)" width="150px" />
<el-table-column prop="stationary_state" label="静止状态">
<el-table-column prop="stewing_time" label="静置时间(分钟)" width="150" />
<el-table-column prop="stationary_state" label="静置状态" min-width="100">
<template slot-scope="scope">
<el-tag
:type="scope.row.stationary_state === '1' ? 'primary' : 'success'"
@@ -118,18 +118,8 @@
</template>
</el-table-column>
<el-table-column v-permission="[]" label="操作" width="100px" align="center" fixed="right">
<!-- <template slot-scope="scope">
<el-button :disabled="scope.row.stationary_state === '1'" type="primary">静止完成</el-button>
</template>-->
<template slot-scope="scope">
<el-dropdown trigger="click" @command="handleCommand">
<span class="el-dropdown-link">
<i class="el-icon-menu" />
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :disabled="scope.row.stationary_state === '0'" :command="beforeHandleCommand(scope.$index, scope.row,'a')">强制完成</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<el-button :disabled="scope.row.stationary_state === '0'" type="text" @click="handleCommand(scope.row)" icon="el-icon-position">强制完成</el-button>
</template>
</el-table-column>
</el-table>
@@ -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()
})

6
wms/qd/src/views/wms/st/out/index.vue
View File

@@ -310,7 +310,7 @@
</template>
</el-table-column>
<el-table-column prop="workprocedure_name" label="所属工序" width="90" />
<el-table-column prop="material_name" label="物料" width="90" />
<el-table-column prop="material_name" label="物料" min-width="130" show-overflow-tooltip/>
<el-table-column prop="vehicle_code" label="载具编码" />
<el-table-column prop="pcsn" label="批次" />
<el-table-column prop="qty" label="数量" width="100">
@@ -319,13 +319,13 @@
</template>
</el-table-column>
<el-table-column prop="unit_name" label="数量单位" />
<el-table-column prop="start_point_name" label="起始点位" width="120" />
<el-table-column prop="start_point_name" label="起始点位" min-width="140" show-overflow-tooltip />
<el-table-column prop="start_area" label="起始区域" width="120">
<template slot-scope="scope">
{{ dict.label.sch_area_type[scope.row.start_area] }}
</template>
</el-table-column>
<el-table-column prop="end_point_name" label="终点点位" width="120" />
<el-table-column prop="end_point_name" label="终点点位" min-width="140" show-overflow-tooltip/>
<el-table-column prop="end_area" label="终点区域" width="120">
<template slot-scope="scope">
{{ dict.label.sch_area_type[scope.row.end_area] }}