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

代码更新

Browse Source
This commit is contained in:
ludj
2023-05-16 13:38:00 +08:00
parent 17bffebc1d
commit 9030279e27
21 changed files with 258 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
nladmin-system/doc/wms.xls
View File

Binary file not shown.

1
nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java
View File

@@ -65,6 +65,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
//判断角色名字是否存在
SysRole role = roleMapper.selectOne(new LambdaQueryWrapper<SysRole>().eq(SysRole::getName, sysRole.getName()));
if (ObjectUtil.isNotEmpty(role)) throw new BadRequestException("角色【" + name + "】已存在!");
String userId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();
String now = DateUtil.now();

1
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/TaskListType.java Normal file
View File

@@ -0,0 +1 @@
package org.nl.wms.sch.task.core.task;

34
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/TaskServiceImpl.java Normal file
View File

@@ -0,0 +1,34 @@
package org.nl.wms.sch.task.core.task;
import cn.hutool.core.lang.Assert;
import com.alibaba.fastjson.JSONObject;
import org.nl.common.exception.BadRequestException;
/**
* @author ldjun
* @version 1.0
* @date 2023年05月08日 13:59
* @desc desc
*/
public class TaskServiceImpl {
String create(JSONObject param) throws BadRequestException {
return null;
}
public void beforeToCreate(JSONObject param) throws BadRequestException {
String point_code = param.getString("point_code");
Assert.notEmpty(point_code, "点位编码为空!");
//1、查找点位
//2、校验点位是否启用
//3、校验点位是否自动
//4、任务类型
}
public void createAfter(JSONObject param) throws BadRequestException {
}
}

1
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/BaseTask.java Normal file
View File

@@ -0,0 +1 @@
package org.nl.wms.sch.task.core.task.core;

11
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/BaseTaskDto.java Normal file
View File

@@ -0,0 +1,11 @@
package org.nl.wms.sch.task.core.task.core;
/**
* @author ldjun
* @version 1.0
* @date 2023年05月08日 13:35
* @desc desc
*/
public class BaseTaskDto {
}

1
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/TaskApplyDto.java Normal file
View File

@@ -0,0 +1 @@
package org.nl.wms.sch.task.core.task.core;

28
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/TaskApplyType.java Normal file
View File

@@ -0,0 +1,28 @@
package org.nl.wms.sch.task.core.task.core;
/**
* @author ldjun
* @version 1.0
* @date 2023年05月08日 10:27
* @desc desc
*/
public enum TaskApplyType {
SEND_MATERIAL(1, "送料", "送料"),
SEND_EMPTY(2, "送空载具", "送空载具"),
CALL_MATERIAL(3, "叫料", "叫料"),
CALL_EMPTY(4, "叫空载具", "叫空载具");
TaskApplyType(int code, String name, String desc) {
this.code = code;
this.name = name;
this.desc = desc;
}
// 操作设备类型编码
private int code;
// 操作设备类型名字
private String name;
//操作设备类型类型
private String desc;
}

11
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/TaskDto.java Normal file
View File

@@ -0,0 +1,11 @@
package org.nl.wms.sch.task.core.task.core;
/**
* @author ldjun
* @version 1.0
* @date 2023年05月08日 13:41
* @desc desc
*/
public class TaskDto {
private String task_code;
}

1
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/TaskInterface.java Normal file
View File

@@ -0,0 +1 @@
package org.nl.wms.sch.task.core.task.core;

1
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/TaskOperateType.java Normal file
View File

@@ -0,0 +1 @@
package org.nl.wms.sch.task.core.task.core;

1
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/core/TaskStatus.java Normal file
View File

@@ -0,0 +1 @@
package org.nl.wms.sch.task.core.task.core;

1
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/core/task/tasks/HNMLTask.java Normal file
View File

@@ -0,0 +1 @@
package org.nl.wms.sch.task.core.task.tasks;

16
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskconfigServiceImpl.java
View File

