Commit Graph

771 Commits

Author SHA1 Message Date
潘荣晟
7e2473051b 销售提交erp 2026-01-26 02:44:15 +08:00
潘荣晟
ea02e5af4e 来料加工订单 2026-01-25 16:57:10 +08:00
潘荣晟
dad22ec7ec Merge branch 'dev' into test 2026-01-23 18:34:19 +08:00
潘荣晟
ca62e80e37 Merge remote-tracking branch 'origin/dev' into dev 2026-01-23 18:32:33 +08:00
潘荣晟
75c1de4f90 来料加工订单 2026-01-23 18:32:05 +08:00
潘荣晟
d2b814bb7d 来料加工订单 2026-01-23 18:31:07 +08:00
朝锦 杨
5a6e561eb8 Merge branch 'dev' into 'test'
添加组织物料信息重复添加修改的简单验证

See merge request jygk/dsc-base!28
2026-01-23 07:05:21 +00:00
yangchaojin
324d07d6c7 添加组织物料信息重复添加修改的简单验证 2026-01-23 15:04:27 +08:00
朝锦 杨
240b64c41f Merge branch 'dev' into 'test'
Dev

See merge request jygk/dsc-base!27
2026-01-23 06:59:10 +00:00
yangchaojin
2b7dd97c64 添加组织物料信息重复添加修改的简单验证 2026-01-23 14:57:31 +08:00
潘荣晟
7e08ec9ec4 委托加工订单 2026-01-23 11:20:23 +08:00
潘荣晟
923e420027 Merge branch 'dev' into test 2026-01-23 11:15:33 +08:00
潘荣晟
be915bff5d 委托加工订单 2026-01-23 11:13:07 +08:00
qianshijiang
8d8a5eba9a Merge remote-tracking branch 'origin/dev' into test 2026-01-23 11:08:12 +08:00
潘荣晟
9a82f22ce7 委托加工订单 2026-01-23 11:02:50 +08:00
潘荣晟
b84faed0cc 委托加工订单 2026-01-23 10:47:53 +08:00
qianshijiang
b934996b74 Merge remote-tracking branch 'origin/dev' into test 2026-01-23 09:12:52 +08:00
潘荣晟
ec2d913bbf 物料产品查询接口优化 2026-01-22 18:05:59 +08:00
qianshijiang
8216466ee7 Merge remote-tracking branch 'origin/dev' into test 2026-01-22 17:44:03 +08:00
潘荣晟
707e7d779a 合同拆分金额与收发货规则优化 2026-01-22 15:28:55 +08:00
潘荣晟
1779f48a43 合同拆分金额与收发货规则优化 2026-01-22 15:25:33 +08:00
潘荣晟
6ba4bdec2c Merge branch 'dev' into test 2026-01-22 15:03:26 +08:00
潘荣晟
3352f6cbac 合同拆分金额与收发货规则优化 2026-01-22 15:00:27 +08:00
潘荣晟
b8de5bfda7 合同拆分金额与收发货规则优化 2026-01-22 11:49:37 +08:00
潘荣晟
71ba93c7db 合同拆分金额 2026-01-22 11:32:40 +08:00
潘荣晟
dc037e6abf Merge branch 'dev' into test 2026-01-22 10:40:11 +08:00
潘荣晟
515b79d115 个人配置文件 2026-01-22 10:38:34 +08:00
潘荣晟
cc0f004288 个人配置文件 2026-01-22 09:30:35 +08:00
qianshijiang
07e921da06 Merge remote-tracking branch 'origin/dev' into test 2026-01-22 09:28:51 +08:00
潘荣晟
51638fa623 物料相关 2026-01-22 09:27:09 +08:00
潘荣晟
0b83979dfc 物料相关 2026-01-21 18:31:11 +08:00
潘荣晟
d71300ee7f 物料相关 2026-01-21 18:20:32 +08:00
潘荣晟
8bb76b85ab 物料相关 2026-01-21 17:22:59 +08:00
潘荣晟
41634a720a Merge remote-tracking branch 'origin/dev' into dev 2026-01-21 16:10:21 +08:00
潘荣晟
1bb5c117d2 计划管理相关功能实现 2026-01-21 16:09:35 +08:00
chenbowen
47473d9844 Merge branch 'dev' into test 2026-01-21 11:25:53 +08:00
chenbowen
62fe6fb7cc 1. 修复 api 没有设置 requestbody 导致无法正常解析请求参数的bug 2026-01-21 11:25:43 +08:00
qianshijiang
33e5478ae3 Merge remote-tracking branch 'origin/dev' into test 2026-01-21 09:09:45 +08:00
潘荣晟
4007160524 计划管理相关功能实现 2026-01-21 09:07:50 +08:00
潘荣晟
15a3c07e8b Merge remote-tracking branch 'origin/dev' into dev 2026-01-20 17:56:02 +08:00
潘荣晟
fec079e2fe 计划管理相关功能实现 2026-01-20 17:55:35 +08:00
朝锦 杨
6d9dafe364 Merge branch 'dev' into 'test'
BUG712,组织机构物料信息功能中,扩展物料编码的属性查询条件支持

See merge request jygk/dsc-base!26
2026-01-20 09:36:41 +00:00
yangchaojin
a5f972db14 BUG712,组织机构物料信息功能中,扩展物料编码的属性查询条件支持 2026-01-20 17:32:13 +08:00
朝锦 杨
7f271ce807 Merge branch 'dev' into 'test'
修复BUG712,组织物料信息查询范围调整

See merge request jygk/dsc-base!25
2026-01-20 03:02:32 +00:00
yangchaojin
b597920d55 修复BUG712,组织物料信息查询范围调整 2026-01-20 09:23:25 +08:00
qianshijiang
65dc1db9c1 Merge remote-tracking branch 'origin/dev' into test 2026-01-19 17:53:04 +08:00
潘荣晟
5f14fe798d 计划管理相关功能实现 2026-01-19 17:47:34 +08:00
潘荣晟
6602fcd6e3 计划管理相关功能实现 2026-01-19 17:31:52 +08:00
wuzongyong
2963fab2a6 feat(material): 修正提交(添加物料快捷添加功能) 2026-01-19 16:09:12 +08:00
wuzongyong
bee606926a feat(material): 修正提交(添加物料快捷添加功能) 2026-01-19 16:09:02 +08:00