Commit Graph

Select branches

Hide Pull Requests

master

projects/lb-zhp

projects/line

projects/line-gtz

projects/line-new

projects/line-new-zhp

projects/line-new-zjl

projects/line-new-zwq

projects/line-test

projects/line-zhp

projects/line-zjl

projects/line-zwq

projects/mes

projects/mes-gtz

projects/mes-test

projects/mes-zhp

projects/mes-zjl

projects/mes-zwq

projects/mesxc

projects/mesxc-dev

projects/mesxc-gtz

projects/mesxc-test

projects/mesxc-zhp

projects/mesxc-zjl

projects/mesxc-zwq

projects/qhd-line-test

projects/qhd-line-zhp

projects/qhd-line-zjl

projects/ry-line-test

projects/ry-line-zhp

projects/ssdl-gtz

projects/ssdl-test

projects/ssdl-zhp

projects/ssdl-zwq

projects/zg

projects/zg-test

projects/zg-zjl

projects/zg-zwq

#1

#10

#100

#101

#102

#103

#104

#105

#106

#107

#108

#109

#11

#110

#111

#112

#113

#114

#115

#116

#117

#118

#119

#12

#120

#121

#122

#123

#124

#125

#126

#127

#128

#129

#13

#130

#131

#132

#133

#134

#135

#136

#137

#138

#139

#14

#140

#141

#142

#143

#144

#145

#146

#147

#148

#149

#15

#150

#151

#152

#153

#154

#155

#156

#157

#158

#159

#16

#160

#161

#162

#163

#164

#165

#166

#167

#168

#169

#17

#170

#171

#172

#173

#174

#175

#176

#177

#178

#179

#18

#180

#181

#182

#183

#184

#185

#186

#187

#188

#189

#19

#190

#191

#192

#193

#194

#195

#196

#197

#198

#199

#2

#20

#200

#201

#202

#203

#204

#205

#206

#207

#208

#209

#21

#210

#211

#212

#213

#214

#215

#216

#217

#218

#219

#22

#220

#221

#222

#223

#224

#225

#226

#227

#228

#229

#23

#230

#231

#232

#233

#234

#235

#236

#237

#238

#239

#24

#240

#241

#242

#243

#244

#245

#246

#247

#248

#249

#25

#250

#251

#252

#253

#254

#255

#256

#257

#258

#259

#26

#260

#261

#262

#263

#264

#265

#266

#267

#268

#269

#27

#270

#271

#272

#273

#274

#275

#276

#277

#278

#279

#28

#280

#281

#282

#283

#284

#285

#286

#287

#288

#289

#29

#290

#291

#292

#293

#294

#295

#296

#297

#298

#299

#3

#30

#300

#301

#302

#303

#304

#305

#306

#307

#308

#309

#31

#310

#311

#312

#313

#314

#315

#316

#317

#318

#319

#32

#320

#321

#322

#323

#324

#325

#326

#327

#328

#329

#33

#330

#331

#332

#333

#334

#335

#336

#337

#338

#339

#34

#340

#341

#342

#343

#344

#345

#346

#347

#348

#349

#35

#350

#351

#352

#353

#354

#355

#356

#357

#358

#359

#36

#360

#361

#362

#363

#364

#365

#366

#367

#368

#369

#37

#370

#371

#372

#373

#374

#375

#376

#377

#378

#379

#38

#380

#381

#382

#383

#384

#385

#386

#387

#388

#389

#39

#390

#391

#392

#393

#394

#395

#396

#397

#398

#399

#4

#40

#400

#401

#402

#403

#404

#405

#406

#407

#408

#409

#41

#410

#411

#412

#413

#414

#415

#416

#417

#418

#419

#42

#420

#421

#422

#423

#424

#425

#426

#427

#428

#429

#43

#430

#431

#432

#433

#434

#435

#436

#437

#438

#439

#44

#440

#441

#442

#443

#444

#445

#446

#447

#448

#449

#45

#450

#451

#452

#453

#454

#455

#456

#457

#458

#459

#46

#460

#461

#462

#463

