diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialParametersServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialParametersServiceImpl.java index c8b53499..5fded07a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialParametersServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialParametersServiceImpl.java @@ -292,6 +292,9 @@ public class MaterialParametersServiceImpl implements MaterialParametersService @Transactional(rollbackFor = Exception.class) public JSONObject queryMaterialParam(String material_id) { MaterialbaseDto materDto = materialbaseService.findById(Long.valueOf(material_id)); + + boolean is_pgf = materialbaseService.isAlongMaterType(MaterOptTypeEnum.PGF.getCode(), material_id, null); + //根据物料类型判断是原辅料还是半成品 String material_type_id = materDto.getMaterial_type_id() + ""; String flag = "1"; @@ -302,6 +305,12 @@ public class MaterialParametersServiceImpl implements MaterialParametersService flag = "2"; } JSONObject json = WQL.getWO("QMD_ME_material_param01").addParam("flag", flag).addParam("material_id", material_id).process().uniqueResult(0); + + if (is_pgf) { + json.put("is_sync", "0"); + } else { + json.put("is_sync", "1"); + } return json; } diff --git a/mes/qd/src/views/wms/basedata/master/materialParameters/view/CpDialog.vue b/mes/qd/src/views/wms/basedata/master/materialParameters/view/CpDialog.vue index a4a16f4a..9fe71a7b 100644 --- a/mes/qd/src/views/wms/basedata/master/materialParameters/view/CpDialog.vue +++ b/mes/qd/src/views/wms/basedata/master/materialParameters/view/CpDialog.vue @@ -214,7 +214,7 @@ - 同步 + 同步 @@ -324,6 +324,7 @@ export default { return { headers: { 'Authorization': getToken() }, formData: {}, + is_sync: false, material_id: '', file_name: '', dialogUpload: false, @@ -420,6 +421,11 @@ export default { } crudMaterialparameters.queryMaterialParam(param).then(res => { this.formData = res + if (this.formData.is_sync === '0') { + this.is_sync = false + } else { + this.is_sync = true + } }).catch(err => { console.log(err.response.data.message) })