Commit Graph

2169 Commits

Author SHA1 Message Date
1d6f644411 fix:修复区域名称不显示问题 2024-04-03 15:56:32 +08:00
bd633bbba2 rev:优化手持接口 2024-04-03 15:47:12 +08:00
4592e16ddf add:新增手持接口 2024-04-03 14:13:26 +08:00
zhouz
75cd58da75 Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms
# Conflicts:
#	lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls
2024-04-02 17:01:50 +08:00
zhouz
cd49cd952d dev:新增点位类型字段 2024-04-02 16:57:13 +08:00
5387ed5419 fix: 去除指定时间 2024-04-02 09:34:33 +08:00
zhouz
73cdc561f1 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2024-04-02 09:27:40 +08:00
zhouz
b110b9cb35 rev:入库查询优化 2024-04-02 09:27:32 +08:00
0f65ab671e rev:是否发超期 文字更改 2024-04-01 17:14:10 +08:00
cab9306336 fix:舞台监控 2024-04-01 15:13:56 +08:00
47c4895b66 Merge remote-tracking branch 'origin/master' 2024-04-01 15:09:55 +08:00
5ce79d36fd fix: 舞台编辑不显示问题修复 2024-04-01 15:09:34 +08:00
yanps
a46b4877d5 add: NDC下发日志增加 2024-04-01 09:13:10 +08:00
yanps
2757ee6655 opt: AGV下发任务优化 2024-04-01 09:00:48 +08:00
a15652e458 dev:cookie保存不了 2024-04-01 08:54:09 +08:00
yanps
b4e31c71a2 fix: 烘箱下发信号指令错误解决 2024-03-29 18:55:20 +08:00
de2bdefb24 fix:限制下发堆垛机有出入库路线相同的任务 2024-03-28 17:29:14 +08:00
60d26e40bc rev:回传sap更新 2024-03-28 10:22:36 +08:00
635984f957 Merge remote-tracking branch 'origin/master' 2024-03-28 09:54:56 +08:00
1442d2d780 fix: 二楼到一楼输送线修改 2024-03-28 09:54:29 +08:00
yanps
9ae98c1d25 fix: 烘箱行架联调问题解决 2024-03-28 08:39:43 +08:00
8503e685dc rev:修改登录 2024-03-27 16:01:16 +08:00
5f8c856a09 add:新增仙工agv动作块以及优化任务看板 2024-03-27 15:11:55 +08:00
yanps
7dc1f2b429 opt: 优化日志和创建者 2024-03-27 08:53:58 +08:00
af02b2b27e Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms 2024-03-26 17:38:58 +08:00
9d168f202c rev:ES删除 2024-03-26 17:38:51 +08:00
d15b0f016c fix: 手持一二期权限 2024-03-25 14:01:50 +08:00
4fb3a59f39 rev:1.出库页面发货信息保存回传sap优化2.出库页面是否超期发货字段优化 2024-03-25 13:53:03 +08:00
44d1024900 fix:修复堆垛机命令变化不能再次申请问题 2024-03-22 17:45:02 +08:00
00830d1835 fix: 堆垛机异常入库次数限制 2024-03-22 17:10:32 +08:00
7d5a0d61dc Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2024-03-22 09:38:59 +08:00
baf3ceb384 rev:改切计划新增木箱字段 2024-03-22 09:38:51 +08:00
6d52122194 Merge remote-tracking branch 'origin/master' 2024-03-21 17:20:56 +08:00
6119fed7f7 fix: 载具类型添加 2024-03-21 17:20:22 +08:00
84af73051c rev:任务看板优化 2024-03-21 17:14:44 +08:00
d1571b8284 fix: 现场联调加堆垛机修改 2024-03-21 16:53:49 +08:00
b548ca5205 rev:出库页面优化 2024-03-21 10:33:09 +08:00
00088cc2e3 Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms 2024-03-21 10:13:37 +08:00
c1b6bee8f8 rev:表处优化 2024-03-21 10:13:25 +08:00
0dee6fed5d rev:参数修改 2024-03-21 09:40:37 +08:00
0fc22f8885 add:增加装箱对接位桁架任务尾卷信息 2024-03-20 17:19:36 +08:00
yanps
0b9b990262 opt: 烘箱行架监控大屏优化 2024-03-20 16:59:08 +08:00
7a50c3c230 Merge remote-tracking branch 'origin/master' 2024-03-20 15:01:19 +08:00
bb012a2c40 fix: 堆垛机 2024-03-20 15:00:59 +08:00
yanps
6da0f596bc add: 增加二楼NDC日志 2024-03-20 14:26:44 +08:00
ea9cb45a3a fix: 现场联调行家 2024-03-20 13:42:36 +08:00
773a951f1f rev:修改确认子卷木箱规格页面能;
add:增加数据库字段执行sql;
2024-03-20 13:40:26 +08:00
yanps
72c9717169 fix: 解决日志信号变化为null的问题 2024-03-20 10:54:46 +08:00
eba9ebf754 feat: 分切的部分注释、魔法值提取 2024-03-20 09:06:02 +08:00
e228808ebd rev:代码合并 2024-03-20 09:05:42 +08:00