Commit Graph

Select branches

Hide Pull Requests

develop

feat/2024

feat/xph

feature

fix-release-1.0.0/yjc-migrate

hotfix/yjc_jd_print

master

sunny-dev

yyw

#1

#1

#10

#10

#100

#100

#101

#101

#102

#102

#103

#103

#104

#104

#105

#105

#106

#106

#107

#107

#108

#108

#109

#109

#11

#11

#110

#110

#111

#111

#112

#112

#113

#113

#114

#114

#115

#115

#116

#116

#117

#117

#118

#118

#119

#119

#12

#12

#120

#120

#121

#121

#122

#122

#123

#123

#124

#124

#125

#125

#126

#126

#127

#127

#128

#128

#129

#129

#13

#13

#130

#130

#131

#131

#132

#132

#133

#133

#134

#134

#135

#135

#136

#136

#137

#137

#138

#138

#139

#139

#14

#14

#140

#140

#141

#141

#142

#142

#143

#143

#144

#144

#145

#145

#146

#146

#147

#147

#148

#148

#149

#149

#15

#15

#150

#150

#151

#151

#152

#152

#153

#153

#154

#154

#155

#155

#156

#156

#157

#157

#158

#158

#159

#159

#16

#16

#160

#160

#161

#161

#162

#162

#163

#163

#164

#164

#165

#165

#166

#166

#167

#167

#168

#168

#169

#169

#17

#17

#170

#170

#171

#171

#172

#172

#173

#173

#174

#174

#175

#175

#176

#176

#177

#177

#178

#178

#179

#179

#18

#18

#180

#180

#181

#181

#182

#182

#183

#183

#184

#184

#185

#185

#186

#186

#187

#187

#188

#188

#189

#189

#19

#19

#190

#190

#191

#191

#192

#192

#193

#193

#194

#194

#195

#195

#196

#196

#197

#198

#198

#199

#199

#2

#2

#20

#20

#200

#200

#201

#201

#202

#202

#203

#203

#204

#204

#205

#205

#206

#206

#207

#207

#208

#208

#209

#209

#21

#21

#210

#210

#211

#211

#212

#212

#213

#213

#214

#214

#215

#215

#216

#216

#217

#217

#218

#218

#219

#219

#22

#22

#220

#220

#221

#221

#222

#222

#223

#223

#224

#224

#225

#225

#226

#226

#227

#227

#228

#228

#229

#229

#23

#23

#230

#230

#231

#231

#232

#232

#233

#233

#234

#234

#235

#235

#236

#236

#237

#237

#238

#239

#239

#24

#24

#240

#240

#241

#241

#242

#242

#243

#243

#244

#244

#245

#245

#246

#246

#247

#247

#248

#248

#249

#249

#25

#25

#250

#250

#251

#251

#252

#252

#253

#253

#254

#254

#255

#255

#256

#256

#257

#257

#258

#258

#259

#259

#26

#26

#260

#260

#261

#261

#262

#262

#263

#263

#264

#264

#265

#265

#266

#266

#267

#267

#268

#268

#269

#269

#27

#27

#270

#270

#271

#271

#272

#272

#273

#273

#274

#274

#275

#275

#276

#276

#277

#277

#278

#278

#279

#279

#28

#28

#280

#280

#281

#281

#282

#282

#283

#283

#284

#284

#285

#285

#286

#286

#29

#29

#3

#3

#30

#30

#31

#31

#32

#32

#33

#33

#34

#34

#35

#35

#36

#36

#37

#37

#38

#38

#39

#39

#4

#4

#40

#40

#41

#41

#42

#42

#43

#43

#44

#44

#45

#45

#46

#46

#47

#47

#48

#48

#49

#49

#5

#5

#50

#50

#51

#51

#52

#52

#53

#53

#54

#54

#55

#55

#56

#56

#57

#57

#58

#58

#59

#59

#6

#6

#60

#60

#61

#61

#62

#62

#63

#63

#64

#64

#65

#65

#66

#66

#67

#67

#68

#68

#69

#69

#7

#7

#70

#70

#71

#71

#72

#72

#73

#73

#74

#74

#75

#75

#76

#76

#77

#77

#78

#78

#79

#79

#8

#8

#80

#80

#81

#81

#82

#82

#83

#83

#84

#84

#85

#85

#86

#86

#87

#87

#88

#88

#89

#89

#9

#9

#90

#90

#91

#91

#92

#92

#93

#93

#94

#94

#95

#95

#96

#96

#97

#97

#98

#98

#99

#99

Mono Color

