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

add: acs添加操作日志,lms优化冲床空满交换逻辑,添加入库天数显示

Browse Source
This commit is contained in:
yanps
2025-03-01 14:26:52 +08:00
parent 0b9c855c17
commit 2be27b9126
14 changed files with 178 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java
View File

@@ -122,10 +122,10 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
resources.setPid(null);
addSystemTypeDict(resources);
}
resources.setSub_count(0);
baseMapper.insert(resources);
// 计算子节点数目
resources.setSub_count(0);
// 更新父节点菜单数目
updateSubCnt(resources.getPid());
updateRootSystemType(resources);

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/fab/controller/FabController.java
View File

@@ -54,7 +54,7 @@ public class FabController {
private ISchBaseVehiclematerialgroupService iSchBaseVehiclematerialgroupService;
@Autowired
private WmsToConnectorService wmsToConnectorService;
private static final HashMap REGION_CODE = MapOf.of("货架", "1", "外协加工", "2", "内部加工", "3", "内部过道", "4","其他加工","5");
private static final HashMap REGION_CODE = MapOf.of("货架", "1", "内部加工", "2", "外协加工", "3", "内部过道", "4","其他加工","5");
/**

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/SchBaseVehiclematerialgroup.java
View File

@@ -168,7 +168,8 @@ public class SchBaseVehiclematerialgroup implements Serializable {
@TableField(exist = false)
private String materialFile;
@TableField(exist = false)
private String between;
@TableField(exist = false)
private String material_name;
@TableField(exist = false)

6
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/impl/SchBaseVehiclematerialgroupServiceImpl.java
View File

@@ -1,6 +1,7 @@
package org.nl.wms.sch.group.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.IdUtil;
@@ -50,6 +51,8 @@ import java.awt.image.BufferedImage;
import java.io.*;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.time.LocalDate;
import java.time.temporal.ChronoUnit;
import java.util.*;
import java.util.List;
import java.util.stream.Collectors;
@@ -109,6 +112,9 @@ public class SchBaseVehiclematerialgroupServiceImpl extends ServiceImpl<SchBaseV
if (CollUtil.isNotEmpty(schBaseVehiclematerialgroups)) {
item.setHasChildren(true);
}
// 计算两个日期之间的天数差
long daysBetween = DateUtil.between(DateUtil.parse(item.getCreate_time()), new Date(), DateUnit.DAY);
item.setBetween(daysBetween + "");
item.setHas_work(true);
});
return schBaseVehiclematerialgroupIPage;

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/controller/SchBasePointController.java
View File

@@ -1,5 +1,6 @@
package org.nl.wms.sch.point.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -58,7 +59,7 @@ public class SchBasePointController {
@Log("删除点位管理")
@ApiOperation("删除点位管理")
//@SaCheckPermission("@el.check('schBasePoint:del')")
@SaCheckPermission("schBasePoint:del")
@DeleteMapping
public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
schBasePointService.deleteAll(ids);

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/connector/CNTTask.java
View File

@@ -43,7 +43,7 @@ public class CNTTask extends AbstractTask {
private static final String TASK_CONFIG_CODE = "CNTTask";
private static final String[] EMPTY_POINT = {"13-01-01","13-01-03"};
private static final String[] EMPTY_POINT = {"13-01-01","13-01-04"};
@Autowired
private ISchBasePointService pointService;
@Autowired

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/connector/FTGTask.java
View File

@@ -46,7 +46,7 @@ public class FTGTask extends AbstractTask {
private static final String TASK_CONFIG_CODE = "FTGTask";
private static final String[] EMPTY_POINT = {"13-01-02","13-01-04"};
private static final String[] EMPTY_POINT = {"13-01-02","13-01-03"};
@Autowired
private ISchBasePointService pointService;
@Autowired

1
lms/nladmin-ui/src/views/wms/sch/group/index.vue
View File

@@ -224,6 +224,7 @@
<el-table-column prop="material_path" label="物料图片路径" :min-width="flexWidth('material_path',crud.data,'物料图片路径')" />
<el-table-column prop="create_name" label="创建人" width="100" />
<el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
<el-table-column prop="between" label="入库天数" :min-width="flexWidth('between',crud.data,'入库天数')" />
<el-table-column v-if="false" prop="update_name" label="修改人" :min-width="flexWidth('update_name',crud.data,'修改人')" />
<el-table-column v-if="false" prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">

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

@@ -231,7 +231,7 @@
<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="can_vehicle_type">
<!--<el-form-item label="允许载具类型" prop="can_vehicle_type">
<el-select
v-model="form.can_vehicle_type"
size="mini"
@@ -246,7 +246,7 @@
:value="item.value"
/>
</el-select>
</el-form-item>
</el-form-item>-->
<el-form-item label="点位状态" prop="point_status">
<el-select
v-model="form.point_status"
@@ -263,7 +263,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="点位类型" prop="point_type">
<!-- <el-form-item label="点位类型" prop="point_type">
<el-select
v-model="form.point_type"
size="mini"
@@ -278,7 +278,7 @@
:value="item.value"
/>
</el-select>
</el-form-item>
</el-form-item>-->
<el-form-item label="是否锁定">
<el-radio v-for="item in dict.TrueOrFalse" :key="item.id" v-model="form.is_lock" :label="item.value">{{ item.label }}</el-radio>
</el-form-item>
@@ -345,24 +345,15 @@
<el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
<el-table-column prop="update_name" label="修改人" :min-width="flexWidth('update_name',crud.data,'修改人')" />
<el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<!-- <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
style="display: inline"
:data="scope.row"
:permission="permission"
/>
<!-- <el-button
v-if="showButton(scope.row.point_status)"
size="mini"
type="text"
icon="el-icon-view"
@click="toView(scope.row)"
>
查看详情
</el-button> -->
</template>
</el-table-column>
</el-table-column> -->
</el-table>
<!--分页组件-->
<pagination />
@@ -431,7 +422,7 @@ export default {
optShow: {
add: true,
edit: true,
del: true,
del: false,
download: false,
reset: true
},
@@ -443,6 +434,11 @@ export default {
},
data() {
return {
permission: {
add: ['point:add'],
edit: ['admin', 'user:edit'],
del: ['admin', 'user:del']
},
dict: {
label: {
point_status: {