Commit Graph

Select branches

Hide Pull Requests

aa

batch

bb

dev

dev1

dev3

dev_one

main

mkm-patch-1

mkm-patch-2

product

refund

rose

updateOrder

update_warehouse_product

#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

#471

#472

#473

#474

#475

#476

#477

#478

#479

#48

#480

#481

#482

#483

#484

#485

#486

#487

#488

#489

#49

#490

#491

#492

#493

#494

#495

#496

#497

#498

#499

#5

#50

#500

#501

#502

#503

#504

#505

#506

#507

#508

#509

#51

#510

#511

#512

#513

#514

#515

#516

#517

#518

#519

#52

#520

#521

#522

#523

#524

#525

#526

#527

#528

#529

#53

#530

#531

#532

#533

#534

#535

#536

#537

#538

#539

#54

#540

#541

#542

#543

#544

#545

#546

#547

#548

#549

#55

#550

#551

#552

#553

#554

#555

#556

#557

#558

#559

#56

#560

#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

1.0.0

1.0.1

1.0.2

1.0.3

1.0.4

1.0.5

1.0.6

1.0.7

1.0.8

1.0.9

1.1.1

1.1.2

1.1.3

1.1.4

1.10.0

Mono Color

• 72b593bb91 Merge pull request 'feat(inventory): 优化库存转移订单功能' (#489) from dev into main mkm 2025-01-24 16:17:06 +08:00
• ae40c1940f feat(inventory): 优化库存转移订单功能 mkm 2025-01-24 16:07:52 +08:00
• d1f51031ef Merge pull request 'dev' (#488) from dev into main mkm 2025-01-24 14:12:58 +08:00
• daec144ca1 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev lewis 2025-01-24 14:09:57 +08:00
• 7091de80c9 入库单商品支持删除 lewis 2025-01-24 14:09:52 +08:00
• b875dc7133 Merge pull request 'feat(search): 添加 is_storage 字段的精确搜索功能' (#487) from dev into main mkm 2025-01-24 13:49:05 +08:00
• c11d89b37c feat(search): 添加 is_storage 字段的精确搜索功能 mkm 2025-01-24 13:48:28 +08:00
• 2bd65a3e49 Merge pull request '修改预订单追加商品' (#486) from dev into main mkm 2025-01-24 11:13:19 +08:00
• 7711ac417d 修改预订单追加商品 lewis 2025-01-24 11:11:39 +08:00
• 5b893fb39a Merge pull request 'feat(purchase): 采购产品供应商价格设置' (#485) from dev into main mkm 2025-01-23 21:54:49 +08:00
• 95a145db70 feat(purchase): 采购产品供应商价格设置 mkm 2025-01-23 21:37:03 +08:00
• 0d5bd06dc8 Merge pull request 'refactor(admin): 注释掉预订单更新错误处理' (#484) from dev into main mkm 2025-01-23 19:13:03 +08:00
• c8560fafdc refactor(admin): 注释掉预订单更新错误处理 mkm 2025-01-23 19:12:33 +08:00
• c244eaca0c Merge pull request 'dev' (#483) from dev into main mkm 2025-01-23 17:13:02 +08:00
• c44b51e33f 修改采购商品入库 lewis 2025-01-23 17:12:32 +08:00
• 17cc47ffc9 修改预订单录入 lewis 2025-01-23 15:26:14 +08:00
• 5e9597a255 Merge pull request 'dev' (#482) from dev into main mkm 2025-01-23 12:00:24 +08:00
• ffb57636ef refactor(xlsx): 优化 Excel 导出模板并添加退货政策说明 mkm 2025-01-23 11:40:48 +08:00
• 0588f765d9 修改预订单商品入库 lewis 2025-01-23 11:12:13 +08:00
• ca772ea9dd Merge pull request '调整采购商品查询' (#481) from dev into main mkm 2025-01-22 17:56:49 +08:00
• 75e153031b 调整采购商品查询 lewis 2025-01-22 17:49:48 +08:00
• a1a6e74938 Merge pull request 'dev' (#480) from dev into main mkm 2025-01-22 17:26:02 +08:00
• 6cb055d9fb Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev lewis 2025-01-22 16:08:21 +08:00
• 02130d9b8a 添加单采购商品入库 lewis 2025-01-22 16:08:14 +08:00
• 2f59a51257 Merge pull request 'dev' (#479) from dev into main mkm 2025-01-22 11:31:04 +08:00
• 3b13ad4a2e refactor(DemoLogic): 优化库存回滚功能 mkm 2025-01-22 11:18:17 +08:00
• 607b523fcd feat(admin): 添加库存回滚功能 mkm 2025-01-22 10:22:08 +08:00
• ea7087c234 Merge pull request '修改自营门店价格' (#478) from dev into main mkm 2025-01-21 16:46:51 +08:00
• d0a583a9bd 修改自营门店价格 lewis 2025-01-21 16:46:35 +08:00
• f5a7815687 Merge pull request 'dev' (#477) from dev into main mkm 2025-01-21 16:42:41 +08:00
• 92c0eac1fc 修改自营门店价格 lewis 2025-01-21 16:37:04 +08:00
• 393659cdf5 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev lewis 2025-01-21 16:19:25 +08:00
• 5bb7fcd0e6 修改自营门店价格 lewis 2025-01-21 16:19:17 +08:00
• 6bca7c2dd3 Merge pull request 'fix(api): 修正价格更新逻辑' (#476) from dev into main mkm 2025-01-21 16:07:41 +08:00
• 3df1a5c67c fix(api): 修正价格更新逻辑 mkm 2025-01-21 16:04:31 +08:00
• 2252caa643 Merge pull request 'dev' (#475) from dev into main mkm 2025-01-21 15:48:57 +08:00
• 7f99a6b34e Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev lewis 2025-01-21 15:48:09 +08:00
• db9257518e 修改自营门店价格 lewis 2025-01-21 15:48:03 +08:00
• 0a131e0c16 refactor(purchase): 重构采购模块逻辑 mkm 2025-01-21 15:10:51 +08:00
• 63f4285759 修改预订单出库的错误 lewis 2025-01-20 15:51:42 +08:00
• 97d529e465 Merge pull request 'dev' (#474) from dev into main mkm 2025-01-20 14:59:37 +08:00
• 29c7f1494a 修改预订单商品删除的错误 lewis 2025-01-20 14:59:05 +08:00
• 209d4366bf 添加门店预订单列表 lewis 2025-01-20 14:32:12 +08:00
• f0b7f234f4 Merge pull request 'dev' (#473) from dev into main mkm 2025-01-20 11:25:22 +08:00
• bd6018ab1b 调整往期补单 lewis 2025-01-18 16:38:54 +08:00
• 4c918cca71 feat(purchase): 一键添加往期采购商品功能 mkm 2025-01-18 16:34:30 +08:00
• 92de8b8ead 修改微信实际支付金额 lewis 2025-01-18 14:35:07 +08:00
• 69870c6dd6 商品添加活动价 lewis 2025-01-18 11:43:40 +08:00
• 0ec22bf2d7 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev lewis 2025-01-17 16:55:45 +08:00
• 82edbfd35a 预订单商品添加门店出货 lewis 2025-01-17 16:55:39 +08:00
• 5890cb68ec feat(warehouse): 添加出库单 ID 和仓库 ID 字段 mkm 2025-01-17 10:27:41 +08:00
• 81ba9228c5 Merge pull request '添加预订单商品关联采购订单' (#472) from dev into main mkm 2025-01-16 17:09:41 +08:00
• 39796fd908 添加预订单商品关联采购订单 lewis 2025-01-16 17:01:29 +08:00
• 885cac9ad6 Merge pull request 'dev' (#471) from dev into main mkm 2025-01-16 14:30:27 +08:00
• 5dd1bbd0bf 修改门店现金查询 lewis 2025-01-16 14:29:50 +08:00
• 7bb22503b4 修改门店现金查询 lewis 2025-01-16 14:23:19 +08:00
• de1c26ac88 Merge pull request '修改铺货订单复制' (#470) from dev into main mkm 2025-01-15 17:58:13 +08:00
• ddfe35d2c9 修改铺货订单复制 lewis 2025-01-15 17:57:38 +08:00
• 06b60af477 Merge pull request '修改库存调拨商品列表，预订单添加同步价格' (#469) from dev into main mkm 2025-01-15 15:12:51 +08:00
• ed9ffc8d8c 修改库存调拨商品列表，预订单添加同步价格 lewis 2025-01-15 15:05:40 +08:00
• abed6f154f Merge pull request 'refactor(StoreOrderCartInfoLogic): 移除不必要的店铺配置验证' (#468) from dev into main mkm 2025-01-15 15:01:26 +08:00
• 88bb49563b refactor(StoreOrderCartInfoLogic): 移除不必要的店铺配置验证 mkm 2025-01-15 15:00:54 +08:00
• e61518dca5 Merge pull request 'refactor(app): 注释掉订单商品状态检查逻辑' (#467) from dev into main mkm 2025-01-15 14:21:18 +08:00
• 99499f3334 refactor(app): 注释掉订单商品状态检查逻辑 mkm 2025-01-15 14:20:38 +08:00
• d4104e5e46 Merge pull request '修改预订单一键入库' (#466) from dev into main mkm 2025-01-14 17:47:48 +08:00
• ed68949326 修改预订单一键入库 lewis 2025-01-14 16:57:17 +08:00
• 07761d7a95 Merge pull request '修改批量入库' (#465) from dev into main mkm 2025-01-14 14:10:42 +08:00
• c12a519bcd 修改批量入库 lewis 2025-01-14 11:38:18 +08:00
• 1f9d9db187 Merge pull request 'dev' (#464) from dev into main mkm 2025-01-14 11:17:28 +08:00
• e2014342bd 添加批量入库，修改门店库存列表 lewis 2025-01-14 11:08:47 +08:00
• 3e6410302c 修改复制订单备注 lewis 2025-01-13 16:58:12 +08:00
• 283868bb81 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev lewis 2025-01-13 16:55:26 +08:00
• a3dfac406b 添加一键复制预订单 lewis 2025-01-13 16:55:21 +08:00
• e099f1ca3e Merge pull request 'fix(admin): 修复会员价显示问题' (#463) from dev into main mkm 2025-01-13 16:15:00 +08:00
• 868ff62e87 fix(admin): 修复会员价显示问题 mkm 2025-01-13 16:14:37 +08:00
• a8cb358d41 Merge pull request 'fix(admin): 优化预订单价格计算逻辑' (#462) from dev into main mkm 2025-01-13 16:01:22 +08:00
• 02d6cd5e94 fix(admin): 优化预订单价格计算逻辑 mkm 2025-01-13 16:00:43 +08:00
• c14fd650c4 Merge pull request 'dev' (#461) from dev into main mkm 2025-01-13 15:53:30 +08:00
• c12ef1cd29 refactor(admin): 修改商品采购价为会员价 mkm 2025-01-13 15:52:49 +08:00
• 227bde742d Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev lewis 2025-01-13 11:14:32 +08:00
• cce18cfcd5 添加确认预订单 lewis 2025-01-13 11:14:26 +08:00
• a42e67a79c Merge pull request 'feat(CashFlowLogic): 添加现金流来源标记功能' (#460) from dev into main mkm 2025-01-13 10:44:19 +08:00
• 0caae69371 feat(CashFlowLogic): 添加现金流来源标记功能 mkm 2025-01-13 10:43:38 +08:00
• 04b5e236c1 Merge pull request 'feat(cash_flow): 增加资金流水插入逻辑' (#459) from dev into main mkm 2025-01-13 10:38:44 +08:00
• 9ed74f26cf feat(cash_flow): 增加资金流水插入逻辑 mkm 2025-01-13 10:38:10 +08:00
• e2726c6356 Merge pull request 'fix(warehouse): 修复仓库产品数量修改逻辑' (#458) from dev into main mkm 2025-01-11 17:19:54 +08:00
• 8f7d02222b fix(warehouse): 修复仓库产品数量修改逻辑 mkm 2025-01-11 17:19:37 +08:00
• 174ef18861 Merge pull request 'dev' (#457) from dev into main mkm 2025-01-11 17:03:45 +08:00
• 5d73af5719 修改门店预订单查询 lewis 2025-01-11 16:52:14 +08:00
• f485c956df 修改商品调拨 lewis 2025-01-11 16:15:52 +08:00
• 768068a8ea feat(store_order): 添加订单核销功能 mkm 2025-01-11 15:27:27 +08:00
• cc8eb3e72f fix(admin): 修复提前单统计功能问题 mkm 2025-01-11 14:59:39 +08:00
• ca43cf01fa refactor(store_branch_product): 重构库存编辑逻辑 mkm 2025-01-11 11:31:48 +08:00
• b7f9a3b5ee feat(change_price_log): 优化价格变更记录列表接口 mkm 2025-01-10 17:50:29 +08:00
• dbb7b9e4c8 feat(store): 添加价格变更日志功能 mkm 2025-01-10 17:24:37 +08:00
• 52e7ac5e2b refactor(api): 解除 DemoLogic::test() 的注释并添加调试输出 mkm 2025-01-10 17:24:07 +08:00
• 28cdc83da0 修改退款的错误 lewis 2025-01-10 16:37:46 +08:00
• 33e4dd43f2 修改退款的错误 lewis 2025-01-10 16:18:26 +08:00
• 26b26768c6 修改退款的错误 lewis 2025-01-10 15:49:46 +08:00
• 54d5f6eb0f Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev lewis 2025-01-10 14:21:47 +08:00