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

• 18185dab6c refactor(warehouse): 重构仓库订单创建逻辑 mkm 2024-12-19 11:26:41 +08:00
• 535bd7e47e refactor(warehouse): 重构仓库出库逻辑 mkm 2024-12-19 10:55:14 +08:00
• 3b10f93790 Merge pull request '暂时回滚采购单' (#397) from dev into main mkm 2024-12-18 17:47:21 +08:00
• bdc290c6b1 暂时回滚采购单 DESKTOP-GMUNQ1B\Administrator 2024-12-18 17:46:56 +08:00
• 65ce4808c9 调整采购单生成 DESKTOP-GMUNQ1B\Administrator 2024-12-18 17:44:44 +08:00
• 58f7be4779 Merge pull request 'dev' (#396) from dev into main mkm 2024-12-18 16:01:30 +08:00
• 9de998ec83 fix(admin): 修复预售订单中商品已删除时的异常 mkm 2024-12-18 16:00:45 +08:00
• c0cdd0974b 添加采购单 DESKTOP-GMUNQ1B\Administrator 2024-12-18 14:48:31 +08:00
• c949a84cfa Merge pull request 'dev' (#395) from dev into main mkm 2024-12-18 12:22:23 +08:00
• 516adaf674 refactor(app): 移除编辑和删除订单时的店铺配置检查 mkm 2024-12-18 12:12:53 +08:00
• b110e042d8 处理分组价格设置的错误 DESKTOP-GMUNQ1B\Administrator 2024-12-17 14:31:18 +08:00
• f430b87881 Merge pull request 'dev' (#394) from dev into main mkm 2024-12-17 14:19:48 +08:00
• 4a06cb516f 修改分组价格设置 DESKTOP-GMUNQ1B\Administrator 2024-12-17 11:47:19 +08:00
• 0b025edcda 修改商品分组价格同步 DESKTOP-GMUNQ1B\Administrator 2024-12-17 10:45:40 +08:00
• d51d56a314 修改商品分类分组价格浮动比例 DESKTOP-GMUNQ1B\Administrator 2024-12-16 17:57:29 +08:00
• a63d90834e Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev DESKTOP-GMUNQ1B\Administrator 2024-12-16 16:32:12 +08:00
• 65229c142d 添加商品分类分组价格浮动比例 DESKTOP-GMUNQ1B\Administrator 2024-12-16 16:32:04 +08:00
• f928a66206 Merge pull request 'dev' (#393) from dev into main mkm 2024-12-16 14:56:55 +08:00
• 41d1435c5a refactor(admin): 注释掉重置产品价格的代码 mkm 2024-12-16 14:49:22 +08:00
• 0ebe7712fd Merge pull request 'main' (#392) from main into dev mkm 2024-12-16 11:37:38 +08:00
• 4661071c65 fix(admin): 修复后台预订单用户id为0时抛出异常 mkm 2024-12-16 11:33:02 +08:00
• 70bd6f9c90 Merge pull request '会员表单' (#391) from dev into main mkm 2024-12-15 15:19:05 +08:00
• e4b5bcd6a4 会员表单 mkm 2024-12-15 15:14:28 +08:00
• 7adaad9365 Merge branch 'dev' mkm 2024-12-14 17:33:26 +08:00
• f81575085f 一键报损 mkm 2024-12-14 17:29:27 +08:00
• c64b1df075 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev DESKTOP-GMUNQ1B\Administrator 2024-12-14 17:21:29 +08:00
• ce0dbca714 添加修复预订单分拣数量 DESKTOP-GMUNQ1B\Administrator 2024-12-14 17:21:23 +08:00
• acee5e3049 修改供货单 mkm 2024-12-14 16:28:41 +08:00
• 43802dadc7 商品列表查询过滤批发商品 DESKTOP-GMUNQ1B\Administrator 2024-12-14 15:59:04 +08:00
• 12314cdf42 调试订单退款 DESKTOP-GMUNQ1B\Administrator 2024-12-14 14:46:35 +08:00
• a0336165b6 Merge pull request '1' (#389) from dev into main mkm 2024-12-14 14:28:28 +08:00
• 9c6c6c873a 1 mkm 2024-12-14 14:26:53 +08:00
• 0535d4513f Merge pull request 'dev' (#388) from dev into main mkm 2024-12-13 17:28:26 +08:00
• 5aa27579df feat(beforehand_order): 添加接货数量字段并更新相关逻辑 mkm 2024-12-13 17:27:23 +08:00
• 584e20a7d0 feat(StoreProductLists): 增加零采商品类型 mkm 2024-12-13 12:00:38 +08:00
• d31fdf90f2 Merge pull request 'feat(store-product): 优化商品状态显示和库存字段' (#387) from dev into main mkm 2024-12-13 11:04:34 +08:00
• 8a884ea6fd feat(store-product): 优化商品状态显示和库存字段 mkm 2024-12-13 11:03:59 +08:00
• 0cdde4f9a3 Merge pull request 'feat(store_product): 优化商品搜索和详情展示' (#386) from dev into main mkm 2024-12-13 10:56:30 +08:00
• 5d0e203d98 feat(store_product): 优化商品搜索和详情展示 mkm 2024-12-13 10:50:38 +08:00
• 4159c4bfdb Merge pull request '修改商品列表查询' (#385) from dev into main mkm 2024-12-12 14:28:34 +08:00
• d02f33f201 修改商品列表查询 DESKTOP-GMUNQ1B\Administrator 2024-12-12 14:28:14 +08:00
• 5e5f7053c9 Merge pull request 'feat(admin): 优化预订单列表的搜索功能' (#384) from dev into main mkm 2024-12-12 11:48:53 +08:00
• 3e43da4b95 feat(admin): 优化预订单列表的搜索功能 mkm 2024-12-12 11:48:18 +08:00
• fc5d749800 Merge pull request '修改预定单查询、商品查询' (#383) from dev into main mkm 2024-12-12 11:37:28 +08:00
• d4246a3d49 修改预定单查询、商品查询 DESKTOP-GMUNQ1B\Administrator 2024-12-12 11:27:29 +08:00
• 1e2c7b2d89 Merge pull request 'fix(order): 修复下单时未检查商品状态导致的异常' (#382) from dev into main mkm 2024-12-11 18:01:36 +08:00
• 1185ecf9ec fix(order): 修复下单时未检查商品状态导致的异常 mkm 2024-12-11 18:01:08 +08:00
• 2d54c28009 Merge pull request 'refactor(order): 修改订单逻辑中的商品状态判断' (#381) from dev into main mkm 2024-12-11 17:59:23 +08:00
• 944aaf2425 refactor(order): 修改订单逻辑中的商品状态判断 mkm 2024-12-11 17:58:53 +08:00
• acedd0f8d6 Merge pull request 'fix(order): 检查订单商品是否下架' (#380) from dev into main mkm 2024-12-11 16:36:50 +08:00
• 7d6049fbf7 fix(order): 检查订单商品是否下架 mkm 2024-12-11 16:36:06 +08:00
• 412f037af0 Merge pull request 'fix: 调整运费模板应用逻辑' (#379) from dev into main mkm 2024-12-10 15:17:21 +08:00
• 36c7aa2d5a fix: 调整运费模板应用逻辑 mkm 2024-12-10 15:16:49 +08:00
• 26422c8d8a Merge pull request 'refactor(cart): 修改运费计算逻辑' (#378) from dev into main mkm 2024-12-10 15:10:48 +08:00
• b2084440d9 refactor(cart): 修改运费计算逻辑 mkm 2024-12-10 15:10:27 +08:00
• 3ce3432268 Merge pull request 'fix(warehouse): 修正库存数量判断逻辑' (#377) from dev into main mkm 2024-12-10 14:41:04 +08:00
• d590c2947e fix(warehouse): 修正库存数量判断逻辑 mkm 2024-12-10 14:40:36 +08:00
• c2d3a81a77 Merge pull request 'dev' (#376) from dev into main mkm 2024-12-10 14:38:38 +08:00
• b28e68966f feat(库存): 添加类型三的负库存查询功能 mkm 2024-12-10 14:33:27 +08:00
• 942a04f514 修改预订单商品分组价格查询 DESKTOP-GMUNQ1B\Administrator 2024-12-09 17:37:48 +08:00
• e3cff35799 修改购物车商品分组价格查询 DESKTOP-GMUNQ1B\Administrator 2024-12-09 17:18:13 +08:00
• a7a1c0bff4 feat(api): 添加 DemoLogic 类和 test 方法 mkm 2024-12-09 17:04:35 +08:00
• dd1033aee9 修改商品详情查询 DESKTOP-GMUNQ1B\Administrator 2024-12-09 11:40:57 +08:00
• 5fa531fcbb Merge pull request '修改商品商户价格' (#375) from dev into main mkm 2024-12-09 09:33:08 +08:00
• 9e4e2be024 修改商品商户价格 DESKTOP-GMUNQ1B\Administrator 2024-12-09 09:32:16 +08:00
• 619ec3b394 Merge pull request 'feat(admin): 添加预订单修改数量和仓库重置数量功能' (#374) from dev into main mkm 2024-12-07 11:56:01 +08:00
• 87609f2fca feat(admin): 添加预订单修改数量和仓库重置数量功能 mkm 2024-12-07 11:54:47 +08:00
• 7ae9abfc1b Merge pull request 'dev' (#373) from dev into main mkm 2024-12-06 17:22:34 +08:00
• 84efa97ed0 修改收银台商品价格计算 DESKTOP-GMUNQ1B\Administrator 2024-12-06 16:44:22 +08:00
• ae0d8dda99 修改收银台商品价格计算 DESKTOP-GMUNQ1B\Administrator 2024-12-06 16:42:48 +08:00
• 9f68846caf 修改收银台商品价格计算 DESKTOP-GMUNQ1B\Administrator 2024-12-06 16:37:47 +08:00
• c91434d54f 修改商品分组价判断 DESKTOP-GMUNQ1B\Administrator 2024-12-06 15:47:53 +08:00
• a034ae5ec1 修改预订单创建 DESKTOP-GMUNQ1B\Administrator 2024-12-06 13:40:35 +08:00
• 444b011d0f 修改商品列表查询 DESKTOP-GMUNQ1B\Administrator 2024-12-05 17:46:03 +08:00
• 83151c140d Merge pull request 'refactor(xlsx): 调整订单供货出库表格的列标题和数据顺序' (#372) from dev3 into main mkm 2024-12-05 17:30:34 +08:00
• b59e9b8bfb refactor(xlsx): 调整订单供货出库表格的列标题和数据顺序 dev3 mkm 2024-12-05 17:30:13 +08:00
• baeb03fd84 Merge branch 'dev3' into dev DESKTOP-GMUNQ1B\Administrator 2024-12-05 17:23:42 +08:00
• 2ee4742d9d Merge pull request 'dev3' (#371) from dev3 into main mkm 2024-12-05 17:23:37 +08:00
• d343df71bf feat(order): 添加商品售后标记 mkm 2024-12-05 17:21:07 +08:00
• 6ccf4f37b0 feat(admin): 添加财务出库导出功能并优化供货出库导出 mkm 2024-12-05 17:20:04 +08:00
• 850f361b63 修改商品分组报价查询 DESKTOP-GMUNQ1B\Administrator 2024-12-04 17:30:49 +08:00
• 6cdf2b1e09 修改商品分组价格 DESKTOP-GMUNQ1B\Administrator 2024-12-04 17:21:20 +08:00
• 7e8f5aacf4 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev DESKTOP-GMUNQ1B\Administrator 2024-12-04 15:23:51 +08:00
• b9f75f32ed 修改商品分组价格查询的错误 DESKTOP-GMUNQ1B\Administrator 2024-12-04 15:23:20 +08:00
• fc7bd7dc0f fix(admin): 修复预订单采购数量为 0 入库问题 mkm 2024-12-04 15:22:56 +08:00
• 2a287fb738 Merge pull request 'dev' (#370) from dev into main mkm 2024-12-04 14:44:17 +08:00
• 9fd586722a refactor(purchase): 优化采购产品报价和仓库产品逻辑 mkm 2024-12-04 14:38:46 +08:00
• 84fde23c25 feat(admin): 添加分组报价功能 mkm 2024-12-03 16:14:18 +08:00
• 4ce9136f14 Merge pull request 'dev' (#369) from dev into main mkm 2024-12-02 15:03:38 +08:00
• 33f0aab0c8 refactor(admin): 修改提前订单列表中出库金额的显示名称 mkm 2024-12-02 14:53:47 +08:00
• 4c3e593331 fix(admin): 修正预订单出库金额计算方式 mkm 2024-12-02 14:47:46 +08:00
• 9d8cceb1e4 Merge pull request 'dev' (#368) from dev into main mkm 2024-11-30 15:13:31 +08:00
• 35c39f40da feat(admin): 增加入库出库金额字段及显示 mkm 2024-11-30 15:12:46 +08:00
• 91877cd4a3 refactor(api): 优化 wps_product 接口并移除未使用的方法 mkm 2024-11-29 20:58:15 +08:00
• cb2187c0ff refactor(api): 优化 wps_product 接口处理逻辑 mkm 2024-11-29 20:48:39 +08:00
• adfc293568 test(api): 测试产品接口 mkm 2024-11-29 20:12:42 +08:00
• 834532a24d refactor(api): 优化产品数据处理 mkm 2024-11-29 20:10:58 +08:00
• c6906f36e5 feat(api): 添加 wps_product 接口无需登录访问 mkm 2024-11-29 19:56:01 +08:00
• ab347de4f1 refactor(api): 重构 IndexController 中的数据处理逻辑 mkm 2024-11-29 19:53:15 +08:00
• a188ba8f53 Merge pull request 'feat(admin): 增加供货出库导出功能' (#367) from dev into main mkm 2024-11-28 14:42:31 +08:00