Commits · 77089dc423507d806c477965d6ed7453e43982b4 · platform / hg-smart

20 Sep, 2024 3 commits

Merge branch 'dev-sx' of http://git.pseer.com:8800/platform/hg-smart into dev · 77089dc4

 Conflicts:
	src/main/java/com/baosight/hggp/hg/cw/sql/HGCW009.xml
	src/main/webapp/HG/CW/HGCW008A.js
	src/main/webapp/HG/CW/HGCW008A.jsp
	src/main/webapp/HG/CW/HGCW008B.js
	src/main/webapp/HG/CW/HGCW008B.jsp
	src/main/webapp/HG/CW/HGCW008C.jsp
	src/main/webapp/HG/CW/HGCW008D.jsp

authored Sep 20, 2024

77089dc4 Browse Files

1.fixBug:结算单明细增加含税和不含税金额，修复累计结算金额计算错误问题 · 2daca877
宋祥 authored Sep 20, 2024

2daca877 Browse Files

2024-09-20 · 69a323fb

1、结算单添加选择租赁合同
2、结算单添加选择租赁合同清单

authored Sep 20, 2024

69a323fb Browse Files

19 Sep, 2024 6 commits
- 2024-09-19 · 569a388e
```
1、租赁合同增加合同类型字段
2、选择为需方时，甲方为公司，乙方供应商，当选择为供方时，甲方为客户，乙方为公司
3、甲方改为承租方，乙方改为出租方
4、租赁合同修改功能bug修复
```
  liuyang authored Sep 19, 2024
  569a388e Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · 7f725784
  liuyang authored Sep 19, 2024
  
  7f725784 Browse Files
- 2024-09-19 · 61c814cc
```
1、租赁合同增加合同类型字段
2、选择为需方时，甲方为公司，乙方供应商，当选择为供方时，甲方为客户，乙方为公司
3、甲方改为承租方，乙方改为出租方
4、租赁合同修改功能bug修复
```
  liuyang authored Sep 19, 2024
  61c814cc Browse Files
- Merge branch 'dev-sx' of http://git.pseer.com:8800/platform/hg-smart into dev · e92f2072
  宋祥 authored Sep 19, 2024
  
  e92f2072 Browse Files
- 1.fixBug:结算单BUG修改 · a5719cd3
  宋祥 authored Sep 19, 2024
  
  a5719cd3 Browse Files
- 2024-09-19 销售合同的含税总价和不含税总价改为两位小数 · 8468398f
  liuyang authored Sep 19, 2024
  
  8468398f Browse Files
18 Sep, 2024 4 commits
- 2024-09-18 · b9d8c3fd
```
1、项目乙方数据过滤修复
```
  liuyang authored Sep 18, 2024
  b9d8c3fd Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · 7bc9739f
  liuyang authored Sep 18, 2024
  
  7bc9739f Browse Files
- 2024-09-18 · fad70131
```
1、项目甲方数据过滤修复
2、项目选择数据过滤修复
```
  liuyang authored Sep 18, 2024
  fad70131 Browse Files
- 1.fixBug:改派写入派工人员明细 · 8295c070
  宋祥 authored Sep 18, 2024
  
  8295c070 Browse Files
15 Sep, 2024 4 commits
- Merge branch 'dev-sx' of http://git.pseer.com:8800/platform/hg-smart into dev · dd13fcad
  宋祥 authored Sep 15, 2024
  
  dd13fcad Browse Files
- 1.fixBug:无法选采购员 · f203d468
  宋祥 authored Sep 15, 2024
  
  f203d468 Browse Files
- Merge branch 'dev-sx' of http://git.pseer.com:8800/platform/hg-smart into dev · 468329c6
  宋祥 authored Sep 15, 2024
  
  468329c6 Browse Files
- 1.fixBug:无法选采购员 · fe273594
  宋祥 authored Sep 15, 2024
  
  fe273594 Browse Files
