Commit Graph

1441 Commits

Author SHA1 Message Date
USER-20220102CG\noblelift
5ca08b760e rev 优化 2023-12-12 16:31:03 +08:00
3b742ff9ac Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2023-12-12 15:22:03 +08:00
71d27d5daf dev:回传优化 2023-12-12 15:20:19 +08:00
188e46b0fb add:新增rgv驱动 2023-12-11 16:12:11 +08:00
2e89771520 rev:删除哦按段载具上是否存在气涨轴 2023-12-11 10:46:43 +08:00
2de7b47102 rev: 设置站点修改 2023-12-11 10:31:52 +08:00
5dd83f0bff dev:代码规范 2023-12-08 11:30:30 +08:00
524717a5f2 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2023-12-05 15:44:06 +08:00
f256124e79 dev:优化 2023-12-05 15:43:59 +08:00
f8df3e6861 rev:成品出库设置站点未生成任务 2023-12-04 20:16:12 +08:00
66f867a162 rev:1.库存报表增加超期原因 2.成品报废回传飞书只回传>200的子卷 3.出库设置站点时出库a单据会带出b单据木箱问题解决 2023-12-04 16:01:55 +08:00
8cab2ee440 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2023-12-04 09:37:51 +08:00
c073c02cd1 dev:设备禁用不影响和MES进行接口对接,只影响AGV运行 2023-12-04 09:33:08 +08:00
b709982b2f rev:成品库存报表sql修改 2023-12-01 09:40:17 +08:00
663a9a7506 rev: 出库分配设置站点提示优化 2023-11-30 17:53:54 +08:00
0b2f5e9610 add:库存管理新增编辑 2023-11-30 13:44:45 +08:00
f35cd4e614 rev:成品日报修改 2023-11-29 16:39:54 +08:00
95ba893f55 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2023-11-28 13:41:32 +08:00
72b31f02c6 dev:查询优化 2023-11-28 13:41:24 +08:00
7499f4c766 rev:改切表设计 2023-11-28 10:25:20 +08:00
110baa3217 rev: 成品日报修改 2023-11-28 09:34:49 +08:00
ludj
f55bd76ccd 页面更新 2023-11-24 18:15:33 +08:00
22f61db5f5 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
# Conflicts:
#	lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java
2023-11-24 16:35:13 +08:00
e51ecf6140 rev:修改仓库 2023-11-24 16:34:32 +08:00
37fdf2598c dev:下发二楼到一楼的任务终点修改 2023-11-24 16:33:26 +08:00
3f8914af53 rev:成品日报单位改为T 2023-11-24 15:14:55 +08:00
df4abb6b69 add: 成品日报接口 2023-11-23 17:39:56 +08:00
ludj
8842d2cece rev:样式修改 2023-11-23 16:58:20 +08:00
ludj
cd8c64312f rev:前端样式调整 2023-11-22 20:10:06 +08:00
ea75b54f38 报错时data注释 2023-11-16 10:19:19 +08:00
87e99fadd6 add:成品报废审核 2023-11-16 09:43:47 +08:00
yanps
f826b0ba77 opt: NDC双工位AGV优化 2023-11-15 14:13:59 +08:00
yanps
47ac9d9ec9 Merge remote-tracking branch 'origin/master' 2023-11-15 14:13:36 +08:00
816d50d42d Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2023-11-15 13:45:20 +08:00
070adc96e2 rev:新增飞书接口 2023-11-15 13:45:12 +08:00
yanps
fe25998a24 opt: NDC双工位AGV优化 2023-11-13 19:57:46 +08:00
247457d4a3 opt:代码优化 2023-11-13 19:35:53 +08:00
c74ab66fdd opt:内包间行架,输送线出口位驱动优化 2023-11-10 10:38:27 +08:00
yanps
7ec5df941c opt: 纸管库,套管工位驱动优化 2023-11-09 14:06:57 +08:00
1181d4c192 opt:内包间行架和插拔轴机驱动代码优化 2023-11-09 13:21:01 +08:00
74e0977658 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2023-11-09 11:19:03 +08:00
5284aff25d rev:数字孪生接口查询优化 2023-11-09 11:18:53 +08:00
f36891047d rev 内包间行架 2023-11-09 10:02:16 +08:00
293906cdb5 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	acs/nladmin-system/src/main/java/org/nl/acs/device/wql/task_inst.xls
2023-11-09 09:58:00 +08:00
205798ad6e fix 2023-11-09 09:56:53 +08:00
61ed74e4ae rev:成品报废审核修改 2023-11-08 19:02:50 +08:00
yanps
46463e7b65 opt: 纸管库,套管工位驱动优化 2023-11-08 17:30:33 +08:00
7b142f95c4 add: 新增成品报废审核功能 2023-11-07 16:10:19 +08:00
78a4a4d6bd Merge remote-tracking branch 'origin/master'
# Conflicts:
#	acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java
#	acs/nladmin-system/src/main/java/org/nl/acs/task/service/dto/TaskDto.java
#	acs/nladmin-ui/src/views/acs/device/config.vue
2023-11-07 13:39:36 +08:00
fa1a3a4e68 fix 2023-11-07 12:37:07 +08:00