@@ -2,6 +2,7 @@ package org.nl.wms.sch.task.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -21,10 +22,10 @@ import java.util.Map;
import java.util.Set;
/**
* @description 服务实现
* @author lyd
* @date 2023-05-15
**/
* @author lyd
* @description 服务实现
* @date 2023-05-15
**/
@Slf4j
@Service
public class SchBaseTaskconfigServiceImpl extends ServiceImpl<SchBaseTaskconfigMapper, SchBaseTaskconfig> implements ISchBaseTaskconfigService {
@@ -33,7 +34,7 @@ public class SchBaseTaskconfigServiceImpl extends ServiceImpl<SchBaseTaskconfigM
private SchBaseTaskconfigMapper schBaseTaskconfigMapper;
@Override
public IPage<SchBaseTaskconfig> queryAll(Map whereJson, PageQuery page){
public IPage<SchBaseTaskconfig> queryAll(Map whereJson, PageQuery page) {
LambdaQueryWrapper<SchBaseTaskconfig> lam = new LambdaQueryWrapper<>();
IPage<SchBaseTaskconfig> pages = new Page<>(page.getPage() + 1, page.getSize());
schBaseTaskconfigMapper.selectPage(pages, lam);
@@ -42,11 +43,14 @@ public class SchBaseTaskconfigServiceImpl extends ServiceImpl<SchBaseTaskconfigM
@Override
public void create(SchBaseTaskconfig entity) {
SchBaseTaskconfig schBaseTaskconfig = schBaseTaskconfigMapper.selectOne(new LambdaQueryWrapper<SchBaseTaskconfig>().eq(SchBaseTaskconfig::getConfig_code, entity.getConfig_code()));
if (ObjectUtil.isNotEmpty(schBaseTaskconfig))
throw new BadRequestException("任务配置【" + entity.getConfig_code() + "】已存在!");
String currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();
String now = DateUtil.now();
entity.setConfig_code(IdUtil.getSnowflake(1, 1).nextIdStr());
entity.setCreate_id(currentUserId);
entity.setCreate_name(nickName);
entity.setCreate_time(now);

120
nladmin-system/nlsso-server/src/main/resources/application.yml
View File

@@ -1,120 +0,0 @@
# 端口
server:
port: 9000
# Sa-Token 配置
sa-token:
# ------- SSO-模式一相关配置 (非模式一不需要配置)
# 配置 Cookie 作用域
# ------- SSO-模式二相关配置
sso:
# Ticket有效期 (单位: 秒)，默认五分钟
ticket-timeout: 300
# 所有允许的授权回调地址比较重要
allow-url: "*"
# 是否打开单点注销功能
is-slo: true
# ------- SSO-模式三相关配置 （下面的配置在SSO模式三并且 is-slo=true 时打开）
# # 是否打开模式三
isHttp: true
# # 接口调用秘钥（用于SSO模式三的单点注销功能）
secretkey: kQwIOrYvnXmSDkwEiFngrKidMcdrgKor
token-name: EL-ADMIN-TOEKN
# # ---- 除了以上配置项，你还需要为 Sa-Token 配置http请求处理器（文档有步骤说明）
#
spring:
#配置 Jpa
jpa:
hibernate:
ddl-auto: none
open-in-view: true
properties:
hibernate:
dialect: org.hibernate.dialect.MySQL5InnoDBDialect
enable_lazy_load_no_trans: true
# 数据源
datasource:
druid:
db-type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
# url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:whxr_test}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
url: jdbc:mysql://${DB_HOST:47.111.78.178}:${DB_PORT:3306}/${DB_NAME:whxr}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
username: ${DB_USER:root}
password: ${DB_PWD:P@ssw0rd}
# username: ${DB_USER:root}
# password: ${DB_PWD:root}
# 初始连接数
initial-size: 5
# 最小连接数
min-idle: 15
# 最大连接数
max-active: 30
# 是否自动回收超时连接
remove-abandoned: true
# 超时时间(以秒数为单位)
remove-abandoned-timeout: 180
# 获取连接超时时间
max-wait: 300
# 连接有效性检测时间
time-between-eviction-runs-millis: 60000
# 连接在池中最小生存的时间
min-evictable-idle-time-millis: 300000
# 连接在池中最大生存的时间
max-evictable-idle-time-millis: 900000
# 指明连接是否被空闲连接回收器(如果有)进行检验.如果检测失败,则连接将被从池中去除
test-while-idle: true
# 指明是否在从池中取出连接前进行检验,如果检验失败, 则从池中去除连接并尝试取出另一个
test-on-borrow: true
# 是否在归还到池中前进行检验
test-on-return: false
# 检测连接是否有效
validation-query: select 1
# 配置监控统计
# webStatFilter:
# enabled: true
# stat-view-servlet:
# enabled: true
# url-pattern: /druid/*
# reset-enable: false
# filter:
# stat:
# enabled: true
# # 记录慢SQL
# log-slow-sql: true
# slow-sql-millis: 1000
# merge-sql: true
# wall:
# config:
# multi-statement-allow: true
# Redis配置 （SSO模式一和模式二使用Redis来同步会话）
redis:
# Redis数据库索引（默认为0）
database: 1
# Redis服务器地址
host: 47.96.133.178
# Redis服务器连接端口
port: 6479
# Redis服务器连接密码（默认为空）
password: 942464Yy
# 连接超时时间
timeout: 10s
lettuce:
pool:
# 连接池最大连接数
max-active: 200
# 连接池最大阻塞等待时间（使用负值表示没有限制）
max-wait: -1ms
# 连接池中的最大空闲连接
max-idle: 10
# 连接池中的最小空闲连接
min-idle: 0
forest:
# 关闭 forest 请求日志打印
log-enabled: false

6
nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml
View File

@@ -7,10 +7,10 @@ spring:
db-type: com.alibaba.druid.pool.DruidDataSource
driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
# url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:nl-sso-server}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:stand_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
url: jdbc:log4jdbc:mysql://${DB_HOST:47.111.78.178}:${DB_PORT:3306}/${DB_NAME:stand_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
username: ${DB_USER:root}
# password: ${DB_PWD:Root.123456}
password: ${DB_PWD:12356}
password: ${DB_PWD:P@ssw0rd}
# password: ${DB_PWD:P@ssw0rd}
# 初始连接数
initial-size: 5
# 最小连接数

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

@@ -13,61 +13,61 @@
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" />
<!--表单组件-->
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="800px">
<el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" size="mini" label-width="115px" label-suffix=":">
<el-form-item label="工单编号">
<el-input v-model="form.workorder_code" style="width: 370px;" />
<el-input v-model="form.workorder_code" style="width: 240px;" />
</el-form-item>
<el-form-item label="生产日期">
<el-input v-model="form.produce_date" style="width: 370px;" />
<el-input v-model="form.produce_date" style="width: 240px;" />
</el-form-item>
<el-form-item label="计划数量">
<el-input v-model="form.plan_qty" style="width: 370px;" />
<el-input v-model="form.plan_qty" style="width: 240px;" />
</el-form-item>
<el-form-item label="实际数量">
<el-input v-model="form.real_qty" style="width: 370px;" />
<el-input v-model="form.real_qty" style="width: 240px;" />
</el-form-item>
<el-form-item label="物料标识">
<el-input v-model="form.material_id" style="width: 370px;" />
<el-input v-model="form.material_id" style="width: 240px;" />
</el-form-item>
<el-form-item label="载具类型">
<el-input v-model="form.vehicle_type" style="width: 370px;" />
<el-input v-model="form.vehicle_type" style="width: 240px;" />
</el-form-item>
<el-form-item label="计划开始时间">
<el-input v-model="form.planproducestart_date" style="width: 370px;" />
<el-input v-model="form.planproducestart_date" style="width: 240px;" />
</el-form-item>
<el-form-item label="计划结束时间">
<el-input v-model="form.planproduceend_date" style="width: 370px;" />
<el-input v-model="form.planproduceend_date" style="width: 240px;" />
</el-form-item>
<el-form-item label="实际开始时间">
<el-input v-model="form.realproducestart_date" style="width: 370px;" />
<el-input v-model="form.realproducestart_date" style="width: 240px;" />
</el-form-item>
<el-form-item label="实际结束时间">
<el-input v-model="form.realproduceend_date" style="width: 370px;" />
<el-input v-model="form.realproduceend_date" style="width: 240px;" />
</el-form-item>
<el-form-item label="静置时间(分钟)">
<el-input v-model="form.standing_time" style="width: 370px;" />
<el-input v-model="form.standing_time" style="width: 240px;" />
</el-form-item>
<el-form-item label="点位编码">
<el-input v-model="form.point_code" style="width: 370px;" />
<el-input v-model="form.point_code" style="width: 240px;" />
</el-form-item>
<el-form-item label="点位名称">
<el-input v-model="form.point_name" style="width: 370px;" />
<el-input v-model="form.point_name" style="width: 240px;" />
</el-form-item>
<el-form-item label="区域编码">
<el-input v-model="form.region_code" style="width: 370px;" />
<el-input v-model="form.region_code" style="width: 240px;" />
</el-form-item>
<el-form-item label="区域名称">
<el-input v-model="form.region_name" style="width: 370px;" />
<el-input v-model="form.region_name" style="width: 240px;" />
</el-form-item>
<el-form-item label="是否需要AGV搬运">
<el-input v-model="form.is_needmove" style="width: 370px;" />
<el-form-item label="是否自动搬运">
<el-input v-model="form.is_needmove" style="width: 240px;" />
</el-form-item>
<el-form-item label="工单类型">
<el-input v-model="form.workorder_type" style="width: 370px;" />
<el-input v-model="form.workorder_type" style="width: 240px;" />
</el-form-item>
<el-form-item label="车间编码">
<el-input v-model="form.workshop_code" style="width: 370px;" />
<el-input v-model="form.workshop_code" style="width: 240px;" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -94,7 +94,7 @@
<el-table-column prop="region_code" label="区域编码" :min-width="flexWidth('region_code',crud.data,'区域编码')"/>
<el-table-column prop="region_name" label="区域名称" :min-width="flexWidth('region_name',crud.data,'区域名称')"/>
<el-table-column prop="workorder_status" label="工单状态" :min-width="flexWidth('workorder_status',crud.data,'工单状态')"/>
<el-table-column prop="is_needmove" label="是否需要AGV搬运" :min-width="flexWidth('is_needmove',crud.data,'是否需要AGV搬运')"/>
<el-table-column prop="is_needmove" label="是否自动搬运" :min-width="flexWidth('is_needmove',crud.data,'是否自动搬运')"/>
<el-table-column prop="workorder_type" label="工单类型" :min-width="flexWidth('workorder_type',crud.data,'工单类型')"/>
<el-table-column prop="passback_status" label="回传MES状态" :min-width="flexWidth('passback_status',crud.data,'回传MES状态')"/>
<el-table-column prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',crud.data,'车间编码')"/>

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

@@ -5,73 +5,74 @@
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" />
<!--表单组件-->
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="800px">
<el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" size="mini" label-width="115px" label-suffix=":">
<el-form-item label="载具编码">
<el-input v-model="form.vehicle_code" style="width: 370px;" />
<el-input v-model="form.vehicle_code" style="width: 240px;" />
</el-form-item>
<el-form-item label="子载具编码">
<el-input v-model="form.child_vehicle_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="来源载具编码">
<el-input v-model="form.source_vehicle_code" style="width: 370px;" />
<!--<el-form-item label="子载具编码">
<el-input v-model="form.child_vehicle_code" style="width: 240px;" />
</el-form-item>-->
<el-form-item v-if="false" label="来源载具">
<el-input v-model="form.source_vehicle_code" style="width: 240px;" />
</el-form-item>
<el-form-item label="点位编码">
<el-input v-model="form.point_code" style="width: 370px;" />
<el-input v-model="form.point_code" style="width: 240px;" />
</el-form-item>
<el-form-item label="点位名称">
<el-input v-model="form.point_name" style="width: 370px;" />
<el-input v-model="form.point_name" style="width: 240px;" />
</el-form-item>
<el-form-item label="是否满托">
<el-input v-model="form.is_full" style="width: 370px;" />
<el-input v-model="form.is_full" style="width: 240px;" />
</el-form-item>
<el-form-item label="批次">
<el-input v-model="form.pcsn" style="width: 370px;" />
<el-input v-model="form.pcsn" style="width: 240px;" />
</el-form-item>
<el-form-item label="入库时间">
<el-input v-model="form.instorage_time" style="width: 370px;" />
<el-input v-model="form.instorage_time" style="width: 240px;" />
</el-form-item>
<el-form-item label="静置时间(分钟)">
<el-input v-model="form.standing_time" style="width: 370px;" />
<el-input v-model="form.standing_time" style="width: 240px;" />
</el-form-item>
<el-form-item label="物料数量">
<el-input v-model="form.material_qty" style="width: 370px;" />
<el-input v-model="form.material_qty" style="width: 240px;" />
</el-form-item>
<el-form-item label="物料重量">
<el-input v-model="form.material_weight" style="width: 370px;" />
<el-input v-model="form.material_weight" style="width: 240px;" />
</el-form-item>
<el-form-item label="搬运工单编码">
<el-input v-model="form.workorder_code" style="width: 370px;" />
<el-form-item label="工单编码">
<el-input v-model="form.workorder_code" style="width: 240px;" />
</el-form-item>
<el-form-item label="组盘次数">
<el-input v-model="form.group_number" style="width: 370px;" />
<el-input v-model="form.group_number" style="width: 240px;" />
</el-form-item>
<el-form-item label="任务编码">
<el-input v-model="form.task_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="车间编码">
<el-input v-model="form.workshop_code" style="width: 370px;" />
<el-input v-model="form.task_code" style="width: 240px;" />
</el-form-item>
<!--<el-form-item label="车间编码">
<el-input v-model="form.workshop_code" style="width: 240px;" />
</el-form-item>-->
<el-form-item label="组盘状态">
<el-input v-model="form.group_status" style="width: 370px;" />
</el-form-item>
<el-form-item label="是否首个流程任务">
<el-input v-model="form.is_first_flow_task" style="width: 370px;" />
<el-input v-model="form.group_status" style="width: 240px;" />
</el-form-item>
<!--<el-form-item label="是否首个流程任务">
<el-input v-model="form.is_first_flow_task" style="width: 240px;" />
</el-form-item>-->
<el-form-item label="流程编码">
<el-input v-model="form.flow_code" style="width: 370px;" />
<el-input v-model="form.flow_code" style="width: 240px;" />
</el-form-item>
<el-form-item label="流程顺序">
<el-input v-model="form.flow_num" style="width: 370px;" />
<el-input v-model="form.flow_num" style="width: 240px;" />
</el-form-item>
<el-form-item label="上一任务编码">
<el-input v-model="form.before_task_code" style="width: 370px;" />
<el-form-item label="上一任务">
<el-input v-model="form.before_task_code" style="width: 240px;" />
</el-form-item>
<el-form-item label="下一任务编码">
<el-input v-model="form.next_task_code" style="width: 370px;" />
<el-form-item label="下一任务">
<el-input v-model="form.next_task_code" style="width: 240px;" />
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" style="width: 370px;" />
<el-form-item label="备注" prop="remark">
<label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
<el-input v-model.trim="form.remark" style="width: 480px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -82,33 +83,33 @@
<!--表格渲染-->
<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="vehicle_code" label="载具编码" :min-width="flexWidth('vehicle_code',crud.data,'载具编码')"/>
<el-table-column prop="child_vehicle_code" label="子载具编码" :min-width="flexWidth('child_vehicle_code',crud.data,'子载具编码')"/>
<el-table-column prop="source_vehicle_code" label="来源载具编码" :min-width="flexWidth('source_vehicle_code',crud.data,'来源载具编码')"/>
<el-table-column prop="point_code" label="点位编码" :min-width="flexWidth('point_code',crud.data,'点位编码')"/>
<el-table-column prop="point_name" label="点位名称" :min-width="flexWidth('point_name',crud.data,'点位名称')"/>
<el-table-column prop="is_full" label="是否满托" :min-width="flexWidth('is_full',crud.data,'是否满托')"/>
<el-table-column prop="pcsn" label="批次" :min-width="flexWidth('pcsn',crud.data,'批次')"/>
<el-table-column prop="instorage_time" label="入库时间" :min-width="flexWidth('instorage_time',crud.data,'入库时间')"/>
<el-table-column prop="standing_time" label="静置时间(分钟)" :min-width="flexWidth('standing_time',crud.data,'静置时间(分钟)')"/>
<el-table-column prop="material_qty" label="物料数量" :min-width="flexWidth('material_qty',crud.data,'物料数量')"/>
<el-table-column prop="material_weight" label="物料重量" :min-width="flexWidth('material_weight',crud.data,'物料重量')"/>
<el-table-column prop="workorder_code" label="搬运工单编码" :min-width="flexWidth('workorder_code',crud.data,'搬运工单编码')"/>
<el-table-column prop="group_number" label="组盘次数" :min-width="flexWidth('group_number',crud.data,'组盘次数')"/>
<el-table-column prop="task_code" label="任务编码" :min-width="flexWidth('task_code',crud.data,'任务编码')"/>
<el-table-column prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',crud.data,'车间编码')"/>
<el-table-column prop="group_status" label="组盘状态" :min-width="flexWidth('group_status',crud.data,'组盘状态')"/>
<el-table-column prop="is_first_flow_task" label="是否首个流程任务" :min-width="flexWidth('is_first_flow_task',crud.data,'是否首个流程任务')"/>
<el-table-column prop="flow_code" label="流程编码" :min-width="flexWidth('flow_code',crud.data,'流程编码')"/>
<el-table-column prop="flow_num" label="流程顺序" :min-width="flexWidth('flow_num',crud.data,'流程顺序')"/>
<el-table-column prop="before_task_code" label="上一任务编码" :min-width="flexWidth('before_task_code',crud.data,'上一任务编码')"/>
<el-table-column prop="next_task_code" label="下一任务编码" :min-width="flexWidth('next_task_code',crud.data,'下一任务编码')"/>
<el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')"/>
<el-table-column prop="is_delete" label="是否删除" :min-width="flexWidth('is_delete',crud.data,'是否删除')"/>
<el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')"/>
<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 prop="vehicle_code" label="载具编码" :min-width="flexWidth('vehicle_code',crud.data,'载具编码')" />
<!-- <el-table-column prop="child_vehicle_code" label="子载具编码" :min-width="flexWidth('child_vehicle_code',crud.data,'子载具编码')"/>-->
<el-table-column prop="source_vehicle_code" label="来源载具" :min-width="flexWidth('source_vehicle_code',crud.data,'来源载具')" />
<el-table-column prop="point_code" label="点位编码" :min-width="flexWidth('point_code',crud.data,'点位编码')" />
<el-table-column prop="point_name" label="点位名称" :min-width="flexWidth('point_name',crud.data,'点位名称')" />
<el-table-column prop="point_name" label="所属区域" :min-width="flexWidth('point_name',crud.data,'所属区域')" />
<el-table-column prop="is_full" label="是否满托" :min-width="flexWidth('is_full',crud.data,'是否满托')" />
<el-table-column prop="pcsn" label="批次" :min-width="flexWidth('pcsn',crud.data,'批次')" />
<el-table-column prop="workorder_code" label="工单编码" :min-width="flexWidth('workorder_code',crud.data,'工单编码')" />
<el-table-column prop="instorage_time" label="入库时间" :min-width="flexWidth('instorage_time',crud.data,'入库时间')" />
<el-table-column prop="standing_time" label="静置时间(分钟)" :min-width="flexWidth('standing_time',crud.data,'静置时间(分钟)')" />
<el-table-column prop="material_qty" label="物料数量" :min-width="flexWidth('material_qty',crud.data,'物料数量')" />
<el-table-column prop="material_weight" label="物料重量" :min-width="flexWidth('material_weight',crud.data,'物料重量')" />
<el-table-column prop="group_number" label="组盘次数" :min-width="flexWidth('group_number',crud.data,'组盘次数')" />
<el-table-column prop="task_code" label="任务编码" :min-width="flexWidth('task_code',crud.data,'任务编码')" />
<!-- <el-table-column prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',crud.data,'车间编码')"/>-->
<el-table-column prop="group_status" label="组盘状态" :min-width="flexWidth('group_status',crud.data,'组盘状态')" />
<!-- <el-table-column prop="is_first_flow_task" label="是否首个流程任务" :min-width="flexWidth('is_first_flow_task',crud.data,'是否首个流程任务')"/>-->
<!-- <el-table-column prop="flow_code" label="流程编码" :min-width="flexWidth('flow_code',crud.data,'流程编码')"/>-->
<!-- <el-table-column prop="flow_num" label="流程顺序" :min-width="flexWidth('flow_num',crud.data,'流程顺序')"/>-->
<el-table-column prop="before_task_code" label="上一任务" :min-width="flexWidth('before_task_code',crud.data,'上一任务')" />
<el-table-column prop="next_task_code" label="下一任务" :min-width="flexWidth('next_task_code',crud.data,'上一任务')" />
<el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
<el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />
<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">
<template slot-scope="scope">
<udOperation
@@ -126,7 +127,7 @@
<script>
import crudSchBaseVehiclematerialgroup from './schBaseVehiclematerialgroup'
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'
@@ -194,7 +195,7 @@ export default {
permission: {
},
rules: {
} }
}}
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据

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

@@ -235,7 +235,7 @@
<el-form-item v-if="form.point_status === '3'" label="物料名称" prop="vehicle_code">
<el-input v-model="form.material_name" clearable style="width: 370px;" @focus="getMaterial" />
</el-form-item>
<el-form-item label="是否创建工单">
<el-form-item label="是否有工单">
<el-radio v-for="item in dict.TrueOrFalse" :key="item.id" v-model="form.is_has_workder" :label="item.value">{{ item.label }}</el-radio>
</el-form-item>
<el-form-item label="是否自动">
@@ -267,7 +267,7 @@
<el-table-column prop="vehicle_qty" label="载具数量" :min-width="flexWidth('vehicle_qty',crud.data,'载具数量')" />
<el-table-column prop="parent_point_code" label="父点位编码" :min-width="flexWidth('parent_point_code',crud.data,'父点位编码')" />
<el-table-column prop="ing_task_code" label="在执行的任务标识" :min-width="flexWidth('ing_task_code',crud.data,'在执行的任务标识')" />
<el-table-column prop="is_has_workder" label="是否创建工单" :min-width="flexWidth('is_has_workder',crud.data,'是否创建工单')">
<el-table-column prop="is_has_workder" label="是否有工单" :min-width="flexWidth('is_has_workder',crud.data,'是否有工单')">
<template slot-scope="scope">
{{scope.row.is_has_workder?'是':'否'}}
</template>

10
nladmin-ui/src/views/wms/sch/region/index.vue
View File

@@ -81,11 +81,11 @@
<el-form-item label="点位状态说明">
<el-input v-model="form.point_status_explain" style="width: 370px;" />
</el-form-item>
<el-form-item label="是否创建工单">
<el-form-item label="是否有工单">
<el-select
v-model="form.is_has_workder"
size="mini"
placeholder="是否创建工单"
placeholder="是否有工单"
class="filter-item"
style="width: 370px;"
>
@@ -96,8 +96,8 @@
/>
</el-select>
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" style="width: 370px;" />
<el-form-item label="备注" prop="description">
<el-input v-model="form.remark" style="width: 380px;" rows="2" type="textarea" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -112,7 +112,7 @@
<el-table-column prop="region_name" label="区域名称" :min-width="flexWidth('region_name',crud.data,'区域名称')" />
<el-table-column prop="point_type_explain" label="点位类型说明" :min-width="flexWidth('point_type_explain',crud.data,'点位类型说明')" />
<el-table-column prop="point_status_explain" label="点位状态说明" :min-width="flexWidth('point_status_explain',crud.data,'点位状态说明')" />
<el-table-column prop="is_has_workder" label="是否创建工单" :min-width="flexWidth('is_has_workder',crud.data,'是否创建工单')">
<el-table-column prop="is_has_workder" label="是否有工单" :min-width="flexWidth('is_has_workder',crud.data,'是否有工单')">
<template slot-scope="scope">
{{scope.row.is_has_workder?'是':'否'}}
</template>

124
nladmin-ui/src/views/wms/sch/task/config/index.vue
View File

@@ -5,100 +5,95 @@
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" />
<!--表单组件-->
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="800px">
<el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" size="mini" label-width="115px" label-suffix=":">
<el-form-item label="配置编码">
<el-input v-model="form.config_code" style="width: 370px;" />
<el-input v-model="form.config_code" style="width: 240px;" />
</el-form-item>
<el-form-item label="配置名称">
<el-input v-model="form.config_name" style="width: 370px;" />
<el-input v-model="form.config_name" style="width: 240px;" />
</el-form-item>
<el-form-item label="任务取放类型">
<el-input v-model="form.task_qf_type" style="width: 370px;" />
<el-input v-model="form.task_qf_type" style="width: 240px;" />
</el-form-item>
<el-form-item label="acs任务类型">
<el-input v-model="form.acs_task_type" style="width: 370px;" />
<el-input v-model="form.acs_task_type" style="width: 240px;" />
</el-form-item>
<el-form-item label="任务名字">
<el-input v-model="form.task_name" style="width: 370px;" />
<el-input v-model="form.task_name" style="width: 240px;" />
</el-form-item>
<el-form-item label="任务类型">
<el-input v-model="form.task_type" style="width: 370px;" />
<el-input v-model="form.task_type" style="width: 240px;" />
</el-form-item>
<el-form-item label="优先级">
<el-input v-model="form.priority" style="width: 370px;" />
<el-input v-model="form.priority" style="width: 240px;" />
</el-form-item>
<el-form-item label="允许最大任务生成数">
<el-input v-model="form.task_create_num" style="width: 370px;" />
<el-form-item label="任务生成数上限">
<el-input v-model="form.task_create_num" style="width: 240px;" />
</el-form-item>
<el-form-item label="允许最大任务下发数">
<el-input v-model="form.task_issue_num" style="width: 370px;" />
<el-form-item label="任务下发数上限">
<el-input v-model="form.task_issue_num" style="width: 240px;" />
</el-form-item>
<el-form-item label="是否自动下发">
<el-input v-model="form.is_auto_issue" style="width: 370px;" />
<el-input v-model="form.is_auto_issue" style="width: 240px;" />
</el-form-item>
<el-form-item label="起点区域配置">
<el-input v-model="form.start_region_str" style="width: 370px;" />
<el-form-item label="起点区域">
<el-input v-model="form.start_region_str" style="width: 240px;" />
</el-form-item>
<el-form-item label="终点区域配置">
<el-input v-model="form.next_region_str" style="width: 370px;" />
<el-form-item label="终点区域">
<el-input v-model="form.next_region_str" style="width: 240px;" />
</el-form-item>
<el-form-item label="起点点位前缀">
<el-input v-model="form.start_point_pre" style="width: 370px;" />
<el-form-item label="起点前缀">
<el-input v-model="form.start_point_pre" style="width: 240px;" />
</el-form-item>
<el-form-item label="终点点位前缀">
<el-input v-model="form.next_region_pre" style="width: 370px;" />
<el-form-item label="终点前缀">
<el-input v-model="form.next_region_pre" style="width: 240px;" />
</el-form-item>
<el-form-item label="是否校验工单">
<el-input v-model="form.is_check_workorder" style="width: 370px;" />
<el-input v-model="form.is_check_workorder" style="width: 240px;" />
</el-form-item>
<el-form-item label="是否判断起点锁定">
<el-input v-model="form.is_check_start_lock" style="width: 370px;" />
<el-form-item label="是否判断起点锁">
<el-input v-model="form.is_check_start_lock" style="width: 240px;" />
</el-form-item>
<el-form-item label="是否立即创建">
<el-input v-model="form.is_immediate_create" style="width: 370px;" />
<el-input v-model="form.is_immediate_create" style="width: 240px;" />
</el-form-item>
<el-form-item label="是否判断终点锁定">
<el-input v-model="form.is_check_next_lock" style="width: 370px;" />
<el-form-item label="是否判断终点锁">
<el-input v-model="form.is_check_next_lock" style="width: 240px;" />
</el-form-item>
<el-form-item label="是否起点自动">
<el-input v-model="form.is_start_auto" style="width: 370px;" />
<el-input v-model="form.is_start_auto" style="width: 240px;" />
</el-form-item>
<el-form-item label="是否终点自动">
<el-input v-model="form.is_next_auto" style="width: 370px;" />
<el-input v-model="form.is_next_auto" style="width: 240px;" />
</el-form-item>
<el-form-item label="是否锁定起点">
<el-input v-model="form.is_lock_start" style="width: 370px;" />
<el-input v-model="form.is_lock_start" style="width: 240px;" />
</el-form-item>
<el-form-item label="是否锁定终点">
<el-input v-model="form.is_lock_next" style="width: 370px;" />
<el-input v-model="form.is_lock_next" style="width: 240px;" />
</el-form-item>
<el-form-item label="生成任务的请求参数">
<el-input v-model="form.request_param" style="width: 370px;" />
<el-form-item v-if="false" label="生成任务的请求参数">
<el-input v-model="form.request_param" style="width: 240px;" />
</el-form-item>
<el-form-item label="下发任务的请求参数">
<el-input v-model="form.response_param" style="width: 370px;" />
<el-form-item v-if="false" label="下发任务的请求参数">
<el-input v-model="form.response_param" style="width: 240px;" />
</el-form-item>
<el-form-item label="是否按组控制下发顺序">
<el-input v-model="form.is_group_congrol_issue_seq" style="width: 370px;" />
<el-form-item v-if="false" label="是否按组控制下发顺序">
<el-input v-model="form.is_group_congrol_issue_seq" style="width: 240px;" />
</el-form-item>
<el-form-item label="任务未完成通知时间数">
<el-input v-model="form.unfinish_notify_time" style="width: 370px;" />
<el-form-item label="未完成通知时间">
<el-input v-model="form.unfinish_notify_time" style="width: 240px;" />
</el-form-item>
<el-form-item label="sql配置">
<el-input v-model="form.sql_param" style="width: 370px;" />
<el-form-item v-if="false" label="sql配置">
<el-input v-model="form.sql_param" style="width: 240px;" />
</el-form-item>
<el-form-item label="车间编码">
<el-input v-model="form.workshop_code" style="width: 370px;" />
<el-form-item v-if="false" label="车间编码">
<el-input v-model="form.workshop_code" style="width: 240px;" />
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" style="width: 370px;" />
</el-form-item>
<el-form-item label="是否启用">
<el-input v-model="form.is_used" style="width: 370px;" />
</el-form-item>
<el-form-item label="是否删除">
<el-input v-model="form.is_delete" style="width: 370px;" />
<el-form-item label="备注" prop="remark">
<label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
<el-input v-model.trim="form.remark" style="width: 480px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -116,30 +111,29 @@
<el-table-column prop="task_name" label="任务名字" :min-width="flexWidth('task_name',crud.data,'任务名字')"/>
<el-table-column prop="task_type" label="任务类型" :min-width="flexWidth('task_type',crud.data,'任务类型')"/>
<el-table-column prop="priority" label="优先级" :min-width="flexWidth('priority',crud.data,'优先级')"/>
<el-table-column prop="task_create_num" label="允许最大任务生成数" :min-width="flexWidth('task_create_num',crud.data,'允许最大任务生成数')"/>
<el-table-column prop="task_issue_num" label="允许最大任务下发数" :min-width="flexWidth('task_issue_num',crud.data,'允许最大任务下发数')"/>
<el-table-column prop="task_create_num" label="任务生成数上限" :min-width="flexWidth('task_create_num',crud.data,'任务生成数上限')"/>
<el-table-column prop="task_issue_num" label="任务下发数上限" :min-width="flexWidth('task_issue_num',crud.data,'任务下发数上限')"/>
<el-table-column prop="is_auto_issue" label="是否自动下发" :min-width="flexWidth('is_auto_issue',crud.data,'是否自动下发')"/>
<el-table-column prop="start_region_str" label="起点区域配置" :min-width="flexWidth('start_region_str',crud.data,'起点区域配置')"/>
<el-table-column prop="next_region_str" label="终点区域配置" :min-width="flexWidth('next_region_str',crud.data,'终点区域配置')"/>
<el-table-column prop="start_point_pre" label="起点点位前缀" :min-width="flexWidth('start_point_pre',crud.data,'起点点位前缀')"/>
<el-table-column prop="next_region_pre" label="终点点位前缀" :min-width="flexWidth('next_region_pre',crud.data,'终点点位前缀')"/>
<el-table-column prop="start_region_str" label="起点区域" :min-width="flexWidth('start_region_str',crud.data,'起点区域')"/>
<el-table-column prop="next_region_str" label="终点区域" :min-width="flexWidth('next_region_str',crud.data,'终点区域')"/>
<el-table-column prop="start_point_pre" label="起点前缀" :min-width="flexWidth('start_point_pre',crud.data,'起点前缀')"/>
<el-table-column prop="next_region_pre" label="终点前缀" :min-width="flexWidth('next_region_pre',crud.data,'终点前缀')"/>
<el-table-column prop="is_check_workorder" label="是否校验工单" :min-width="flexWidth('is_check_workorder',crud.data,'是否校验工单')"/>
<el-table-column prop="is_check_start_lock" label="是否判断起点锁定" :min-width="flexWidth('is_check_start_lock',crud.data,'是否判断起点锁定')"/>
<el-table-column prop="is_check_start_lock" label="是否判断起点锁" :min-width="flexWidth('is_check_start_lock',crud.data,'是否判断起点锁')"/>
<el-table-column prop="is_immediate_create" label="是否立即创建" :min-width="flexWidth('is_immediate_create',crud.data,'是否立即创建')"/>
<el-table-column prop="is_check_next_lock" label="是否判断终点锁定" :min-width="flexWidth('is_check_next_lock',crud.data,'是否判断终点锁定')"/>
<el-table-column prop="is_check_next_lock" label="是否判断终点锁" :min-width="flexWidth('is_check_next_lock',crud.data,'是否判断终点锁')"/>
<el-table-column prop="is_start_auto" label="是否起点自动" :min-width="flexWidth('is_start_auto',crud.data,'是否起点自动')"/>
<el-table-column prop="is_next_auto" label="是否终点自动" :min-width="flexWidth('is_next_auto',crud.data,'是否终点自动')"/>
<el-table-column prop="is_lock_start" label="是否锁定起点" :min-width="flexWidth('is_lock_start',crud.data,'是否锁定起点')"/>
<el-table-column prop="is_lock_next" label="是否锁定终点" :min-width="flexWidth('is_lock_next',crud.data,'是否锁定终点')"/>
<el-table-column prop="request_param" label="生成任务的请求参数" :min-width="flexWidth('request_param',crud.data,'生成任务的请求参数')"/>
<el-table-column prop="response_param" label="下发任务的请求参数" :min-width="flexWidth('response_param',crud.data,'下发任务的请求参数')"/>
<el-table-column prop="is_group_congrol_issue_seq" label="是否按组控制下发顺序" :min-width="flexWidth('is_group_congrol_issue_seq',crud.data,'是否按组控制下发顺序')"/>
<el-table-column prop="unfinish_notify_time" label="任务未完成通知时间数" :min-width="flexWidth('unfinish_notify_time',crud.data,'任务未完成通知时间数')"/>
<el-table-column prop="sql_param" label="sql配置" :min-width="flexWidth('sql_param',crud.data,'sql配置')"/>
<el-table-column v-if="false" prop="is_group_congrol_issue_seq" label="是否按组控制下发顺序" :min-width="flexWidth('is_group_congrol_issue_seq',crud.data,'是否按组控制下发顺序')"/>
<el-table-column prop="unfinish_notify_time" label="未完成通知时间" :min-width="flexWidth('unfinish_notify_time',crud.data,'未完成通知时间')"/>
<el-table-column v-if="false" prop="sql_param" label="sql配置" :min-width="flexWidth('sql_param',crud.data,'sql配置')"/>
<el-table-column prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',crud.data,'车间编码')"/>
<el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')"/>
<el-table-column prop="is_used" label="是否启用" :min-width="flexWidth('is_used',crud.data,'是否启用')"/>
<el-table-column prop="is_delete" label="是否删除" :min-width="flexWidth('is_delete',crud.data,'是否删除')"/>
<!-- <el-table-column prop="is_used" label="是否启用" :min-width="flexWidth('is_used',crud.data,'是否启用')"/>-->
<el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')"/>
<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,'修改人')"/>