14 Sep, 2024 19 commits
- Merge remote-tracking branch 'origin/dev' into dev · c6945933
  宋祥 authored Sep 14, 2024
  
  c6945933 Browse Files
- 1.生产计划提交后，不允许在操作 · e7b6d854
  宋祥 authored Sep 14, 2024
  
  e7b6d854 Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · 3f6be941
  liuyang authored Sep 14, 2024
  
  3f6be941 Browse Files
- 2024-09-14 优化批量派工 · cd84a3e2
  liuyang authored Sep 14, 2024
  
  cd84a3e2 Browse Files
- 1.合并代码解决冲突2 · 46b6a0c5
  宋祥 authored Sep 14, 2024
  
  46b6a0c5 Browse Files
- 1.合并代码解决冲突 · d76503e1
  宋祥 authored Sep 14, 2024
  
  d76503e1 Browse Files
- Merge branch 'dev-sx' of http://git.pseer.com:8800/platform/hg-smart into dev · 3afa5872
```
 Conflicts:
	src/main/java/com/baosight/hggp/hg/sc/service/ServiceHGSC006B.java
```
  宋祥 authored Sep 14, 2024
  3afa5872 Browse Files
- 1.生产组订单增加派工人员历史记录，人员组织架构变动后认可查看历史任务 · 391cb15e
  宋祥 authored Sep 14, 2024
  
  391cb15e Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · 8746e620
  liuyang authored Sep 14, 2024
  
  8746e620 Browse Files
- 2024-09-14 · 20f897c9
```
1.新增生产订单改派功能
2.生产订单拆单功能调整
```
  liuyang authored Sep 14, 2024
  20f897c9 Browse Files
- 1.计划明细增加计划行号 · 8374a3d3
  宋祥 authored Sep 14, 2024
  
  8374a3d3 Browse Files
- Merge branch 'dev-sx' of http://git.pseer.com:8800/platform/hg-smart into dev · 5a2ef524
  宋祥 authored Sep 14, 2024
  
  5a2ef524 Browse Files
- 1.合同生产收货时写入收货单行号 · cb9ba8d3
  宋祥 authored Sep 14, 2024
  
  cb9ba8d3 Browse Files
- Merge branch 'dev-sx' of http://git.pseer.com:8800/platform/hg-smart into dev · c4a8b4a9
  宋祥 authored Sep 14, 2024
  
  c4a8b4a9 Browse Files
- 1.采购合同、采购收货手动录入的数据功能报错问题修复 · be677d66
  宋祥 authored Sep 14, 2024
  
  be677d66 Browse Files
- Merge branch 'dev-sx' of http://git.pseer.com:8800/platform/hg-smart into dev · 6f934c22
  宋祥 authored Sep 14, 2024
  
  6f934c22 Browse Files
- 1.一级目录时隐藏预览区域 · 5e497113
  宋祥 authored Sep 14, 2024
  
  5e497113 Browse Files
- Merge branch 'dev-sx' of http://git.pseer.com:8800/platform/hg-smart into dev · 65355ac0
  宋祥 authored Sep 14, 2024
  
  65355ac0 Browse Files
- 1.APP端查询接口过滤 · e8151534
  宋祥 authored Sep 14, 2024
  
  e8151534 Browse Files
13 Sep, 2024 4 commits
- 2024-09-13 · d802110d
```
1.结算单金额显示优化
2.销售开票金额显示优化
```
  liuyang authored Sep 13, 2024
  d802110d Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · 88d5cc85
  liuyang authored Sep 13, 2024
  
  88d5cc85 Browse Files
- 2024-09-13 · 3c166634
```
1.结算单选择合同逻辑调整
2.销售开票选择合同逻辑调整
3.结算单选择项目过滤条件修复
```
  liuyang authored Sep 13, 2024
  3c166634 Browse Files
- Merge branch 'dev-sx' of http://git.pseer.com:8800/platform/hg-smart into dev · c6ecd1f4
  宋祥 authored Sep 13, 2024
  
  c6ecd1f4 Browse Files