Commits · 3b7bd28742c7dbc82083d994893d595d2071e4a6 · platform / hp-smart

01 Feb, 2024 5 commits
- 生产入库去掉存货档案 · 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
- 产品库存管理 · 4ad3c20e
  wuwenlong authored Feb 01, 2024
  
  4ad3c20e Browse Files
31 Jan, 2024 21 commits
- 1.销售出库逻辑关联生产任务以及实时库存， · de8e4bb0
  宋祥 authored Jan 31, 2024
  
  de8e4bb0 Browse Files
- Merge branch 'dev' of ssh://10.70.33.7:32359/smart/hp-smart into dev · 02bcb651
  宋祥 authored Jan 31, 2024
  
  02bcb651 Browse Files
- 1.销售出库逻辑关联生产任务 · f7796178
  宋祥 authored Jan 31, 2024
  
  f7796178 Browse Files
- 产品库存管理 · 1364de19
  wuwenlong authored Jan 31, 2024
  
  1364de19 Browse Files
- Merge branch 'dev' of https://gitlab.baocloud.cn/bggf/smart/hp-smart into dev · da0de78c
  yukang authored Jan 31, 2024
  
  da0de78c Browse Files
- 生产订单分派增加厂区 · 8bd0cbe5
  yukang authored Jan 31, 2024
  
  8bd0cbe5 Browse Files
- 产品库存接口 · 15b4e566
  wuwenlong authored Jan 31, 2024
  
  15b4e566 Browse Files
- 生产订单增加单重 · b711bbf5
  yukang authored Jan 31, 2024
  
  b711bbf5 Browse Files
- Merge branch 'dev' of https://gitlab.baocloud.cn/bggf/smart/hp-smart into dev · 15dc5ad7
  yukang authored Jan 31, 2024
  
  15dc5ad7 Browse Files
- 页面字段优化 · eea7474d
  yukang authored Jan 31, 2024
  
  eea7474d Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · c4e7d5a0
```
# Conflicts:
#	src/main/java/com/baosight/hpjx/hp/kc/domain/HPKC003.java
#	src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC003.java
#	src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC004.xml
#	src/main/webapp/HP/SC/HPSC003.jsp
```
  宋祥 authored Jan 31, 2024
  c4e7d5a0 Browse Files
- 代码合并修改/增加产品存货代码逻辑 · 9e68021e
  yukang authored Jan 31, 2024
  
  9e68021e Browse Files
- 代码合并修改 · 0bb9bc9e
  yukang authored Jan 31, 2024
  
  0bb9bc9e Browse Files
- 代码合并修改 · cf8a001c
  yukang authored Jan 31, 2024
  
  cf8a001c Browse Files
- 代码合并修改 · f62191a6
  yukang authored Jan 31, 2024
  
  f62191a6 Browse Files
- 代码合并修改 · 499243ed
  yukang authored Jan 31, 2024
  
  499243ed Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 3b2b7168
```
# Conflicts:
#	src/main/java/com/baosight/hpjx/hp/pz/tools/HPPZTools.java
#	src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC003.xml
#	src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC004.xml
#	src/main/webapp/HP/SC/HPSC002.jsp
#	src/main/webapp/HP/SC/HPSC003.jsp
#	src/main/webapp/HP/SC/HPSC005.jsp
```
  yukang authored Jan 31, 2024
  3b2b7168 Browse Files
- 物料清单支持输入和选择，没有选项的情况下，输入自动生成存货档案 · 92ad500e
```
	1）物料清单可输入规格，规格不联动，默认查询无规格的存货档案，保存时，如果没有同规格的数据，则自动生成新的存货档案
	2）所有的入库支持手填存货档案，数据库有则直接关联保存档案ID，没有则自动生成
	3）物料清单含耗材生产
	4）物料清单重量非必填
	5）生产入库通过物料清单单重计算总量
	6）物料清单新增部件保存上级部件编码
	7）生产订单新增上级部件编码、名称
```
  yukang authored Jan 31, 2024
  92ad500e Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 05fd0277
```
# Conflicts:
#	src/main/java/com/baosight/hpjx/hp/pz/tools/HPPZTools.java
#	src/main/java/com/baosight/hpjx/hp/sc/domain/HPSC004.java
```
  宋祥 authored Jan 31, 2024
  05fd0277 Browse Files
- 1.厂区管理 · 201a113f
```
2.出库单打印
```
  宋祥 authored Jan 31, 2024
  201a113f Browse Files
- 判断存货档案是否存在，如果存在返回存货档案，否则新增并返回存货档案 · 99131737
  wuwenlong authored Jan 31, 2024
  
  99131737 Browse Files
30 Jan, 2024 11 commits
- 判断存货档案是否存在，如果存在返回存货档案，否则新增并返回存货档案 · f1faf702
  wuwenlong authored Jan 30, 2024
  
  f1faf702 Browse Files
- * 判断存货名称是否存在，如果存在返回编码，否则新增并返回编码 · 39e7a7cd
  wuwenlong authored Jan 30, 2024
  
  39e7a7cd Browse Files
- 生产订单更名生产任务 · 99b518b9
  wuwenlong authored Jan 30, 2024
  
  99b518b9 Browse Files
- 生产订单明细，部件更名为零部件 · 4e302c6a
  wuwenlong authored Jan 30, 2024
  
  4e302c6a Browse Files
- 生产计划明细，部件更名为零部件 · d4b5fcf8
  wuwenlong authored Jan 30, 2024
  
  d4b5fcf8 Browse Files
- 物料清单opt · eda10e12
  wuwenlong authored Jan 30, 2024
  
  eda10e12 Browse Files
- 产品更名为部件 · 84e33109
  wuwenlong authored Jan 30, 2024
  
  84e33109 Browse Files
- 审核更名为提交； · a23761d7
```
反审更名为撤回；
```
  wuwenlong authored Jan 30, 2024
  a23761d7 Browse Files
- 审核更名为提交； · e6608058
```
反审更名为撤回；
```
  wuwenlong authored Jan 30, 2024
  e6608058 Browse Files
- 产品更名为部件 · 1c175828
  wuwenlong authored Jan 30, 2024
  
  1c175828 Browse Files
- 生产计划bugfix · cabb2d63
  wuwenlong authored Jan 30, 2024
  
  cabb2d63 Browse Files
29 Jan, 2024 1 commit
- 修改HPSC003 · 2010f86b
  971729 authored Jan 29, 2024
  
  2010f86b Browse Files
26 Jan, 2024 2 commits
- 1.重写表格的新增删除按钮事件 · 57b86b96
  宋祥 authored Jan 26, 2024
  
  57b86b96 Browse Files
- 1.根据企业过滤组织管理 · c0998ea8
  宋祥 authored Jan 26, 2024
  
  c0998ea8 Browse Files