36940cbd2b
优化生产制单
2025-01-12 22:07:55 +08:00
dd36e9f7cc
Merge branch 'dev' of https://git.yfgame.vip/r/hangtag into dev
2025-01-12 12:31:20 +08:00
0aa527f44f
Merge branch 'dev' of https://git.yfgame.vip/r/hangtag into dev
2025-01-12 12:22:15 +08:00
86212bb3b6
修改生产制单备注
2025-01-12 12:09:10 +08:00
2749b1285e
Merge branch 'dev' of https://git.yfgame.vip/r/hangtag into dev
2025-01-10 11:29:43 +08:00
f46b04ca90
修复销售合约编码替换数据
2025-01-10 11:29:27 +08:00
8dd5fb6519
新增 稿件源文件下载
2025-01-07 01:07:31 +08:00
41bc20a3a8
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-01-04 22:42:13 +08:00
c2285e42e4
新增 产品信息导入，稿件下载功能
2025-01-04 22:41:06 +08:00
a2ea5282a2
优生产制单备注
2025-01-04 17:10:31 +08:00
86a118a785
优生产制单备注
2025-01-04 16:23:34 +08:00
0b956eb7b1
提交20250104
2025-01-04 15:04:19 +08:00
22888ef18c
新增 销售订单sku行备注，
2025-01-03 02:24:51 +08:00
cc27de49b7
提交20241230
2024-12-30 19:59:28 +08:00
3061eec79a
修改审核方法
2024-12-14 22:52:07 +08:00
bdc4983c21
修改审核方法
2024-12-14 22:45:23 +08:00
c7142816db
修改审核方法
2024-12-14 22:11:21 +08:00
ff45257f88
修改审核方法
2024-12-14 21:35:47 +08:00
5f96777d00
修改两位小数计算
2024-12-14 21:18:40 +08:00
af39aca752
更新修改地址
2024-12-14 17:51:54 +08:00
90e9d7bbc5
修改生成制单
2024-12-14 17:20:26 +08:00
359df015f1
新增合约类型
2024-12-14 15:47:24 +08:00
7314b545ea
增加结算币种
2024-12-14 15:40:07 +08:00
3894c47452
增加忘记密码
2024-12-08 21:34:14 +08:00
ab5b66e9b4
新增 币种和产品默认价格
2024-12-02 23:41:06 +08:00
698dd3f1a8
新增 护理流程类型
2024-11-25 00:59:29 +08:00
86f080e474
优化 下单动态属性配置
2024-11-24 23:35:27 +08:00
1d495c6e35
优化 变量输入，下单默认品牌
2024-11-21 23:22:09 +08:00
487e8250da
优化 稿件添加封面
2024-11-20 23:28:51 +08:00
5984d5a9d7
新增 管理品牌跟单员，新增产品资料复制功能
2024-11-19 23:25:18 +08:00
1d67e968e9
fix 停用获取产品品类型查询权限
2024-11-19 22:30:34 +08:00
1b122b0fb7
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/controller/admin/productinfo/ProductInfoController.java
2024-11-19 22:12:16 +08:00
69799f3705
fix 去除查询权限控制
2024-11-19 22:09:20 +08:00
c591e0b38f
去除权限校验
2024-11-18 09:51:13 +08:00
e788b57684
跟单员发送邮箱
2024-11-18 09:04:39 +08:00
cf54cbf47c
Merge branch 'dev' of https://git.yfgame.vip/r/hangtag into dev
2024-11-16 14:06:06 +08:00
ad175a2393
新增 下单分不同类型添加sku,下单预览图设置背景
2024-11-16 14:04:38 +08:00
63f493ec3d
增加跟单员
2024-11-13 20:53:40 +08:00
1b221bca72
销售订单增加导出PI功能
2024-11-03 20:29:09 +08:00
b3b8f40d03
销售订单增加导出PI功能
2024-11-02 15:56:38 +08:00
a1f6556df5
销售订单增加导出PI功能
2024-11-02 15:14:57 +08:00
bb8e93cfc6
销售订单增加导出PI功能
2024-11-02 14:47:18 +08:00
12638209f7
销售订单增加导出PI功能
2024-11-02 12:12:44 +08:00
47ca534052
销售订单增加导出PI功能
2024-11-02 11:56:53 +08:00
973ad77d7f
销售订单增加导出PI功能
2024-11-02 11:52:23 +08:00
0c40437c74
销售订单增加导出PI功能
2024-11-02 11:45:49 +08:00
294c4e5d6e
销售订单增加导出PI功能
2024-11-02 11:36:20 +08:00
e20641292a
销售订单增加导出PI功能
2024-11-02 11:30:14 +08:00
1d98827bfb
销售订单增加导出PI功能
2024-11-02 11:10:18 +08:00
e930e28373
销售订单增加导出PI功能
2024-10-29 23:16:13 +08:00
eb1cd78f07
销售订单增加导出PI功能
2024-10-29 23:13:48 +08:00
c0cc36772f
优化销售订单
2024-10-29 00:03:06 +08:00
86bd0b411f
更新生产单信息
2024-10-27 22:20:44 +08:00
a192ae63c9
修改客户初始化密码
2024-10-27 21:57:33 +08:00
ef860b32f3
增加打印日志
2024-10-26 21:20:47 +08:00
280747ad91
增加打印日志
2024-10-26 21:11:15 +08:00
af97c2824f
优化生产制单
2024-10-23 23:23:53 +08:00
cce6c32bad
优化生产制单
2024-10-23 22:31:24 +08:00
ccf7fa405a
优化生产制单
2024-10-23 22:31:00 +08:00
8a3ddf222f
优化生产制单
2024-10-23 22:24:21 +08:00
476860c434
优化生产制单
2024-10-22 22:28:59 +08:00
fd67533544
优化销售订单审核功能
2024-10-21 00:04:17 +08:00
e9a5400423
优化销售订单审核功能
2024-10-20 23:08:14 +08:00
6ff368298d
优化销售订单审核功能
2024-10-20 22:30:39 +08:00
6858a908c3
优化发票信息
2024-10-20 16:26:56 +08:00
55feb08407
修改客户新增页面排版
2024-10-20 15:02:15 +08:00
75aad6a93d
优化 下单页面，新增客户地址管理，新增查询条件构建工具类
2024-10-18 10:08:43 +08:00
4012c53116
关联 销售订单id
2024-10-08 23:46:48 +08:00
7b3e0d944a
下单页面 接口对接
2024-10-08 23:41:50 +08:00
a12b47aeac
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.
2024-10-06 08:44:33 +08:00
f314af7ad2
调整 稿件图片存储方式，新增产品工艺
2024-10-06 08:38:50 +08:00
7550592b8a
新增前端下单首页
2024-09-24 23:45:30 +08:00
fe4019d27d
新增前端订单列表
2024-09-23 22:46:24 +08:00
c9d84bd169
删除测试代码
2024-09-22 22:38:20 +08:00
3bca52f8a1
删除测试代码
2024-09-22 22:26:17 +08:00
268b577851
增加首页
2024-09-22 21:25:49 +08:00
3d64b4eaac
增加首页
2024-09-22 21:19:31 +08:00
fe54bd79b6
优化销售订单价格
2024-09-18 23:25:58 +08:00
8f88c051c6
优化销售订单
2024-09-17 17:36:09 +08:00
693b8a60e9
优化客户菜单
2024-09-16 14:12:42 +08:00
b33aea368a
提交
2024-09-15 21:40:39 +08:00
c39aa21b7f
增加pdf打印
2024-09-15 20:04:59 +08:00
11c705f7e6
新增pi推送邮件
2024-09-12 12:54:23 +08:00
79e94961ae
Merge branch 'dev' of https://git.yfgame.vip/r/hangtag into dev
2024-09-08 23:13:04 +08:00
f1332e2765
新增生产制单
2024-09-08 23:12:47 +08:00
c1a7bee638
Merge branch 'dev' of https://git.yfgame.vip/r/hangtag into dev
...
# Conflicts:
# hangtag-ui/hangtag-ui-admin/src/utils/dict.ts
2024-09-08 16:42:12 +08:00
785bcede9f
改造 优化产品保养项，产品支持多稿件关联，产品保养预览数据结构优化
...
修复 已知错误
2024-09-08 16:34:49 +08:00
9604e44645
优化销售订单
2024-09-07 20:04:01 +08:00
ff46f4d940
新增订单信息
2024-09-04 00:24:14 +08:00
96b087489f
增加生产制单
2024-09-03 13:05:57 +08:00
2cfd3db67a
Merge branch 'dev' of https://git.yfgame.vip/r/hangtag into dev
...
# Conflicts:
# hangtag-module-oms/hangtag-module-oms-api/src/main/java/cn/hangtag/module/oms/enums/ErrorCodeConstants.java
# hangtag-module-system/hangtag-module-system-biz/target/generated-sources/annotations/cn/hangtag/module/system/convert/oauth2/OAuth2OpenConvertImpl.java
# hangtag-module-system/hangtag-module-system-biz/target/generated-sources/annotations/cn/hangtag/module/system/convert/social/SocialUserConvertImpl.java
2024-09-01 18:39:16 +08:00
567b95f371
增加销售订单
2024-09-01 18:36:49 +08:00
a2231b68de
Merge branch 'dev' of https://git.yfgame.vip/r/hangtag into dev
...
# Conflicts:
# hangtag-module-oms/hangtag-module-oms-api/src/main/java/cn/hangtag/module/oms/enums/ErrorCodeConstants.java
# hangtag-ui/hangtag-ui-front/src/components/DraftDesign/components/DesignPreviewDialog.vue
# hangtag-ui/hangtag-ui-front/src/components/DraftDesign/components/DesignPropEdit.vue
2024-09-01 15:20:38 +08:00
044df3161f
新增 产品保养项管理
...
新增 稿件预览组件
完善 产品资料管理功能
2024-09-01 15:12:47 +08:00
1c9bca7345
新增品牌关系表
2024-08-30 08:13:57 +08:00
320e76dad4
销售订单
2024-08-25 18:15:14 +08:00
778968620e
新增 稿件管理
2024-08-12 23:44:01 +08:00
5744f7be34
修改 处理冲突
2024-08-12 01:11:38 +08:00
5b73c0cd01
Merge branch 'dev' of https://git.yfgame.vip/r/hangtag into dev
...
# Conflicts:
# hangtag-module-oms/hangtag-module-oms-api/src/main/java/cn/hangtag/module/oms/enums/ErrorCodeConstants.java
2024-08-12 01:03:50 +08:00
ee85e1217b
优化 后台本地文件存储和访问路径，配置文件添加本地文件域名配置项
...
新增 [ui]
1.图稿设计图形图库管理
2.工具栏节点更多属性配置
3.使用技巧提示功能
3.右键菜单功能，
4.动态属性功能，右侧查看节点，和动态属性组功能,
5.优化访问资源的路径问题
2024-08-12 00:59:44 +08:00
Mrking
yf