Commit Graph

101 Commits

Author SHA1 Message Date
e64c2d0383 Merge branch 'master' of http://121.40.234.130:8899/root/nladmin 2022-10-10 20:06:04 +08:00
b0c8928390 修改 2022-10-10 20:05:32 +08:00
310bcfe72f 代码更新 2022-10-10 19:58:36 +08:00
3de8ecd3ad Merge branch 'master' of http://121.40.234.130:8899/root/nladmin 2022-10-10 16:05:38 +08:00
26ac8df73c 修改 2022-10-10 16:05:31 +08:00
lyd
87a0099839 生箔区域去掉点位状态 2022-10-10 15:45:43 +08:00
ldj_willow
3d9236b3d0 删除任务相关代码 2022-10-10 15:41:56 +08:00
lyd
f6de45d426 生箔点位库存 2022-10-10 14:00:42 +08:00
2160e93d77 任务管理 2022-10-10 10:58:40 +08:00
bd9e684477 Merge branch 'master' of http://121.40.234.130:8899/root/nladmin 2022-10-10 10:15:29 +08:00
b16fca3072 修改 2022-10-10 10:15:13 +08:00
lyd
5d789ce187 生箔下料界面、手持登录 2022-10-10 09:36:02 +08:00
8e19cbc213 修改 2022-10-09 19:20:08 +08:00
da5a62f51b 修改 2022-10-09 19:18:19 +08:00
6afca9aa56 修改 2022-10-09 19:14:15 +08:00
594819cf73 修改 2022-10-09 19:12:44 +08:00
dff2f324cc 修改 2022-10-09 18:41:41 +08:00
5b16486fcb 修改 2022-10-09 18:24:31 +08:00
8478390075 Merge branch 'master' of http://121.40.234.130:8899/root/nladmin 2022-10-09 18:16:15 +08:00
a36889dcd1 修改 2022-10-09 18:16:10 +08:00
3893c034a2 手持 2022-10-09 18:15:32 +08:00
lyd
22f38f80cf 烘烤区库存 2022-10-09 17:00:18 +08:00
0e4bae7baf 代码更新 2022-10-09 16:27:20 +08:00
lyd
ce630b9ae3 分切区库存 2022-10-09 16:21:51 +08:00
ldj_willow
01b34aa808 代码更新 2022-10-09 16:20:43 +08:00
lyd
abf814d560 烘烤区 2022-10-09 15:50:25 +08:00
ldj_willow
00154727c3 是否字段更新 2022-10-09 15:46:43 +08:00
ldj_willow
0857c51f1d 代码更新 2022-10-09 15:34:46 +08:00
lyd
1a638e9d14 冷却区库存 2022-10-09 15:33:32 +08:00
bc3e76c63e Merge branch 'master' of http://121.40.234.130:8899/root/nladmin 2022-10-09 14:38:34 +08:00
c90596c60c 修改 2022-10-09 14:38:28 +08:00
ldj_willow
55e46a0674 代码更新 2022-10-09 14:25:11 +08:00
ldj_willow
324fa05a39 代码更新 2022-10-09 14:09:49 +08:00
ldj_willow
e595a2c9a6 定时任务日志更新 2022-10-09 14:09:34 +08:00
ldj_willow
dc1ad3b88c 代码更新 2022-10-09 11:14:50 +08:00
ldj_willow
422c2f537b 代码更新 2022-10-09 11:14:33 +08:00
d497daef9b 代码更新 2022-10-09 10:52:18 +08:00
e0ca3c5d77 新增空纸管表 2022-10-09 10:37:45 +08:00
731b50fdce 修改 2022-10-09 10:28:01 +08:00
2a7f364921 Merge branch 'master' of http://121.40.234.130:8899/root/nladmin
# Conflicts:
#	nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls
2022-10-09 10:22:13 +08:00
fc3eb03338 修改 2022-10-09 10:21:41 +08:00
ldj_willow
e32474c3d5 代码更新 2022-10-09 09:39:07 +08:00
ldj_willow
b8989355af 代码更新 2022-10-09 09:38:37 +08:00
lyd
6c3595a316 库存 2022-10-09 09:08:28 +08:00
a9bcc62a6d 表结构修改 2022-10-08 19:29:18 +08:00
359a57b43c 表修改 2022-10-08 18:31:12 +08:00
de4ba7f203 Merge branch 'master' of http://121.40.234.130:8899/root/nladmin 2022-10-08 17:22:57 +08:00
6cecbdc119 表修改 2022-10-08 17:22:50 +08:00
lyd
12a7feca10 Merge branch 'master' of http://121.40.234.130:8899/root/nladmin
# Conflicts:
#	nladmin-system/pom.xml
#	nladmin-system/src/main/resources/config/application-dev.yml
2022-10-08 17:21:14 +08:00
lyd
3f565f7c51 token过期提示 2022-10-08 17:15:56 +08:00