Commits · 28666e0d6a594afe0535b07a11323f9b054e2468 · platform / hp-smart · GitLab

06 Feb, 2024 24 commits
- 1.fixBug:生产任务明细不重复新增 · 28666e0d
  宋祥 authored Feb 06, 2024
  
  28666e0d Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · b10c0f73
  宋祥 authored Feb 06, 2024
  
  b10c0f73 Browse Files
- 1.fixBug:入库失败问题修复 · b318ea64
  宋祥 authored Feb 06, 2024
  
  b318ea64 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 03d92f7e
  yukang authored Feb 06, 2024
  
  03d92f7e Browse Files
- 下料登记 · 8ea5c013
  yukang authored Feb 06, 2024
  
  8ea5c013 Browse Files
- 存货类型名称同步bugfix； · 3a23e6a7
  wuwenlong authored Feb 06, 2024
  
  3a23e6a7 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · ee5cad33
  宋祥 authored Feb 06, 2024
  
  ee5cad33 Browse Files
- 1.fixBug:生产计划下载文件报错 · 817ffeb7
  宋祥 authored Feb 06, 2024
  
  817ffeb7 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 3ef015fd
  wuwenlong authored Feb 06, 2024
  
  3ef015fd Browse Files
- 质量巡检状态去编码opt · 611e5266
  wuwenlong authored Feb 06, 2024
  
  611e5266 Browse Files
- Merge branch 'dev' of https://gitlab.baocloud.cn/bggf/smart/hp-smart into dev · 9a80e53c
  yukang authored Feb 06, 2024
  
  9a80e53c Browse Files
- 下料登录 · 3e187ec5
  yukang authored Feb 06, 2024
  
  3e187ec5 Browse Files
- 1.fixBug:拆单导致生产订单串数据问题修复 · 22269ad8
  宋祥 authored Feb 06, 2024
  
  22269ad8 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 67b0d320
  宋祥 authored Feb 06, 2024
  
  67b0d320 Browse Files
- 1.优化：调整页面显示排版 · 8c8bd690
  宋祥 authored Feb 06, 2024
  
  8c8bd690 Browse Files
- Merge branch 'dev' of https://gitlab.baocloud.cn/bggf/smart/hp-smart into dev · 4a86cb76
  liuyang authored Feb 06, 2024
  
  4a86cb76 Browse Files
- 修复库存类型和库存名称联动 · ad712b3c
  liuyang authored Feb 06, 2024
  
  ad712b3c Browse Files
- 1.fixBug:生产计划重量计算错误 · 76039d5d
  宋祥 authored Feb 06, 2024
  
  76039d5d Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · f6878a78
  宋祥 authored Feb 06, 2024
  
  f6878a78 Browse Files
- 1.fixBug:修复加载厂区下拉框时报错问题 · 8354d1c3
  宋祥 authored Feb 06, 2024
  
  8354d1c3 Browse Files
- Merge branch 'dev' of https://gitlab.baocloud.cn/bggf/smart/hp-smart into dev · 6e3c82a8
```
 Conflicts:
	src/main/webapp/HP/SC/HPSC006.js
```
  liuyang authored Feb 06, 2024
  6e3c82a8 Browse Files
- 1.调整宽度 · a047bd71
  宋祥 authored Feb 06, 2024
  
  a047bd71 Browse Files
- 1.测试功能，修改BUG · eea2ed58
  宋祥 authored Feb 06, 2024
  
  eea2ed58 Browse Files
- 物料清单页面优化 · 4358a893
  liuyang authored Feb 06, 2024
  
  4358a893 Browse Files
05 Feb, 2024 16 commits
- 生产入库bugfix · 67563677
  wuwenlong authored Feb 05, 2024
  
  67563677 Browse Files
- 生产下料 · 0e776ad3
  yukang authored Feb 05, 2024
  
  0e776ad3 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · fb2ddc9d
```
# Conflicts:
#	src/main/webapp/HP/SC/HPSC005.js
```
  yukang authored Feb 05, 2024
  fb2ddc9d Browse Files
- 生产下料 · 8e2ab56f
  yukang authored Feb 05, 2024
  
  8e2ab56f Browse Files
- 生产计划附件优化 · 7fb9eb76
  liuyang authored Feb 05, 2024
  
  7fb9eb76 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 1647b8b5
```
# Conflicts:
#	src/main/webapp/HP/SC/HPSC005.js
#	src/main/webapp/HP/SC/HPSC005.jsp
```
  宋祥 authored Feb 05, 2024
  1647b8b5 Browse Files
- 生产下料 · e116e06b
  yukang authored Feb 05, 2024
  
  e116e06b Browse Files
- 1.生产派工 · b1dff5cd
```
2.生产入库
3.销售出库
4.质量巡检
```
  宋祥 authored Feb 05, 2024
  b1dff5cd Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 006296a5
  yukang authored Feb 05, 2024
  
  006296a5 Browse Files
- 生产下料 · 57401c2d
  yukang authored Feb 05, 2024
  
  57401c2d Browse Files
- 生产日报页面优化 · 3f2de241
  wancheng authored Feb 05, 2024
  
  3f2de241 Browse Files
- Merge branch 'dev' of https://gitlab.baocloud.cn/bggf/smart/hp-smart into dev · 46c4433b
```
 Conflicts:
	src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC003.xml
	src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC004.xml
```
  liuyang authored Feb 05, 2024
  46c4433b Browse Files
- bug修正 · 3be74e0c
  liuyang authored Feb 05, 2024
  
  3be74e0c Browse Files
- Merge branch 'dev' of https://gitlab.baocloud.cn/bggf/smart/hp-smart into dev · 00767cc0
  yukang authored Feb 05, 2024
  
  00767cc0 Browse Files
- inventType update · 68e5cd86
  wuwenlong authored Feb 05, 2024
  
  68e5cd86 Browse Files
- Merge branch 'dev' of https://gitlab.baocloud.cn/bggf/smart/hp-smart into dev · e33e9436
  yukang authored Feb 05, 2024
  
  e33e9436 Browse Files