Commits · d23c369119667945f52d00a884f7ef7f1c74c15d · platform / hg-smart · GitLab

30 Oct, 2024 3 commits
- Merge branch 'dev' of http://129.211.46.84:8800/platform/hg-smart into master-dc · d23c3691
```
# Conflicts:
#	src/main/resources/application.properties
#	src/main/resources/quartz.properties
```
  宋祥 authored Oct 30, 2024
  d23c3691 Browse Files
- 1.还原测试环境数据库链接信息 · b8643c38
  宋祥 authored Oct 30, 2024
  
  b8643c38 Browse Files
- 工序质检生成实时库存bug修改V2 · 634d940c
  江和松 authored Oct 30, 2024
  
  634d940c Browse Files
29 Oct, 2024 18 commits
- Merge remote-tracking branch 'origin/dev' into dev · ea67414c
  江和松 authored Oct 29, 2024
  
  ea67414c Browse Files
- 工序质检生成实时库存bug修改 · 31eca5f9
  江和松 authored Oct 29, 2024
  
  31eca5f9 Browse Files
- 1.文档库文档权限管理按钮添加权限过滤 · 56e5b50c
  liuyang authored Oct 29, 2024
  
  56e5b50c Browse Files
- 1.修复委外执行加工表计划量没有数问题 · a497ce0e
  liuyang authored Oct 29, 2024
  
  a497ce0e Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · 8c31e57e
  liuyang authored Oct 29, 2024
  
  8c31e57e Browse Files
- 委外执行加工表页面展示优化1 · d5eb28d3
  zhangzhen authored Oct 29, 2024
  
  d5eb28d3 Browse Files
- 操作栏放一列 · 9782eb36
  江和松 authored Oct 29, 2024
  
  9782eb36 Browse Files
- 成品编码错误修改 · 7999fff1
  江和松 authored Oct 29, 2024
  
  7999fff1 Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · 5891c3b2
  liuyang authored Oct 29, 2024
  
  5891c3b2 Browse Files
- 配置修改 · a005a011
  江和松 authored Oct 29, 2024
  
  a005a011 Browse Files
- 生产领料单增加选择产品清单功能,显示成品、材料 · e0528440
  江和松 authored Oct 29, 2024
  
  e0528440 Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · 5bde6613
  liuyang authored Oct 29, 2024
  
  5bde6613 Browse Files
- 1.合同号改为可手工修改 · 8cb924ca
```
2.填写发票号后点保存直接开票
```
  liuyang authored Oct 29, 2024
  8cb924ca Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 3a3dfeb7
  江和松 authored Oct 29, 2024
  
  3a3dfeb7 Browse Files
- 委外执行加工表页面展示优化 · 139f86a2
  zhangzhen authored Oct 29, 2024
  
  139f86a2 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 8ca77ea4
  江和松 authored Oct 29, 2024
  
  8ca77ea4 Browse Files
- 产品成材率添加过滤条件 · bd8f0147
  liuyang authored Oct 29, 2024
  
  bd8f0147 Browse Files
- 新表格模式页面查询条件优化5 · 0ad28df9
  zhangzhen authored Oct 29, 2024
  
  0ad28df9 Browse Files
28 Oct, 2024 10 commits
- Merge branch 'master' into dev · 4db84cd1
  江和松 authored Oct 28, 2024
  
  4db84cd1 Browse Files
- 新表格模式页面查询条件优化3 · 2eeee4a4
  zhangzhen authored Oct 28, 2024
  
  2eeee4a4 Browse Files
- 新表格模式页面查询条件优化2 · 93c7bdf7
  zhangzhen authored Oct 28, 2024
  
  93c7bdf7 Browse Files
- 产品成材率过滤构件零件 · adb45526
  liuyang authored Oct 28, 2024
  
  adb45526 Browse Files
- 产品成材率 · 478b85e5
  liuyang authored Oct 28, 2024
  
  478b85e5 Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · bb6803fa
  liuyang authored Oct 28, 2024
  
  bb6803fa Browse Files
- 产品成材率 · 2f8b57f5
  liuyang authored Oct 28, 2024
  
  2f8b57f5 Browse Files
- Merge branch 'dev-sx' of http://129.211.46.84:8800/platform/hg-smart into dev · 3e3540b4
  宋祥 authored Oct 28, 2024
  
  3e3540b4 Browse Files
- Merge branch 'dev-sx' of http://129.211.46.84:8800/platform/hg-smart into master-dc · ece82da3
  宋祥 authored Oct 28, 2024
  
  ece82da3 Browse Files
- 1.修改文档预览页面，单个文件点击预览无效的问题 · 72e7632e
  宋祥 authored Oct 28, 2024
  
  72e7632e Browse Files
27 Oct, 2024 4 commits
- 生产领料单增加选择产品清单功能 · de5887cb
  江和松 authored Oct 27, 2024
  
  de5887cb Browse Files
- 模板变更 · ddb9b1f4
  liuyang authored Oct 27, 2024
  
  ddb9b1f4 Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev · e5ae93cb
  liuyang authored Oct 27, 2024
  
  e5ae93cb Browse Files
- 2024-10-27 合同位置变更 · 3e170e3a
  liuyang authored Oct 27, 2024
  
  3e170e3a Browse Files
26 Oct, 2024 5 commits
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · a4fb41c1
  liuyang authored Oct 26, 2024
  
  a4fb41c1 Browse Files
- 2024-10-24 添加打包单及其功能 · 51730006
  liuyang authored Oct 26, 2024
  
  51730006 Browse Files
- 采购收票选择结算单：增加收票数量（默认等于数量，可修改）、收票重量（默认等于数量，可修改）、收票金额（默认等于数量，可修改），剩余数量（数量-收票数量）、剩余重… · 98f78e4d
```
采购收票选择结算单：增加收票数量（默认等于数量，可修改）、收票重量（默认等于数量，可修改）、收票金额（默认等于数量，可修改），剩余数量（数量-收票数量）、剩余重量（重量-收票重量）、剩余收票金额（收货金额-收票金额）
```
  江和松 authored Oct 26, 2024
  98f78e4d Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · f3f747f1
  liuyang authored Oct 26, 2024
  
  f3f747f1 Browse Files
- 2024-10-24 添加打包单及其功能 · 2678361a
  liuyang authored Oct 26, 2024
  
  2678361a Browse Files