|
|
a7021a27f4
|
feat(入库计划): 对接小型刀具库
|
2024-11-29 11:41:12 +08:00 |
|
|
|
50f434954f
|
fix(入库计划): 语法错误修改
|
2024-11-29 11:29:59 +08:00 |
|
|
|
42ce332dbe
|
Merge remote-tracking branch 'origin/master'
|
2024-11-29 09:39:39 +08:00 |
|
|
|
0de94143cd
|
feat(入库计划): 执行任务方法，临时
|
2024-11-29 09:30:39 +08:00 |
|
|
|
42b1f93f4b
|
feat(入库): 同步小型刀具库
|
2024-11-29 09:28:15 +08:00 |
|
|
|
72dac19897
|
Merge remote-tracking branch 'origin/master'
|
2024-11-29 09:27:04 +08:00 |
|
|
|
cf0e3d0739
|
Merge remote-tracking branch 'origin/master'
|
2024-11-29 09:16:50 +08:00 |
|
|
|
5fb40915c3
|
tjk
|
2024-11-29 09:16:50 +08:00 |
|
|
|
603aea2567
|
调试
|
2024-11-28 18:08:22 +08:00 |
|
|
|
24ed0ed36e
|
编写小型货柜出库表相关实体类与MAPPER
|
2024-11-28 17:32:16 +08:00 |
|
|
|
3e4b8929ca
|
关闭事务
|
2024-11-28 16:55:57 +08:00 |
|
|
|
528a8463f3
|
增加设置已读代码
|
2024-11-28 16:47:07 +08:00 |
|
|
|
8e210b75d6
|
Merge remote-tracking branch 'origin/master'
|
2024-11-28 16:45:38 +08:00 |
|
|
|
ada2cb73ac
|
编写同步出库计划代码
|
2024-11-28 16:45:01 +08:00 |
|
|
|
9705df6be2
|
改变校验方法
|
2024-11-28 16:05:30 +08:00 |
|
|
|
78a51123b6
|
refactor: 字段数据类型修改
|
2024-11-28 15:50:35 +08:00 |
|
|
|
262ffdd50c
|
refactor: 字段数据类型修改
|
2024-11-28 15:49:25 +08:00 |
|
|
|
de37f12a8d
|
feat: 增加 执行入库计划
|
2024-11-28 15:49:02 +08:00 |
|
|
|
a56d6c5752
|
Merge remote-tracking branch 'origin/master'
|
2024-11-28 14:43:48 +08:00 |
|
|
|
1d97037059
|
开放接口
|
2024-11-28 14:43:36 +08:00 |
|
|
|
9ae9de272d
|
忽略空数据
|
2024-11-28 14:25:34 +08:00 |
|
|
|
a1c16f0be6
|
增加异常抛出
|
2024-11-28 14:20:18 +08:00 |
|
|
|
a988e974d6
|
Merge remote-tracking branch 'origin/master'
|
2024-11-28 14:14:07 +08:00 |
|
|
|
256b910f14
|
忽略数量为0的记录
|
2024-11-28 14:14:00 +08:00 |
|
|
|
e96e1e21a1
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# ktg-mes/src/main/java/com/ktg/mes/md/controller/WmsOutPlanController.java
|
2024-11-28 11:05:30 +08:00 |
|
|
|
e407905d3c
|
完成技术验证代码
|
2024-11-28 11:02:34 +08:00 |
|
|
|
c2d5dbff3d
|
Merge remote-tracking branch 'origin/master'
|
2024-11-28 11:01:11 +08:00 |
|
|
|
2739b0c695
|
将切换数据代码移动到MAPPER层
|
2024-11-28 10:59:40 +08:00 |
|
|
|
f06d14b301
|
修改服务层接口名称
|
2024-11-28 10:53:17 +08:00 |
|
|
|
467b1e1548
|
组装任务基础物料出库流程拆分
|
2024-11-28 10:52:31 +08:00 |
|
|
|
fede5e6540
|
完善接口
|
2024-11-28 10:40:23 +08:00 |
|
|
|
d1d2c72fbe
|
增加啊更新接口
|
2024-11-28 10:36:21 +08:00 |
|
|
|
bcfc66611f
|
开放执行接口
|
2024-11-28 09:40:21 +08:00 |
|
|
|
9ac0574f20
|
读取对刀xml文件
|
2024-11-28 09:08:31 +08:00 |
|
|
|
4941a50de5
|
SQLSERVER测试
|
2024-11-27 19:58:14 +08:00 |
|
|
|
bc00c4380c
|
Merge remote-tracking branch 'origin/master'
|
2024-11-27 15:20:26 +08:00 |
|
|
|
a6dcee2ef3
|
增加手持设备新增料箱功能
|
2024-11-27 15:20:18 +08:00 |
|
|
|
0ef09efe07
|
refactor(出库任务): 增加"出库类型编码"字段
|
2024-11-27 08:56:07 +08:00 |
|
|
|
aaa6cc9c3b
|
Merge remote-tracking branch 'origin/master'
|
2024-11-26 17:19:22 +08:00 |
|
|
|
f0f5d00496
|
接收扫描器传递来的数据
|
2024-11-26 17:19:14 +08:00 |
|
|
|
94f3f6b9ab
|
refactor: 计划类型ID 数据类型修改
|
2024-11-26 15:01:07 +08:00 |
|
|
|
54b7964a79
|
refactor: 台账
|
2024-11-26 15:00:35 +08:00 |
|
|
|
773a0e75bc
|
feat(入库计划): 增加 计划类型编码字段
|
2024-11-26 14:58:24 +08:00 |
|
|
|
437848ffbe
|
feat(入库任务): 增加 计划类型编码字段
|
2024-11-26 14:58:01 +08:00 |
|
|
|
c25c26f6f2
|
修正锁定过多问题
|
2024-11-26 11:00:54 +08:00 |
|
|
|
e0a902a579
|
fix(出库计划): 修复
|
2024-11-26 09:13:09 +08:00 |
|
|
|
204f2d7294
|
refactor(出库任务): 增加库位信息
|
2024-11-26 09:11:13 +08:00 |
|
|
|
614299992d
|
组装任务生成待执行入库任务
|
2024-11-25 21:08:13 +08:00 |
|
|
|
e936e8e613
|
完成上传接口
|
2024-11-25 19:22:20 +08:00 |
|
|
|
d4029665a1
|
完成加载接口
|
2024-11-25 18:58:51 +08:00 |
|
|
|
a012aa0743
|
refactor(入库任务): 增加库位信息
|
2024-11-25 09:39:16 +08:00 |
|
|
|
e5b2cc6e31
|
Merge remote-tracking branch 'origin/master'
|
2024-11-22 16:34:23 +08:00 |
|
|
|
6eb7a441a7
|
维护库存批次台账入库信息
|
2024-11-22 16:34:07 +08:00 |
|
|
|
8ce9810271
|
refactor(出库任务): 任务列表开放接口
|
2024-11-22 16:28:26 +08:00 |
|
|
|
ae2f8206de
|
维护工艺数据
|
2024-11-22 15:07:01 +08:00 |
|
|
|
8641de0a3f
|
手动组装时显示物料库存
|
2024-11-22 14:12:18 +08:00 |
|
|
|
3eb5b1458f
|
refactor(入库计划明细实例): 增加 库位 xyz
|
2024-11-22 09:27:51 +08:00 |
|
|
|
f62ad17b71
|
refactor(入库任务): 增加查询 入库计划明细实例
|
2024-11-22 09:13:01 +08:00 |
|
|
|
816085fedc
|
优化库存批次台账
|
2024-11-22 08:43:34 +08:00 |
|
|
|
ff2924591b
|
优化库存批次台账
|
2024-11-21 15:11:30 +08:00 |
|
|
|
2d7e887629
|
refactor(入库任务): 入库任务逻辑修改
|
2024-11-21 09:06:10 +08:00 |
|
|
|
9fb82adabd
|
出库明细新增物料编码物料单位字段
|
2024-11-21 09:01:17 +08:00 |
|
|
|
c158c74f0b
|
完成库存批次台账列表功能
|
2024-11-20 17:13:28 +08:00 |
|
|
|
4d5ab64fc3
|
fix(台账): rfid验证方法修复
|
2024-11-20 15:29:08 +08:00 |
|
|
|
cf4cbc8365
|
feat(供应商管理): 初始化
|
2024-11-20 14:59:34 +08:00 |
|
|
|
8c4b8940f4
|
生产准备记录表新增加工单元字段，台账出库明细表新增是否对刀字段
|
2024-11-20 11:18:45 +08:00 |
|
|
|
9f3cc12a53
|
Merge remote-tracking branch 'origin/master'
|
2024-11-19 15:13:45 +08:00 |
|
|
|
7d38eb503d
|
更新开放接口
|
2024-11-19 15:13:21 +08:00 |
|
|
|
3732544474
|
refactor(台账): 优化 验证rfid方法
|
2024-11-19 08:40:44 +08:00 |
|
|
|
41b78fa0af
|
feat(入库计划明细实例): 增加库房信息
|
2024-11-19 08:38:25 +08:00 |
|
|
|
7cf4ad5510
|
提交查询台账基础物料
|
2024-11-18 17:46:28 +08:00 |
|
|
|
058e9db114
|
修复修复物料状态
|
2024-11-18 16:12:00 +08:00 |
|
|
|
67debb35c8
|
完成验证订单完成状态功能
|
2024-11-18 15:35:07 +08:00 |
|
|
|
e6a7bc32d8
|
完成物料多库位出库
|
2024-11-15 17:38:39 +08:00 |
|
|
|
d079737970
|
Merge remote-tracking branch 'origin/master'
|
2024-11-15 17:28:32 +08:00 |
|
|
|
2f407f2451
|
完成解绑与绑定
|
2024-11-15 17:28:21 +08:00 |
|
|
|
21ea93c5d9
|
refactor(入库任务): 联查 物料名称
|
2024-11-15 17:15:48 +08:00 |
|
|
|
3edc3317e9
|
增加注解
|
2024-11-15 16:37:51 +08:00 |
|
|
|
90b81b421c
|
Merge remote-tracking branch 'origin/master'
|
2024-11-15 16:32:18 +08:00 |
|
|
|
df6b1730af
|
增加根据RFID查询接口
|
2024-11-15 16:32:08 +08:00 |
|
|
|
e599a0cb5d
|
优化组装任务
|
2024-11-15 15:04:06 +08:00 |
|
|
|
bb93abcee8
|
feat(台账): 查询rfid是否唯一
|
2024-11-15 14:04:18 +08:00 |
|
|
|
f82a1fb830
|
完成手动组刀
|
2024-11-15 10:43:04 +08:00 |
|
|
|
ffa6dc4e99
|
Merge remote-tracking branch 'origin/master'
|
2024-11-15 09:15:13 +08:00 |
|
|
|
006f030b32
|
出库计划编码不可重复
|
2024-11-15 09:15:03 +08:00 |
|
|
|
07d9261801
|
流程修改
|
2024-11-14 17:13:18 +08:00 |
|
|
|
ad3b288b50
|
refactor(入库任务): 查询根据时间倒序
|
2024-11-14 16:58:34 +08:00 |
|
|
|
92de67e498
|
refactor(入库计划明细实例): 增加字段
|
2024-11-14 16:56:58 +08:00 |
|
|
|
1492deeeda
|
fix(入库计划): 修复入库计划明细实例 数据问题
|
2024-11-14 16:55:12 +08:00 |
|
|
|
43201ab3c8
|
feat(入库计划): 查询入库计划编码是否重复
|
2024-11-14 16:54:31 +08:00 |
|
|
|
6d0151cee1
|
feat(入库计划): 查询入库计划编码是否重复
|
2024-11-14 16:54:03 +08:00 |
|
|
|
7fbd042688
|
feat(台账): 新增入库计划明细
|
2024-11-14 16:53:16 +08:00 |
|
|
|
20e58eb0a7
|
Merge remote-tracking branch 'origin/master'
|
2024-11-14 14:05:50 +08:00 |
|
|
|
1cbdf9966e
|
refactor(入库计划明细): 实体 库位ID类型修改
|
2024-11-14 11:08:15 +08:00 |
|
|
|
89cf873277
|
增加存在差异的盘点展示
|
2024-11-14 10:15:00 +08:00 |
|
|
|
a545cb9ae6
|
Merge remote-tracking branch 'origin/master'
|
2024-11-14 09:18:09 +08:00 |
|
|
|
499ef5b518
|
进一步完善盘点
|
2024-11-14 09:17:59 +08:00 |
|
|
|
99aff48f13
|
feat(台账): 新增 入库信息明细实体字段
|
2024-11-14 08:44:14 +08:00 |
|
|
|
62c8ab2cfb
|
wmsInventory
|
2024-11-13 17:54:35 +08:00 |
|
|
|
9188de1d50
|
Merge remote-tracking branch 'origin/master'
|
2024-11-13 17:53:39 +08:00 |
|
|
|
15fd353d5a
|
初步完善盘点
|
2024-11-13 17:53:21 +08:00 |
|
|
|
d7d689b74b
|
Merge remote-tracking branch 'origin/master'
|
2024-11-13 17:18:53 +08:00 |
|
|
|
74fbddeffe
|
refactor(入库任务): 连表查询库位信息
|
2024-11-13 17:06:23 +08:00 |
|
|
|
b05fa24c5d
|
增加主动生成盘点计划
|
2024-11-13 16:37:57 +08:00 |
|
|
|
a121273c6b
|
完善数据排序规则
|
2024-11-13 15:48:03 +08:00 |
|
|
|
a284ef3fa3
|
物料管理倒序查询
|
2024-11-13 15:35:29 +08:00 |
|
|
|
90a7648905
|
Merge remote-tracking branch 'origin/master'
|
2024-11-13 15:05:31 +08:00 |
|
|
|
3c6b110b63
|
完善页面UI
|
2024-11-13 15:05:16 +08:00 |
|
|
|
b83849ccea
|
Merge remote-tracking branch 'origin/master'
|
2024-11-13 15:00:50 +08:00 |
|
|
|
efa65b6327
|
增加范围
|
2024-11-13 15:00:27 +08:00 |
|
|
|
a2b894ecd6
|
refactor(入库任务): 执行入库任务 计算寿命优化
|
2024-11-13 15:00:26 +08:00 |
|
|
|
f9d750c814
|
增加状态范围
|
2024-11-13 14:56:36 +08:00 |
|
|
|
16bc405273
|
Merge remote-tracking branch 'origin/master'
|
2024-11-13 11:41:56 +08:00 |
|
|
|
9f42ebb884
|
进一步完善盘点
|
2024-11-13 11:41:48 +08:00 |
|
|
|
d8289eb4f0
|
更改时间
|
2024-11-13 11:33:07 +08:00 |
|
|
|
3a00a896ba
|
Merge remote-tracking branch 'origin/master'
|
2024-11-13 11:32:50 +08:00 |
|
|
|
1d3ffa7694
|
fix(台账): 查询SQL语法错误
|
2024-11-13 11:31:42 +08:00 |
|
|
|
864e1c1789
|
完善盘点
|
2024-11-13 11:20:36 +08:00 |
|
|
|
1ae1576d35
|
修正统计SQL错误
|
2024-11-13 10:38:59 +08:00 |
|
|
|
243b5c3952
|
台账状态修改
|
2024-11-13 10:13:43 +08:00 |
|
|
|
caf253f51e
|
修复bug
|
2024-11-13 09:09:30 +08:00 |
|
|
|
931ef8cb1d
|
Merge remote-tracking branch 'origin/master'
|
2024-11-13 09:02:11 +08:00 |
|
|
|
db60f86dcd
|
refactor(入库任务): 执行任务代码优化
|
2024-11-13 08:59:33 +08:00 |
|
|
|
37067b913d
|
refactor(入库计划): 插入入库计划明细实例 优化
|
2024-11-13 08:53:41 +08:00 |
|
|
|
9592daa5fc
|
Merge remote-tracking branch 'origin/master'
|
2024-11-12 17:31:48 +08:00 |
|
|
|
c4ee688bd0
|
增加连带数据
|
2024-11-12 17:31:39 +08:00 |
|
|
|
309cd94000
|
Merge remote-tracking branch 'origin/master'
|
2024-11-12 16:50:43 +08:00 |
|
|
|
943f15edab
|
完成未完成调度任务接口
|
2024-11-12 16:50:22 +08:00 |
|
|
|
8766db00ff
|
Merge remote-tracking branch 'origin/master'
|
2024-11-12 16:47:45 +08:00 |
|
|
|
d444af2eea
|
粗略完成盘点基础功能
|
2024-11-12 16:44:42 +08:00 |
|
|
|
9bda1d3df0
|
feat(台账mapper): 参数类型修改
|
2024-11-12 14:45:10 +08:00 |
|
|
|
281e55a551
|
feat(入库计划明细实例): 新增rfid字段
|
2024-11-12 14:22:14 +08:00 |
|
|
|
fc80d0dedf
|
修复bug
|
2024-11-12 11:17:37 +08:00 |
|
|
|
50fef10840
|
重置次数优化
|
2024-11-12 09:38:13 +08:00 |
|
|
|
5b5f836ad8
|
完善盘点计划
|
2024-11-12 09:05:55 +08:00 |
|
|
|
f83513ab8c
|
Merge remote-tracking branch 'origin/master'
|
2024-11-12 08:52:54 +08:00 |
|
|
|
2e6403fdee
|
增加创建者与更新者的获取
|
2024-11-12 08:52:46 +08:00 |
|
|
|
58b0206406
|
Merge remote-tracking branch 'origin/master'
|
2024-11-11 17:40:19 +08:00 |
|
|
|
dd3f33d7e1
|
增加寿命预警参数
|
2024-11-11 17:40:04 +08:00 |
|
|
|
ed19d0cfd7
|
Merge remote-tracking branch 'origin/master'
|
2024-11-11 17:34:54 +08:00 |
|
|
|
8f58ad7a57
|
增加盘点计划管理的基础代码
|
2024-11-11 17:34:45 +08:00 |
|
|
|
535d81cf8c
|
Merge remote-tracking branch 'origin/master'
|
2024-11-11 16:41:24 +08:00 |
|
|
|
75e0866df0
|
改造生产准备接口
|
2024-11-11 16:41:08 +08:00 |
|
|
|
906cb82135
|
完善响应字段
|
2024-11-11 16:40:48 +08:00 |
|
|
|
baf560095b
|
Merge remote-tracking branch 'origin/master'
|
2024-11-11 14:11:17 +08:00 |
|
|
|
3d21743a37
|
完成同一图号的组装任务的出入库记录合并
|
2024-11-11 10:09:04 +08:00 |
|
|
|
1b79b79082
|
feat(入库计划明细实例): 新增 根据入库计划明细ID删除、批量插入入库计划明细实例
|
2024-11-08 17:08:52 +08:00 |
|
|
|
50f96b0bdd
|
refactor(入库计划): 新增入库计划明细实例
|
2024-11-08 17:05:48 +08:00 |
|
star
|
863c471442
|
Merge remote-tracking branch 'origin/master'
|
2024-11-08 17:01:01 +08:00 |
|
star
|
f1598fbfda
|
添加工装定检管理和工装定检结果导出功能
|
2024-11-08 17:00:54 +08:00 |
|
