Commit Graph

452 Commits

Author SHA1 Message Date
sxu 8a53fee0aa 获取菜品原料反算接口 2025-07-16 10:36:52 +08:00
sxu 6ea3015204 供应链设置恢复默认值 2025-07-15 17:34:12 +08:00
sxu 2f088bfe53 供应链设置恢复默认值 2025-07-15 17:26:24 +08:00
sxu 9805bbfa7c 询价和报价 2025-07-15 15:19:30 +08:00
sxu 3949fb152b 货品供应商 2025-07-15 13:39:02 +08:00
skjia 902c5d2a75 Merge branch 'master' of http://192.168.0.75:3000/bonus/Bonus-Cloud-JYY-Smart-Canteen 2025-07-15 13:01:14 +08:00
skjia 04c85a0fa7 jsk 解决体检信息录入过慢 2025-07-15 13:00:23 +08:00
sxu b0974f5a91 Merge remote-tracking branch 'origin/master' 2025-07-15 10:40:48 +08:00
sxu fe9ffbeb81 库存调拨 2025-07-15 10:39:56 +08:00
gaowdong 8de9bd1603 Merge remote-tracking branch 'origin/master' 2025-07-15 10:23:39 +08:00
gaowdong 569e5bfa9f 生产计划 2025-07-15 10:22:03 +08:00
sxu 097f8c353b 供应链设置 2025-07-15 09:24:06 +08:00
sxu 85766fc81d 供应链设置 2025-07-15 08:57:37 +08:00
gaowdong 693517b9e0 i国网:订单提交数据
i国网:退单提交数据
2025-07-14 13:15:03 +08:00
gaowdong cf5cc60fe4 i国网:订单提交数据
i国网:退单提交数据
2025-07-14 11:28:08 +08:00
sxu 68d4a4a6a1 供应链第三批 2025-07-14 08:56:45 +08:00
liux 7ad5355f20 领料单添加仓库id查询条件 2025-07-11 18:04:04 +08:00
gaowdong 0b8d75223e 供应链管理 2025-07-11 16:27:09 +08:00
gaowdong 9d83a44f32 Merge remote-tracking branch 'origin/master' 2025-07-11 15:59:18 +08:00
gaowdong 40da503935 供应链管理 2025-07-11 15:59:00 +08:00
liux eac460c8e0 退货单添加库存字段 2025-07-11 15:33:03 +08:00
gaowdong 3b2bea761f 库存管理 2025-07-11 14:12:29 +08:00
gaowdong e5af4fa564 库存管理 2025-07-11 13:02:59 +08:00
liux 5f131141f3 领料问题修复 2025-07-11 10:32:15 +08:00
gaowdong bebe8d530d 库存管理 2025-07-10 18:02:08 +08:00
gaowdong f0fdea424f Merge remote-tracking branch 'origin/master' 2025-07-10 15:14:20 +08:00
gaowdong 00d3be250d 库存管理-按入库单出库 2025-07-10 15:13:54 +08:00
sxu 7d4ad983f2 Merge remote-tracking branch 'origin/master' 2025-07-10 15:09:44 +08:00
sxu f66187815b 求原料商品库存 2025-07-10 15:07:31 +08:00
liux 12d58efac3 领料单、退料单问题修复 2025-07-10 14:07:04 +08:00
sxu 982d7840d8 防止sql注入% 2025-07-10 11:05:26 +08:00
gaowdong 1dedac1926 Merge remote-tracking branch 'origin/master' 2025-07-09 17:56:43 +08:00
gaowdong bc1aabfb63 6732 环境监测中无筛选条件时“正常”状态数据未展示 2025-07-09 17:56:29 +08:00
liux d6c8f0180e 禅道问题修复,领料单相关问题修复 2025-07-09 17:38:45 +08:00
gaowdong e778663c81 库存管理 2025-07-09 17:34:15 +08:00
gaowdong 84e0ad09d5 库存管理 2025-07-09 16:33:49 +08:00
gaowdong b7e86fdfcf Merge remote-tracking branch 'origin/master' 2025-07-09 13:47:20 +08:00
gaowdong 0666085986 库存管理 2025-07-09 13:47:00 +08:00
liux 82f4eba535 领料、退货相关代码提交 2025-07-08 18:09:08 +08:00
sxu 46a4d88082 bug 6725 根据操作员、时间查询失败 2025-07-08 17:02:15 +08:00
sxu 51c27e0d36 bug 6726 支持模糊查询 2025-07-08 16:39:06 +08:00
sxu 7b8748024f Merge remote-tracking branch 'origin/master' 2025-07-08 16:16:45 +08:00
gaowdong d979b590cd i国网:账户接口返回新格式 2025-07-08 16:09:33 +08:00
sxu bc5c237692 i国网:一周菜谱 2025-07-08 14:57:21 +08:00
gaowdong 134d541eb9 库存管理 2025-07-08 11:30:57 +08:00
gaowdong f85a440b2b 库存管理 2025-07-08 11:24:05 +08:00
sxu 284659b998 i国网:一周菜谱 2025-07-07 18:11:58 +08:00
sxu e5776dd910 i国网:一周菜谱 2025-07-07 18:10:01 +08:00
sxu 54ce84f534 i国网:一周菜谱接入 2025-07-07 16:50:40 +08:00
sxu 684ede633c i国网:一周菜谱接入 2025-07-07 15:23:55 +08:00
sxu a958533ec6 zhhq 2025-07-07 13:34:11 +08:00
sxu f8f0f4604c 领料单退料单 2025-07-07 13:18:25 +08:00
sxu b41d187e7b Revert "领料单退料单"
This reverts commit 3375aca6aa.
2025-07-07 13:12:28 +08:00
sxu 3375aca6aa 领料单退料单 2025-07-07 13:10:15 +08:00
sxu 908d743327 Merge remote-tracking branch 'origin/master' 2025-07-07 08:30:41 +08:00
sxu 80886a9b69 i国网-一周菜谱 2025-07-04 18:22:02 +08:00
skjia 2a4a4a97c2 jsk 厨房进出记录修正 2025-07-04 17:13:05 +08:00
sxu 111dcfa568 i国网-一周菜谱 2025-07-04 16:33:38 +08:00
gaowdong 4586f61c51 供应链修改 2025-07-04 14:35:38 +08:00
gaowdong 938fe57b06 Merge remote-tracking branch 'origin/master' 2025-07-04 13:45:09 +08:00
gaowdong 5bed40ca6b 增加排序条件 2025-07-04 13:44:30 +08:00
jjLv 22fb0cbdcf 营养类别删除增加食材判断
数据总览数据为昨日数据(之前为上一个有食堂订单数据)
2025-07-04 13:40:56 +08:00
skjia 770c30e069 Merge branch 'master' of http://192.168.0.75:3000/bonus/Bonus-Cloud-JYY-Smart-Canteen 2025-07-04 10:57:43 +08:00
skjia a7241e6352 jsk 电话加密 2025-07-04 10:56:25 +08:00
jjLv 5b64648c89 APP获取用户信息 去除手机号解密
设备APK上传增加deviceType
2025-07-04 10:33:01 +08:00
gaowdong 1cccac924e 6672 员工信息中未做手机号唯一性校验 2025-07-04 09:59:14 +08:00
skjia 14c4f53941 jsk ---厨房出入接口及BUg修改 2025-07-03 19:48:30 +08:00
gaowdong a768c9df40 Merge remote-tracking branch 'origin/master' 2025-07-03 11:26:18 +08:00
gaowdong 05fb76231a 6682 报警记录中不需要展示正常数据 2025-07-03 11:25:56 +08:00
sxu 5c975cd755 Merge remote-tracking branch 'origin/master' 2025-07-03 11:23:27 +08:00
sxu ca6db30a52 bug-6674-改食堂区域时同时改档口区域 2025-07-03 11:22:52 +08:00
gaowdong 8764dae833 6651 账户消费明细中缺少消费档口字段 2025-07-03 09:14:08 +08:00
sxu ecf928e871 删除订单评价中空菜谱的记录 2025-07-02 15:53:37 +08:00
sxu 3d3b00db9a 删除订单评价中空菜谱的记录 2025-07-02 15:24:26 +08:00
sxu 0fa7da306a Merge remote-tracking branch 'origin/master' 2025-07-02 11:23:03 +08:00
sxu 0c0c30683d 注释超市商品接口 2025-07-02 11:22:08 +08:00
sxu e58f0e0256 查询当前档口餐次的所有菜品及其留样特征 2025-07-02 10:49:24 +08:00
gaowdong 00dc8051f3 供应链-采购管理 2025-07-02 10:37:48 +08:00
liux 894bd4e91a 供应商接口对接修改及供货商统计相关接口编写 2025-07-01 18:21:24 +08:00
gaowdong c8e3ca6f11 Merge remote-tracking branch 'origin/master' 2025-07-01 18:01:45 +08:00
gaowdong a0a592fbae 供应链-采购管理 2025-07-01 18:01:32 +08:00
sxu 94741f61af Merge remote-tracking branch 'origin/master' 2025-07-01 17:38:02 +08:00
sxu 39f646310d 查询当前档口餐次的所有菜品及其留样特征 2025-07-01 17:33:36 +08:00
gaowdong de396f3da4 供应链-采购管理 2025-07-01 17:09:59 +08:00
gaowdong 36fc2bdd15 供应链-采购管理 2025-07-01 16:27:45 +08:00
liux bdb8de04db 供应商列表等功能修改,供应商资质预警列表接口 2025-07-01 15:07:12 +08:00
sxu 3692aa3024 食堂设备信息 2025-07-01 13:57:45 +08:00
sxu 572bc11109 仓库优化 2025-07-01 11:07:04 +08:00
sxu c486fad5e8 Merge remote-tracking branch 'origin/master' 2025-06-30 18:11:59 +08:00
sxu 7efee531b8 去掉supermarket_material表 2025-06-30 17:52:41 +08:00
sxu 26129929bb 去掉supermarket_material表 2025-06-30 17:38:46 +08:00
sxu 252c156d5f 去掉supermarket_material表 2025-06-30 17:37:34 +08:00
liux 360bd57a63 供应商相关代码提交 2025-06-30 17:35:05 +08:00
sxu 8081718c62 去掉supermarket_material表 2025-06-30 17:26:20 +08:00
sxu e2c35c5092 去掉supermarket_material表 2025-06-30 16:45:56 +08:00
sxu 19007047c9 去掉supermarket_material表 2025-06-30 16:23:22 +08:00
sxu 603537b983 去掉supermarket_material_type表 2025-06-30 16:10:15 +08:00
sxu 40d400107f 去掉supermarket_material表 2025-06-30 13:58:59 +08:00
sxu 7ab95f37b7 食堂后场人员登录设备密码 2025-06-30 10:58:30 +08:00
sxu 23fe423980 供应链 2025-06-30 09:23:02 +08:00
sxu abd85c1487 供应链 2025-06-30 09:14:45 +08:00
sxu d24dbaeb78 改包名 2025-06-30 09:09:51 +08:00
liux 806260b76b 厨房问题修复,视频列表接口编写 2025-06-27 17:11:15 +08:00
gaowdong cfac874002 Merge remote-tracking branch 'origin/master' 2025-06-27 15:26:03 +08:00
gaowdong 63533ab29f 智慧厨房-超时自动离柜 2025-06-27 15:25:29 +08:00
liux 69cb3803fb 视频相关代码 jar包 2025-06-27 15:13:26 +08:00
liux e78d475cc1 视频相关代码 2025-06-27 14:55:09 +08:00
skjia 896fa85865 jsk 2025-06-27 14:26:35 +08:00
gaowdong 3b00f4033c 智慧厨房 2025-06-27 10:18:48 +08:00
gaowdong aa66bfdb39 智慧厨房 2025-06-26 17:25:42 +08:00
liux 3366e42154 首页接口 2025-06-25 16:09:16 +08:00
liux 0da27cab4d Merge remote-tracking branch 'origin/master' 2025-06-25 13:45:16 +08:00
liux e88eb48edc 查询设备下卡框 2025-06-25 13:44:39 +08:00
skjia 7552b16382 jsk 手机查询 2025-06-25 13:43:51 +08:00
sxu 4798d2b3a3 Merge remote-tracking branch 'origin/master' 2025-06-25 11:14:57 +08:00
gaowdong cf67aeaabf 智慧厨房 2025-06-25 11:04:46 +08:00
sxu 7afa5bacb9 卡号不应重复发放 2025-06-25 10:10:20 +08:00
gaowdong 981bbdbe6d 报表增加 部分退单状态 2025-06-24 13:35:32 +08:00
gaowdong 965c082f59 Merge remote-tracking branch 'origin/master' 2025-06-23 17:54:45 +08:00
gaowdong 6dc82e7a89 智慧厨房 2025-06-23 17:54:14 +08:00
sxu cc18c9f36e 菜谱编辑优化 2025-06-23 17:51:41 +08:00
sxu 4f7503ffec Merge remote-tracking branch 'origin/master' 2025-06-23 17:28:32 +08:00
sxu fa6332822c Merge remote-tracking branch 'origin/master' 2025-06-23 17:27:56 +08:00
sxu dc64b1b099 位置信息优化 2025-06-23 17:27:39 +08:00
jjLv cf0d0035c9 Merge remote-tracking branch 'origin/master' 2025-06-23 17:27:38 +08:00
jjLv 0562fbb942 0623bug修改 2025-06-23 17:26:49 +08:00
gaowdong de96c9a9c8 Merge remote-tracking branch 'origin/master' 2025-06-23 16:39:11 +08:00
gaowdong 87bc3002ab 订单菜品限购 2025-06-23 16:38:02 +08:00
sxu 87def2c183 Merge remote-tracking branch 'origin/master' 2025-06-23 16:24:38 +08:00
sxu 3ed3e3c57c 位置信息优化 2025-06-23 16:24:13 +08:00
gaowdong 92b72c1e5d Merge remote-tracking branch 'origin/master' 2025-06-23 14:40:16 +08:00
gaowdong 39fd6ff85e 智慧厨房 2025-06-23 14:40:02 +08:00
sxu cb81116691 位置信息和员工进出信息 2025-06-23 13:29:28 +08:00
liux df66e88ace 首页统计数据 2025-06-20 18:06:21 +08:00
gaowdong 7b37799469 智慧厨房 2025-06-20 16:38:38 +08:00
gaowdong bd703a2450 智慧厨房 2025-06-20 16:09:28 +08:00
gaowdong 38057e96a0 智慧厨房 2025-06-20 10:02:04 +08:00
sxu d290b2d72b 厨房摄像头设置 2025-06-19 18:35:09 +08:00
sxu 03c36f2d0e Merge remote-tracking branch 'origin/master' 2025-06-19 18:15:35 +08:00
sxu b94b21b26e 厨房设置 2025-06-19 18:14:52 +08:00
gaowdong 089b201732 智慧厨房 2025-06-19 18:08:54 +08:00
sxu 890357723c 单位仓库 2025-06-19 17:29:41 +08:00
sxu 0234ca086f 单位仓库 2025-06-19 17:17:24 +08:00
sxu 5e7e3490ef 单位仓库 2025-06-19 17:02:07 +08:00
jjLv bb9e06a9d7 双屏机--设备信息获取根据deviceType分类获取 2025-06-19 16:09:02 +08:00
gaowdong c4f244d66d 智慧厨房 2025-06-19 14:50:04 +08:00
gaowdong b66535be3b 智慧厨房 2025-06-19 14:38:17 +08:00
liux 76de2ba7fd 厨房设备前后台对接问题处理 2025-06-19 14:08:49 +08:00
gaowdong b2b764840e Merge remote-tracking branch 'origin/master' 2025-06-19 11:18:03 +08:00
gaowdong f410994c76 智慧厨房 2025-06-19 11:16:27 +08:00