Commit Graph

717 Commits

Author SHA1 Message Date
wuzongyong
251176c88d feat(material): 添加物料快捷添加功能
- 在MaterialInfomationController中新增/creat-quickly接口
- 实现createMaterialInfomationQuickly方法支持快捷创建
- 添加同一小类下相同编码和名称物料的重复校验逻辑
- 当存在重复物料时返回提示信息避免重复创建
- 创建成功时返回操作结果描述和物料ID信息
2026-01-19 15:47:40 +08:00
qianshijiang
bcf01d452d Merge remote-tracking branch 'origin/dev' into test 2026-01-16 17:07:09 +08:00
潘荣晟
3ef89280ee 计划管理 2026-01-16 17:04:06 +08:00
潘荣晟
05de361806 计划管理 2026-01-16 17:03:26 +08:00
qianshijiang
79e1f91a1e Merge remote-tracking branch 'origin/dev' into test 2026-01-16 16:53:24 +08:00
潘荣晟
38a6b695f0 新增销售订单明细装运地点非空校验 2026-01-16 15:27:38 +08:00
潘荣晟
27a61f78a3 新增通过销售订单明细id查询订单详情 2026-01-16 15:24:07 +08:00
qianshijiang
5bcf34ab44 Merge remote-tracking branch 'origin/dev' into test 2026-01-16 10:35:09 +08:00
qianshijiang
d77f4b1411 erp修改 2026-01-16 10:34:44 +08:00
chenbowen
4d2c2ce6c4 1. 修复页面上传文件 500 错误 2026-01-16 10:26:01 +08:00
chenbowen
d5df640fbf 1. 修复页面上传文件 500 错误 2026-01-16 10:06:06 +08:00
chenbowen
897d7e4d3e 1. 修复错误的权限校验信息 2026-01-16 10:00:32 +08:00
chenbowen
ed8b9c808a 1. 统一物料类型以及物料信息的权限 2026-01-16 09:49:29 +08:00
chenbowen
5fd5b1fc35 1. 统一物料类型以及物料信息的权限 2026-01-16 09:45:57 +08:00
chenbowen
98dc345c5f 1. 新增帆软报表导入功能
2. 新增物料扩展牌号属性功能
2026-01-15 18:04:47 +08:00
潘荣晟
3277fd5d89 Merge remote-tracking branch 'origin/dev' into dev 2026-01-15 17:54:28 +08:00
潘荣晟
08a0b4c1c9 物料权限 2026-01-15 17:53:58 +08:00
qianshijiang
2466b022cc erp修改 2026-01-15 17:42:37 +08:00
潘荣晟
6e5b24bb3a 联系人和税码去掉权限 2026-01-15 17:40:14 +08:00
潘荣晟
793a5acba9 联系人和税码去掉权限 2026-01-15 17:25:24 +08:00
潘荣晟
93aff069c5 联系人和税码去掉权限 2026-01-15 17:13:42 +08:00
潘荣晟
f2f4170b0e Merge remote-tracking branch 'origin/dev' into dev 2026-01-15 17:04:18 +08:00
潘荣晟
5d812fb149 联系人和税码去掉权限 2026-01-15 17:03:37 +08:00
qianshijiang
e7e1f0ace6 erp修改 2026-01-15 16:55:01 +08:00
潘荣晟
cd5a942f7b 合同资金拆分实现 2026-01-15 16:43:31 +08:00
ranke
b819904205 Merge branch 'dev' into test
* dev:
  修改私服地址
2026-01-15 14:45:28 +08:00
ranke
7c61b8eacf 修改私服地址 2026-01-15 14:45:16 +08:00
chenbowen
22e0a30a74 1. 移除错误的引用 2026-01-15 12:01:47 +08:00
chenbowen
a279414aef Merge branch 'refs/heads/dev' into test 2026-01-15 11:29:57 +08:00
chenbowen
34205bc1a6 1. 移除错误的引用 2026-01-15 11:29:36 +08:00
ranke
b2e56f1c7f Merge branch 'dev' into test
* dev:
  增加快照发布配置
  数据库唯一校验
2026-01-15 08:52:44 +08:00
ranke
5877705ac3 增加快照发布配置 2026-01-15 08:45:16 +08:00
潘荣晟
b5f142cc3e 数据库唯一校验 2026-01-14 17:45:15 +08:00
chenbowen
62914e6055 Merge branch 'refs/heads/dev' into test 2026-01-14 17:04:03 +08:00
chenbowen
af6b6342c1 1. 提交主数据同步的数据源信息 2026-01-14 17:03:30 +08:00
潘荣晟
11318f10b1 Merge remote-tracking branch 'origin/dev' into dev 2026-01-14 15:50:26 +08:00
潘荣晟
97b71a1e8c 数据库唯一校验 2026-01-14 15:50:07 +08:00
qianshijiang
1732d1424b erp修改 2026-01-14 15:41:49 +08:00
ranke
f8d83607a7 组织物料属性展示弹窗,新增通用物料属性的只读展示, 优化物料信息查询效率 http://172.16.46.63:31560/index.php?m=task&f=view&taskID=706 2026-01-14 15:25:00 +08:00
wuzongyong
9ea70b0dc4 feat(job): 添加测试的xxljob 2026-01-14 15:22:23 +08:00
wuzongyong
bea4a3fe74 feat(job): 添加测试的xxljob 2026-01-14 15:21:42 +08:00
qianshijiang
f33259910b Merge remote-tracking branch 'origin/dev' into test 2026-01-14 14:37:38 +08:00
qianshijiang
c31b08f648 erp修改 2026-01-14 14:37:15 +08:00
qianshijiang
cd294b3d3f erp修改 2026-01-14 14:33:26 +08:00
潘荣晟
3e93981058 权限标识相关功能修复 2026-01-14 14:12:29 +08:00
qianshijiang
9f2f242dd8 Merge remote-tracking branch 'origin/dev' into test 2026-01-14 11:50:36 +08:00
qianshijiang
2ebfa4ab9a erp修改 2026-01-14 11:49:40 +08:00
qianshijiang
00c0a53c68 Merge remote-tracking branch 'origin/dev' into test 2026-01-14 11:44:47 +08:00
qianshijiang
078dca116a erp修改 2026-01-14 11:44:09 +08:00
qianshijiang
ae4371be81 Merge remote-tracking branch 'origin/dev' into test 2026-01-14 11:18:45 +08:00