Commit Graph

2200 Commits

Author SHA1 Message Date
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
79bc126d39 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2024-03-20 09:05:13 +08:00
2f4e488f2c rev:出库分配页面 优化 2024-03-20 09:04:49 +08:00
d99c0d8437 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
2024-03-20 09:04:32 +08:00
2eac4ea4e3 fix: 现场联调 2024-03-20 09:01:40 +08:00
yanps
c9fb151de5 fix: 解决连续创建多个指令 2024-03-19 18:23:10 +08:00
3e808280ad rev:成品报废审核新增字段 2024-03-19 15:26:52 +08:00
7b7d4d542a rev:成品报废导入 2024-03-19 15:00:05 +08:00
d0b46cc42a Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms 2024-03-19 14:49:14 +08:00
22d7a97b27 rev:样式修改 2024-03-19 14:49:05 +08:00
e42fdec93a rev:代码合并 2024-03-19 14:30:43 +08:00
9f5eb3914f Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2024-03-19 14:30:09 +08:00
565878bde3 rev:1.发货出库不能强控优化2.出库实际重量显示真是发货重量3.B开头子卷保质期为180天优化4.发货信息回传sap优化5.库存报表字段优化6.一键新增仓位优化 2024-03-19 14:29:56 +08:00
461781c5d8 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2024-03-19 14:20:49 +08:00
080fd348e3 rev:页面优化 2024-03-19 14:20:41 +08:00
yanps
ecbf9077c7 opt: 自动门优化 2024-03-19 13:08:35 +08:00
6903bdfa6d add: 行架缓存为页面 2024-03-18 11:03:09 +08:00
2fa7a54247 add: 行架缓存为页面 2024-03-18 10:59:44 +08:00
5303bf4828 Merge remote-tracking branch 'origin/master' 2024-03-18 08:46:07 +08:00
0783af09c2 fix: 堆垛机联调 2024-03-18 08:45:37 +08:00