Commit Graph

215 Commits

Author SHA1 Message Date
3afe6dda6c feat: 国际化 2024-04-02 17:17:41 +08:00
f9aceb9eb8 rev:点位,任务,区域修改 2024-04-02 15:28:41 +08:00
976c2bb283 rev:代码合并 2024-04-02 14:04:14 +08:00
7a3ce90932 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_two 2024-04-02 14:03:48 +08:00
26e6207e61 rev:仓储 2024-04-02 14:03:36 +08:00
4f26755f92 add:重构生产,工单,区域模块; 2024-04-02 10:44:01 +08:00
093e03f0fd fix: 国际化 2024-04-02 09:30:01 +08:00
7fed531835 feat: 基础部分的国际化 2024-04-01 10:33:53 +08:00
620dba9b38 fix: 任务类公共入口与注释 2024-03-28 10:23:20 +08:00
dedc9fbba2 feat: 载具维护、客户信息、计量单位、基础分类 2024-03-28 09:53:06 +08:00
c61a5083c3 fix: 基础框架修改,去除不要代码 2024-03-25 18:04:26 +08:00
3c3114985b fix: 当获取不到lang的时候提供默认值 2024-03-25 16:27:00 +08:00
726c16a29d feat: 代码生成模板配置 2024-03-25 15:51:43 +08:00
92844f14b3 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_two 2024-03-25 15:44:11 +08:00
10527668be feat: 菜单多语言、包名修改 2024-03-25 15:43:56 +08:00
2faebed078 rev:字段类型更新-Long -> String 2024-03-25 15:37:11 +08:00
83ef66968b add:人员对应仓库 2024-01-16 17:30:04 +08:00
yanps
f00816c610 add: 仙工AGV 2024-01-16 15:44:50 +08:00
7c3edd65d9 Merge remote-tracking branch 'origin/master' 2024-01-16 15:42:11 +08:00
753dfffd63 add: 添加页面 2024-01-16 15:41:45 +08:00
c1bdbafb37 fix 2024-01-16 15:37:16 +08:00
412dc43654 Merge remote-tracking branch 'origin/master' 2024-01-16 15:33:25 +08:00
355f0878d1 add: 包名 2024-01-16 15:32:51 +08:00
9737a2a4b4 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java
#	acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/BoxStorageManipulatorDeviceDriver.java
2024-01-16 15:29:52 +08:00
078d72b3f7 fix:修复启动报错问题 2024-01-16 15:26:41 +08:00
888e55a4b8 Merge remote-tracking branch 'origin/master' 2024-01-16 13:42:33 +08:00
0ca256d734 add: 木箱入库、装箱入库、空木箱出库驱动开发(后端) 2024-01-16 13:42:10 +08:00
ac611aa823 rev:新增驱动 2024-01-16 13:38:05 +08:00
2fad2071b3 add:新增表 库区、仓库、仓位 2024-01-16 10:54:44 +08:00
22b0a59930 Merge remote-tracking branch 'origin/master' 2024-01-16 09:59:45 +08:00
c7b6d79b38 add:前端可开发 2024-01-16 09:59:11 +08:00
6204f3a465 rev:出入库表结构更改 2024-01-15 19:55:39 +08:00
ludj
9382c6ffe2 rev:LMS项目初始化 2024-01-15 19:48:24 +08:00
yanps
4742236a7c add: 创建任务添加扩展字段 2024-01-15 19:40:03 +08:00
5b483c6936 rev:task 2024-01-15 19:14:06 +08:00
4ea2e8c245 rev:合并 2024-01-15 17:26:56 +08:00
eb98aabcac Revert "add:车间"
This reverts commit f2ad3bf346.
2024-01-15 17:18:37 +08:00
f328dbcb73 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_two 2024-01-15 17:17:56 +08:00
f2ad3bf346 add:车间 2024-01-15 17:17:02 +08:00
8addf6e707 rev:任务 2024-01-15 17:16:58 +08:00
2c69607cda add: 木箱入库、装箱入库、空木箱出库驱动开发(后端) 2024-01-12 18:03:07 +08:00
486cea7de8 rev:堆叠机双向点位平均分配原则 2024-01-11 19:39:40 +08:00
db4d0db124 rev:平均分配页面显示问题 2024-01-10 18:16:16 +08:00
f928a093db Merge remote-tracking branch 'origin/master' 2024-01-10 17:46:54 +08:00
480a96a3d1 add: 一楼驱动开发(后端) 2024-01-10 17:46:35 +08:00
eb1fae7313 rev:修复无路由路线时取消任务索引越界 2024-01-10 14:09:41 +08:00
a9d36024bb rev:更新 2024-01-10 12:34:46 +08:00
80c0cf6d46 rev:lucene路径 2024-01-10 12:31:57 +08:00
2e22fbee6e rev:lucene 2024-01-10 12:28:55 +08:00
ce6f38597c add:添加驱动 2024-01-09 13:19:16 +08:00