• b68f0f7ed0
  !250 修复bug Merge pull request !250 from 杨建炊/fix-release-1.0.0/yjc-migrate 杨建炊 2024-11-12 06:44:39 +00:00
• d2fded39f2
  !249 代码合并 Merge pull request !249 from 杨耀威/yyw 杨建炊 2024-11-12 06:40:43 +00:00
• 274ed2f1c1 yyw提交 DESKTOP-8FGKA8Q\chunfen 2024-11-12 14:39:26 +08:00
• 82bfc36ab5 yyw提交 DESKTOP-8FGKA8Q\chunfen 2024-11-12 14:37:55 +08:00
• ca20c9020e
  !248 代码合并 Merge pull request !248 from 杨耀威/yyw 杨建炊 2024-11-12 06:31:02 +00:00
• 8f156fa71b yyw提交 DESKTOP-8FGKA8Q\chunfen 2024-11-12 14:29:53 +08:00
• 3475baedd6 商品列表： 订单重置销量 新增筛选字段剩余库存和在售库存 DESKTOP-8FGKA8Q\chunfen 2024-11-12 14:26:09 +08:00
• c027c7ef0a bug修复 杨建炊 2024-11-12 13:49:03 +08:00
• d347d2436c
  !247 去除锁表 Merge pull request !247 from 杨建炊/fix-release-1.0.0/yjc-migrate 杨建炊 2024-11-11 05:36:01 +00:00
• 837b92e06a bug修复 杨建炊 2024-11-11 13:35:12 +08:00
• d6fadaae1e
  !246 bug Merge pull request !246 from 杨建炊/fix-release-1.0.0/yjc-migrate 杨建炊 2024-11-11 02:54:54 +00:00
• 51e8f3a9fb bug修复 杨建炊 2024-11-11 10:52:37 +08:00
• efcde2d5df bug修复 杨建炊 2024-11-11 09:37:19 +08:00
• fbc2eeb42c bug修复 杨建炊 2024-11-11 09:35:21 +08:00
• 13021d439a bug修复 杨建炊 2024-11-08 18:10:36 +08:00
• 0f4d91e939 bug修复 杨建炊 2024-11-08 18:10:00 +08:00
• d9f73a8675
  !245 修复库存导入0的异常 Merge pull request !245 from 杨建炊/fix-release-1.0.0/yjc-migrate 杨建炊 2024-11-08 08:42:52 +00:00
• 1bbb0c4c63 库存支持数据0导入 杨建炊 2024-11-08 16:41:44 +08:00
• 072e995b70
  !244 鲜花 Merge pull request !244 from 杨建炊/fix-release-1.0.0/yjc-migrate 杨建炊 2024-11-08 08:05:36 +00:00
• 2c965ed7b2 a订单导出 杨建炊 2024-11-08 16:04:31 +08:00
• 1bff0bf7e8
  !240 鲜花2.0迭代 Merge pull request !240 from 杨建炊/fix-release-1.0.0/yjc-migrate 杨建炊 2024-11-08 01:49:35 +00:00
• 46f32294b8 a订单导出 杨建炊 2024-11-06 16:13:23 +08:00
• f946d6c65b
  !243 代码合并 Merge pull request !243 from 杨耀威/yyw 杨建炊 2024-11-06 01:42:30 +00:00
• 4327e6805d yyw提交 DESKTOP-8FGKA8Q\chunfen 2024-11-05 16:22:19 +08:00
• 9db90e62c2 输入框回车查询 DESKTOP-8FGKA8Q\chunfen 2024-11-05 16:20:39 +08:00
• 8b3066b210
  !242 代码合并 Merge pull request !242 from 杨耀威/yyw 杨建炊 2024-11-04 06:47:52 +00:00
• 914f59d6c9 yyw提交 DESKTOP-8FGKA8Q\chunfen 2024-11-04 14:46:22 +08:00
• 47f8d4dab4 导出 DESKTOP-8FGKA8Q\chunfen 2024-11-04 14:44:52 +08:00
• f2b52e5c88 Merge remote-tracking branch 'origin/fix-release-1.0.0/yjc-migrate' into fix-release-1.0.0/yjc-migrate 杨建炊 2024-11-04 14:44:47 +08:00
• bec14778a3 a订单导出 杨建炊 2024-11-04 14:44:35 +08:00
• 2283bfcc0c
  !241 代码合并 Merge pull request !241 from 杨耀威/yyw 杨建炊 2024-11-04 06:13:04 +00:00
