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

rev：更新

Browse Source
This commit is contained in:
gengby
2024-07-05 09:48:10 +08:00
parent d1628efd15
commit 9a16d8be85
4 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/decisioner/impl/base/FIFORuleHandler.java
View File

@@ -59,7 +59,7 @@ public class FIFORuleHandler extends Decisioner<StructattrVechielDto, JSONObject
, "order_by", "ABS(qty-#{plan_qty}) asc,update_time asc") , "order_by", "ABS(qty-#{plan_qty}) asc,update_time asc")
); );
int finalPlan_qty = plan_qty; int finalPlan_qty = plan_qty;
vechielDtos.sort(Comparator.comparingInt(o -> (o.getQty().intValue() - finalPlan_qty))); // vechielDtos.sort(Comparator.comparingInt(o -> (o.getQty().intValue() - finalPlan_qty)));
List<String> need = list.stream().map(StructattrVechielDto::getVehicle_code).collect(Collectors.toList()); List<String> need = list.stream().map(StructattrVechielDto::getVehicle_code).collect(Collectors.toList());
List<StructattrVechielDto> disList = new ArrayList<>(); List<StructattrVechielDto> disList = new ArrayList<>();

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/GroupDickInStorageTask.java
View File

@@ -65,7 +65,7 @@ public class GroupDickInStorageTask extends AbstractTask {
if (StringUtils.isEmpty(point_code1)){ if (StringUtils.isEmpty(point_code1)){
throw new BadRequestException("申请任务失败:请求参数数据异常"); throw new BadRequestException("申请任务失败:请求参数数据异常");
} }
MdGruopDick mst = iMdGruopDickService.getOne(new QueryWrapper<MdGruopDick>().eq("vehicle_code", vehicle_code).lt("status", StatusEnum.FORM_STATUS.code("完成"))); MdGruopDick mst = iMdGruopDickService.getOne(new QueryWrapper<MdGruopDick>().eq("vehicle_code", vehicle_code).le("status", StatusEnum.FORM_STATUS.code("完成")));
if (mst == null){ if (mst == null){
throw new BadRequestException("申请任务失败:载具"+vehicle_code+"组盘信息不存在"); throw new BadRequestException("申请任务失败:载具"+vehicle_code+"组盘信息不存在");
} }

2
wms_pro/qd/src/views/wms/base_manage/struct/index.vue
View File

@@ -101,7 +101,7 @@
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<<el-form-item label="归属库区" prop="sect_name"> <el-form-item label="归属库区" prop="sect_name">
<el-input v-model="form.sect_name" style="width: 200px;" /> <el-input v-model="form.sect_name" style="width: 200px;" />
</el-form-item> </el-form-item>
</el-col> </el-col>

8
wms_pro/qd/src/views/wms/stor_manage/warehouse/pick/TaskDialog.vue
View File

@@ -191,7 +191,7 @@
<el-table-column width="130" show-overflow-tooltip v-for="(item, index) in disCols" :key="item.value" <el-table-column width="130" show-overflow-tooltip v-for="(item, index) in disCols" :key="item.value"
:label="item.lable"> :label="item.lable">
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch v-if="item.value == 'is_artificial'" <el-switch v-if="item.value == 'is_artificiality'"
v-model="tabledis[scope.$index].form_data[item.value]" v-model="tabledis[scope.$index].form_data[item.value]"
active-color="#409EFF" active-color="#409EFF"
inactive-color="#F56C6C" inactive-color="#F56C6C"
@@ -351,9 +351,7 @@ export default {
dtl.source_form_id = this.currentDtl.id dtl.source_form_id = this.currentDtl.id
dtl.source_form_date = this.currentDtl.create_time dtl.source_form_date = this.currentDtl.create_time
dtl.parent_id = this.currentDtl.id dtl.parent_id = this.currentDtl.id
debugger dtl.form_data = JSON.parse(JSON.stringify(this.disFormData))
dtl.form_data = this.disFormData
this.tabledis.push(dtl) this.tabledis.push(dtl)
}, },
subRow(index){ subRow(index){
@@ -441,7 +439,7 @@ export default {
padding: 10px 0px 0px 20px; padding: 10px 0px 0px 20px;
} }
.crud-opts-right2 { .crud-opts-right2 {
padding-left: 77%; padding-left: 89%;
} }
.input-with-select { .input-with-select {