Commit Graph

152 Commits

Author SHA1 Message Date
袁锋 8e5b2dc02c Merge branch 'dev' of https://git.yfgame.vip/r/hangtag into dev
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2025-12-08 22:06:45 +08:00
袁锋 609cc4eef0 优化 添加edge 浏览器下载推荐,单位丢失不能保存问题 2025-12-08 22:05:39 +08:00
wwb 63c2099a74 Merge branch 'dev' of https://git.yfgame.vip/r/hangtag into dev
# Conflicts:
#	hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java
2025-12-08 14:14:18 +08:00
wwb 9538904f0f 销售订单增加附件下载 2025-12-08 12:00:01 +08:00
袁锋 4e6d2a621c 改造 多个跟单员下单发邮件 2025-12-08 10:08:21 +08:00
袁锋 25439fc0b1 优化 支持多跟单员
新增 新增客户 联系邮箱字段
2025-12-06 22:11:20 +08:00
袁锋 cb54921eaf 优化 产品excel导入实体 2025-11-23 07:57:48 +08:00
袁锋 70f355232e 产品 excel导入 2025-11-23 07:49:42 +08:00
袁锋 c5e78f8521 11 2025-11-21 12:19:57 +08:00
袁锋 91b99ef557 优化 缓存 2025-11-17 16:24:09 +08:00
袁锋 eb8d5539f9 优化 导入提示 2025-11-16 08:28:21 +08:00
袁锋 1b6949baf8 优化 下单显示产品类型 2025-11-15 23:54:49 +08:00
袁锋 eb1748ff79 优化 产品导入导出模板为一致 2025-11-15 23:32:27 +08:00
袁锋 9db1775917 优化 产品导入 2025-11-05 21:01:10 +08:00
yf 42616da7e8 优化 产品导入逻辑,存在相同编码覆盖数据 2025-10-26 08:54:05 +08:00
yf 3d7fa5e802 优化 新增产品类型导入 2025-10-23 09:04:55 +08:00
yf 9df51bddda 优化 产品导入导出 2025-10-21 10:44:22 +08:00
yf ef41c1b22b 修复 销售订单审核 规格问题 2025-10-07 17:21:50 +08:00
yf f68e17ea0e 优化 下单修改为手机号码非必填,
优化 下单步骤产品列表添加关键字搜索
优化 后台订单金额调整为保留4位小数位
2025-07-09 23:01:27 +08:00
yf c9c56a1806 修复 复制报错 2025-03-23 23:48:33 +08:00
yf 830ce9d3af 修复 找不到包错误 2025-03-05 00:46:24 +08:00
yf c5a8f8f032 Merge branch 'dev' of https://git.yfgame.vip/r/hangtag into dev
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2025-03-05 00:23:58 +08:00
yf b153c22261 新增 客户组别,新增稿件附件,及下单附件上传 2025-03-05 00:21:13 +08:00
Mrking ccdc8afaab 新增复制订单 2025-03-03 22:01:53 +08:00
Mrking f3e592af18 新增复制订单 2025-03-03 00:04:10 +08:00
Mrking 2d9539251e 增加下单发送邮件提示 2025-03-02 23:19:45 +08:00
yf 054780da33 优化 导出文件名称 2025-01-20 12:42:56 +08:00
yf b90eb96bb4 修复 编辑覆盖sku的id问题 2025-01-20 12:31:16 +08:00
yf ea0ce9540b 优化 导出文件名称 2025-01-20 11:19:54 +08:00
yf 7bbd610392 修复 只导出html 2025-01-20 10:52:16 +08:00
yf e01f3c9918 修复 文件导出 2025-01-20 10:41:35 +08:00
yf 4f061b363d 修复 文件导出 2025-01-20 10:29:14 +08:00
yf bd2c1ccd6b 修复 文件导出 2025-01-20 10:18:46 +08:00
yf 70e2e167a7 修复 文件导出 2025-01-20 09:55:57 +08:00
yf 01ab7a07f7 修复 文件不能存在 2025-01-20 09:31:06 +08:00
yf b391148e26 修复 稿件文件目录问题 2025-01-20 09:18:04 +08:00
yf 2d7ea83f0b 修复 导出文件路径 2025-01-20 08:54:12 +08:00
yf 3729dd568a 修复 稿件导出路径错误 2025-01-20 08:36:32 +08:00
yf 7b1b5cf618 新增 订单稿件导出功能 2025-01-20 00:26:12 +08:00
yf b3d8346204 新增 关键字查询 2025-01-19 22:33:46 +08:00
Mrking 1f5872249e 优化修改订单 2025-01-19 21:50:48 +08:00
Mrking ff807e0def 优化修改订单 2025-01-19 21:12:31 +08:00
Mrking 1618b15b01 Merge branch 'dev' of https://git.yfgame.vip/r/hangtag into dev
# Conflicts:
#	hangtag-ui/hangtag-ui-admin/src/views/oms/produceorder/ProduceOrderForm.vue
2025-01-19 18:26:50 +08:00
Mrking 97678c49d2 修改销售订单 2025-01-19 15:51:18 +08:00
wwb 2e876da193 优化生产制单 2025-01-13 08:37:07 +08:00
Mrking 36940cbd2b 优化生产制单 2025-01-12 22:07:55 +08:00
wwb dd36e9f7cc Merge branch 'dev' of https://git.yfgame.vip/r/hangtag into dev 2025-01-12 12:31:20 +08:00
wwb 0aa527f44f Merge branch 'dev' of https://git.yfgame.vip/r/hangtag into dev 2025-01-12 12:22:15 +08:00
wwb 86212bb3b6 修改生产制单备注 2025-01-12 12:09:10 +08:00
wwb 2749b1285e Merge branch 'dev' of https://git.yfgame.vip/r/hangtag into dev 2025-01-10 11:29:43 +08:00