Commit Graph

423 Commits

Author SHA1 Message Date
helloDy
9eea7e049a 部分bug 2023-11-24 19:01:25 +08:00
b3a117f6c6 merge test 2023-11-24 17:31:21 +08:00
8929e53724 ui样式 2023-11-24 17:29:40 +08:00
lb
a8fa98cb91 update StatusAndParams 2023-11-24 14:56:17 +08:00
zwq
3e9540bcc9 更新仓库 2023-11-24 14:36:59 +08:00
zwq
601387184e 更新仓库bug 2023-11-24 14:32:58 +08:00
lb
54b63a7f53 update drawer and edit 2023-11-24 10:41:11 +08:00
helloDy
8004c85c32 Merge branch 'projects/mes-test' into projects/mes-dy 2023-11-24 09:14:32 +08:00
helloDy
9041428003 部分bug 2023-11-24 09:13:56 +08:00
lb
d79ba71bd7 Merge branch 'projects/mes-test' into projects/mes-lb 2023-11-24 08:51:18 +08:00
lb
0225be1c94 fix bugs 2023-11-23 17:07:57 +08:00
960751a264 merge test 2023-11-23 16:57:39 +08:00
978aa3a1d1 ui修改 2023-11-23 16:56:08 +08:00
zwq
8cd53915c1 修改仓库UI测试bug 2023-11-23 16:42:09 +08:00
helloDy
8dbc1d512d Merge branch 'projects/mes-test' into projects/mes-dy 2023-11-23 15:10:26 +08:00
helloDy
8af06c6c42 bug 2023-11-23 15:09:46 +08:00
‘937886381’
afafbccc0c Merge branch 'projects/mes-test' into projects/mes-zhp 2023-11-23 14:33:32 +08:00
‘937886381’
0948737f1a 修改bug 2023-11-23 14:32:53 +08:00
lb
e318aa4f59 Merge branch 'projects/mes-test' into projects/mes-lb 2023-11-22 17:05:53 +08:00
lb
ab09a2b08c update zentao bugs 2023-11-22 17:04:22 +08:00
6940155e4f merge test 2023-11-22 17:00:32 +08:00
dfc758bfae 订单监控图 2023-11-22 16:58:32 +08:00
gtz
de15716b7c Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test 2023-11-22 14:53:49 +08:00
gtz
c736992a34 '1' 2023-11-22 14:49:56 +08:00
helloDy
5492666b53 merge 2023-11-22 14:43:07 +08:00
lb
cd55b4c860 update 2023-11-22 14:41:53 +08:00
helloDy
a7f811aa3e bug 2023-11-22 14:41:10 +08:00
lb
33188481bf update login 2023-11-22 14:27:30 +08:00
‘937886381’
a22da566c3 解决冲突 2023-11-22 14:11:23 +08:00
‘937886381’
3c99ddc4c0 修改bug 2023-11-22 14:00:02 +08:00
lb
ac28476024 update hints 2023-11-22 11:15:39 +08:00
lb
b348a31b24 update some equipment bugs 2023-11-22 10:14:40 +08:00
lb
c6d618b2b8 update bugs 2023-11-21 17:02:22 +08:00
lb
c8fb8d7589 Merge branch 'projects/mes-test' into projects/mes-lb 2023-11-21 16:08:44 +08:00
lb
51baca61cc update equipment attach process 2023-11-21 15:07:33 +08:00
lb
847e34fcc6 update 2023-11-21 11:48:17 +08:00
lb
32a43fbc3b update process equipment relation 2023-11-21 09:13:28 +08:00
lb
20975948ef update 2023-11-20 16:50:38 +08:00
zwq
685a3308db 更新仓库bug 2023-11-20 16:09:42 +08:00
lb
ac041c2f4a update bom-selector v1 2023-11-20 15:53:23 +08:00
lb
dd23c49ba0 update 设备选择 2023-11-20 14:21:14 +08:00
lb
44452f2e89 update 2023-11-20 11:26:27 +08:00
lb
8ddef0de9d update bomselector 2023-11-17 17:07:52 +08:00
lb
7249abf5b1 add BomSelector 2023-11-17 16:57:55 +08:00
lb
76f5385140 add Candidate 2023-11-17 16:05:57 +08:00
zwq
75f59c3279 更新-仓库-2级bug 2023-11-17 15:48:17 +08:00
lb
bb731dfcd4 add custom tree 2023-11-17 14:56:43 +08:00
bad7175f87 merge test 2023-11-17 14:07:51 +08:00
231e9227a5 1 2023-11-17 14:04:53 +08:00
lb
d3eb9d8fbc update custom-transfer 2023-11-17 11:25:28 +08:00
lb
9a7521e691 add CustomTrasfer 2023-11-17 11:15:18 +08:00
helloDy
40e7d6b6d8 Merge branch 'projects/mes-test' into projects/mes-dy 2023-11-17 10:26:21 +08:00
helloDy
1d9b97f1d0 设备信息bug 2023-11-17 10:24:53 +08:00
lb
d1cbac481d Merge branch 'projects/mes-test' into projects/mes-lb 2023-11-17 10:14:26 +08:00
lb
c895975703 update 2023-11-17 10:12:00 +08:00
lb
6ef90a8eba merge test 2023-11-17 10:00:04 +08:00
zwq
c99393dd12 更新仓库bug 2023-11-17 09:55:09 +08:00
lb
23c1b4b3c6 update 2023-11-17 09:48:39 +08:00
gtz
88615a52a4 '1' 2023-11-17 08:46:35 +08:00
Melete
010e51c0f6 update 工艺流程 2023-11-16 22:18:45 +08:00
Melete
a6b48280aa update 工艺流程 2023-11-16 22:00:50 +08:00
helloDy
c4091b7181 Merge branch 'projects/mes-test' into projects/mes-dy 2023-11-16 21:07:59 +08:00
helloDy
34e6a73852 bug 2023-11-16 21:07:21 +08:00
‘937886381’
7523f98f84 Merge branch 'projects/mes-test' into projects/mes-zhp 2023-11-16 18:54:43 +08:00
‘937886381’
b349432eaa 修改bug 2023-11-16 18:52:55 +08:00
lb
42177846e8 Merge branch 'projects/mes-test' into projects/mes-lb 2023-11-16 17:25:39 +08:00
lb
c5b5de7a78 update 2023-11-16 17:23:58 +08:00
lb
0884159dd7 update login 2023-11-16 17:16:37 +08:00
d37c5881a5 2 2023-11-16 16:53:35 +08:00
2b0579dc70 merge test 2023-11-16 16:13:36 +08:00
6a10afd04e 1 2023-11-16 16:12:05 +08:00
helloDy
25d1ac8d90 merge 2023-11-16 14:07:50 +08:00
helloDy
3667b98da9 bug 2023-11-16 13:57:21 +08:00
lb
bbdf0a75f0 update system 2023-11-16 13:47:18 +08:00
‘937886381’
3832aee028 解决冲突 2023-11-16 08:52:38 +08:00
‘937886381’
2fbc6ea5e7 修改bug 2023-11-16 08:50:59 +08:00
helloDy
4ce62c14ee Merge branch 'projects/mes-test' into projects/mes-dy 2023-11-15 17:47:31 +08:00
helloDy
e5966c27a3 工单[ 2023-11-15 17:46:54 +08:00
3e9f629888 Merge pull request '修改bug' (#82) from projects/mes-zhp into projects/mes-test
Reviewed-on: #82
2023-11-15 16:03:01 +08:00
‘937886381’
ecabeeeea9 修改bug 2023-11-15 15:47:45 +08:00
helloDy
aef062b4c9 merge 2023-11-15 14:37:52 +08:00
helloDy
952490f0d4 24h,设备 2023-11-15 14:30:28 +08:00
0ae68aacef 订单 2023-11-15 14:22:45 +08:00
a37fa65e8f bug 2023-11-15 14:02:16 +08:00
5d054254f7 merge test 2023-11-15 10:17:35 +08:00
76cdc34af1 小bug 2023-11-15 10:13:54 +08:00
‘937886381’
ecc84a1c4b 合并冲突 2023-11-15 09:10:45 +08:00
‘937886381’
95f7004d1c 修改bug 2023-11-15 09:08:20 +08:00
zwq
de06dfddf4 仓库-bug修改 2023-11-14 16:02:16 +08:00
67612c79df merge test 2023-11-14 15:47:06 +08:00
26862423c1 首页 2023-11-14 10:35:10 +08:00
zwq
d2c82fa692 更新-仓库-库位监控 2023-11-14 09:42:38 +08:00
lb
ebae332674 update 2023-11-14 09:23:08 +08:00
lb
7f6fa0af96 Merge branch 'projects/mes-test' into projects/mes-lb 2023-11-13 16:56:07 +08:00
lb
ba92da2d5d update login mobile 2023-11-13 16:55:16 +08:00
lb
06c124a149 update login 2023-11-13 16:37:04 +08:00
helloDy
e6158cd59b merge 2023-11-11 20:51:01 +08:00
helloDy
624ed7bc27 设备管理 2023-11-11 20:49:31 +08:00
‘937886381’
f7846f2767 Merge branch 'projects/mes-test' into projects/mes-zhp 2023-11-10 17:03:25 +08:00
‘937886381’
a8adb317c0 质量管理 2023-11-10 17:02:52 +08:00