Commit Graph

249 Commits

Author SHA1 Message Date
3ec762c7a3 feat:子卷装箱桁架任务 2026-08-18 16:35:49 +08:00
f07062bb4f feat:定时器补充入装箱区任务 2026-08-18 15:46:30 +08:00
5d988431a6 fix: 装箱点位管理 2026-08-18 15:13:25 +08:00
d3feb61e62 fix: 子卷包装关系新增判断erp卷号是否存在 2026-08-18 13:57:14 +08:00
68a7112921 fix: 子卷包装关系ui调整 2026-08-18 11:27:46 +08:00
f22f832ad4 fix: 子卷包装关系手动添加 2026-08-18 09:48:50 +08:00
98f573fab4 fix: 严格校验批量失败行号 2026-08-17 21:39:03 +08:00
dc6341d24e fix: 校验批量保存响应一致性 2026-08-17 21:37:12 +08:00
357ef89d3e fix: 优先校验批量输入行标识 2026-08-17 21:34:09 +08:00
934cde0034 fix: 防止批量结果映射丢失输入 2026-08-17 21:32:15 +08:00
9e2c5d04d3 feat: 增加包装关系批量录入模型 2026-08-17 21:26:10 +08:00
a07922a3d3 fix: 调整批量行标识校验顺序 2026-08-17 21:19:25 +08:00
f29fa3dc5a fix: 校验批量新增行标识重复 2026-08-17 21:17:06 +08:00
ad7608e050 feat: 实现子卷包装关系分组批量保存接口 2026-08-17 21:09:16 +08:00
312c3fe825 fix: 处理包装关系批量保存失败 2026-08-17 21:01:38 +08:00
93e4dc039b feat: 增加包装关系分组事务写入器 2026-08-17 20:56:11 +08:00
0fb66b980e feat: 定义子卷包装关系批量新增契约 2026-08-17 20:48:38 +08:00
cb2aeef2b9 docs: 设计子卷包装关系批量新增 2026-08-17 20:26:38 +08:00
18490ba4a0 fix: 木箱类型 2026-08-17 19:56:20 +08:00
6e9bbce2fe docs: 设计木箱类型最大子卷数字段 2026-08-17 17:06:12 +08:00
daaaf6a457 docs: 记录木箱类型选择弹窗设计 2026-08-17 16:08:53 +08:00
914e595a0f feat: 木箱类型crud 2026-08-17 13:26:35 +08:00
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