Commit Graph

111 Commits

Author SHA1 Message Date
934cde0034 fix: 防止批量结果映射丢失输入 2026-08-17 21:32:15 +08:00
9e2c5d04d3 feat: 增加包装关系批量录入模型 2026-08-17 21:26:10 +08:00
18490ba4a0 fix: 木箱类型 2026-08-17 19:56:20 +08:00
914e595a0f feat: 木箱类型crud 2026-08-17 13:26:35 +08:00
3d11668705 feat: 子卷包装关系crud 2026-08-17 10:43:10 +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
757ab83bee fix: 小修补 2026-08-10 17:43:16 +08:00
2e1214fbff feat: 装箱区点位表 2026-08-10 16:38:17 +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
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
79017f74f1 feat:入库、移库功能页面完善 2026-07-31 09:57:09 +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
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
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
zhouz
ac19f00697 feat:出库单修改功能 2026-07-24 10:35:50 +08:00
zhouz
8a9d488ac2 fix:页面优化 2026-07-23 16:55:30 +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
05c3d92abf feat:新增出库单新增功能 2026-07-23 13:28:17 +08:00
76ebd44f26 fix: 载具扩展表 2026-07-23 10:29:52 +08:00
efe6e3b0d5 feat: 载具扩展表 2026-07-23 09:28:18 +08:00
zhouz
25cbaf9078 Merge remote-tracking branch 'origin/feature/20260716/wms-module' into feature/20260716/wms-module
# Conflicts:
#	nl-module-wms/nl-module-wms-server/src/main/java/cn/code/nl/module/wms/framework/rpc/config/RpcConfiguration.java
2026-07-22 16:40:10 +08:00
586ce7ed40 feat:载具信息批量新增 2026-07-22 16:36:46 +08:00
zhouz
4e276c5b05 fix: 保存前重校验出库库存 2026-07-22 16:02:43 +08:00
zhouz
a841118805 fix: 防止出库编辑请求串扰 2026-07-22 15:48:08 +08:00
zhouz
88b70e6729 fix: 修正出库单字典加载与详情标识 2026-07-22 15:43:26 +08:00
zhouz
e5f56057c3 feat: 按参考布局实现出库单新增页 2026-07-22 15:37:44 +08:00
zhouz
733ef97a3b fix: 取消过期库存分页请求 2026-07-22 15:26:58 +08:00
zhouz
6210286518 fix: 完善库存跨页选择稳定性 2026-07-22 15:23:13 +08:00
zhouz
d4a28480f1 feat: 增加出库库存选择和手工汇总弹窗 2026-07-22 15:15:47 +08:00
zhouz
36d0be1500 fix: 收紧出库请求与汇总类型 2026-07-22 15:08:16 +08:00