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

fix：对接位分配查询优化

Browse Source
This commit is contained in:
zhouz
2024-07-31 09:38:45 +08:00
parent 6ccd09a395
commit 7907a8493c
4 changed files with 71 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java
View File

@@ -356,10 +356,10 @@ public class FeedingServiceImpl implements FeedingService {
break;
}
JSONObject map = new JSONObject();
map.put("flag", "1");
map.put("flag", "4");
map.put("reging_id", reging_id);
map.put("point_location", cool_jo.getString("point_location"));
//只找出箱点位
//只找入箱点位
map.put("point_type", "5");
JSONObject pointArr = WQL.getWO("PDA_OVENINANDOUT_01").addParamMap(map).process().uniqueResult(0);

3
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_OVENINANDOUT_01.wql
View File

@@ -299,13 +299,14 @@
AND IFNULL(po.material_code,'') = ''
AND po.region_id = 输入.reging_id
AND po.point_location = 输入.point_location
AND po.point_type = 输入.point_type
AND NOT EXISTS (
SELECT
*
FROM
sch_base_task
WHERE
( point_code2 = point_code OR point_code4 = point_code )
(point_code1 = point_code OR point_code2 = point_code OR point_code4 = point_code )
AND task_status < '07'
AND is_delete = '0'
)

5
lms/nladmin-system/src/main/java/org/nl/wms/sch/service/dto/PointDto.java
View File

@@ -92,6 +92,11 @@ public class PointDto implements Serializable {
*/
private String vehicle_code;
/**
* 载具编码
*/
private String material_code;
/**
* 载具数量
*/

36
lms/nladmin-ui/src/views/wms/sch/point/index.vue
View File

@@ -291,6 +291,9 @@
<el-form-item label="载具编码" prop="vehicle_code">
<el-input v-model="form.vehicle_code" clearable style="width: 370px;"/>
</el-form-item>
<el-form-item label="物料批次" prop="material_code">
<el-input v-model="form.material_code" clearable style="width: 370px;"/>
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" style="width: 370px;" rows="2" type="textarea"/>
@@ -322,8 +325,12 @@
{{ dict.label.vehicle_type[scope.row.vehicle_type] }}
</template>
</el-table-column>-->
<el-table-column prop="vehicle_code" label="载具编码" :min-width="flexWidth('vehicle_code',crud.data,'载具编码')" />
<el-table-column prop="material_code" label="物料批次" :min-width="flexWidth('material_code',crud.data,'物料批次')" />
<el-table-column prop="vehicle_code" label="载具编码"
:min-width="flexWidth('vehicle_code',crud.data,'载具编码')"
/>
<el-table-column prop="material_code" label="物料批次"
:min-width="flexWidth('material_code',crud.data,'物料批次')"
/>
<el-table-column prop="vehicle_qty" label="载具数量"/>
<el-table-column prop="product_area" label="生产区域"/>
<el-table-column prop="remark" label="备注" min-width="100" show-overflow-tooltip/>
@@ -366,7 +373,26 @@ import pagination from '@crud/Pagination'
import { download } from '@/api/data'
import { downloadFile } from '@/utils'
const defaultForm = { point_id: null, point_code: null, point_name: null, point_type: null, point_status: null, lock_type: '1', vehicle_code: null, source_id: null, remark: null, is_used: null, is_delete: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null }
const defaultForm = {
point_id: null,
point_code: null,
material_code: null,
point_name: null,
point_type: null,
point_status: null,
lock_type: '1',
vehicle_code: null,
source_id: null,
remark: null,
is_used: null,
is_delete: null,
create_id: null,
create_name: null,
create_time: null,
update_optid: null,
update_optname: null,
update_time: null
}
export default {
name: 'Point',
dicts: ['vehicle_type', 'd_lock_type', 'SCH_TASK_TYPE_DTL', 'vehicle_type'],
@@ -483,7 +509,9 @@ export default {
this.getPointStatusList(id, flag)
this.getPointTypeList(id, flag)
}
if (flag === 1) { this.crud.toQuery() }
if (flag === 1) {
this.crud.toQuery()
}
},
getPointStatusList(id, flag) {
debugger