Commit Graph

403 Commits

Author SHA1 Message Date
skjia 24003bd931 jsk 健康 2025-06-05 08:59:42 +08:00
skjia a77562526b jsk 健康 2025-06-04 09:33:52 +08:00
skjia a667b8ef68 jsk 健康 2025-06-03 09:18:31 +08:00
sxu 9ec6670a51 Revert "人脸主键"
This reverts commit 7c2cbed7b7.
2025-05-27 17:26:50 +08:00
sxu 7c2cbed7b7 人脸主键 2025-05-27 17:26:08 +08:00
jjLv 91bef4a27b 供应链-退单git合并处理 2025-05-22 09:30:33 +08:00
liux d093680218 送货单、付款记录 2025-05-21 14:10:25 +08:00
jjLv 0ebb107e66 供应链-过期预警、库存预警、库存盘点(未验证接口版,可正常启动) 2025-05-21 09:37:27 +08:00
jjLv 6210daaeee Merge remote-tracking branch 'origin/master'
# Conflicts:
#	bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/mapper/DrpOutDetailMapper.java
#	bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/po/DrpIntoDetailByIdGetModel.java
#	bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/service/DrpOutInventoryService.java
#	bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/service/impl/DrpOutInventoryServiceImpl.java
#	bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/vo/MqDrpOutMaterialInfoVO.java
#	bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supplier/DrpOutDetailMapper.xml
#	bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supplier/DrpOutInventoryMapper.xml
2025-05-20 14:23:01 +08:00
gaowdong 68d40d110e 供应链-采购管理 2025-05-20 11:16:05 +08:00
jjLv 8478f14385 供应链-退货管理-暂未验证(无入库订单数据等) 2025-05-20 09:04:16 +08:00
liux b775a79f19 供应链模块整体字段修改,供应商货品记录-详情接口编写、证书库模块接口编写 2025-05-19 18:02:48 +08:00
gaowdong bb43eb5803 6009 个人收支汇总上期余额会出现负数 2025-05-19 17:20:23 +08:00
gaowdong 532eb15e38 供应链-采购管理api修改 2025-05-19 17:00:37 +08:00
jjLv d4a6118e1f 供应链-领料管理 2025-05-19 14:56:53 +08:00
sxu 52d29a7df6 投诉建议回复 2025-05-19 14:48:27 +08:00
sxu f0255ceb1b Merge remote-tracking branch 'origin/master' 2025-05-19 14:37:24 +08:00
sxu 950c43f055 投诉建议 2025-05-19 14:37:22 +08:00
gaowdong 661534ea93 供应链-采购管理 2025-05-19 14:24:49 +08:00
gaowdong 7acdce51e4 退单发mq给双屏机 2025-05-19 13:33:27 +08:00
gaowdong eb26f17dd4 预定订单保存时效:10分钟,10分钟后订单取消,不保存记录,菜品库存释放 2025-05-19 13:07:07 +08:00
gaowdong ca34461e7f Merge remote-tracking branch 'origin/master' 2025-05-16 18:38:47 +08:00
gaowdong 4d3b41ad07 6009 个人收支汇总上期余额会出现负数 2025-05-16 18:38:34 +08:00
liux f3dbb61890 应付应收模块接口编写,代码合并修改,bug修复 2025-05-16 17:40:04 +08:00
gaowdong 3504872a5a 6006 退款记录中的组织和操作员查询不可用 2025-05-16 17:00:15 +08:00
gaowdong a5619f5300 Merge remote-tracking branch 'origin/master' 2025-05-16 16:32:34 +08:00
gaowdong 4cd1a8f751 增加补扣 2025-05-16 16:32:20 +08:00
jjLv 8a939b61a4 食堂数据总览-逻辑变更 2025-05-16 15:57:47 +08:00
gaowdong 20541f800d 6012 线上消费核销后依然支持退单(需求要求 2025-05-16 15:50:16 +08:00
gaowdong 24e25747ff 采购管理 2025-05-16 15:40:17 +08:00
gaowdong 6209edbfdc 采购管理 2025-05-16 15:10:29 +08:00
jjLv cb456f0b72 食堂数据总览 代码优化 2025-05-16 11:20:02 +08:00
jjLv 62ce2a9810 食堂数据总览 2025-05-16 09:24:35 +08:00
sxu 804946dad1 Merge remote-tracking branch 'origin/master' 2025-05-15 18:26:39 +08:00
liux 7185f534bb 供应商功能相关功能开发,供应商管理接口调试修改 2025-05-15 17:46:53 +08:00
sxu c226cc5aec 仓库 2025-05-15 16:03:35 +08:00
sxu 4dbb3a8088 仓库 2025-05-15 16:00:56 +08:00
sxu 03e369c5ee 删除区域保护 2025-05-15 14:27:31 +08:00
sxu 3cf549e24a 商超 2025-05-15 10:45:43 +08:00
sxu bb2d95709c 商超 2025-05-15 10:10:37 +08:00
sxu 2c43e80e1e 商超 2025-05-15 09:52:59 +08:00
jjLv 0a5e08aba2 营养信息删除优化 2025-05-14 17:44:05 +08:00
sxu 5a6edda8cd 勿删区域根节点 2025-05-14 16:58:13 +08:00
jjLv 882dfd0933 菜品新增修改,重复菜品和编号判断优化 2025-05-14 15:41:09 +08:00
jjLv 41e65e2a01 营养、原料、菜品、菜谱相关优化 2025-05-14 13:23:20 +08:00
liux 3350f26b4d Merge remote-tracking branch 'origin/master' 2025-05-14 09:29:33 +08:00
liux e4b31da1cf 轮播图url添加 2025-05-14 09:29:25 +08:00
sxu 64377aa30d 营养科普富文本图片链接处理 2025-05-14 09:10:43 +08:00
sxu 7b9ac4f0de Merge remote-tracking branch 'origin/master' 2025-05-13 18:26:25 +08:00
sxu 09a6ee13cb 营养科普富文本图片链接处理 2025-05-13 18:26:19 +08:00