• 55f1d1f133 yyw提交 DESKTOP-8FGKA8Q\chunfen 2024-11-04 14:10:14 +08:00
• 0947542239 yyw提交 DESKTOP-8FGKA8Q\chunfen 2024-11-04 14:08:48 +08:00
• 985d4c8b59 a订单导出 杨建炊 2024-11-04 11:31:56 +08:00
• c60786f798 a订单导出 杨建炊 2024-11-02 17:05:46 +08:00
• 67dd4ea4fb a订单导出 杨建炊 2024-11-02 13:26:07 +08:00
• a5e82074a8 数据统计修复 杨建炊 2024-11-01 18:00:46 +08:00
• 9229309500 数据统计修复 杨建炊 2024-11-01 15:42:23 +08:00
• 625acfa290 扣减后触发重算 杨建炊 2024-10-31 18:56:50 +08:00
• 2ca2352ba0 扣减后触发重算 杨建炊 2024-10-31 17:38:43 +08:00
• 24757518fc 显示销量 杨建炊 2024-10-31 17:12:24 +08:00
• a9e542f89b 增加锁 杨建炊 2024-10-31 16:33:15 +08:00
• 495253e791 增加锁 杨建炊 2024-10-31 15:09:20 +08:00
• c017753fe6 增加锁 杨建炊 2024-10-31 14:37:42 +08:00
• a8290bd5d0 Merge branch 'yyw' of gitee.com:hzchunfen/erp into fix-release-1.0.0/yjc-migrate 杨建炊 2024-10-30 16:32:40 +08:00
• ffc78c9dc3 yyw提交 DESKTOP-8FGKA8Q\chunfen 2024-10-30 16:28:27 +08:00
• 74b42969b7 商品添加导出、时间筛选 DESKTOP-8FGKA8Q\chunfen 2024-10-30 16:25:58 +08:00
• c48c4da83d 调整排序 杨建炊 2024-10-30 16:20:36 +08:00
• 8af2f75854 调整排序 杨建炊 2024-10-30 16:08:48 +08:00
• 86554e20d5 批量修改在售库存 杨建炊 2024-10-30 15:27:45 +08:00
• ae5cc03c17 批量修改在售库存 杨建炊 2024-10-30 15:15:54 +08:00
• 44163c5c5c 批量修改在售库存 杨建炊 2024-10-29 17:00:10 +08:00
• 2e96bc6cdd 批量修改在售库存 杨建炊 2024-10-29 16:47:05 +08:00
• 67ed7dbe6b 批量修改在售库存 杨建炊 2024-10-29 16:33:30 +08:00
• 7bcecbe435 批量修改在售库存 杨建炊 2024-10-22 17:32:01 +08:00
• e76f78dd8c 批量修改在售库存 杨建炊 2024-10-22 17:31:30 +08:00
• c95efcdc15 erp DESKTOP-8FGKA8Q\chunfen 2024-10-22 17:19:15 +08:00
• ab3b8b47f3 Merge remote-tracking branch 'origin/fix-release-1.0.0/yjc-migrate' into fix-release-1.0.0/yjc-migrate 杨建炊 2024-10-22 11:50:09 +08:00
• dd482189f9 批量修改在售库存 杨建炊 2024-10-22 11:49:49 +08:00
• 02cd13c6f7 yyw提交 DESKTOP-8FGKA8Q\chunfen 2024-10-22 10:21:38 +08:00
• 0e2e982eb2 yyw提交 DESKTOP-8FGKA8Q\chunfen 2024-10-18 16:34:24 +08:00
• 68168a0936 同步快团团用在售库存其他都是实际库存 杨建炊 2024-09-21 14:41:55 +08:00
• a5dacc8a81
  !237 合并 Merge pull request !237 from 赵世界/feat/2024 赵世界 2024-09-18 07:42:25 +00:00
