Commit Graph

397 Commits

Author SHA1 Message Date
牛叉闪闪 f8e4834e69 修改方法 2024-07-30 14:39:00 +08:00
SongZhang e6db1a41bc Merge remote-tracking branch 'origin/dev' into zs 2024-07-30 14:02:21 +08:00
GYJ 820237d63e 添加商品 填充预警值字段 2024-07-30 11:29:31 +08:00
GYJ f1ee8d0de5 Merge branch 'refs/heads/dev' into gyj 2024-07-30 11:12:16 +08:00
GYJ 8486461224 Merge remote-tracking branch 'origin/zstmp' into gyj 2024-07-30 11:11:53 +08:00
牛叉闪闪 0aa0bcda77 添加出入库备注 2024-07-29 17:38:11 +08:00
牛叉闪闪 d8aaeff997 添加出入库备注 2024-07-29 17:23:21 +08:00
GYJ 68ed64849a 员工登录状态校验 2024-07-29 14:54:32 +08:00
GYJ 08f3f8b5e0 员工登录状态校验 2024-07-29 13:26:38 +08:00
GYJ cb7246d5fa 判断中文正则表达式 2024-07-29 11:47:45 +08:00
GYJ 02167b163a 员工bug fix 2024-07-29 11:29:18 +08:00
牛叉闪闪 e44cf94993 Merge remote-tracking branch 'origin/dev' into dev 2024-07-29 10:32:21 +08:00
牛叉闪闪 37c5aa1226 添加类型判断 2024-07-29 10:32:06 +08:00
SongZhang ff1be0554a Merge remote-tracking branch 'origin/dev' into dev 2024-07-26 18:10:38 +08:00
SongZhang 59b983dd77 Merge remote-tracking branch 'origin/zstmp' into zs 2024-07-26 18:09:19 +08:00
SongZhang 6521464900 1.规格 2024-07-26 18:07:13 +08:00
SongZhang 275b781f48 1.默认上下架 2024-07-26 18:05:11 +08:00
wangw 92e743cb8f 商家管理员账号 默认为店铺名称
修改时 该店铺的 Master员工 名称一律为店铺名称
2024-07-26 16:47:01 +08:00
wangw 80e666126c 修改时 员工账户不可重复 2024-07-26 15:35:51 +08:00
wangw 5dff4105e6 修改时 员工账户不可重复 2024-07-26 15:32:24 +08:00
wangw e592d5503d 员工账户校验 2024-07-26 14:36:15 +08:00
wangw 0d81d6ea5a 账户校验 2024-07-26 14:32:39 +08:00
wangw aee7e1fa0f 账号修改 2024-07-26 14:21:07 +08:00
wangw b02b4c236c 密码设置 2024-07-26 13:58:22 +08:00
wangw b8a0a14b21 员工管理 2024-07-26 09:20:56 +08:00
SongZhang ae8fdd72b3 1.登录验证码可选 2024-07-25 17:40:54 +08:00
wangw c7d4757c64 日期校验问题 2024-07-25 15:55:03 +08:00
牛叉闪闪 e9ec9a1ca5 Merge remote-tracking branch 'origin/dev' into dev 2024-07-25 15:02:43 +08:00
牛叉闪闪 a381f231f8 交班记录 2024-07-25 15:02:32 +08:00
SongZhang a534ffdf37 1.库存记录不一致问题修复 2024-07-25 14:06:34 +08:00
SongZhang 3674955224 1.耗材列表倒序 2024-07-24 14:41:23 +08:00
牛叉闪闪 3db2139e25 添加盘点备注 2024-07-23 15:41:38 +08:00
wangw fb6f024394 商品单位必填 2024-07-23 11:22:56 +08:00
wangw fe05a3ae7d Merge branch 'dev' 2024-07-23 10:11:44 +08:00
SongZhang 89733cdd95 1.库存查询接口,sku上下架字段返回 2024-07-23 09:17:14 +08:00
wangw f6c8a0c067 店铺扩展数据 2024-07-22 13:48:06 +08:00
牛叉闪闪 0946c9375d 添加盘点备注 2024-07-22 11:37:31 +08:00
SongZhang 2a6dcf563b 1.sku售出记录不保存问题
2.库存条目数不一致
2024-07-20 17:00:39 +08:00
牛叉闪闪 4c153a2bfb 耗材记录中添加商品信息 2024-07-20 16:53:27 +08:00
牛叉闪闪 7e4299eecc 添加耗材记录通过店铺id 2024-07-20 16:02:45 +08:00
牛叉闪闪 4bd089e0fc 添加耗材记录通过店铺id 2024-07-20 15:17:05 +08:00
牛叉闪闪 946a827154 添加耗材单位 2024-07-18 17:43:17 +08:00
SongZhang 66c3f2ab62 Merge remote-tracking branch 'origin/dev' into dev 2024-07-18 14:27:15 +08:00
SongZhang 5943f1b72f 1.sku售出记录不保存问题
2.库存条目数不一致
2024-07-18 14:26:58 +08:00
GYJ cf1f5c8688 Merge branch 'refs/heads/gyj' into dev 2024-07-17 11:25:58 +08:00
GYJ 34c190ced8 订单查询携带商品名称模糊查询 2024-07-17 11:25:16 +08:00
牛叉闪闪 762c23b08e 添加耗材单位 2024-07-17 11:12:07 +08:00
SongZhang a16b2925b2 1.库存新增上下架接口
2.库存记录返回orderNo
3.增加保存库存记录mq处理
2024-07-17 09:55:23 +08:00
SongZhang 279057d54f Merge remote-tracking branch 'origin/dev' 2024-07-17 09:52:28 +08:00
GYJ f9c6411750 Merge branch 'refs/heads/dev' 2024-07-12 14:44:49 +08:00