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

• 7d149aed99 修改商品价格设置的错误 lewis 2025-02-20 09:59:33 +08:00
• 26cbcace03 Merge pull request '修改商品改价的错误' (#519) from dev into main mkm 2025-02-20 09:22:52 +08:00
• 1417143eaf 修改商品改价的错误 lewis 2025-02-19 18:06:33 +08:00
• e5fcae622b Merge pull request 'dev' (#518) from dev into main mkm 2025-02-19 17:56:40 +08:00
• f709b79455 修改入库单数量更新的错误 lewis 2025-02-19 17:26:18 +08:00
• 8c602ead5e 修改商品列表导出 lewis 2025-02-19 10:53:50 +08:00
• 9bcd722e47 Merge pull request '修改商品列表导出' (#517) from dev into main mkm 2025-02-19 10:44:39 +08:00
• b3cbc13896 修改商品列表导出 lewis 2025-02-19 10:44:25 +08:00
• f76a364929 Merge pull request 'dev' (#516) from dev into main mkm 2025-02-19 09:23:50 +08:00
• debfc5cb62 修改入库单列表、入库商品列表 lewis 2025-02-18 16:15:14 +08:00
• ca1570abb2 商品价格更改列表添加走势图 lewis 2025-02-18 10:51:19 +08:00
• ef95b1989f 修改收银订单采购款支付校验 lewis 2025-02-17 10:34:50 +08:00
• 53adbca681 Merge pull request '修改收银订单采购款支付校验' (#515) from dev into main mkm 2025-02-17 10:27:04 +08:00
• 66a6915e4f 修改收银订单采购款支付校验 lewis 2025-02-17 10:21:14 +08:00
• 282b26baaa Merge pull request '账期欠款添加统计' (#514) from dev into main mkm 2025-02-15 17:35:17 +08:00
• a70d3f7dbf 账期欠款添加统计 lewis 2025-02-15 17:10:50 +08:00
• 75b8d794e5 Merge pull request 'dev' (#513) from dev into main mkm 2025-02-15 15:47:10 +08:00
• 36016871da 修改门店入库列表查询 lewis 2025-02-15 14:06:16 +08:00
• 8567f2de4a fix(inventory_store): 修复库存盘点逻辑 mkm 2025-02-14 18:00:33 +08:00
• d3d3556038 feat(inventory_store): 优化门店盘存列表和生成逻辑 mkm 2025-02-14 16:42:57 +08:00
• ea5687eabe feat(inventory_store): 添加管理员ID字段 mkm 2025-02-14 16:24:23 +08:00
• d718fd567d feat(inventory_store): 添加门店盘存功能 mkm 2025-02-14 16:01:53 +08:00
• de15271e14 Merge pull request '门店入库记录添加退库操作，采购单添加追加商品，调整商品改价列表' (#512) from dev into main mkm 2025-02-13 19:25:59 +08:00
• 45418d5f55 门店入库记录添加退库操作，采购单添加追加商品，调整商品改价列表 lewis 2025-02-13 17:11:12 +08:00
• 32721fb910 Merge pull request '添加导入商品价格比例' (#511) from dev into main mkm 2025-02-12 17:17:34 +08:00
• 681f31153f 添加导入商品价格比例 lewis 2025-02-12 17:17:11 +08:00
• c77e49f0ba Merge pull request '添加导入商品价格比例' (#510) from dev into main mkm 2025-02-12 17:13:31 +08:00
• 2fa2267832 添加导入商品价格比例 lewis 2025-02-12 17:12:21 +08:00
• f810a002a4 Merge pull request 'dev' (#509) from dev into main mkm 2025-02-12 16:59:50 +08:00
• eb9de07654 修改商品改价 lewis 2025-02-12 16:58:47 +08:00
• 5641eaecab 修改商品改价 lewis 2025-02-12 15:45:51 +08:00
• 8aa7355485 添加导出门店财务流水 lewis 2025-02-11 17:59:21 +08:00
• 906fd620a9 refactor(store): 优化管理员信息返回格式 mkm 2025-02-11 17:58:11 +08:00
• 78bf3ac5a8 feat(admin): 获取管理员详情时增加门店是否营业字段 mkm 2025-02-11 17:51:56 +08:00
• 2ebf1dbb62 feat(store_cash_finance_flow): 添加资金流动类型字段 mkm 2025-02-11 14:20:30 +08:00
• adb1291a83 fix(store_cash_finance_flow): 调整支出类型的金额显示 mkm 2025-02-11 14:05:15 +08:00
• ef5027611d Merge pull request 'refactor(warehouse): 重构仓库相关逻辑' (#508) from dev into main mkm 2025-02-11 10:46:17 +08:00
• 66b74b6e7c refactor(warehouse): 重构仓库相关逻辑 mkm 2025-02-11 10:43:12 +08:00
• c6548ffb4f Merge pull request 'dev' (#507) from dev into main mkm 2025-02-08 16:36:57 +08:00
• 51e848718f 调试商品入库到门店 lewis 2025-02-08 16:17:21 +08:00
• c14d3b8d47 feat(admin): 优化仓库产品列表搜索功能 mkm 2025-02-08 15:44:23 +08:00
• 5eeffb91d3 调试商品入库到门店 lewis 2025-02-08 15:37:53 +08:00
• d5e9bbec9a 调试商品入库到门店 lewis 2025-02-08 14:26:11 +08:00
• 0a3e465b9d Merge pull request 'dev' (#506) from dev into main mkm 2025-02-08 09:44:56 +08:00
• 31320e3961 调试账单还款 lewis 2025-02-07 17:54:51 +08:00
• 850c06df40 fix(admin): 修复仓库产品搜索未包含软删除商品的问题 mkm 2025-02-07 17:46:09 +08:00
• 0594ce6f76 feat(admin): 优化订单列表和仓库产品列表 mkm 2025-02-07 17:31:14 +08:00
• 025a143de9 添加预订单转欠款 lewis 2025-02-07 15:20:42 +08:00
• a1517c1aba 添加是否合并采购单商品 lewis 2025-02-07 11:31:21 +08:00
• 100a3c9f82 refactor(admin): 优化商品库存校验逻辑 mkm 2025-02-07 11:02:18 +08:00
• c06ca03681 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev mkm 2025-02-07 10:49:29 +08:00
• e67ae33478 feat(warehouse): 添加商品状态修改功能并优化库存校验逻辑 mkm 2025-02-07 10:49:23 +08:00
• e42568dd03 调试账单欠款 lewis 2025-02-06 17:30:39 +08:00
• f4d02f91aa 调试账单欠款 lewis 2025-02-06 17:01:26 +08:00
• 0693df434f 调试账单欠款 lewis 2025-02-06 16:56:57 +08:00
• 4d462cbabb Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev mkm 2025-02-06 16:18:10 +08:00
• 2a30c2144f refactor(app): 限制订单列表中商品数量的查询 mkm 2025-02-06 16:17:42 +08:00
• 6e2a0ca262 修改账期欠款列表 lewis 2025-02-06 16:13:09 +08:00
• 126051cc15 Merge pull request 'perf(user): 优化用户资金操作逻辑' (#505) from dev into main mkm 2025-02-06 16:02:41 +08:00
• 995a63949d perf(user): 优化用户资金操作逻辑 mkm 2025-02-06 16:01:37 +08:00
• e6e43723f5 Merge pull request 'feat(inventory_transfer_order): 增加备注字段' (#504) from dev into main mkm 2025-02-06 10:43:31 +08:00
• 81f9840993 feat(inventory_transfer_order): 增加备注字段 mkm 2025-02-06 10:14:54 +08:00
• 71dd95086d Merge pull request 'dev' (#503) from dev into main mkm 2025-02-06 09:57:32 +08:00
• 405eebb642 添加创建采购单 lewis 2025-02-05 17:44:31 +08:00
• b0f38e5bcd Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev lewis 2025-02-05 14:09:36 +08:00
• 541e752573 修改会员充值流水写入 lewis 2025-02-05 14:09:29 +08:00
• 6bbd225302 refactor(purchase): 移除预售订单中不必要的产品属性 mkm 2025-02-05 11:39:30 +08:00
• 5cbda7166e Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev mkm 2025-02-05 11:24:00 +08:00
• 14b08b8f43 refactor(admin): 优化前置订单出库逻辑 mkm 2025-02-05 11:23:55 +08:00
• c7c7bb9831 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev lewis 2025-02-05 11:16:33 +08:00
• 5e1f639f63 调试账单欠款 lewis 2025-02-05 11:15:40 +08:00
• 0b7d0b21a6 修改会员充值流水写入 lewis 2025-02-05 11:07:19 +08:00
• 40732d55cc Merge pull request 'fix(api): 修复演示逻辑中产品查询' (#502) from dev into main mkm 2025-02-03 15:42:57 +08:00
• b793ace840 fix(api): 修复演示逻辑中产品查询 mkm 2025-02-03 15:42:39 +08:00
• ad47b44c78 Merge pull request 'dev' (#501) from dev into main mkm 2025-02-03 14:37:15 +08:00
• ffd5fa44c4 fix(api): 修正更新订单总价格时的表名引用 mkm 2025-02-03 14:36:28 +08:00
• 7469bd3fe5 fix(api): 修正更新订单总金额逻辑 mkm 2025-02-03 14:35:10 +08:00
• 82c1eb1ce6 feat(admin): 添加 demo4 接口并实现价格同步功能 mkm 2025-02-03 14:22:24 +08:00
• 4565edfe15 Merge pull request 'fix(admin): 修复已出库订单修改价格的问题' (#500) from dev into main mkm 2025-02-03 13:53:26 +08:00
• a6c386a298 fix(admin): 修复已出库订单修改价格的问题 mkm 2025-02-03 13:52:06 +08:00
• 7a5311dc9c Merge pull request 'fix(admin): 修复订单修改时的权限和状态问题' (#499) from dev into main mkm 2025-02-03 13:19:35 +08:00
• 81c766a2f1 fix(admin): 修复订单修改时的权限和状态问题 mkm 2025-02-03 13:18:55 +08:00
• 6022470619 Merge pull request 'refactor(admin): 优化商品列表逻辑' (#498) from dev into main mkm 2025-02-03 13:11:23 +08:00
• 198e5e2a78 refactor(admin): 优化商品列表逻辑 mkm 2025-02-03 13:10:48 +08:00
• e81c0fc671 Merge pull request 'feat(app): 为 StoreProductLists 添加会员价显示逻辑' (#497) from dev into main mkm 2025-02-01 17:08:42 +08:00
• 38da3cf56f feat(app): 为 StoreProductLists 添加会员价显示逻辑 mkm 2025-02-01 17:08:15 +08:00
• 7877b6a6d6 Merge pull request 'refactor(admin): 优化商品列表搜索和展示逻辑' (#496) from dev into main mkm 2025-02-01 17:02:05 +08:00
• 07fb90ca8b refactor(admin): 优化商品列表搜索和展示逻辑 mkm 2025-02-01 17:01:27 +08:00
• 485177f90e Merge pull request 'refactor(store): 移除创建预订订单时的员工 ID 参数' (#495) from dev into main mkm 2025-01-27 13:27:33 +08:00
• 6b44bc45ed refactor(store): 移除创建预订订单时的员工 ID 参数 mkm 2025-01-27 13:26:55 +08:00
• e33bee3cea Merge pull request '1' (#494) from dev into main mkm 2025-01-25 15:00:57 +08:00
• 97697e4882 1 mkm 2025-01-25 14:59:58 +08:00
• 8658df0d79 Merge pull request 'fix(app): 修复订单退款和库存处理相关问题' (#493) from dev into main mkm 2025-01-25 13:11:25 +08:00
• 57bde2df4c fix(app): 修复订单退款和库存处理相关问题 mkm 2025-01-25 13:06:12 +08:00
• f2b4a25da0 Merge pull request 'refactor(order): 优化预订单转订单流程' (#492) from dev into main mkm 2025-01-25 12:32:42 +08:00
• b67ecfd595 refactor(order): 优化预订单转订单流程 mkm 2025-01-25 12:32:13 +08:00
• bd672b439a Merge pull request 'fix(purchase): 修复采购产品报价中产品不存在的问题' (#491) from dev into main mkm 2025-01-25 10:52:35 +08:00
• 26df751c99 fix(purchase): 修复采购产品报价中产品不存在的问题 mkm 2025-01-25 10:51:58 +08:00
• f9e19f0eb0 Merge pull request 'perf(warehouse): 优化产品搜索功能' (#490) from dev into main mkm 2025-01-24 17:44:23 +08:00
• 304e0d3199 perf(warehouse): 优化产品搜索功能 mkm 2025-01-24 17:43:33 +08:00