Commit Graph

Select branches

Hide Pull Requests

master

projects/line

projects/line-gtz

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/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

#44

#45

#46

#47

#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

• c5b5de7a78 update lb 2023-11-16 17:23:58 +0800
• 0884159dd7 update login lb 2023-11-16 17:16:37 +0800
• 87eccc7b25 Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test gtz 2023-11-16 17:05:19 +0800
• 8a819b84b6 Merge pull request 'projects/mes-zjl' (#87) from projects/mes-zjl into projects/mes-test juzi 2023-11-16 16:54:45 +0800
• d37c5881a5 2 juzi 2023-11-16 16:53:35 +0800
• 2b0579dc70 merge test juzi 2023-11-16 16:13:36 +0800
• 6a10afd04e 1 juzi 2023-11-16 16:12:05 +0800
• 7c1c61f8f8 Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test gtz 2023-11-16 15:27:15 +0800
• fb967fb825 Merge pull request 'projects/mes-dy' (#86) from projects/mes-dy into projects/mes-test hellody 2023-11-16 14:09:07 +0800
• 25d1ac8d90 merge helloDy 2023-11-16 14:07:50 +0800
• 3667b98da9 bug helloDy 2023-11-16 13:57:21 +0800
• d3c289f11e Merge pull request 'projects/mes-lb' (#85) from projects/mes-lb into projects/mes-test g7hoo 2023-11-16 13:55:22 +0800
• bbdf0a75f0 update system lb 2023-11-16 13:47:18 +0800
• 5339854df4 Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test gtz 2023-11-16 12:56:11 +0800
• 26658accfc Merge branch 'projects/mes-test' into projects/mes-lb lb 2023-11-16 10:57:20 +0800
• 31033dd7e2 Merge pull request 'projects/mes-zhp' (#84) from projects/mes-zhp into projects/mes-test 高天泽 2023-11-16 10:20:53 +0800
• 3832aee028 解决冲突 ‘937886381’ 2023-11-16 08:52:38 +0800
• 2fbc6ea5e7 修改bug ‘937886381’ 2023-11-16 08:50:59 +0800
• d0cb4d383e Merge pull request 'projects/mes-dy' (#83) from projects/mes-dy into projects/mes-test 高天泽 2023-11-15 18:15:03 +0800
• 4ce62c14ee Merge branch 'projects/mes-test' into projects/mes-dy helloDy 2023-11-15 17:47:31 +0800
• e5966c27a3 工单[ helloDy 2023-11-15 17:46:54 +0800
• ea1d981a5a Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test gtz 2023-11-15 16:49:05 +0800
• 3e9f629888 Merge pull request '修改bug' (#82) from projects/mes-zhp into projects/mes-test 高天泽 2023-11-15 16:03:01 +0800
• ecabeeeea9 修改bug ‘937886381’ 2023-11-15 15:47:45 +0800
• 0f7a8fbf73 Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test gtz 2023-11-15 15:05:37 +0800
• d7366e80ee '1' gtz 2023-11-15 15:05:33 +0800
• 3da077bdf3 Merge pull request 'projects/mes-dy' (#81) from projects/mes-dy into projects/mes-test 高天泽 2023-11-15 14:55:44 +0800
• aef062b4c9 merge helloDy 2023-11-15 14:37:52 +0800
• 952490f0d4 24h,设备 helloDy 2023-11-15 14:30:28 +0800
• 51d6ce5dbb Merge pull request '订单' (#80) from projects/mes-zjl into projects/mes-test juzi 2023-11-15 14:23:23 +0800
• 0ae68aacef 订单 juzi 2023-11-15 14:22:45 +0800
• 2ab686a797 Merge pull request 'bug' (#79) from projects/mes-zjl into projects/mes-test juzi 2023-11-15 14:03:01 +0800
• a37fa65e8f bug juzi 2023-11-15 14:02:16 +0800
• 887390cf91 Merge pull request 'projects/mes-zjl' (#78) from projects/mes-zjl into projects/mes-test juzi 2023-11-15 10:18:22 +0800
• 5d054254f7 merge test juzi 2023-11-15 10:17:35 +0800
• 76cdc34af1 小bug juzi 2023-11-15 10:13:54 +0800
• 0fefe4d432 Merge pull request 'projects/mes-zhp' (#77) from projects/mes-zhp into projects/mes-test 高天泽 2023-11-15 10:02:14 +0800
• ecc84a1c4b 合并冲突 ‘937886381’ 2023-11-15 09:10:45 +0800
• 95f7004d1c 修改bug ‘937886381’ 2023-11-15 09:08:20 +0800
• 9a1aa047b0 Merge pull request '仓库-bug修改' (#76) from projects/mes-zwq into projects/mes-test 朱文强 2023-11-14 16:02:50 +0800
• de06dfddf4 仓库-bug修改 zwq 2023-11-14 16:02:16 +0800
• 26100af90a Merge pull request 'projects/mes-zjl' (#75) from projects/mes-zjl into projects/mes-test juzi 2023-11-14 15:49:56 +0800
• 67612c79df merge test juzi 2023-11-14 15:47:06 +0800
• 26862423c1 首页 juzi 2023-11-14 10:35:10 +0800
• a1a7256af5 Merge pull request '更新-仓库-库位监控' (#74) from projects/mes-zwq into projects/mes-test 朱文强 2023-11-14 09:43:59 +0800
• d2c82fa692 更新-仓库-库位监控 zwq 2023-11-14 09:42:38 +0800
• 5654b3aeef Merge pull request 'update' (#73) from projects/mes-lb into projects/mes-test g7hoo 2023-11-14 09:24:38 +0800
• ebae332674 update lb 2023-11-14 09:23:08 +0800
• 10219fd841 Merge pull request 'projects/line-lb' (#72) from projects/line-lb into projects/line-test projects/zg projects/line-test g7hoo 2023-11-14 09:22:16 +0800
• 74a2a3b8e5 Merge branch 'projects/line-lb' of http://git.picaiba.com/mt-fe-group/yudao-dev into projects/line-lb lb 2023-11-14 09:15:58 +0800
• c3b4223e5b update login lb 2023-10-30 10:52:08 +0800
• afae859d8b 更新login Merge pull request 'projects/mes-lb' (#71) from projects/mes-lb into projects/mes-test g7hoo 2023-11-13 16:57:14 +0800
• 7f6fa0af96 Merge branch 'projects/mes-test' into projects/mes-lb lb 2023-11-13 16:56:07 +0800
• ba92da2d5d update login mobile lb 2023-11-13 16:55:16 +0800
• 06c124a149 update login lb 2023-11-13 16:37:04 +0800
• e369fe25ca Merge pull request 'projects/mes-dy' (#70) from projects/mes-dy into projects/mes-test 高天泽 2023-11-11 21:40:47 +0800
• e6158cd59b merge helloDy 2023-11-11 20:51:01 +0800
• 624ed7bc27 设备管理 helloDy 2023-11-11 20:49:31 +0800
• afba54fcab Merge pull request 'projects/mes-zhp' (#69) from projects/mes-zhp into projects/mes-test 高天泽 2023-11-10 17:10:49 +0800
• f7846f2767 Merge branch 'projects/mes-test' into projects/mes-zhp ‘937886381’ 2023-11-10 17:03:25 +0800
• a8adb317c0 质量管理 ‘937886381’ 2023-11-10 17:02:52 +0800
• b185d3ebf7 Merge pull request 'projects/mes-zjl' (#68) from projects/mes-zjl into projects/mes-test juzi 2023-11-09 15:07:01 +0800
• 045843bc1c mrege test juzi 2023-11-09 15:05:54 +0800
• 3812eb38a9 修改订单bug juzi 2023-11-09 15:01:50 +0800
• 1962ecc6df 质量管理 ‘937886381’ 2023-11-07 19:10:45 +0800
• e64e33a203 Merge pull request 'projects/mes-zjl' (#67) from projects/mes-zjl into projects/mes-test juzi 2023-11-07 16:01:50 +0800
• 3ada2c5d08 merge test juzi 2023-11-07 16:01:07 +0800
• 0eb6a99fa9 Merge pull request 'projects/mes-dy' (#66) from projects/mes-dy into projects/mes-test 高天泽 2023-11-07 15:55:56 +0800
• 9e8276d3a7 merge test juzi 2023-11-07 15:55:19 +0800
• f9741b07c0 Merge branch 'projects/mes-test' into projects/mes-dy helloDy 2023-11-07 15:53:53 +0800
• fcb1885bf7 基础，物料，设备 helloDy 2023-11-07 15:53:01 +0800
• 123d45afa9 Merge pull request '更新仓库' (#65) from projects/mes-zwq into projects/mes-test 朱文强 2023-11-07 15:49:59 +0800
• 97e6a665de 更新仓库 zwq 2023-11-07 15:49:33 +0800
• 6e1bf994c2 bug juzi 2023-11-07 15:49:07 +0800
• 298789bf24 Merge pull request 'projects/mes-zjl' (#64) from projects/mes-zjl into projects/mes-test juzi 2023-11-06 13:43:22 +0800
• 876f7d8f3c merge test juzi 2023-11-06 13:42:09 +0800
• 5695c3db90 成品发货 juzi 2023-11-06 13:37:52 +0800
• 9537c55f0e Merge pull request 'projects/mes-dy' (#63) from projects/mes-dy into projects/mes-test 高天泽 2023-11-06 12:57:09 +0800
• 1d38a560ec Merge branch 'projects/mes-test' into projects/mes-dy helloDy 2023-11-06 12:55:03 +0800
• 0ae3c66dc3 基础核心 helloDy 2023-11-06 12:54:28 +0800
• e49084d85d Merge pull request '更新仓库管理' (#62) from projects/mes-zwq into projects/mes-test 朱文强 2023-11-04 16:40:59 +0800
• 0deb38647e 更新仓库管理 zwq 2023-11-04 16:40:16 +0800
• 5521f07c18 Merge pull request 'projects/mes-zjl' (#61) from projects/mes-zjl into projects/mes-test juzi 2023-11-03 17:02:04 +0800
• 14d426b020 merge test juzi 2023-11-03 17:01:14 +0800
• 046a5eea32 成品发货 juzi 2023-11-03 16:59:07 +0800
• b468204f88 Merge pull request 'projects/mes-dy' (#60) from projects/mes-dy into projects/mes-test 高天泽 2023-11-03 15:38:59 +0800
• e5978d1700 merge helloDy 2023-11-03 11:16:30 +0800
• 91eb13af26 客商信息、人事相关 helloDy 2023-11-03 11:15:12 +0800
• fe29043ab1 Merge pull request 'projects/mes-lb' (#59) from projects/mes-lb into projects/mes-test g7hoo 2023-11-01 09:45:17 +0800
• 2075b42427 'merge' lb 2023-11-01 09:39:25 +0800
• c851188989 update before hand over lb 2023-11-01 09:37:47 +0800
• 0fa310609e update 设备备品备件+巡检 Melete 2023-10-31 22:34:10 +0800
• 57a4ca96e7 add lb 2023-10-31 17:49:39 +0800
• af868a7cd7 update 设备基础配置，设备保养 lb 2023-10-30 16:51:37 +0800
• cb1ad9edec Merge pull request 'projects/mes-zhp' (#57) from projects/mes-zhp into projects/mes-test 高天泽 2023-10-30 11:04:40 +0800
• 070e01c2c4 Merge pull request 'projects/line-lb' (#58) from projects/line-lb into projects/line-test g7hoo 2023-10-30 10:53:44 +0800
• 2665b6a0b0 Merge branch 'projects/line-test' into projects/line-lb lb 2023-10-30 10:52:08 +0800
• a71fb90e6a update DialogForm v-model lb 2023-10-30 10:51:41 +0800
• 34e8178ddc 解决合并冲突 ‘937886381’ 2023-10-30 10:50:21 +0800
• 6c094b2a2e 修改bug ‘937886381’ 2023-10-30 10:48:32 +0800