Commit Graph

227 Commits

Author SHA1 Message Date
38ccff26d6 docs: 记录木箱类型捆扎默认值设计 2026-08-17 11:10:24 +08:00
3d11668705 feat: 子卷包装关系crud 2026-08-17 10:43:10 +08:00
95286d126e docs: 添加子卷包装批量新增原型设计 2026-08-17 10:14:30 +08:00
e3045f8098 Merge remote-tracking branch 'refs/remotes/origin/huachuang_ls' into feature/20260808/packaging_workshop 2026-08-15 14:32:26 +08:00
4ccc1e304c Merge remote-tracking branch 'refs/remotes/origin/huachuang_ls' into feature/20260808/packaging_workshop
# Conflicts:
#	nl-module-lms/nl-module-lms-api/src/main/java/cn/code/nl/module/lms/enums/ErrorCodeConstants.java
#	nl-module-task/nl-module-task-api/src/main/java/cn/code/nl/module/task/enums/TaskOwnerServiceEnum.java
#	nl-module-task/nl-module-task-server/src/main/java/cn/code/nl/module/task/mq/producer/TaskEventProducer.java
#	nl-server/src/main/resources/application.yaml
2026-08-15 14:17:27 +08:00
ls
768d0ce52b add:开发 2026-08-15 10:12:29 +08:00
5ada3c2a41 feat: 自动补空任务 2026-08-13 16:47:46 +08:00
6db59d422d feat: 子卷送到待检区任务 2026-08-13 15:04:14 +08:00
e20c0f2168 fix: 子卷下线区送满卷任务 2026-08-12 17:20:07 +08:00
757ab83bee fix: 小修补 2026-08-10 17:43:16 +08:00
2e1214fbff feat: 装箱区点位表 2026-08-10 16:38:17 +08:00
df24f4c88b Merge branch 'refs/heads/feature/20260713/task-module' into feature/20260808/packaging_workshop
# Conflicts:
#	nl-framework/nl-spring-boot-starter-execute/src/main/java/cn/code/nl/framework/execute/util/http/AcsUtil.java
#	nl-server/src/test/java/cn/code/nl/server/acs/AcsUtilLocalSpringTest.java
2026-08-10 14:28:27 +08:00
0bde732829 fix: 测试推送 2026-08-08 18:13:37 +08:00
ls
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
ls
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
d9f21147aa feat:取消完成通过配置决定是否使用mq或者feign 2026-08-03 19:30:54 +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
1e3f95eace feat:acs交互接口定义
(cherry picked from commit c89590f76f)
2026-07-30 10:17:10 +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