Commits · 0e776ad371b84376eedd6907bc279b1c0c9d7a92 · platform / hp-smart · GitLab

05 Feb, 2024 25 commits
- 生产下料 · 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
- 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
- 生产下料 · 38d7ecbe
  yukang authored Feb 05, 2024
  
  38d7ecbe Browse Files
- 仓库档案opt · d12fe09d
  wuwenlong authored Feb 05, 2024
  
  d12fe09d Browse Files
- 存货档案，采购入库opt； · 8cbeba7f
  wuwenlong authored Feb 05, 2024
  
  8cbeba7f Browse Files
- 销售管理、项目档案opt； · f1da52d9
  wuwenlong authored Feb 05, 2024
  
  f1da52d9 Browse Files
- 销售管理、项目档案opt； · 0eb29277
  wuwenlong authored Feb 05, 2024
  
  0eb29277 Browse Files
- 销售管理、项目档案opt； · d8261254
  wuwenlong authored Feb 05, 2024
  
  d8261254 Browse Files
- 销售管理、项目档案opt； · 91409975
  wuwenlong authored Feb 05, 2024
  
  91409975 Browse Files
- 销售管理、项目档案opt； · 9a481bdb
  wuwenlong authored Feb 05, 2024
  
  9a481bdb Browse Files
- 销售管理、项目档案opt； · fa8e8c25
  wuwenlong authored Feb 05, 2024
  
  fa8e8c25 Browse Files
- 销售管理、项目档案opt； · cf30f4c9
  wuwenlong authored Feb 05, 2024
  
  cf30f4c9 Browse Files
- 字段优化 · 3145e10d
  wuwenlong authored Feb 05, 2024
  
  3145e10d Browse Files
04 Feb, 2024 4 commits
- 生产日报页面展示，数据模拟 · 69fab2e1
  wancheng authored Feb 04, 2024
  
  69fab2e1 Browse Files
- 1.质量巡检单BUG 修复 · d66317d6
  宋祥 authored Feb 04, 2024
  
  d66317d6 Browse Files
- 1.质量巡检单更具生产任务生成 · 947ef27d
  宋祥 authored Feb 04, 2024
  
  947ef27d Browse Files
- 1.质量巡检单功能 · 352b58e0
  宋祥 authored Feb 04, 2024
  
  352b58e0 Browse Files
02 Feb, 2024 5 commits
- 页面优化 · 832fb1fb
  yukang authored Feb 02, 2024
  
  832fb1fb Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 12c94131
  yukang authored Feb 02, 2024
  
  12c94131 Browse Files
- 生产任务拆分，一个零部件的生产可以分给多个生产组 · fbbc36a5
```
1）生产组多选，输入分配各组生产任务量，生成多个生产任务子单号
2）新增生产任务功能
```
  yukang authored Feb 02, 2024
  fbbc36a5 Browse Files
- 存货档案自动生成返回ID · 91f600bf
  wuwenlong authored Feb 02, 2024
  
  91f600bf Browse Files
- 1.企业管理增加登录前缀 · 56ed24e0
```
2.企业在注册用户时登录号前强制增加登录前缀
```
  宋祥 authored Feb 02, 2024
  56ed24e0 Browse Files
01 Feb, 2024 6 commits
- Merge remote-tracking branch 'origin/dev' into dev · 4c5cac02
  宋祥 authored Feb 01, 2024
  
  4c5cac02 Browse Files
- 1.登录绑定企业信息 · 96ca01e1
  宋祥 authored Feb 01, 2024
  
  96ca01e1 Browse Files
- 生产入库去掉存货档案 · 3b7bd287
  yukang authored Feb 01, 2024
  
  3b7bd287 Browse Files
- 生产入库 · e6874586
  yukang authored Feb 01, 2024
  
  e6874586 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 440b3ff5
```
# Conflicts:
#	src/main/java/com/baosight/hpjx/hp/zl/service/ServiceHPZL001.java
```
  yukang authored Feb 01, 2024
  440b3ff5 Browse Files
- 生产订单分派增加厂区 · e3398e8f
  yukang authored Feb 01, 2024
  
  e3398e8f Browse Files