Commits · 384fc5c1adec99889c17b1b5bf882f71a33c11eb · platform / hp-smart · GitLab

27 Aug, 2024 7 commits
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hp-smart into dev-ly · 384fc5c1
  liuyang authored Aug 27, 2024
  
  384fc5c1 Browse Files
- 2024-08-27 添加收票单和付款单 · ec1c4a50
  liuyang authored Aug 27, 2024
  
  ec1c4a50 Browse Files
- 1.整改通知单修改,过滤删除的文件 · 09827b42
  宋祥 authored Aug 27, 2024
  
  09827b42 Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hp-smart into dev-ly · be86a227
  liuyang authored Aug 27, 2024
  
  be86a227 Browse Files
- 2024-08-22 生产任务任务状态逻辑修复 · 5fcc8dd6
  liuyang authored Aug 27, 2024
  
  5fcc8dd6 Browse Files
- 1.整改通知单修改,只读模式 · 592fef70
  宋祥 authored Aug 27, 2024
  
  592fef70 Browse Files
- 2024-08-22 生产任务任务状态逻辑修复 · 5a0118d9
  liuyang authored Aug 27, 2024
  
  5a0118d9 Browse Files
26 Aug, 2024 1 commit
- 1.整改通知单修改 · ff0f25fb
  宋祥 authored Aug 26, 2024
  
  ff0f25fb Browse Files
22 Aug, 2024 3 commits
- 2024-08-22 生产任务部分完工逻辑修复 · ea9143b2
  liuyang authored Aug 22, 2024
  
  ea9143b2 Browse Files
- 2024-08-22 生产任务部分完工逻辑修复 · 20e1b131
  liuyang authored Aug 22, 2024
  
  20e1b131 Browse Files
- 2024-08-22 · 9b4d14a0
```
1、销售管理添加部件逻辑调整，
2、物料清单不能修改部件并且部件总量部不根据零件重量汇总
3、报工删除同步删除生产入库
```
  liuyang authored Aug 22, 2024
  9b4d14a0 Browse Files
21 Aug, 2024 1 commit
- 2024-08-21 调整设备管理附件删除和企业管理附件删除 · 12d7ea33
  liuyang authored Aug 21, 2024
  
  12d7ea33 Browse Files
20 Aug, 2024 2 commits
- 2024-08-16 安全记录APP附件上传调整 · d203eef4
  liuyang authored Aug 20, 2024
  
  d203eef4 Browse Files
- 2024-08-16 安全记录APP附件上传调整修改不再删除附件 · 97999a1f
  liuyang authored Aug 20, 2024
  
  97999a1f Browse Files
19 Aug, 2024 4 commits
- 2024-08-16 安全记录APP附件上传调整 · 3e5883c1
  liuyang authored Aug 19, 2024
  
  3e5883c1 Browse Files
- 2024-08-16 安全记录APP附件上传调整 · d2ed7d39
  liuyang authored Aug 19, 2024
  
  d2ed7d39 Browse Files
- 2024-08-16 安全记录APP附件上传调整 · 28f87ae7
  liuyang authored Aug 19, 2024
  
  28f87ae7 Browse Files
- 2024-08-16 安全记录APP附件上传 · 7cadec6f
  liuyang authored Aug 19, 2024
  
  7cadec6f Browse Files
16 Aug, 2024 3 commits
- 2024-08-16 维修审批优化 · 759f9179
  liuyang authored Aug 16, 2024
  
  759f9179 Browse Files
- 2024-08-16 生产报工重量可编辑，物料清单总重提示修改 · 6b6ef52c
  liuyang authored Aug 16, 2024
  
  6b6ef52c Browse Files
- 2024-08-14 设备管理开发 · 0cb816e1
  liuyang authored Aug 16, 2024
  
  0cb816e1 Browse Files
14 Aug, 2024 8 commits
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hp-smart into dev-ly · 7db3aa99
```
 Conflicts:
	src/main/java/com/baosight/hpjx/hp/constant/HPConstant.java
	src/main/resources/resources/ibatis/sqlmap-config.xml
```
  liuyang authored Aug 14, 2024
  7db3aa99 Browse Files
- 2024-08-14 设备管理 · b02ad10d
  liuyang authored Aug 14, 2024
  
  b02ad10d Browse Files
- 1.增加差异数量大于小于条件 · a954aff7
  宋祥 authored Aug 14, 2024
  
  a954aff7 Browse Files
- 1.状态修改 · 6eae50d6
  宋祥 authored Aug 14, 2024
  
  6eae50d6 Browse Files
- 1.整改通知单 · 95f4d4cd
  宋祥 authored Aug 14, 2024
  
  95f4d4cd Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hp-smart into dev-ly · e2fafc06
  liuyang authored Aug 14, 2024
  
  e2fafc06 Browse Files
- 2024-08-14 · 53dfa704
  liuyang authored Aug 14, 2024
  
  53dfa704 Browse Files
- 2024-08-14 · 0fb10b72
  liuyang authored Aug 14, 2024
  
  0fb10b72 Browse Files
12 Aug, 2024 11 commits
- Merge remote-tracking branch 'origin/dev' into dev · 6c0add7d
  宋祥 authored Aug 12, 2024
  
  6c0add7d Browse Files
- 1.客户回访新增附件上传和下载功能 · 54182c7d
  宋祥 authored Aug 12, 2024
  
  54182c7d Browse Files
- 2024-06-12 生产报工优化显示 · 8c2b9ef0
  liuyang authored Aug 12, 2024
  
  8c2b9ef0 Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hp-smart into dev-ly · 420c439f
```
 Conflicts:
	src/main/java/com/baosight/hpjx/core/enums/DocRouteEnum.java
```
  liuyang authored Aug 12, 2024
  420c439f Browse Files
- 2024-06-12 添加物料清单导入枚举 · 6d89f1fe
  liuyang authored Aug 12, 2024
  
  6d89f1fe Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · d9940577
  宋祥 authored Aug 12, 2024
  
  d9940577 Browse Files
- 1.宏建路桥功能 · 319844c0
  宋祥 authored Aug 12, 2024
  
  319844c0 Browse Files
- 2024-06-12 mysql版本更新 · 541238a5
  liuyang authored Aug 12, 2024
  
  541238a5 Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hp-smart into dev-ly · 72d41ddd
```
 Conflicts:
	src/main/java/com/baosight/hpjx/core/enums/DocRouteEnum.java
	src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC102.java
	src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC111.java
	src/main/webapp/HP/SC/HPSC102.js
	src/main/webapp/HP/SC/HPSC102.jsp
	src/main/webapp/HP/SC/HPSC111.js
	src/main/webapp/HP/SC/HPSC111.jsp
```
  liuyang authored Aug 12, 2024
  72d41ddd Browse Files
- 2024-06-12 宏建添加项目档案，生产计划，生产订单，生产任务，生产报工单 · c036452d
  liuyang authored Aug 12, 2024
  
  c036452d Browse Files
- 2024-06-12 · 8198a183
  liuyang authored Aug 12, 2024
  
  8198a183 Browse Files