Commit Graph

750 Commits

Author SHA1 Message Date
sxu 544d237176 获取菜品原料反算接口 2025-07-16 10:38:35 +08:00
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 8ff83dc450 定时任务修改 2025-07-15 16:48:38 +08:00
sxu f9c593872e 定时任务修改 2025-07-15 16:43:51 +08:00
sxu 2f6eafb811 cook_recipe/listAll 2025-07-15 16:22:08 +08:00
sxu ccb427c2cb 供应链设置 2025-07-15 15:32:34 +08:00
sxu 35fcb4445e 询价和报价 2025-07-15 15:20:14 +08:00
sxu 9805bbfa7c 询价和报价 2025-07-15 15:19:30 +08:00
sxu 01fd434fd5 Merge remote-tracking branch 'origin/master' 2025-07-15 13:48:49 +08:00
sxu 3949fb152b 货品供应商 2025-07-15 13:39:02 +08:00
gaowdong 8f0f1c158e 采购管理 2025-07-15 13:29:11 +08:00
sxu 2ce485cedd Merge remote-tracking branch 'origin/master' 2025-07-15 13:13:08 +08:00
sxu be93dc15ba 货品供应商 2025-07-15 13:12:21 +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 0399970e76 货品供应商 2025-07-15 11:07:46 +08:00
sxu 4570baa4cd 货品供应商 2025-07-15 10:44:02 +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 74729dc667 删除detail controller 2025-07-15 10:00:30 +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
liux 0bf30f59fa 厨房首页 设备问题修复 2025-07-11 16:55:46 +08:00
gaowdong 41fbb4ddbe 供应链管理 2025-07-11 16:39:27 +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 ba3489dc8c 退货单 2025-07-11 11:21:46 +08:00
liux 59be7d17fa 退货单 2025-07-11 10:50:21 +08:00
liux 5f131141f3 领料问题修复 2025-07-11 10:32:15 +08:00
gaowdong fbe4568fa4 Merge remote-tracking branch 'origin/master' 2025-07-10 18:02:28 +08:00
gaowdong bebe8d530d 库存管理 2025-07-10 18:02:08 +08:00
liux 3c930a106b 退货单库存 2025-07-10 17:57:43 +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
gaowdong 49ef3a7983 库存管理-修改领料单状态 2025-07-10 14:03:44 +08:00
gaowdong c50af27e61 Merge remote-tracking branch 'origin/master' 2025-07-10 13:29:24 +08:00
gaowdong f11b811a5f 库存管理 2025-07-10 13:29:05 +08:00
sxu 982d7840d8 防止sql注入% 2025-07-10 11:05:26 +08:00
sxu 35ba4ea213 防止sql注入% 2025-07-10 10:25:43 +08:00
gaowdong 43490a106f 6739 餐厨废弃物新增时费用输入过大时系统报错,建议添加限制 2025-07-10 09:37:52 +08:00
gaowdong 0ea545d226 库存管理 2025-07-09 18:06:56 +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 e3fee8da6d 6729 在钱包管理中提现0.005,在记录中会被记录成0.01 2025-07-09 17:35:36 +08:00
gaowdong 725195c76e Merge remote-tracking branch 'origin/master' 2025-07-09 17:34:29 +08:00
gaowdong e778663c81 库存管理 2025-07-09 17:34:15 +08:00
sxu 8cdcbe03ac i国网:增加sign校验 2025-07-09 17:20:07 +08:00
sxu 3aa7edc0c7 Merge remote-tracking branch 'origin/master' 2025-07-09 17:18:37 +08:00
sxu 277ad7399f i国网:增加sign校验 2025-07-09 17:14:28 +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 efb7d360c7 刪除多余引入类 2025-07-09 09:15:27 +08:00
sxu 5f414ea91b device type 2025-07-09 09:09:47 +08:00
liux 82f4eba535 领料、退货相关代码提交 2025-07-08 18:09:08 +08:00
sxu 2f168e4bcc bug 6712 菜品单价超过限制 2025-07-08 17:11:20 +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 968e639378 bug 6727 换卡记录修改 2025-07-08 16:35:17 +08:00
sxu f1125e4e0a bug 6722 新卡号不能为空 2025-07-08 16:30:43 +08:00
sxu 7b8748024f Merge remote-tracking branch 'origin/master' 2025-07-08 16:16:45 +08:00
sxu 64fac6445c bug 6670 餐次时间不能重叠 2025-07-08 16:16:13 +08:00
gaowdong d979b590cd i国网:账户接口返回新格式 2025-07-08 16:09:33 +08:00
sxu bc5c237692 i国网:一周菜谱 2025-07-08 14:57:21 +08:00
sxu aba688fd61 i国网:一周菜谱 2025-07-08 14:30:26 +08:00
sxu 9a35ef9a9d i国网:一周菜谱 2025-07-08 14:14:57 +08:00
gaowdong e779c5c94a 库存管理 2025-07-08 13:25:16 +08:00
gaowdong 327a050d23 库存管理 2025-07-08 13:21:36 +08:00
gaowdong e89c757fc3 库存管理 2025-07-08 13:19:35 +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 2954e53c05 加载海康库 2025-07-07 17:56:09 +08:00
sxu bcb79d64db i国网:一周菜谱接入 2025-07-07 17:17:28 +08:00
sxu 75e41f9018 Merge remote-tracking branch 'origin/master' 2025-07-07 17:16:58 +08:00
skjia 67be09636c jsk 门禁设备加载 2025-07-07 17:06:53 +08:00
sxu c34fbeaf98 i国网:一周菜谱接入 2025-07-07 17:04:16 +08:00
sxu 6074f8f2fd 还原主程序 2025-07-07 16:51:09 +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 ea1649d981 智能出入库秤 2025-07-07 13:45:28 +08:00
sxu a958533ec6 zhhq 2025-07-07 13:34:11 +08:00
sxu 91c998c8e6 领料单退料单 2025-07-07 13:20:59 +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 e32d43897f Merge remote-tracking branch 'origin/master' 2025-07-07 12:56:25 +08:00
liux 65ac48eda9 厨房首页 设备问题修复 2025-07-07 09:22:17 +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
jjLv a9d07ce5e7 数据总览数据 2025-07-04 16:56:27 +08:00
sxu 111dcfa568 i国网-一周菜谱 2025-07-04 16:33:38 +08:00
sxu 496d8761cc Merge remote-tracking branch 'origin/master' 2025-07-04 15:37:41 +08:00
sxu 1e78459fdf 文件更名 2025-07-04 15:35:12 +08:00
gaowdong 08e1156152 订单查询修改 2025-07-04 15:30:32 +08:00
gaowdong d14ccd5773 Merge remote-tracking branch 'origin/master' 2025-07-04 14:35:52 +08:00
gaowdong 4586f61c51 供应链修改 2025-07-04 14:35:38 +08:00
sxu 8607fda249 Merge remote-tracking branch 'origin/master' 2025-07-04 13:59:44 +08:00
sxu 8f2c2adfc9 转换价格金额元->分 2025-07-04 13:59:09 +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
sxu 4fe5bf5c20 Merge remote-tracking branch 'origin/master' 2025-07-04 13:44:25 +08:00
sxu 7afc1fbad0 转换价格金额元->分 2025-07-04 13:43:16 +08:00
jjLv 22fb0cbdcf 营养类别删除增加食材判断
数据总览数据为昨日数据(之前为上一个有食堂订单数据)
2025-07-04 13:40:56 +08:00
sxu d07a6d1072 前后餐次时间不能重叠 2025-07-04 11:19:34 +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 602c04b0f6 Merge remote-tracking branch 'origin/master' 2025-07-04 10:33:24 +08:00
jjLv 5b64648c89 APP获取用户信息 去除手机号解密
设备APK上传增加deviceType
2025-07-04 10:33:01 +08:00
gaowdong c16da18514 Merge remote-tracking branch 'origin/master' 2025-07-04 10:32:15 +08:00
gaowdong 0cda82e13c 餐厨废弃物图片处理 2025-07-04 10:31:54 +08:00
skjia c426c1dc8d Merge branch 'master' of http://192.168.0.75:3000/bonus/Bonus-Cloud-JYY-Smart-Canteen 2025-07-04 10:23:32 +08:00
skjia b3b6b1ce0c jsk 门禁不初始化 2025-07-04 10:23:19 +08:00
gaowdong 1cccac924e 6672 员工信息中未做手机号唯一性校验 2025-07-04 09:59:14 +08:00
skjia 717fd7441b JSK pom.xml 2025-07-04 09:42:03 +08:00
gaowdong b313e34260 Merge remote-tracking branch 'origin/master' 2025-07-04 09:13:37 +08:00
gaowdong c0fccb61f1 6673 员工信息修改页面中出入权限设备位置回显错误 2025-07-04 09:13:23 +08:00
skjia 14c4f53941 jsk ---厨房出入接口及BUg修改 2025-07-03 19:48:30 +08:00
liux a415d405fc 设备相关bug修复 2025-07-03 13:53:56 +08:00
sxu 2e8aae096e 抓拍频率最小值保护 2025-07-03 13:32:41 +08:00
sxu 5ba2bc90c7 Merge remote-tracking branch 'origin/master' 2025-07-03 13:01:04 +08:00
sxu 18636f3260 放开人脸录入接口 2025-07-03 13:00:41 +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 ca1d10ff92 6618 订单管理模块中手机号传输未加密
6620 账户管理模块用户手机号传输未加密
6622 钱包管理模块用户手机号传输未加密
2025-07-03 11:12:43 +08:00
gaowdong f74b79ed8b Merge remote-tracking branch 'origin/master' 2025-07-03 09:15:29 +08:00
gaowdong 8764dae833 6651 账户消费明细中缺少消费档口字段 2025-07-03 09:14:08 +08:00
sxu b979ccbc97 Revert "bug-6628-接口返回手机号加密"
This reverts commit 9d43f1f833.
2025-07-03 08:57:55 +08:00
sxu 4c111087e8 Revert "bug-6628-接口返回手机号加密"
This reverts commit 0e2c2d8df8.
2025-07-03 08:57:46 +08:00
sxu 0e2c2d8df8 bug-6628-接口返回手机号加密 2025-07-02 18:28:24 +08:00
sxu 9d43f1f833 bug-6628-接口返回手机号加密 2025-07-02 18:19:36 +08:00
sxu ecf928e871 删除订单评价中空菜谱的记录 2025-07-02 15:53:37 +08:00
sxu 3d3b00db9a 删除订单评价中空菜谱的记录 2025-07-02 15:24:26 +08:00
sxu 4c7f439d65 Merge remote-tracking branch 'origin/master' 2025-07-02 14:17:54 +08:00
sxu e4926b4bc6 餐次之菜品留样标记 2025-07-02 14:16:58 +08:00
gaowdong 26f42b4308 供应链-采购管理 2025-07-02 13:32:02 +08:00
gaowdong 1091419d25 供应链-采购管理 2025-07-02 11:28:22 +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 3c6c146d67 Merge remote-tracking branch 'origin/master' 2025-07-02 10:38:00 +08:00
gaowdong 00dc8051f3 供应链-采购管理 2025-07-02 10:37:48 +08:00
sxu b9abdcff44 Merge remote-tracking branch 'origin/master' 2025-07-02 10:18:03 +08:00
sxu 0fb5aa0d42 查询当前档口餐次的所有菜品及其留样特征 2025-07-02 10:17:48 +08:00
gaowdong e58d6822fd Merge remote-tracking branch 'origin/master' 2025-07-02 09:31:31 +08:00
gaowdong 5b2e614af3 供应链-采购管理 2025-07-02 09:30:56 +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 061a51a1aa 供应链-采购管理 2025-07-01 17:16:30 +08:00
gaowdong de396f3da4 供应链-采购管理 2025-07-01 17:09:59 +08:00
gaowdong 36fc2bdd15 供应链-采购管理 2025-07-01 16:27:45 +08:00
liux dcac34bf88 Merge remote-tracking branch 'origin/master' 2025-07-01 15:39:41 +08:00
liux 62dae04182 供应商分页 2025-07-01 15:39:17 +08:00
sxu 6f050ec0f9 Merge remote-tracking branch 'origin/master' 2025-07-01 15:21:40 +08:00
sxu 41990c1468 请选择营养信息名称 2025-07-01 15:19:08 +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 7ba0f67f5c 查询仓库信息列表,不分页 2025-07-01 09:54:57 +08:00
sxu fd5242df73 去掉supermarket_material表 2025-06-30 18:16:02 +08:00
sxu d5b632268b 去掉supermarket_material表 2025-06-30 18:15:34 +08:00
sxu c486fad5e8 Merge remote-tracking branch 'origin/master' 2025-06-30 18:11:59 +08:00
sxu f768672f35 去掉supermarket_material表 2025-06-30 18:03:23 +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 f8b857ee93 去掉supermarket_material表 2025-06-30 17:00:30 +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 f59053f4c5 供应链 2025-06-30 09:47:03 +08:00
sxu 23fe423980 供应链 2025-06-30 09:23:02 +08:00
sxu 52a081b50b 供应链 2025-06-30 09:15:44 +08:00