#464

#465

#466

#467

#468

#469

#47

#470

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#7

#70

#71

#72

#73

#74

#75

#76

#77

#78

#79

#8

#80

#81

#82

#83

#84

#85

#86

#87

#88

#89

#9

#90

#91

#92

#93

#94

#95

#96

#97

#98

#99

Mono Color

• e6b9d75f16 Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test gtz 2023-11-28 09:03:13 +08:00
• 4323982b89 Merge pull request 'projects/mes-dy' (#118) from projects/mes-dy into projects/mes-test 高天泽 2023-11-28 09:01:37 +08:00
• c76078214e Merge branch 'projects/mes-test' into projects/mes-dy helloDy 2023-11-27 20:42:33 +08:00
• b527589e0f ui helloDy 2023-11-27 20:41:45 +08:00
• 375273419d Merge pull request 'projects/mes-lb' (#117) from projects/mes-lb into projects/mes-test g7hoo 2023-11-27 17:05:07 +08:00
• a18929a261 Merge branch 'projects/mes-test' into projects/mes-lb lb 2023-11-27 17:04:32 +08:00
• 6d465c17c2 Merge pull request 'projects/mes-zjl' (#116) from projects/mes-zjl into projects/mes-test juzi 2023-11-27 16:43:48 +08:00
• 669345c983 merge test juzi 2023-11-27 16:43:15 +08:00
• b86094c630 订单监控 juzi 2023-11-27 16:41:14 +08:00
• 2fdee9cafd update lb 2023-11-27 15:25:41 +08:00
• 4348d66e53 update lb 2023-11-27 14:40:11 +08:00
• 76c2f50bf3 fix bugs lb 2023-11-27 11:31:21 +08:00
• 888b5aa91f Merge pull request 'projects/mes-dy' (#115) from projects/mes-dy into projects/mes-test 高天泽 2023-11-27 09:42:54 +08:00
• a7f1087775 Merge branch 'projects/mes-test' into projects/mes-dy helloDy 2023-11-27 09:39:01 +08:00
• b0efd66a75 bug ui helloDy 2023-11-27 09:38:31 +08:00
• d9f3434712 Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test gtz 2023-11-27 09:31:52 +08:00
• 51f72ea5d2 Merge pull request 'projects/mes-lb' (#114) from projects/mes-lb into projects/mes-test g7hoo 2023-11-27 08:43:14 +08:00
• d5507ec4c0 Merge branch 'projects/mes-test' into projects/mes-lb lb 2023-11-24 19:15:23 +08:00
• 8802c932e2 update 设备报警日志 lb 2023-11-24 19:10:33 +08:00
• ee26741e62 Merge pull request 'projects/mes-dy' (#113) from projects/mes-dy into projects/mes-test 高天泽 2023-11-24 19:06:04 +08:00
• 7f5b9d5228 Merge branch 'projects/mes-test' into projects/mes-dy helloDy 2023-11-24 19:03:48 +08:00
• 9eea7e049a 部分bug helloDy 2023-11-24 19:01:25 +08:00
• 328b3ff560 Merge pull request 'projects/mes-zjl' (#112) from projects/mes-zjl into projects/mes-test juzi 2023-11-24 17:32:15 +08:00
• b3a117f6c6 merge test juzi 2023-11-24 17:31:21 +08:00
• 8929e53724 ui样式 juzi 2023-11-24 17:29:40 +08:00
• a8fa98cb91 update StatusAndParams lb 2023-11-24 14:56:17 +08:00
• db081c1bd1 Merge pull request '更新仓库' (#111) from projects/mes-zwq into projects/mes-test 朱文强 2023-11-24 14:37:15 +08:00
• 3e9540bcc9 更新仓库 zwq 2023-11-24 14:36:59 +08:00
• 69ceadab69 Merge pull request '更新仓库bug' (#110) from projects/mes-zwq into projects/mes-test 朱文强 2023-11-24 14:33:20 +08:00
• 601387184e 更新仓库bug zwq 2023-11-24 14:32:58 +08:00
• 54b63a7f53 update drawer and edit lb 2023-11-24 10:41:11 +08:00
• b625ef0118 Merge pull request 'projects/mes-dy' (#109) from projects/mes-dy into projects/mes-test 高天泽 2023-11-24 09:19:27 +08:00
• 8004c85c32 Merge branch 'projects/mes-test' into projects/mes-dy helloDy 2023-11-24 09:14:32 +08:00
• 9041428003 部分bug helloDy 2023-11-24 09:13:56 +08:00
• 39d06cd902 Merge pull request 'projects/mes-lb' (#108) from projects/mes-lb into projects/mes-test g7hoo 2023-11-24 08:56:13 +08:00
• d79ba71bd7 Merge branch 'projects/mes-test' into projects/mes-lb lb 2023-11-24 08:51:18 +08:00
• 0225be1c94 fix bugs lb 2023-11-23 17:07:57 +08:00
• 265024d989 Merge pull request 'projects/mes-zjl' (#107) from projects/mes-zjl into projects/mes-test juzi 2023-11-23 16:58:12 +08:00
• 960751a264 merge test juzi 2023-11-23 16:57:39 +08:00
• 978aa3a1d1 ui修改 juzi 2023-11-23 16:56:08 +08:00
• 2eb1afe9b2 Merge pull request '修改仓库UI测试bug' (#106) from projects/mes-zwq into projects/mes-test 朱文强 2023-11-23 16:42:37 +08:00
• 8cd53915c1 修改仓库UI测试bug zwq 2023-11-23 16:42:09 +08:00
• 571d204d68 Merge pull request 'projects/mes-zhp' (#105) from projects/mes-zhp into projects/mes-test 朱文强 2023-11-23 16:41:12 +08:00
• 8dbc1d512d Merge branch 'projects/mes-test' into projects/mes-dy helloDy 2023-11-23 15:10:26 +08:00
• 8af06c6c42 bug helloDy 2023-11-23 15:09:46 +08:00
• afafbccc0c Merge branch 'projects/mes-test' into projects/mes-zhp ‘937886381’ 2023-11-23 14:33:32 +08:00
• 0948737f1a 修改bug ‘937886381’ 2023-11-23 14:32:53 +08:00
• 0ce6bc07a0 Merge pull request 'projects/mes-lb' (#104) from projects/mes-lb into projects/mes-test g7hoo 2023-11-22 17:09:03 +08:00
• e318aa4f59 Merge branch 'projects/mes-test' into projects/mes-lb lb 2023-11-22 17:05:53 +08:00
• ab09a2b08c update zentao bugs lb 2023-11-22 17:04:22 +08:00
• d2d5503792 Merge pull request 'projects/mes-zjl' (#103) from projects/mes-zjl into projects/mes-test juzi 2023-11-22 17:01:21 +08:00
• 6940155e4f merge test juzi 2023-11-22 17:00:32 +08:00
• dfc758bfae 订单监控图 juzi 2023-11-22 16:58:32 +08:00
• de15716b7c Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test gtz 2023-11-22 14:53:49 +08:00
• ec2994e928 Merge pull request 'projects/mes-dy' (#102) from projects/mes-dy into projects/mes-test 高天泽 2023-11-22 14:53:35 +08:00
• c736992a34 '1' gtz 2023-11-22 14:49:56 +08:00
• 5492666b53 merge helloDy 2023-11-22 14:43:07 +08:00
• cd55b4c860 update lb 2023-11-22 14:41:53 +08:00
• a7f811aa3e bug helloDy 2023-11-22 14:41:10 +08:00
• 33188481bf update login lb 2023-11-22 14:27:30 +08:00
• dcbb2c719b Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test gtz 2023-11-22 14:15:39 +08:00
• 0200fc08f1 Merge pull request 'projects/mes-zhp' (#101) from projects/mes-zhp into projects/mes-test 高天泽 2023-11-22 14:14:03 +08:00
• a22da566c3 解决冲突 ‘937886381’ 2023-11-22 14:11:23 +08:00
• 3c99ddc4c0 修改bug ‘937886381’ 2023-11-22 14:00:02 +08:00
• 96705bd4d9 Merge pull request 'update hints' (#100) from projects/mes-lb into projects/mes-test g7hoo 2023-11-22 13:28:39 +08:00
• ac28476024 update hints lb 2023-11-22 11:15:39 +08:00
• 1299a56e22 Merge pull request 'update some equipment bugs' (#99) from projects/mes-lb into projects/mes-test g7hoo 2023-11-22 10:21:55 +08:00
• b348a31b24 update some equipment bugs lb 2023-11-22 10:14:40 +08:00
• bc2940ca99 Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test gtz 2023-11-21 17:30:38 +08:00
• 67d639c413 Merge pull request 'update bugs' (#98) from projects/mes-lb into projects/mes-test g7hoo 2023-11-21 17:03:52 +08:00
• c6d618b2b8 update bugs lb 2023-11-21 17:02:22 +08:00
• aa79d15f52 Merge pull request 'projects/mes-lb' (#97) from projects/mes-lb into projects/mes-test g7hoo 2023-11-21 16:09:15 +08:00
• c8fb8d7589 Merge branch 'projects/mes-test' into projects/mes-lb lb 2023-11-21 16:08:44 +08:00
• 51baca61cc update equipment attach process lb 2023-11-21 14:10:47 +08:00
• 847e34fcc6 update lb 2023-11-21 11:48:17 +08:00
• 32a43fbc3b update process equipment relation lb 2023-11-21 09:13:28 +08:00
• 20975948ef update lb 2023-11-20 16:50:38 +08:00
• c46c4dbf65 Merge pull request '更新仓库bug' (#96) from projects/mes-zwq into projects/mes-test 朱文强 2023-11-20 16:11:49 +08:00
• 685a3308db 更新仓库bug zwq 2023-11-20 16:09:42 +08:00
• 76938951ed Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test gtz 2023-11-20 16:07:12 +08:00
• ac041c2f4a update bom-selector v1 lb 2023-11-20 15:51:47 +08:00
• dd23c49ba0 update 设备选择 lb 2023-11-20 14:21:14 +08:00
• 44452f2e89 update lb 2023-11-20 11:26:27 +08:00
• 8ddef0de9d update bomselector lb 2023-11-17 17:07:52 +08:00
• 7249abf5b1 add BomSelector lb 2023-11-17 16:48:00 +08:00
• 76f5385140 add Candidate lb 2023-11-17 16:05:57 +08:00
• 27f4e034be Merge pull request '更新-仓库-2级bug' (#95) from projects/mes-zwq into projects/mes-test 朱文强 2023-11-17 15:48:45 +08:00
• 75f59c3279 更新-仓库-2级bug zwq 2023-11-17 15:48:17 +08:00
• bb731dfcd4 add custom tree lb 2023-11-17 14:56:43 +08:00
• 8c37647aab Merge pull request 'projects/mes-zjl' (#94) from projects/mes-zjl into projects/mes-test juzi 2023-11-17 14:08:54 +08:00
• bad7175f87 merge test juzi 2023-11-17 14:07:51 +08:00
• 231e9227a5 1 juzi 2023-11-17 14:04:53 +08:00
• d3eb9d8fbc update custom-transfer lb 2023-11-17 11:25:28 +08:00
• 9a7521e691 add CustomTrasfer lb 2023-11-17 11:15:18 +08:00
• 8b91e7812f '1' gtz 2023-11-17 10:38:44 +08:00
• 9cffa01414 Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test gtz 2023-11-17 10:38:35 +08:00
• e82ee4e542 Merge pull request 'projects/mes-dy' (#93) from projects/mes-dy into projects/mes-test 高天泽 2023-11-17 10:38:28 +08:00
• 905479d5f4 'del_dist' gtz 2023-11-17 10:29:23 +08:00
• c1ae248234 '1' gtz 2023-11-17 10:28:39 +08:00
• 40e7d6b6d8 Merge branch 'projects/mes-test' into projects/mes-dy helloDy 2023-11-17 10:26:21 +08:00