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-10-26 15:57:29 +08:00
parent 0857a63285
commit b020b34d85
4 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -435,9 +435,12 @@ public class AcceptFormulaServiceImpl implements AcceptFormulaService {
oneMap.put("ball_speed", NumberUtil.round(jsonMark.getString("ball_speed"),0).toString()); oneMap.put("ball_speed", NumberUtil.round(jsonMark.getString("ball_speed"),0).toString());
// 原料总碳 // 原料总碳
oneMap.put("c_balance", jsonMark.getString("c_balance")); oneMap.put("c_balance", NumberUtil.round(jsonMark.getString("c_balance"), 3).toString());
} }
// 实验序号
oneMap.put("formula_code", jsonFormMst.getString("formula_code"));
// 实验批号 // 实验批号
oneMap.put("accept_pcsn", jsonFormMst.getString("accept_pcsn")); oneMap.put("accept_pcsn", jsonFormMst.getString("accept_pcsn"));
@@ -445,7 +448,7 @@ public class AcceptFormulaServiceImpl implements AcceptFormulaService {
String inspection_item_id = "1510155749437870083"; // ct项点标识 String inspection_item_id = "1510155749437870083"; // ct项点标识
JSONObject jsonFactDtl = factDtlTab.query("inspection_id = '" + jsonFactMst.getString("inspection_id") + "' and inspection_item_id = '" + inspection_item_id + "'").uniqueResult(0); JSONObject jsonFactDtl = factDtlTab.query("inspection_id = '" + jsonFactMst.getString("inspection_id") + "' and inspection_item_id = '" + inspection_item_id + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(jsonFactDtl)) { if (ObjectUtil.isNotEmpty(jsonFactDtl)) {
oneMap.put("ct_value", NumberUtil.round(jsonFactDtl.getString("value"), 2).toString()); oneMap.put("ct_value", NumberUtil.round(jsonFactDtl.getString("value"), 3).toString());
} }
// 开单日期 // 开单日期

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/wql/QMD_PD_ACCEPTFORMULA01.wql
View File

@@ -135,6 +135,7 @@
SELECT SELECT
FactoryWarrantyMst.inspection_id AS id , FactoryWarrantyMst.inspection_id AS id ,
FactoryWarrantyMst.pcsn AS code , FactoryWarrantyMst.pcsn AS code ,
FactoryWarrantyMst.biz_date ,
FactoryWarrantyMst.inspection_code AS name FactoryWarrantyMst.inspection_code AS name
FROM FROM
QL_TEST_FactoryWarrantyMst FactoryWarrantyMst QL_TEST_FactoryWarrantyMst FactoryWarrantyMst
@@ -145,6 +146,7 @@
OPTION 输入.material_id <> "" OPTION 输入.material_id <> ""
FactoryWarrantyMst.material_id = 输入.material_id FactoryWarrantyMst.material_id = 输入.material_id
ENDOPTION ENDOPTION
order by FactoryWarrantyMst.biz_date desc
ENDSELECT ENDSELECT
ENDQUERY ENDQUERY
ENDIF ENDIF

1
mes/qd/src/views/wms/pf/acceptformula/AddDialog.vue
View File

@@ -446,6 +446,7 @@ export default {
} }
}, },
open() { open() {
this.tableData = []
if (this.form.formula_id) { if (this.form.formula_id) {
// 编辑之后获取明细 // 编辑之后获取明细
crudacceptformula.getDtl({ 'formula_id': this.form.formula_id }).then(res => { crudacceptformula.getDtl({ 'formula_id': this.form.formula_id }).then(res => {

1
mes/qd/src/views/wms/pf/acceptformula/index.vue
View File

@@ -208,6 +208,7 @@ export default {
this.viewShow = true this.viewShow = true
}, },
typeChange() { typeChange() {
this.mstrow = { }
this.newShow = true this.newShow = true
}, },
mytoEdit(row) { mytoEdit(row) {