• 3f1f724cdd 软删除 feat/2024 赵世界 2024-09-18 15:41:46 +08:00
• c62829b1ad 商品列表、组合商品的新增、编辑添加权限控制 DESKTOP-8FGKA8Q\chunfen 2024-09-07 16:55:06 +08:00
• f9c0662282 鲜花2.0-采购流程变更 杨建炊 2024-09-07 16:46:29 +08:00
• 1b6bd4ffc4 鲜花2.0-采购流程变更 杨建炊 2024-09-05 11:01:02 +08:00
• 53ac852284 Merge branch 'yyw' of gitee.com:hzchunfen/erp into fix-release-1.0.0/yjc-migrate 杨建炊 2024-09-05 10:52:14 +08:00
• 3410958449 更新提交 DESKTOP-8FGKA8Q\chunfen 2024-09-05 10:51:36 +08:00
• fcd6735028 鲜花2.0-采购流程变更 杨建炊 2024-09-05 10:14:22 +08:00
• a9d04bdf18 鲜花2.0-采购流程变更 杨建炊 2024-09-04 16:43:15 +08:00
• cb56e5a227 1、采购管理拆分为商品采购和质检入库 DESKTOP-8FGKA8Q\chunfen 2024-09-03 17:34:54 +08:00
• 7fb90a77f9 鲜花2.0-采购流程变更 杨建炊 2024-09-02 17:36:43 +08:00
• a43d8b0c81 鲜花2.0-采购流程变更 杨建炊 2024-08-30 17:06:24 +08:00
• ea65bcee66 鲜花2.0-sku命名规则变更 杨建炊 2024-08-30 16:15:40 +08:00
• 20ae896e0c Merge branch 'yyw' of gitee.com:hzchunfen/erp into fix-release-1.0.0/yjc-migrate 杨建炊 2024-08-24 16:00:09 +08:00
• fb52234ee5 yyw提交 DESKTOP-8FGKA8Q\chunfen 2024-08-24 15:59:46 +08:00
• 50229d464e 鲜花2.0-文案调整 杨建炊 2024-08-24 15:31:12 +08:00
• d0d10604d5 鲜花2.0-文案调整 杨建炊 2024-08-24 15:27:44 +08:00
• d8f181a033 Merge branch 'yyw' of gitee.com:hzchunfen/erp into fix-release-1.0.0/yjc-migrate 杨建炊 2024-08-24 14:51:25 +08:00
• 10428c0673 yyw提交 DESKTOP-8FGKA8Q\chunfen 2024-08-24 14:51:04 +08:00
• 7ad3581a9d yyw提交 DESKTOP-8FGKA8Q\chunfen 2024-08-24 14:50:12 +08:00
• 863f78f73f 鲜花2.0-文案调整 杨建炊 2024-08-24 14:31:32 +08:00
• 984132bfff Merge branch 'yyw' of gitee.com:hzchunfen/erp into fix-release-1.0.0/yjc-migrate 杨建炊 2024-08-24 14:23:34 +08:00
• 374787b57c 鲜花2.0-文案调整 杨建炊 2024-08-24 14:23:06 +08:00
• 43977aea63 yyw提交 DESKTOP-8FGKA8Q\chunfen 2024-08-24 14:22:16 +08:00
• cb9261853a yyw提交 DESKTOP-8FGKA8Q\chunfen 2024-08-24 14:20:41 +08:00
• 2c974cfbc0 鲜花2.0-文案调整 杨建炊 2024-08-23 15:33:10 +08:00
• fe7a4e5c33 yyw提交 DESKTOP-8FGKA8Q\chunfen 2024-08-23 15:14:47 +08:00
• 16b93f1619 鲜花2.0-文案调整 杨建炊 2024-08-22 16:35:34 +08:00
• 6e8ca109fc 鲜花2.0-文案调整 杨建炊 2024-08-21 18:30:30 +08:00
• 0477d04bbd 新增商品 规格编码即为最终编码 DESKTOP-8FGKA8Q\chunfen 2024-08-21 17:52:32 +08:00
• 70442ebbac Merge branch 'yyw' of gitee.com:hzchunfen/erp into fix-release-1.0.0/yjc-migrate 杨建炊 2024-08-21 09:53:46 +08:00
• f54cf6a4a8 优化 DESKTOP-8FGKA8Q\chunfen 2024-08-21 09:53:24 +08:00
• f858221f24 Merge branch 'yyw' of gitee.com:hzchunfen/erp into fix-release-1.0.0/yjc-migrate 杨建炊 2024-08-21 09:47:50 +08:00
• 2468a9c751 鲜花2.0-新增父级分类的数据返回和预警状态维护 杨建炊 2024-08-20 16:58:37 +08:00
• 825748480c 鲜花erp优化 DESKTOP-8FGKA8Q\chunfen 2024-08-20 16:40:07 +08:00
• 89a2df396e Merge branch 'yyw' of gitee.com:hzchunfen/erp into fix-release-1.0.0/yjc-migrate 杨建炊 2024-08-19 16:55:58 +08:00
• 0273ea5255 yyw提交 DESKTOP-8FGKA8Q\chunfen 2024-08-19 16:55:32 +08:00
• a70945dc33 Merge branch 'yyw' of gitee.com:hzchunfen/erp into fix-release-1.0.0/yjc-migrate 杨建炊 2024-08-19 16:43:52 +08:00