|
|
768d0ce52b
|
add：开发
|
2026-08-15 10:12:29 +08:00 |
|
|
|
f95bd84c21
|
Merge remote-tracking branch 'refs/remotes/origin/feature/20260727/lms-rawfoil' into huachuang_ls
# Conflicts:
# nl-framework/nl-spring-boot-starter-execute/src/main/java/cn/code/nl/framework/execute/biz/api/lms/LmsTaskCommonApi.java
# nl-framework/nl-spring-boot-starter-execute/src/main/java/cn/code/nl/framework/execute/biz/api/wms/WmsTaskCommonApi.java
# nl-gateway/src/main/resources/application-dev.yaml
# nl-module-base/nl-module-base-server/src/main/resources/application-dev.yaml
# nl-module-infra/nl-module-infra-server/src/main/resources/application-dev.yaml
# nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/demo/DemoApi.java
# nl-module-system/nl-module-system-server/src/main/resources/application-dev.yaml
|
2026-08-06 18:27:14 +08:00 |
|
|
|
cf37c9c4cd
|
add：开发
|
2026-08-06 17:29:03 +08:00 |
|
|
|
c31b925c93
|
feat:1.新增LMS 生箔缓存位管理。2.新增LMS 空辊缓存位管理。3.ACSToLMS称重完成上报接口。4.手持呼叫-上满下空。5.生箔任务反馈处理。
|
2026-08-06 17:09:19 +08:00 |
|
zhouz
|
69301e5801
|
Merge remote-tracking branch 'origin/feature/20260716/wms-module'
|
2026-07-31 09:59:15 +08:00 |
|
zhouz
|
afb512cf6c
|
feat:入库、移库功能页面完善
|
2026-07-31 09:58:22 +08:00 |
|
zhouz
|
e0fb258af0
|
Merge remote-tracking branch 'origin/feature/20260716/wms-module' into feature/20260716/wms-module
|
2026-07-31 09:57:18 +08:00 |
|
zhouz
|
79017f74f1
|
feat:入库、移库功能页面完善
|
2026-07-31 09:57:09 +08:00 |
|
|
|
cd62a2528d
|
feat：acs交互接口定义
(cherry picked from commit c89590f76f)
|
2026-07-30 10:17:48 +08:00 |
|
|
|
c89590f76f
|
feat：acs交互接口定义
|
2026-07-30 10:15:05 +08:00 |
|
|
|
0f29c81596
|
Merge remote-tracking branch 'origin/feature/20260713/task-module'
|
2026-07-29 11:06:17 +08:00 |
|
zhouz
|
04ffd865a3
|
feat:出库单一键设置功能及移库单CRUD
|
2026-07-28 16:21:22 +08:00 |
|
|
|
51701d94b0
|
fix: 是否启用acs连接
|
2026-07-28 14:21:03 +08:00 |
|
|
|
9e43129c37
|
fix: 是否启用acs连接
|
2026-07-28 14:20:10 +08:00 |
|
|
|
b30d4e1d27
|
Merge remote-tracking branch 'origin/feature/20260713/task-module' into feature/20260716/wms-module
|
2026-07-28 11:26:43 +08:00 |
|
|
|
566027cfdf
|
fix: 任务日志
|
2026-07-28 10:58:20 +08:00 |
|
|
|
eb3a6c3c5f
|
Merge remote-tracking branch 'origin/feature/20260713/task-module' into feature/20260716/wms-module
|
2026-07-28 09:11:11 +08:00 |
|
|
|
3f23b83985
|
fix: 补充字段
|
2026-07-28 09:10:41 +08:00 |
|
|
|
f5102bc7ba
|
Merge remote-tracking branch 'origin/feature/20260713/task-module' into feature/20260716/wms-module
|
2026-07-28 08:44:43 +08:00 |
|
|
|
50e47de5bd
|
feat: acs开关
|
2026-07-28 08:44:20 +08:00 |
|
|
|
2ff9b010c8
|
Merge remote-tracking branch 'origin/feature/20260713/task-module' into feature/20260716/wms-module
|
2026-07-27 19:44:17 +08:00 |
|
|
|
220bdec122
|
fix: 任务编码
|
2026-07-27 19:43:20 +08:00 |
|
|
|
855b53f80e
|
Merge remote-tracking branch 'origin/feature/20260716/wms-module' into feature/20260716/wms-module
|
2026-07-27 17:57:06 +08:00 |
|
|
|
182e856b6e
|
Merge remote-tracking branch 'origin/feature/20260713/task-module' into feature/20260716/wms-module
|
2026-07-27 17:56:42 +08:00 |
|
|
|
f5c1c16062
|
fix: 异常信息提炼
|
2026-07-27 17:55:58 +08:00 |
|
|
|
7d654ec06a
|
feat：单任务下发：success=false就报错误异常
|
2026-07-27 17:27:31 +08:00 |
|
|
|
742d360cd4
|
feat：日志记录
|
2026-07-27 15:52:16 +08:00 |
|
zhouz
|
73491b412c
|
Merge remote-tracking branch 'origin/feature/20260716/wms-module' into feature/20260716/wms-module
|
2026-07-27 14:56:27 +08:00 |
|
zhouz
|
2269022205
|
feat:修改校验出库单状态
|
2026-07-27 14:56:20 +08:00 |
|
|
|
2799b9f54e
|
Merge remote-tracking branch 'origin/feature/20260713/task-module' into feature/20260716/wms-module
|
2026-07-27 10:52:43 +08:00 |
|
|
|
865f2a1e14
|
Merge remote-tracking branch 'origin/feature/20260713/task-module'
# Conflicts:
# nl-module-lms/nl-module-lms-server/pom.xml
|
2026-07-27 10:46:21 +08:00 |
|
|
|
25ea2a248f
|
fix: 任务并发控制
|
2026-07-27 10:44:51 +08:00 |
|
zhouz
|
b54fbb614a
|
feat:修改表格的底层样式
|
2026-07-27 10:39:02 +08:00 |
|
zhouz
|
66dca91e7d
|
feat:出库单分配功能
|
2026-07-27 10:26:58 +08:00 |
|
|
|
ed0b18a4af
|
refactor：PC 下发任务
|
2026-07-24 16:36:00 +08:00 |
|
|
|
62454c77c1
|
feat：PC 下发任务
|
2026-07-24 16:23:19 +08:00 |
|
|
|
4805e6482f
|
opt：任务完成取消与ACS确认是否可行
|
2026-07-24 13:14:43 +08:00 |
|
zhouz
|
ac19f00697
|
feat:出库单修改功能
|
2026-07-24 10:35:50 +08:00 |
|
|
|
89c21e900e
|
feat：任务定时任务下发
|
2026-07-24 10:06:35 +08:00 |
|
zhouz
|
8a9d488ac2
|
fix:页面优化
|
2026-07-23 16:55:30 +08:00 |
|
|
|
6f566b7a69
|
opt: 任务发送消费者topic定义
|
2026-07-23 16:48:05 +08:00 |
|
|
|
65fb53fc00
|
opt: 把 LMS/WMS 重复的执行逻辑下沉到 starter
|
2026-07-23 16:05:51 +08:00 |
|
|
|
16bab7ab21
|
add：启动报错
|
2026-07-23 15:20:23 +08:00 |
|
|
|
7972122ea1
|
Merge remote-tracking branch 'refs/remotes/origin/feature/20260716/wms-module' into feature/20260713/task-module
|
2026-07-23 15:03:31 +08:00 |
|
zhouz
|
172e6f892f
|
Merge remote-tracking branch 'origin/feature/20260716/wms-module' into feature/20260716/wms-module
|
2026-07-23 14:48:06 +08:00 |
|
zhouz
|
5e8f72e211
|
fix:页面优化
|
2026-07-23 14:47:55 +08:00 |
|
|
|
57dd81c656
|
feat:新增LMS 生箔工序工单管理。
|
2026-07-23 14:26:08 +08:00 |
|
|
|
4359679657
|
Merge remote-tracking branch 'origin/feature/20260716/wms-module' into feature/20260716/wms-module
# Conflicts:
# .gitignore
|
2026-07-23 13:51:41 +08:00 |
|
|
|
69750540a3
|
fix: 载具扩展
|
2026-07-23 13:51:09 +08:00 |
|
zhouz
|
410c929764
|
Merge remote-tracking branch 'origin/feature/20260716/wms-module' into feature/20260716/wms-module
|
2026-07-23 13:28:24 +08:00 |
|
