|
|
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 |
|
|
|
703ca49d2e
|
refactor(入库计划明细): 实体修改
|
2024-11-08 14:46:44 +08:00 |
|
|
|
d6de6d9a38
|
refactor(入库计划明细实例): 实体修改
|
2024-11-08 14:46:23 +08:00 |
|
|
|
bc0aa1e44a
|
refactor(入库任务): 实体修改
|
2024-11-08 14:42:53 +08:00 |
|
|
|
17e93ace05
|
refactor(入库计划): 实体修改
|
2024-11-08 14:42:45 +08:00 |
|
|
|
9b88927224
|
Merge remote-tracking branch 'origin/master'
|
2024-11-08 14:34:08 +08:00 |
|
|
|
f0413064d8
|
优化显示效果
|
2024-11-08 12:06:14 +08:00 |
|
|
|
ba4a211a0d
|
增加出库任务查看接口
|
2024-11-08 10:53:01 +08:00 |
|
|
|
a12e380c0c
|
完成一键清退报废物品
|
2024-11-08 10:03:42 +08:00 |
|
|
|
8429137f08
|
修复组装任务入库计划单不能重复bug
|
2024-11-07 16:37:26 +08:00 |
|
|
|
65969a44ec
|
fix(入库计划明细实体): 增加根据入库计划明细ID查询
|
2024-11-07 16:13:16 +08:00 |
|
|
|
1fb81c6bed
|
修复刀柄也进行计算寿命bug
|
2024-11-07 15:53:34 +08:00 |
|
|
|
3060ff4c5e
|
增加出库时数量校验
|
2024-11-07 15:47:11 +08:00 |
|
|
|
5eb96ee45b
|
修复数量统计bug，手动组装整刀不锁定
|
2024-11-07 15:32:02 +08:00 |
|
|
|
ce7a6197ae
|
fix(入库人物): 查询错误
|
2024-11-07 15:06:58 +08:00 |
|
|
|
3ebca24a51
|
fix(物料管理): 插入错误
|
2024-11-07 15:06:23 +08:00 |
|
|
|
180f4dd995
|
组装计划单
|
2024-11-07 14:28:29 +08:00 |
|
|
|
f274691bad
|
refactor(入库计划明细实例): 增加批量插入
|
2024-11-07 14:22:20 +08:00 |
|
|
|
be916cd00d
|
Merge remote-tracking branch 'gitea/master'
|
2024-11-07 14:18:41 +08:00 |
|
|
|
9bec09e7c7
|
Merge remote-tracking branch 'origin/master'
|
2024-11-07 14:03:55 +08:00 |
|
|
|
0c6e34b6c3
|
完成组装任务改造
|
2024-11-07 09:52:54 +08:00 |
|
star
|
2974922d41
|
单元测试
|
2024-11-07 08:39:40 +08:00 |
|
|
|
181090b4b7
|
Merge remote-tracking branch 'gitea/master'
|
2024-11-06 16:55:57 +08:00 |
|
|
|
1ea32ca5e5
|
初步完成生产准备改造
|
2024-11-06 15:51:45 +08:00 |
|
|
|
24ebffa072
|
Merge remote-tracking branch 'gitea/master'
|
2024-11-06 14:26:23 +08:00 |
|
|
|
b1dc3ceba0
|
refactor: 字段修改
|
2024-11-06 10:48:38 +08:00 |
|
star
|
0a5367ccfb
|
修改单元测试
|
2024-11-06 09:05:11 +08:00 |
|
star
|
c0620df13d
|
Merge remote-tracking branch 'origin/master'
|
2024-11-05 17:26:04 +08:00 |
|
star
|
73e242a4a1
|
单元测试
|
2024-11-05 17:25:56 +08:00 |
|
|
|
17e64f7c75
|
优化
|
2024-11-05 17:17:07 +08:00 |
|
|
|
1cdbbdb3b0
|
feat(入库任务明细): 初始化
|
2024-11-05 17:16:29 +08:00 |
|
|
|
df8fc37da3
|
完善注释
|
2024-11-05 16:59:56 +08:00 |
|
|
|
491f1ed0a4
|
完善注释
|
2024-11-05 16:51:49 +08:00 |
|
|
|
70f4f0bb27
|
数据类型优化
|
2024-11-05 16:07:36 +08:00 |
|
|
|
e75be5d985
|
删除不必要的注释
|
2024-11-05 15:14:51 +08:00 |
|
|
|
7d57efd9e2
|
增加物料信息字段
|
2024-11-05 11:10:41 +08:00 |
|
|
|
2c47efdcb5
|
增加连带信息
|
2024-11-05 11:06:25 +08:00 |
|
|
|
bbd4387916
|
增加出库明细查询接口
|
2024-11-05 11:03:23 +08:00 |
|
|
|
74147f2703
|
refactor(入库任务): 列表数据，根据创建时间倒序
|
2024-11-05 10:59:33 +08:00 |
|
|
|
b4566baedc
|
refactor: 入库计划列表，根据创建时间倒序
|
2024-11-05 10:58:29 +08:00 |
|
|
|
96dcda49d3
|
删除多余接口
|
2024-11-05 10:47:01 +08:00 |
|
|
|
94a6384502
|
删除多余接口
|
2024-11-05 10:46:10 +08:00 |
|
|
|
aeb7b23058
|
优化时间显示
|
2024-11-05 09:14:25 +08:00 |
|
|
|
ee9539f124
|
优化信息
|
2024-11-04 17:40:52 +08:00 |
|
|
|
2469b45193
|
Merge remote-tracking branch 'origin/master'
|
2024-11-04 17:30:52 +08:00 |
|
|
|
bb56232345
|
工具台账增加出库记录字段
|
2024-11-04 17:30:42 +08:00 |
|
star
|
1c382bca6f
|
Merge remote-tracking branch 'origin/master'
|
2024-11-04 16:23:57 +08:00 |
|
star
|
331ebf0b2b
|
修复工装定检，录入结果后还能修改定检任务
|
2024-11-04 16:23:50 +08:00 |
|
|
|
3c1327c4f3
|
工具台账增加报废时间字段
|
2024-11-04 16:14:38 +08:00 |
|
|
|
0b880b82ac
|
Merge remote-tracking branch 'origin/master'
|
2024-11-04 15:42:10 +08:00 |
|
|
|
0e6b482ceb
|
增加列表查询公共接口
|
2024-11-04 15:42:01 +08:00 |
|
star
|
77baabe39a
|
修复工装定检修改时出现类型转换错误
|
2024-11-04 14:41:39 +08:00 |
|
|
|
51ebe3d1d4
|
Merge remote-tracking branch 'origin/master'
|
2024-11-04 11:07:26 +08:00 |
|
|
|
633c4ed148
|
增加库存数量显示
|
2024-11-04 11:07:14 +08:00 |
|
star
|
cc3ef7d075
|
修复库区、库位关系查询出错
|
2024-11-04 09:54:47 +08:00 |
|
|
|
6f9dc83108
|
Merge remote-tracking branch 'origin/master'
|
2024-11-02 21:44:11 +08:00 |
|
|
|
71a9672412
|
组装任务添加库位
|
2024-11-02 21:43:54 +08:00 |
|
|
|
01de5298cd
|
refactor: 执行入库任务接口
|
2024-11-02 20:39:31 +08:00 |
|
|
|
86eccc17ae
|
更新库存
|
2024-11-02 20:14:44 +08:00 |
|
|
|
17870ba3a6
|
改造生产准备接口
|
2024-11-02 20:10:23 +08:00 |
|
|
|
6119c98509
|
完成台账明细
|
2024-11-02 15:29:17 +08:00 |
|
|
|
8daf7004a9
|
完善出库任务
|
2024-11-02 15:24:40 +08:00 |
|
|
|
4ec17f6978
|
增加创建者更新者获取
|
2024-11-02 15:04:36 +08:00 |
|
|
|
49b86b3aa4
|
初步完成出库任务
|
2024-11-02 15:02:46 +08:00 |
|
|
|
778f269b82
|
完成出库计划
|
2024-11-02 14:36:45 +08:00 |
|
|
|
5ae138a72d
|
Merge remote-tracking branch 'origin/master'
|
2024-11-02 14:25:10 +08:00 |
|
|
|
dd0263657d
|
增加接口
|
2024-11-02 14:24:52 +08:00 |
|
|
|
ca4eec034a
|
台账重置次数优化
|
2024-11-02 14:08:33 +08:00 |
|
|
|
136238121b
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmsInTaskController.java
|
2024-11-02 10:42:04 +08:00 |
|
|
|
40e2db0be3
|
优化
|
2024-11-02 10:41:04 +08:00 |
|
|
|
524dc49942
|
refactor: 执行入库任务接口，增加更新任务状态
|
2024-11-02 10:40:28 +08:00 |
|
|
|
8ab46c4f8d
|
优化
|
2024-11-02 10:40:02 +08:00 |
|
|
|
286b409e0d
|
refactor: 入库任务实体修改，增加执行入库任务接口
|
2024-11-02 10:31:42 +08:00 |
|
|
|
7dd9f0419b
|
Merge remote-tracking branch 'origin/master'
|
2024-11-02 10:24:43 +08:00 |
|
|
|
76c23d1e13
|
增加接口
|
2024-11-02 10:24:32 +08:00 |
|
|
|
0cd20ff72a
|
数量字段数据类型优化
|
2024-11-02 10:24:18 +08:00 |
|
|
|
20f0149b23
|
优化料箱绑定
|
2024-11-02 10:19:07 +08:00 |
|
|
|
1ed28c41d6
|
注入service
|
2024-11-02 10:07:57 +08:00 |
|
|
|
3ec4d452ea
|
feat: 入库任务
|
2024-11-02 09:59:46 +08:00 |
|
|
|
7007d27886
|
Merge remote-tracking branch 'origin/master'
|
2024-11-02 09:41:33 +08:00 |
|
|
|
eaa4196c58
|
feat: 生成任务编码工具类
|
2024-11-02 09:41:08 +08:00 |
|
|
|
df02b7278d
|
完成料箱管理模块
|
2024-11-02 09:40:57 +08:00 |
|
|
|
4e2e07cfa4
|
优化
|
2024-11-01 21:20:05 +08:00 |
|
|
|
ffab0ed8aa
|
完成组装任务
|
2024-11-01 20:45:27 +08:00 |
|
star
|
3f552dbecb
|
Merge remote-tracking branch 'origin/master'
|
2024-11-01 16:59:25 +08:00 |
|
star
|
3ea21e8056
|
完成工装定检与工装定检结果
完成库房、库区、库位软删除
|
2024-11-01 16:59:17 +08:00 |
|
|
|
2443538f5a
|
完成开放接口日志记录
|
2024-11-01 14:43:27 +08:00 |
|
star
|
3a374df281
|
Merge remote-tracking branch 'origin/master'
|
2024-11-01 12:06:05 +08:00 |
|
star
|
a977a5d353
|
修复库位编辑报错，库房库位库区增加模糊查询
|
2024-11-01 12:05:44 +08:00 |
|
|
|
996763155d
|
完成台账重置寿命
|
2024-11-01 11:20:21 +08:00 |
|
|
|
cfb6386a10
|
Merge remote-tracking branch 'origin/master'
|
2024-11-01 10:47:50 +08:00 |
|
|
|
ad02e62fd0
|
feat: 入库任务
|
2024-11-01 10:39:46 +08:00 |
|
|
|
7a04c9748d
|
Merge remote-tracking branch 'origin/master'
|
2024-11-01 10:38:20 +08:00 |
|
|
|
c1d177e1eb
|
完成齐套性检查和生产准备接口
|
2024-11-01 10:38:03 +08:00 |
|
|
|
786d59e7ea
|
feat: 入库计划
|
2024-11-01 10:34:57 +08:00 |
|
|
|
bb81bd21e3
|
refactor: 查询语句修改
|
2024-11-01 09:15:49 +08:00 |
|
|
|
642c0be972
|
初步完成齐套性检查接口，开放三个大屏查询接口，
|
2024-10-31 20:50:25 +08:00 |
|
|
|
9da5ad4228
|
Merge remote-tracking branch 'origin/master'
|
2024-10-31 19:48:35 +08:00 |
|
|
|
13ee588b12
|
完成BOM后端
|
2024-10-31 19:48:21 +08:00 |
|
star
|
3b81abee1f
|
Merge remote-tracking branch 'origin/master'
|
2024-10-31 17:54:12 +08:00 |
|
star
|
6673efa2c0
|
工装定检增删改查接口、定检模型查询接口
|
2024-10-31 17:53:46 +08:00 |
|
|
|
bbe7262a03
|
refactor: 出入库类型，修改为软删除
|
2024-10-31 10:48:08 +08:00 |
|
|
|
a3b8743a1c
|
refactor: 生成代码模块，达梦适配
|
2024-10-31 10:25:01 +08:00 |
|
|
|
70e3773647
|
Merge remote-tracking branch 'origin/master'
|
2024-10-30 19:44:54 +08:00 |
|
|
|
05aca8a9af
|
物料增加标准数量字段
|
2024-10-30 19:44:07 +08:00 |
|
star
|
4fe19336cd
|
修复库位显示报错
|
2024-10-30 17:23:55 +08:00 |
|
star
|
08d6f2f6ae
|
新增库位vo类
|
2024-10-30 17:08:13 +08:00 |
|
star
|
0cb7c07dc7
|
库房、库位、库区管理查询方法修改
|
2024-10-30 17:07:46 +08:00 |
|
|
|
3eb879e497
|
完善物料分类
|
2024-10-30 15:05:17 +08:00 |
|
|
|
d283e5fa5e
|
更改型号规格，以适配详细设计
|
2024-10-30 11:14:32 +08:00 |
|
|
|
28ea8e77ea
|
Merge remote-tracking branch 'origin/master'
|
2024-10-30 10:48:36 +08:00 |
|
|
|
4d3ab0b844
|
整理格式
|
2024-10-30 10:48:26 +08:00 |
|
|
|
d8be65de8f
|
完成组织机构模块改造
|
2024-10-30 10:25:19 +08:00 |
|
|
|
08def4b8d9
|
原始版本
|
2024-10-29 16:34:09 +08:00 |
|
