root/wuHanXinRui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
zds
2022-08-04 11:23:34 +08:00
parent dc53ad0aee
commit 3dc21c8023
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/InitformulaServiceImpl.java
View File

@@ -400,6 +400,10 @@ public class InitformulaServiceImpl implements InitformulaService {
//是否软废 //是否软废
if(MaterOptTypeEnum.RD_AND_PG.getClass_idStr().contains(md_jo.getString("material_type_id"))){ if(MaterOptTypeEnum.RD_AND_PG.getClass_idStr().contains(md_jo.getString("material_type_id"))){
JSONObject pro_jo = md_me_producmaterialext.query("material_id='"+jo.getString("material_id")+"'").uniqueResult(0); JSONObject pro_jo = md_me_producmaterialext.query("material_id='"+jo.getString("material_id")+"'").uniqueResult(0);
if(pro_jo ==null){
throw new BadRequestException("物料"+jo.getString("material_code")+" "+jo.getString("material_name")+"未设置成品物料扩展信息！");
}
double net_rate = pro_jo.getDouble("net_rate"); double net_rate = pro_jo.getDouble("net_rate");
RF_total = RF_total+jo.getDouble("formula_qty")*pro_jo.getDouble("net_rate")/100.0; RF_total = RF_total+jo.getDouble("formula_qty")*pro_jo.getDouble("net_rate")/100.0;
} }

2
mes/qd/src/views/wms/pf/formula/DivDialog.vue
View File

@@ -877,7 +877,7 @@ export default {
} }
for (let i = 0; i < this.tableDtl.length; i++) { for (let i = 0; i < this.tableDtl.length; i++) {
if (!this.tableDtl[i].edit) { if (!this.tableDtl[i].edit) {
this.crud.notify('尚有未完成编辑的副桶物料，明细序号为' + (i + 1) + '请检查！') this.crud.notify('尚有未完成编辑的物料，明细序号为' + (i + 1) + '请检查！')
return false return false
} }
} }

8
mes/qd/src/views/wms/pf/initformula/DivDialog.vue
View File

@@ -988,7 +988,7 @@ export default {
} }
for (let i = 0; i < this.tableDtl.length; i++) { for (let i = 0; i < this.tableDtl.length; i++) {
if (!this.tableDtl[i].edit) { if (!this.tableDtl[i].edit) {
this.crud.notify('尚有未完成编辑的副桶物料，明细序号为' + (i + 1) + '请检查！') this.crud.notify('尚有未完成编辑的主桶物料，明细序号为' + (i + 1) + '请检查！')
return false return false
} }
} }
@@ -1012,7 +1012,7 @@ export default {
} }
for (let i = 0; i < this.tableDtl.length; i++) { for (let i = 0; i < this.tableDtl.length; i++) {
if (!this.tableDtl[i].edit) { if (!this.tableDtl[i].edit) {
this.crud.notify('尚有未完成编辑的副桶物料，明细序号为' + (i + 1) + '请检查！') this.crud.notify('尚有未完成编辑的主桶物料，明细序号为' + (i + 1) + '请检查！')
return false return false
} }
} }
@@ -1077,7 +1077,7 @@ export default {
} }
for (let i = 0; i < this.tableDtl.length; i++) { for (let i = 0; i < this.tableDtl.length; i++) {
if (!this.tableDtl[i].edit) { if (!this.tableDtl[i].edit) {
this.crud.notify('尚有未完成编辑的副桶物料，明细序号为' + (i + 1) + '请检查！') this.crud.notify('尚有未完成编辑的主桶物料，明细序号为' + (i + 1) + '请检查！')
return false return false
} }
} }
@@ -1101,7 +1101,7 @@ export default {
} }
for (let i = 0; i < this.tableDtl.length; i++) { for (let i = 0; i < this.tableDtl.length; i++) {
if (!this.tableDtl[i].edit) { if (!this.tableDtl[i].edit) {
this.crud.notify('尚有未完成编辑的副桶物料，明细序号为' + (i + 1) + '请检查！') this.crud.notify('尚有未完成编辑的主桶物料，明细序号为' + (i + 1) + '请检查！')
return false return false
} }
} }