Commit Graph

750 Commits

Author SHA1 Message Date
skjia e483647500 jsk 2025-07-21 14:06:09 +08:00
skjia 40b0dbaefd jsk 2025-07-21 13:16:53 +08:00
sxu 784e7689b1 alipay 2025-07-21 09:29:57 +08:00
sxu f6c020729e alipay 2025-07-21 09:06:36 +08:00
skjia 03e8f82a95 jsk 报价 2025-07-20 15:12:02 +08:00
skjia 35857fad71 jsk 询价管理 2025-07-20 12:35:21 +08:00
liux 8f39a7369c Merge remote-tracking branch 'origin/master' 2025-07-18 18:20:58 +08:00
gaowdong e186942193 采购管理 2025-07-18 17:29:31 +08:00
liux dd13df8f29 预警字段添加 2025-07-18 16:47:16 +08:00
skjia 07c63f3910 Merge branch 'master' of http://192.168.0.75:3000/bonus/Bonus-Cloud-JYY-Smart-Canteen 2025-07-18 15:53:57 +08:00
skjia 3c05712b9c jsk bug修改 2025-07-18 15:53:41 +08:00
gaowdong 2900d77967 采购管理 2025-07-18 15:37:58 +08:00
gaowdong e2b02a2ccd 采购管理 2025-07-18 15:00:35 +08:00
liux 3da35d3536 . 2025-07-18 14:44:12 +08:00
liux 748cd58c78 报表、调拨相关代码提交 2025-07-18 14:39:55 +08:00
gaowdong 7e2b1dc58a 采购管理 2025-07-18 14:19:17 +08:00
gaowdong 4fbc318aaf 采购管理 2025-07-18 13:16:55 +08:00
gaowdong 70ae528536 采购管理 2025-07-18 09:35:58 +08:00
gaowdong 6e23b446cf 采购管理 2025-07-18 09:16:40 +08:00
gaowdong 9a01f7c4a4 采购管理 2025-07-17 18:29:56 +08:00
gaowdong 2eb49e6dbf 采购管理 2025-07-17 17:47:27 +08:00
gaowdong 43c0a7d18e 采购管理 2025-07-17 17:24:47 +08:00
gaowdong 85319380fe Merge remote-tracking branch 'origin/master' 2025-07-17 16:54:54 +08:00
gaowdong 2e801db9a4 出库管理 2025-07-17 16:54:25 +08:00
sxu ea6e07cc26 查询原料绑定供应商列表 2025-07-17 16:52:18 +08:00
sxu cfede26a22 用户地址 2025-07-17 16:35:04 +08:00
sxu 8396ce9cb6 查询原料绑定供应商列表 2025-07-17 10:02:28 +08:00
sxu cabd78b5be 查询原料绑定供应商列表 2025-07-17 09:57:59 +08:00
sxu 873ba2633b 查询原料绑定供应商列表 2025-07-17 09:45:00 +08:00
gaowdong 097f0e27a2 i国网-账户 2025-07-17 09:26:20 +08:00
sxu 6d233fe985 Merge remote-tracking branch 'origin/master' 2025-07-17 09:11:05 +08:00
sxu 586b2ffe38 查询原料绑定供应商列表 2025-07-17 09:10:11 +08:00
gaowdong 8b363e5698 采购管理-报表 2025-07-17 09:05:45 +08:00
sxu 5244e44638 查询原料绑定供应商列表 2025-07-16 18:45:54 +08:00
sxu 521f3873d1 i国网:一周菜谱 2025-07-16 18:04:33 +08:00
sxu 7107938e20 Merge remote-tracking branch 'origin/master' 2025-07-16 17:13:29 +08:00
sxu 451be85559 添加时间 2025-07-16 17:12:23 +08:00
gaowdong b082bbd948 采购管理 2025-07-16 16:12:47 +08:00
gaowdong eba75aa851 采购管理 2025-07-16 16:03:24 +08:00
liux 49a928607f 库存盘点、货品调拨、库存预警、过期预警代码提交 2025-07-16 15:39:58 +08:00
sxu c1c56d15f9 库存记录报表 2025-07-16 15:22:41 +08:00
sxu e470a01f2c 导入菜谱格式错误 2025-07-16 15:02:17 +08:00
sxu 2599b8076e 菜谱数据保护 2025-07-16 14:11:27 +08:00
sxu 4c6d26ddea 菜谱数据保护 2025-07-16 14:06:59 +08:00
sxu be83f08860 Merge remote-tracking branch 'origin/master' 2025-07-16 13:40:29 +08:00
sxu 5ea7a5b03e 获取菜品原料反算接口 2025-07-16 13:39:47 +08:00
sxu efe60fb315 档口餐次配置接口 2025-07-16 11:11:54 +08:00
sxu 219b3f9dbc 档口餐次配置接口 2025-07-16 11:09:25 +08:00
sxu 5445c750d4 获取菜品原料反算接口 2025-07-16 11:04:49 +08:00
gaowdong 1c7af2ab9e 采购管理 2025-07-16 10:51:23 +08:00
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