|
|
15b0967a89
|
Merge commit '908401ec8d8a55763a38aacaaa734cd735872b01'
|
2024-08-21 13:20:07 +08:00 |
|
|
|
908401ec8d
|
fix: 任务与对接记录的前端优化
|
2024-08-21 13:18:46 +08:00 |
|
|
|
1f4489367f
|
Merge commit '83984237d5a09a9187c2c87b887d97567f6b19df'
|
2024-08-20 17:14:32 +08:00 |
|
|
|
83984237d5
|
fix: quartz调度添加IP校验2
|
2024-08-20 17:12:06 +08:00 |
|
|
|
3701fb95d3
|
fix: quartz调度添加IP校验
|
2024-08-20 17:11:45 +08:00 |
|
|
|
136622db8b
|
feat: 分切下料，送气胀轴，套轴绑定
|
2024-08-20 16:34:29 +08:00 |
|
|
|
c78feb0581
|
feat: 手持出入收卷辊
|
2024-08-15 18:24:45 +08:00 |
|
|
|
37499a0cb0
|
feat: 呼叫取样
|
2024-08-15 16:23:16 +08:00 |
|
|
|
69f4e2dadf
|
feat: 废箔搬运业务2
|
2024-08-15 15:29:20 +08:00 |
|
|
|
dea0260141
|
feat: 废箔搬运业务
|
2024-08-15 15:26:00 +08:00 |
|
|
|
518e3ea3df
|
feat: 管芯出入库、子卷下线、货梯状态修改
|
2024-08-14 16:19:50 +08:00 |
|
|
|
33c0f8d98a
|
feat: 包重命名与挪动
|
2024-08-13 14:04:54 +08:00 |
|
|
|
2b16f760d0
|
feat: 分切上料
|
2024-08-13 13:46:26 +08:00 |
|
|
|
f6ce731385
|
feat: 烘烤确定的业务
|
2024-08-12 13:52:28 +08:00 |
|
|
|
62ab422c30
|
Merge commit 'd0101952d209bd43e2791f4062882f80a666cd9d'
|
2024-08-09 18:04:44 +08:00 |
|
|
|
8da7bf48fc
|
feat: 烘箱业务
|
2024-08-09 18:04:07 +08:00 |
|
|
|
d0101952d2
|
fix: lucene打印
|
2024-08-09 18:03:17 +08:00 |
|
|
|
a511dfea4d
|
Merge commit '4db3a16a3691082d42c5e1b8ef3bc11a265081f0'
|
2024-08-09 15:05:27 +08:00 |
|
|
|
5bb5ae2b98
|
feat: 合并nl-admin，新增生箔、烘箱业务
|
2024-08-09 15:04:37 +08:00 |
|
|
|
4db3a16a36
|
fix: 定时任务无法启动
|
2024-08-09 15:03:04 +08:00 |
|
|
|
153dcb1964
|
fix: 日志查看页面优化
|
2024-08-08 09:22:20 +08:00 |
|
|
|
fcbe8c92ed
|
fix: lucene打印配置
|
2024-08-07 20:04:22 +08:00 |
|
|
|
5be507e458
|
fix: 日志记录转换成Druid的打印日志
|
2024-08-07 19:10:23 +08:00 |
|
|
|
5009ff59c9
|
fix: test
|
2024-08-07 18:58:08 +08:00 |
|
|
|
01bd8257af
|
add: 手持生箔呼叫空辊、下料
|
2024-08-07 18:52:39 +08:00 |
|
|
|
d3f5aa4f19
|
fix: DruidFilter记录日志
|
2024-08-06 20:26:11 +08:00 |
|
|
|
9a8395f4b6
|
fix: 初步维护主体框架
|
2024-08-06 16:13:20 +08:00 |
|
|
|
1c05806c3f
|
Merge commit '931bb1270b1e28800cb719e098aa238a513fe167'
|
2024-08-06 13:42:31 +08:00 |
|
|
|
0436248fef
|
fix: 新增车间区域管理
|
2024-08-06 13:40:45 +08:00 |
|
|
|
931bb1270b
|
rev: 去除jetcache, 新增达梦测试
|
2024-08-06 13:38:52 +08:00 |
|
|
|
bf7a271f1a
|
Add 'lms2/' from commit 'c4a92a9d11b9076dac1e03df7e71cac00625c5ec'
git-subtree-dir: lms2
git-subtree-mainline: 7df70b07be
git-subtree-split: c4a92a9d11
|
2024-08-05 20:20:21 +08:00 |
|
|
|
7df70b07be
|
fix: 暂存
|
2024-08-05 20:18:24 +08:00 |
|
|
|
4dcd5b555a
|
fix: 日志管理
|
2024-08-01 15:54:11 +08:00 |
|
|
|
34e858987a
|
init: 初始化龙电项目 from 兰州二期
|
2024-08-01 13:16:42 +08:00 |
|
|
|
e03b604a28
|
Add 'lms/' from commit 'c09c67e44448a20112c7eb9b0d6932c6f05a931b'
git-subtree-dir: lms
git-subtree-mainline: fbe1cc4ea2
git-subtree-split: c09c67e444
|
2024-08-01 11:04:27 +08:00 |
|
|
|
fbe1cc4ea2
|
fix: 开发
|
2024-08-01 10:51:17 +08:00 |
|
|
|
c09c67e444
|
add:增加子卷质检判断
|
2024-08-01 10:01:03 +08:00 |
|
|
|
b46c6dba76
|
rev：入库异常任务下发托盘号
|
2024-08-01 09:15:22 +08:00 |
|
|
|
eb085ca093
|
add:增加手持装箱接口
|
2024-07-31 18:53:02 +08:00 |
|
|
|
f97bffd478
|
add:增加手持装箱接口
|
2024-07-31 18:34:36 +08:00 |
|
|
|
502260e12d
|
rev：找相同规格的空木箱修改
|
2024-07-31 18:22:06 +08:00 |
|
|
|
9118043048
|
add：一期新增接口：飞送通知LMS木箱是否通过
|
2024-07-31 18:14:48 +08:00 |
|
|
|
076ef25531
|
fix:修复查询订单号异常
|
2024-07-31 16:11:58 +08:00 |
|
|
|
3de0fdbaf8
|
opt:优化补空载具优先级
|
2024-07-31 15:21:45 +08:00 |
|
|
|
2cc00c2c06
|
opt:
1.子卷装箱增加子卷质检生成包装关系，去除临时包装关系；
2.修改最后一个子卷判断方式；
3.恢复装箱毛重推送，优化装箱页面；
|
2024-07-31 13:53:18 +08:00 |
|
zhouz
|
66d23ee832
|
fix:分切上料AGV也添加允许放货动作
|
2024-07-31 12:34:26 +08:00 |
|
|
|
cf91b0f94d
|
opt:优先取待检区取空载具
|
2024-07-31 11:43:11 +08:00 |
|
zhouz
|
fd528f4109
|
Merge remote-tracking branch 'origin/master_merge' into master_merge
|
2024-07-31 09:39:24 +08:00 |
|
zhouz
|
7907a8493c
|
fix：对接位分配查询优化
|
2024-07-31 09:38:45 +08:00 |
|
|
|
c100af51e3
|
fix：一期子卷包装页面新增【是否入库】查询条件
|
2024-07-30 17:50:26 +08:00 |
|
