Commits · ee227f8bc9f5f3f1d2035f1f5be94cc8131e5162 · platform / hg-smart · GitLab

31 May, 2024 4 commits
- 2024-05-31 调拨单 · ee227f8b
  liuyang authored May 31, 2024
  
  ee227f8b Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · 36086a52
  liuyang authored May 31, 2024
  
  36086a52 Browse Files
- 2024-05-31 调拨单 · 1a63dea6
  liuyang authored May 31, 2024
  
  1a63dea6 Browse Files
- 生产领料单代码提交 · 8f3122c0
  江和松 authored May 31, 2024
  
  8f3122c0 Browse Files
30 May, 2024 13 commits
- 其他入库单，其他出库单 · aae685e8
  wancheng authored May 30, 2024
  
  aae685e8 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 00c255cb
  yukang authored May 30, 2024
  
  00c255cb Browse Files
- 付款单 · 9d243a63
  yukang authored May 30, 2024
  
  9d243a63 Browse Files
- 2024-05-30 销售出库单 · 59d462d3
  liuyang authored May 30, 2024
  
  59d462d3 Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · f590823c
```
 Conflicts:
	src/main/java/com/baosight/hggp/hg/constant/HGConstant.java
```
  liuyang authored May 30, 2024
  f590823c Browse Files
- 2024-05-30 销售出库单 · ab2d23c6
  liuyang authored May 30, 2024
  
  ab2d23c6 Browse Files
- 采购收票调整 · 62bcb9ac
  13420 authored May 30, 2024
  
  62bcb9ac Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 60b613c3
```
# Conflicts:
#	src/main/java/com/baosight/hggp/hg/cw/tools/HGCWTools.java
```
  yukang authored May 30, 2024
  60b613c3 Browse Files
- 付款单 · ae6d0b7d
  yukang authored May 30, 2024
  
  ae6d0b7d Browse Files
- 销售开票，采购收票调整 · 8596a267
  13420 authored May 30, 2024
  
  8596a267 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · cf25a59e
  yukang authored May 30, 2024
  
  cf25a59e Browse Files
- 处理公司查询重复 · 8d6e8996
  yukang authored May 30, 2024
  
  8d6e8996 Browse Files
- 其他入库单，其他出库单 · b4b4530d
  wancheng authored May 30, 2024
  
  b4b4530d Browse Files
29 May, 2024 23 commits
- 生产入库单问题处理 · 30194b75
  江和松 authored May 29, 2024
  
  30194b75 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · f74ab360
  江和松 authored May 29, 2024
  
  f74ab360 Browse Files
- 校验项目重复问题 · d7e0008e
  江和松 authored May 29, 2024
  
  d7e0008e Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · d4241aa5
  yukang authored May 29, 2024
  
  d4241aa5 Browse Files
- 收款单修改、删除、反写数据逻辑处理 · c6d36a31
  yukang authored May 29, 2024
  
  c6d36a31 Browse Files
- 1.修改物料清单逻辑 · 6d02b731
```
2.增加批量新增逻辑
3.生产入库接口修改
```
  江和松 authored May 29, 2024
  6d02b731 Browse Files
- jsp condition opt · 2aceb4f9
  wuwenlong authored May 29, 2024
  
  2aceb4f9 Browse Files
- 报工单删除 · a62dc2cd
  wuwenlong authored May 29, 2024
  
  a62dc2cd Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 93264b58
  wuwenlong authored May 29, 2024
  
  93264b58 Browse Files
- 工序质检单生成 · 0aef8bee
  wuwenlong authored May 29, 2024
  
  0aef8bee Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 07e31b43
  yukang authored May 29, 2024
  
  07e31b43 Browse Files
- 收款单修改、删除、反写数据逻辑处理 · 504febc9
  yukang authored May 29, 2024
  
  504febc9 Browse Files
- 工序质检单生成 · de3253e5
  wuwenlong authored May 29, 2024
  
  de3253e5 Browse Files
- 报工单删除 · f1b15ddb
  wuwenlong authored May 29, 2024
  
  f1b15ddb Browse Files
- 报工生成工序质检 · 53f55052
  wuwenlong authored May 29, 2024
  
  53f55052 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · a5a20c05
  wuwenlong authored May 29, 2024
  
  a5a20c05 Browse Files
- 报工 · ec0ff7a6
  wuwenlong authored May 29, 2024
  
  ec0ff7a6 Browse Files
- 其他入库单，其他出库单 · 0865e2f9
  wancheng authored May 29, 2024
  
  0865e2f9 Browse Files
- 收款单 · 9c2b4826
  yukang authored May 29, 2024
  
  9c2b4826 Browse Files
- 收款单 · f55161f6
  yukang authored May 29, 2024
  
  f55161f6 Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev · e5065dde
```
# Conflicts:
#	src/main/java/com/baosight/hggp/hg/constant/HGConstant.java
```
  yukang authored May 29, 2024
  e5065dde Browse Files
- 收款单 · f01d48dc
  yukang authored May 29, 2024
  
  f01d48dc Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · 36a51ac2
```
 Conflicts:
	src/main/resources/resources/ibatis/sqlmap-config.xml
```
  liuyang authored May 29, 2024
  36a51ac2 Browse Files