diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/AcceptFormulaServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/AcceptFormulaServiceImpl.java index 885e3c55..f2ae3a16 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/AcceptFormulaServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/AcceptFormulaServiceImpl.java @@ -435,9 +435,12 @@ public class AcceptFormulaServiceImpl implements AcceptFormulaService { 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")); @@ -445,7 +448,7 @@ public class AcceptFormulaServiceImpl implements AcceptFormulaService { 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); 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()); } // 开单日期 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/wql/QMD_PD_ACCEPTFORMULA01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/wql/QMD_PD_ACCEPTFORMULA01.wql index 10e16c9c..167f6d70 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/wql/QMD_PD_ACCEPTFORMULA01.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/wql/QMD_PD_ACCEPTFORMULA01.wql @@ -135,6 +135,7 @@ SELECT FactoryWarrantyMst.inspection_id AS id , FactoryWarrantyMst.pcsn AS code , + FactoryWarrantyMst.biz_date , FactoryWarrantyMst.inspection_code AS name FROM QL_TEST_FactoryWarrantyMst FactoryWarrantyMst @@ -145,6 +146,7 @@ OPTION 输入.material_id <> "" FactoryWarrantyMst.material_id = 输入.material_id ENDOPTION + order by FactoryWarrantyMst.biz_date desc ENDSELECT ENDQUERY ENDIF diff --git a/mes/qd/src/views/wms/pf/acceptformula/AddDialog.vue b/mes/qd/src/views/wms/pf/acceptformula/AddDialog.vue index 9b21e4b3..1ac24af3 100644 --- a/mes/qd/src/views/wms/pf/acceptformula/AddDialog.vue +++ b/mes/qd/src/views/wms/pf/acceptformula/AddDialog.vue @@ -446,6 +446,7 @@ export default { } }, open() { + this.tableData = [] if (this.form.formula_id) { // 编辑之后获取明细 crudacceptformula.getDtl({ 'formula_id': this.form.formula_id }).then(res => { diff --git a/mes/qd/src/views/wms/pf/acceptformula/index.vue b/mes/qd/src/views/wms/pf/acceptformula/index.vue index 2c1823a5..5253c3dd 100644 --- a/mes/qd/src/views/wms/pf/acceptformula/index.vue +++ b/mes/qd/src/views/wms/pf/acceptformula/index.vue @@ -208,6 +208,7 @@ export default { this.viewShow = true }, typeChange() { + this.mstrow = { } this.newShow = true }, mytoEdit(row) {