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

代码更新

Browse Source
This commit is contained in:
lyd
2022-10-21 18:29:30 +08:00
parent b82b329410
commit 4abc0f8cb1
10 changed files with 46 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/src/main/java/org/nl/wms/ext/wql/AUTO_QUERYTASK.wql
View File

@@ -48,7 +48,7 @@
SCH_BASE_Task task
WHERE
task.is_delete = '0'
AND task.task_status = '01'
AND task.task_status = '1'
AND task.point_code1 in ('YQX01_WX','YQX02_WX')
ENDSELECT

4
lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkorderServiceImpl.java
View File

@@ -121,7 +121,7 @@ public class WorkorderServiceImpl implements WorkordeService {
String newCode = CodeUtil.getNewCode("PDM_SHIFTORDER");
dto.setWorkorder_id(IdUtil.getSnowflake(1, 1).nextId());
dto.setWorkorder_code(newCode);
dto.setOrder_status("00");
dto.setOrder_status("1");
dto.setCreate_id(currentUserId);
dto.setCreate_time(now);
dto.setCreate_name(nickName);
@@ -386,7 +386,7 @@ public class WorkorderServiceImpl implements WorkordeService {
WQLObject wo = WQLObject.getWQLObject("PDM_BD_WORKORDER");
JSONObject produceorderMap = new JSONObject();
produceorderMap.put("workorder_id",workorder_id);
produceorderMap.put("order_status","04");
produceorderMap.put("order_status","5");
produceorderMap.put("update_optid", currentUserId);
produceorderMap.put("device_id", null);
produceorderMap.put("update_optname", nickName);

2
lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/MPS_PRODUCEDURE001.wql
View File

@@ -74,7 +74,7 @@
ShiftOrder.order_type_scode = 输入.order_type_scode
ENDOPTION
OPTION 输入.unFinish <> ""
ShiftOrder.order_status <> '04'
ShiftOrder.order_status <> '5'
ENDOPTION
OPTION 输入.order_status <> ""
find_in_set( ShiftOrder.order_status, 输入.order_status)

2
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/GjxCallEmpVehicleTask.java
View File

@@ -123,7 +123,7 @@ public class GjxCallEmpVehicleTask extends AbstractAcsTask {
JSONObject dpjPoint1 = pointTab.query("is_delete='0' and region_code='DPJQB01' and can_vehicle_type like '%" + vehicle_type + "%'").uniqueResult(0);
//叠盘架无载具:1-判断是否有在执行中的堆叠任务，有则等堆叠任务完成以后再去，否则去去缓存位和养生A区找
JSONObject ddTask = taskTab.query("is_delete='0' and point_code2 = '" + dpjPoint1.getString("point_code") + "'").uniqueResult(0);
JSONObject ddTask = taskTab.query("is_delete='0' and point_code2 = '" + dpjPoint1.getString("point_code") + "'" + " and task_status <> '7' ").uniqueResult(0);
if (ObjectUtil.isNotEmpty(ddTask)) continue;
//去缓存位和养生A区找,生成到叠盘架的任务

4
lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
View File

@@ -341,9 +341,9 @@ const defaultForm = {
planproduceend_date: null,
realproducestart_date: null,
realproduceend_date: null,
order_status: '00',
order_status: '1',
is_needmove: '1',
order_type_scode: '01',
order_type_scode: '1',
create_id: null,
create_name: null,
create_time: null,

6
lms/nladmin-ui/src/views/wms/st/cppoint/cppInRegion.vue
View File

@@ -153,6 +153,10 @@ export default {
url: 'api/regionio',
idField: 'qty_unit_id',
sort: 'qty_unit_id,desc',
query: {
io_type: '1',
io_region: "'CPQYA01'"
},
crudMethod: { ...crudBill }
})
},
@@ -175,8 +179,6 @@ export default {
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
this.query.io_type = '1'
this.query.io_region = "'CPQYA01'"
return true
}
}

4
lms/nladmin-ui/src/views/wms/st/cppoint/cppInventory.vue
View File

@@ -260,6 +260,9 @@ export default {
del: false,
download: false,
reset: true
},
query: {
region_code: "'CPQYA01'"
}
})
},
@@ -280,7 +283,6 @@ export default {
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
this.query.region_code = "'CPQYA01'"
return true
},
hand(value) {

4
lms/nladmin-ui/src/views/wms/st/ysa/inventory.vue
View File

@@ -260,6 +260,9 @@ export default {
del: false,
download: false,
reset: true
},
query: {
region_code: "'YSQA01', 'YSAQKTPQ01'"
}
})
},
@@ -280,7 +283,6 @@ export default {
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
this.query.region_code = "'YSQA01', 'YSAQKTPQ01'"
return true
},
hand(value) {

40
lms/nladmin-ui/src/views/wms/st/ysa/ysqInRegion.vue
View File

@@ -95,29 +95,29 @@
<!--表格渲染-->
<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="bill_code" label="单据编号" min-width="150"/>
<el-table-column prop="io_type" label="出入类型" >
<el-table-column prop="bill_code" label="单据编号" min-width="150" />
<el-table-column prop="io_type" label="出入类型">
<template slot-scope="scope">
{{ dict.label.io_type[scope.row.io_type] }}
</template>
</el-table-column>
<el-table-column prop="pcsn" label="批次" />
<el-table-column prop="vehicle_code" label="载具编码" show-overflow-tooltip/>
<el-table-column prop="qty" label="数量" :formatter="crud.formatNum3"/>
<el-table-column prop="bill_status" label="单据状态" >
<el-table-column prop="vehicle_code" label="载具编码" show-overflow-tooltip />
<el-table-column prop="qty" label="数量" :formatter="crud.formatNum3" />
<el-table-column prop="bill_status" label="单据状态">
<template slot-scope="scope">
{{ dict.label.st_bill_status[scope.row.bill_status] }}
</template>
</el-table-column>
<el-table-column prop="start_point_code" label="起始点位编码" min-width="120"/>
<el-table-column prop="end_point_code" label="终点点位编码" min-width="120"/>
<el-table-column prop="start_point_code" label="起始点位编码" min-width="120" />
<el-table-column prop="end_point_code" label="终点点位编码" min-width="120" />
<!-- <el-table-column prop="start_region_id" label="起始区域" />-->
<!-- <el-table-column prop="end_region_id" label="终点区域" />-->
<el-table-column prop="remark" label="备注" />
<el-table-column prop="update_optname" label="修改人姓名" min-width="100"/>
<el-table-column prop="update_time" label="修改时间" min-width="140"/>
<el-table-column prop="confirm_optname" label="确认人姓名" min-width="100"/>
<el-table-column prop="confirm_time" label="确认时间" min-width="140"/>
<el-table-column prop="update_optname" label="修改人姓名" min-width="100" />
<el-table-column prop="update_time" label="修改时间" min-width="140" />
<el-table-column prop="confirm_optname" label="确认人姓名" min-width="100" />
<el-table-column prop="confirm_time" label="确认时间" min-width="140" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
@@ -135,7 +135,7 @@
<script>
import crudBill from '@/views/wms/st/bill'
import CRUD, {crud, form, header, presenter} from '@crud/crud'
import CRUD, { crud, form, header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
@@ -148,7 +148,17 @@ export default {
dicts: ['io_type', 'st_bill_status'],
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({ title: '养生区入库管理', url: 'api/regionio', idField: 'qty_unit_id', sort: 'qty_unit_id,desc', crudMethod: { ...crudBill }})
return CRUD({
title: '养生区入库管理',
url: 'api/regionio',
idField: 'qty_unit_id',
sort: 'qty_unit_id,desc',
crudMethod: { ...crudBill },
query: {
io_type: '1',
io_region: "'YSQA01', 'YSAQKTPQ01'"
}
})
},
data() {
return {
@@ -164,13 +174,11 @@ export default {
bill_status: [
{ required: true, message: '单据状态不能为空', trigger: 'blur' }
]
} }
}}
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
this.query.io_type = '1'
this.query.io_region = "'YSQA01', 'YSAQKTPQ01'"
return true
}
}

8
lms/nladmin-ui/src/views/wms/st/ysa/ysqOutRegion.vue
View File

@@ -153,7 +153,11 @@ export default {
url: 'api/regionio',
idField: 'qty_unit_id',
sort: 'qty_unit_id,desc',
crudMethod: { ...crudBill }
crudMethod: { ...crudBill },
query: {
io_type: '2',
io_region: "'YSQA01', 'YSAQKTPQ01'"
}
})
},
data() {
@@ -175,8 +179,6 @@ export default {
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
this.query.io_type = '2'
this.query.io_region = "'YSQA01', 'YSAQKTPQ01'"
return true
}
}