|
|
973796f491
|
Merge branch 'ww' into test
|
2024-10-17 10:17:32 +08:00 |
|
|
|
0f7502df06
|
耗材列表
|
2024-10-17 10:17:06 +08:00 |
|
|
|
dc9859b31d
|
Merge branch 'ww' into test
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java
|
2024-10-17 09:57:59 +08:00 |
|
|
|
30f21e1dd3
|
排序
|
2024-10-17 09:56:38 +08:00 |
|
|
|
d79f737665
|
耗材列表
|
2024-10-16 17:56:04 +08:00 |
|
|
|
e04281d8b9
|
耗材列表
|
2024-10-16 17:54:16 +08:00 |
|
|
|
7de19ffb1f
|
Merge branch 'ww' into test
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/SuppFlow.java
|
2024-10-15 15:51:45 +08:00 |
|
|
|
c105c8d0ff
|
实体类
|
2024-10-15 15:51:05 +08:00 |
|
|
|
9e8d74845a
|
Merge branch 'ww' into test
|
2024-10-15 14:33:11 +08:00 |
|
|
|
a6a8c330ae
|
耗材 判断记录
|
2024-10-15 14:32:30 +08:00 |
|
|
|
958f1cfc5e
|
Merge branch 'ww' into test
|
2024-10-14 09:14:15 +08:00 |
|
|
|
cab483a7b9
|
耗材记录
|
2024-10-14 09:13:51 +08:00 |
|
|
|
fac0e9b046
|
Merge branch 'ww' into test
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/TbConsStockCountQueryCriteria.java
# eladmin-system/src/main/java/cn/ysk/cashier/cons/repository/TbConsInfoFlowRepository.java
# eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbConsInfoFlowController.java
# eladmin-system/src/main/java/cn/ysk/cashier/cons/service/TbConsInfoFlowService.java
# eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoFlowServiceImpl.java
# eladmin-system/src/main/java/cn/ysk/cashier/repository/product/ProductStockCountRepository.java
|
2024-10-12 18:28:17 +08:00 |
|
|
|
f120867e35
|
耗材记录
|
2024-10-12 18:26:54 +08:00 |
|
|
|
527b5f059c
|
耗材记录
|
2024-10-12 18:17:04 +08:00 |
|
|
|
c918f2e5ce
|
耗材记录
|
2024-10-12 18:15:46 +08:00 |
|
|
|
7c7976c197
|
Merge branch 'ww' into test
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
|
2024-10-12 15:12:07 +08:00 |
|
|
|
1945d3f906
|
商品共享库存字段
|
2024-10-12 15:11:00 +08:00 |
|
|
|
2e374dcda7
|
Merge branch 'ww' into test
|
2024-10-11 15:58:43 +08:00 |
|
|
|
080c426caa
|
耗材记录 排序报错
|
2024-10-11 15:58:21 +08:00 |
|
|
|
4f14f8c914
|
Merge branch 'ww' into test
|
2024-10-11 15:47:52 +08:00 |
|
|
|
5a2a18992a
|
耗材记录 报错
|
2024-10-11 15:47:20 +08:00 |
|
|
|
c8b2c5903a
|
Merge branch 'ww' into test
|
2024-10-11 15:41:26 +08:00 |
|
|
|
e8a7ab070b
|
耗材列表
绑定耗材
|
2024-10-11 15:40:15 +08:00 |
|
|
|
58ef3ae818
|
Merge branch 'ww' into test
|
2024-10-10 16:04:43 +08:00 |
|
|
|
4b28ad0f1c
|
耗材绑定关系
|
2024-10-10 16:02:23 +08:00 |
|
|
|
3533a1c90e
|
订单详情返回餐位费信息
|
2024-10-10 14:46:53 +08:00 |
|
|
|
548c3a1940
|
Merge branch 'ww' into test
|
2024-10-08 17:49:44 +08:00 |
|
|
|
d855a7eeac
|
商品列表 统计
|
2024-10-08 17:48:42 +08:00 |
|
|
|
b20996355c
|
Merge branch 'ww' into test
|
2024-10-08 16:16:19 +08:00 |
|
|
|
12cc56aada
|
商品列表v2改为post
统计处理空值
绑定相同耗材 提示
|
2024-10-08 16:14:09 +08:00 |
|
|
|
81dce3ea75
|
Merge branch 'gyj' into test
|
2024-10-08 13:50:02 +08:00 |
|
|
|
58a74d1b29
|
conInfoId 字段名
|
2024-10-08 13:49:26 +08:00 |
|
|
|
185b50a84e
|
修改会员点单信息
|
2024-09-29 10:40:42 +08:00 |
|
|
|
ffe39b3113
|
Merge remote-tracking branch 'origin/test' into test
|
2024-09-28 16:14:46 +08:00 |
|
|
|
84acdd0161
|
选择人数添加锁
|
2024-09-28 16:14:30 +08:00 |
|
|
|
e36fb3f55e
|
Merge branch 'ww' into test
|
2024-09-28 14:56:09 +08:00 |
|
|
|
29277ec4eb
|
报损 返回信息
|
2024-09-28 14:55:49 +08:00 |
|
|
|
7fbabbfeec
|
Merge branch 'ww' into test
|
2024-09-28 14:43:08 +08:00 |
|
|
|
dfcd29c738
|
商品报损 状态码
|
2024-09-28 14:42:44 +08:00 |
|
|
|
723cf01696
|
获取key报错fix
|
2024-09-27 17:42:05 +08:00 |
|
|
|
4ff17e7aba
|
Merge branch 'ww' into test
|
2024-09-27 14:31:45 +08:00 |
|
|
|
74fee9a48e
|
耗材重复绑定问题
|
2024-09-27 14:31:16 +08:00 |
|
|
|
7285de2024
|
Merge branch 'ww' into test
|
2024-09-27 09:59:10 +08:00 |
|
|
|
5be1876d3d
|
商品/耗材 记录接口
|
2024-09-27 09:58:03 +08:00 |
|
|
|
1198781b61
|
库存记录 操作人
|
2024-09-26 17:02:16 +08:00 |
|
|
|
3302b8dd24
|
库存记录 操作人
|
2024-09-26 17:01:35 +08:00 |
|
|
|
b06487848f
|
Merge branch 'ww' into test
|
2024-09-25 17:39:33 +08:00 |
|
|
|
57269a1e92
|
耗材 记录 统计 Bug
|
2024-09-25 17:38:54 +08:00 |
|
|
|
ba025f0e09
|
Merge branch 'ww' into test
# Conflicts:
# eladmin-system/src/main/java/cn/ysk/cashier/repository/product/ProductStockCountRepository.java
|
2024-09-25 17:21:29 +08:00 |
|
