Commit Graph

1462 Commits

Author SHA1 Message Date
yanps
d3dbb4191f add: 添加创建任务的字段 2023-12-13 15:55:28 +08:00
USER-20220102CG\noblelift
b517f41682 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2023-12-13 15:49:47 +08:00
USER-20220102CG\noblelift
e0808d770c rev 更新套管工位 2023-12-13 15:48:41 +08:00
b98beff8ce rev 优化 2023-12-13 14:59:06 +08:00
ludj
d1be5733b8 rev:代码规范:去掉未使用的import与格式化 2023-12-13 13:24:02 +08:00
ludj
074a6e78cd 代码规范更新 2023-12-13 13:13:24 +08:00
yanps
d7c8665c54 opt: 套管工位实现套管完成业务 2023-12-13 10:53:17 +08:00
ludj
82a8540504 rev:代码规范更新 2023-12-13 10:16:35 +08:00
10b0e6c2eb dev:代码规范 2023-12-13 10:10:16 +08:00
52a0ba88ea Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2023-12-13 10:02:08 +08:00
96f06bb6d0 dev:前端用户名不显示 2023-12-13 10:02:00 +08:00
yanps
a2051a8e2a opt: 内包间驱动优化 2023-12-13 09:59:13 +08:00
yanps
d31bdc14ce opt: 优化 2023-12-13 09:58:18 +08:00
b5b00f0669 rev:更新代码 2023-12-13 09:48:19 +08:00
a7f50a7e90 Merge remote-tracking branch 'origin/master' 2023-12-13 09:47:15 +08:00
dacad71eac rev:更新驱动点位地址 2023-12-13 09:45:43 +08:00
e5e6bedffc Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2023-12-13 09:00:41 +08:00
ad638ee127 dev:代码优化,该切计划和业务员 2023-12-13 09:00:32 +08:00
19ed527a0a fix 2023-12-12 16:57:59 +08:00
7b27f86111 Merge remote-tracking branch 'origin/master' 2023-12-12 16:56:15 +08:00
6572957a09 fix:驱动代码修改 2023-12-12 16:54:49 +08:00
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