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

Merge branch 'master' of http://121.40.234.130:8899/root/wuHanXinRui

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2022-10-18 10:53:44 +08:00
parent b9596e081b df8668d2eb
commit b144709781
43 changed files with 1089 additions and 492 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/MaterialParametersController.java
View File

@@ -148,4 +148,11 @@ public class MaterialParametersController {
public ResponseEntity<Object> getSeries() { public ResponseEntity<Object> getSeries() {
return new ResponseEntity<>(materialParametersService.getSeries(), HttpStatus.OK); return new ResponseEntity<>(materialParametersService.getSeries(), HttpStatus.OK);
} }
@PostMapping("/sync")
@Log("同步")
@ApiOperation("同步-产品系列")
public ResponseEntity<Object> sync(@RequestBody JSONObject whereJson) {
return new ResponseEntity<>(materialParametersService.sync(whereJson),HttpStatus.OK);
}
} }

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/MaterialParametersService.java
View File

@@ -85,4 +85,10 @@ public interface MaterialParametersService {
* 查询基础分类-产品系列 * 查询基础分类-产品系列
*/ */
JSONArray getSeries(); JSONArray getSeries();
/**
* 同步
* @param whereJson /
*/
JSONObject sync(JSONObject whereJson);
} }

156
mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialParametersServiceImpl.java
View File

@@ -5,6 +5,7 @@ package org.nl.wms.basedata.master.service.impl;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.map.MapUtil; import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
@@ -20,6 +21,7 @@ import org.nl.wms.basedata.master.service.MaterialParametersService;
import org.nl.wms.basedata.master.service.MaterialbaseService; import org.nl.wms.basedata.master.service.MaterialbaseService;
import org.nl.wms.basedata.master.service.dto.MaterialParametersDto; import org.nl.wms.basedata.master.service.dto.MaterialParametersDto;
import org.nl.wms.basedata.master.service.dto.MaterialbaseDto; import org.nl.wms.basedata.master.service.dto.MaterialbaseDto;
import org.nl.wms.basedata.pdm.service.impl.WastecchangeServiceImpl;
import org.nl.wql.WQL; import org.nl.wql.WQL;
import org.nl.wql.core.bean.WQLObject; import org.nl.wql.core.bean.WQLObject;
import org.nl.wql.util.WqlUtil; import org.nl.wql.util.WqlUtil;
@@ -290,6 +292,9 @@ public class MaterialParametersServiceImpl implements MaterialParametersService
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public JSONObject queryMaterialParam(String material_id) { public JSONObject queryMaterialParam(String material_id) {
MaterialbaseDto materDto = materialbaseService.findById(Long.valueOf(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 material_type_id = materDto.getMaterial_type_id() + "";
String flag = "1"; String flag = "1";
@@ -300,6 +305,12 @@ public class MaterialParametersServiceImpl implements MaterialParametersService
flag = "2"; flag = "2";
} }
JSONObject json = WQL.getWO("QMD_ME_material_param01").addParam("flag", flag).addParam("material_id", material_id).process().uniqueResult(0); 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; return json;
} }
@@ -318,4 +329,149 @@ public class MaterialParametersServiceImpl implements MaterialParametersService
return resultJSONArray; return resultJSONArray;
} }
@Override
@Transactional(rollbackFor = Exception.class)
public JSONObject sync(JSONObject whereJson) {
/*
* 1.PG粉碳平衡修正
* 2.软废碳平衡修正
*/
WQLObject productMstTab = WQLObject.getWQLObject("MD_PD_ProductBOM"); // 产品bom单主表
WQLObject productDtlTab = WQLObject.getWQLObject("MD_PD_ProductBOMDtl"); // 产品bom单明细表
WQLObject wasTab = WQLObject.getWQLObject("PDM_BI_WasteCChange"); // 软废碳平衡修正表
WQLObject materTab = WQLObject.getWQLObject("md_me_materialbase"); // 物料表
WQLObject extTab = WQLObject.getWQLObject("MD_ME_ProducMaterialExt"); // 成品物料扩展信息表
JSONObject result = new JSONObject();
// 1.判断此物料是PG粉还是RF
boolean is_pgf = materialbaseService.isAlongMaterType(MaterOptTypeEnum.PGF.getCode(), whereJson.getString("material_id"), null);
boolean is_rf = materialbaseService.isAlongMaterType(MaterOptTypeEnum.RF.getCode(), whereJson.getString("material_id"), null);
String material_id = whereJson.getString("material_id");
JSONObject jsonMater = materTab.query("material_id = '" + material_id + "'").uniqueResult(0);
JSONObject jsonExtMater = extTab.query("material_id = '" + material_id + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(jsonExtMater)) throw new BadRequestException("此PGF扩展属性不存在");
if (is_pgf) {
/*
* PG粉碳平衡修正：
* 1.查询此PG粉产品bom明细表第一个碳化钨
* 2.查询此碳化钨 软废碳平衡修正表获得全部软废类型的值
* 3.查询软废：物料表，软废编码 = PG粉编码 + '-CF'
* 4.依次修改16种软废类型的碳平衡
* 软废碳平衡=pg粉碳平衡+CF修正值
*/
// 1.查询此物料的产品bom明细表中第一个出现的碳化钨
// 查主表
JSONObject jsonProductMst = productMstTab.query("material_id = '" + material_id + "' and is_used = '1' and is_delete = '0'").uniqueResult(0);
if (ObjectUtil.isEmpty(jsonProductMst)) throw new BadRequestException("此产品没有创建bom单或者已删除、未启用");
// 查明细
JSONArray productDtlArr = productDtlTab.query("bom_id = '" + jsonProductMst.getString("bom_id") + "' order by seqno ASC").getResultJSONArray(0);
if (ObjectUtil.isEmpty(productDtlArr)) throw new BadRequestException("此产品bom单暂无明细");
// 找出第一个碳化钨
String thw_material_id = "";
for (int i = 0; i < productDtlArr.size(); i++) {
JSONObject jsonProductDtl = productDtlArr.getJSONObject(i);
boolean is_thw = materialbaseService.isAlongMaterType(MaterOptTypeEnum.THW.getCode(), jsonProductDtl.getString("material_id"), null);
if (is_thw) {
thw_material_id = jsonProductDtl.getString("material_id");
break;
}
}
// 2.查询此碳化钨 软废碳平衡修正表获得全部软废类型的值 并转化成数组（便于处理数据）
JSONObject jsonThwMater = materTab.query("material_id = '" + thw_material_id + "'").uniqueResult(0);
JSONObject jsonWas = wasTab.query("material_id = '" + thw_material_id + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(jsonWas)) throw new BadRequestException("此碳化钨软废修正数据不存在："+jsonThwMater.getString("material_code"));
// 将此碳化钨的软废类型转化为数组
JSONArray wasArr = new WastecchangeServiceImpl().contentShift(jsonWas);
// 3.查询软废：物料表，软废编码 = PG粉编码 + '-CF' (以软废类型CF为例)
for (int j = 0; j < wasArr.size(); j++) {
JSONObject jsonWasDtl = wasArr.getJSONObject(j);
String rf_type_code = jsonMater.getString("material_code") +"-"+jsonWasDtl.getString("name");
JSONObject jsonRfMater = materTab.query("material_code = '" + rf_type_code + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(jsonRfMater)) {
// 4.依次修改16种软废类型的碳平衡: 软废碳平衡=pg粉碳平衡+CF修正值
JSONObject jsonRfExt = extTab.query("material_id = '" + jsonRfMater.getString("material_id") + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(jsonRfExt)) throw new BadRequestException("此软废扩展信息不存在:"+rf_type_code);
double rf_c_balance = NumberUtil.add(jsonExtMater.getDoubleValue("c_balance"), jsonWasDtl.getDoubleValue("value"));
jsonRfExt.put("c_balance", String.valueOf(rf_c_balance));
extTab.update(jsonRfExt);
}
}
result.put("c_balance", "");
}
if (is_rf) {
/*
* 软废粉碳平衡修正：
* 1.找PG粉：查物料表： PG粉编码 = 此软废编码去掉最后一个'-'和后面的内容
* 2.找碳化钨：此PG粉产品BOM明细第一个碳化钨
* 3.找修正值：废类型为编码最后'-'后的内容 ：如JZ16-P-A2-20-JY ： 软废类型就是 JY
* 查此碳化钨的软废修正表对应的软废类型：软废碳平衡=pg粉碳平衡+此软废修正值
* 4.最后将计算后的值返回给页面
*/
// 1.找PG粉：查物料表： PG粉编码 = 此软废编码去掉最后一个'-'和后面的内容
String pg_material_code = jsonMater.getString("material_code").substring(0, jsonMater.getString("material_code").lastIndexOf("-"));
JSONObject jsonPgfMater = materTab.query("material_code = '" + pg_material_code + "'").uniqueResult(0);
// 2.找碳化钨：此PG粉产品BOM明细第一个碳化钨
// 查主表
JSONObject jsonProductMst = productMstTab.query("material_id = '" + jsonPgfMater.getString("material_id") + "' and is_used = '1' and is_delete = '0'").uniqueResult(0);
if (ObjectUtil.isEmpty(jsonProductMst)) throw new BadRequestException("此产品没有创建bom单或者已删除、未启用"+pg_material_code);
// 查明细
JSONArray productDtlArr = productDtlTab.query("bom_id = '" + jsonProductMst.getString("bom_id") + "' order by seqno ASC").getResultJSONArray(0);
if (ObjectUtil.isEmpty(productDtlArr)) throw new BadRequestException("此产品bom单暂无明细"+pg_material_code);
// 找出第一个碳化钨
String thw_material_id = "";
for (int i = 0; i < productDtlArr.size(); i++) {
JSONObject jsonProductDtl = productDtlArr.getJSONObject(i);
boolean is_thw = materialbaseService.isAlongMaterType(MaterOptTypeEnum.THW.getCode(), jsonProductDtl.getString("material_id"), null);
if (is_thw) {
thw_material_id = jsonProductDtl.getString("material_id");
break;
}
}
// 3.找修正值：废类型为编码最后'-'后的内容
JSONObject jsonThwMater = materTab.query("material_id = '" + thw_material_id + "'").uniqueResult(0);
JSONObject jsonWas = wasTab.query("material_id = '" + thw_material_id + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(jsonWas)) throw new BadRequestException("此碳化钨软废修正数据不存在："+jsonThwMater.getString("material_name"));
// 将此碳化钨的软废类型转化为数组
JSONArray wasArr = new WastecchangeServiceImpl().contentShift(jsonWas);
String rf_type_code = jsonMater.getString("material_code").substring(jsonMater.getString("material_code").lastIndexOf("-")+1,jsonMater.getString("material_code").length());
double value = 0;
for (int j = 0; j < wasArr.size(); j++) {
JSONObject jsonWasDtl = wasArr.getJSONObject(j);
if (StrUtil.equals(rf_type_code, jsonWasDtl.getString("name"))) {
value = jsonWasDtl.getDoubleValue("value");
break;
}
}
// 软废碳平衡=pg粉碳平衡+此软废修正值
JSONObject jsonPgfExt = extTab.query("material_id = '" + jsonPgfMater.getString("material_id") + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(jsonPgfExt)) throw new BadRequestException("此PG粉扩展属性不存在："+pg_material_code);
double c_balance = NumberUtil.add(jsonPgfExt.getDoubleValue("c_balance"), value);
result.put("c_balance", String.valueOf(c_balance));
}
return result;
}
} }

22
mes/hd/nladmin-system/src/main/java/org/nl/wms/pa/service/impl/PerformancemstServiceImpl.java
View File

@@ -245,7 +245,7 @@ public class PerformancemstServiceImpl implements PerformancemstService {
JSONObject jsonObject = WQL.getWO("QL_TEST_PERFORMANCEMST01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mst.assessor_date asc"); JSONObject jsonObject = WQL.getWO("QL_TEST_PERFORMANCEMST01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mst.assessor_date asc");
JSONArray re = jsonObject.getJSONArray("content"); JSONArray re = jsonObject.getJSONArray("content");
// ===== 2.根据日期查出当天日期所有人员及分数 // ===== 2.根据日期查出当天日期所有人员及分数
for (int i = 0; i < re.size(); i++) { /* for (int i = 0; i < re.size(); i++) {
JSONObject json = re.getJSONObject(i); JSONObject json = re.getJSONObject(i);
JSONArray arr = WQLObject.getWQLObject("QL_TEST_PerformanceMst").query("assessor_date = '" + json.getString("assessor_date") + "'").getResultJSONArray(0); JSONArray arr = WQLObject.getWQLObject("QL_TEST_PerformanceMst").query("assessor_date = '" + json.getString("assessor_date") + "'").getResultJSONArray(0);
double total = 0; //总分 double total = 0; //总分
@@ -256,6 +256,26 @@ public class PerformancemstServiceImpl implements PerformancemstService {
total = total + json2.getDoubleValue("total_score"); total = total + json2.getDoubleValue("total_score");
average = NumberUtil.div(total, arr.size()); average = NumberUtil.div(total, arr.size());
} }
//查询出有多少个员工 要用到它们的个数
JSONArray jsonArr = WQL.getWO("QL_TEST_PERFORMANCEMST01").addParam("flag", "5").process().getResultJSONArray(0);
json.put(String.valueOf(jsonArr.size() + 2), total);
json.put(String.valueOf(jsonArr.size() + 1), average);
are.add(json);
}*/
for (int i = 0; i < re.size(); i++) {
JSONObject json = re.getJSONObject(i);
JSONArray userArr = WQL.getWO("QL_TEST_PERFORMANCEMST01").addParam("flag", "7").addParam("assessor_date", json.getString("assessor_date")).process().getResultJSONArray(0);
double total = 0; //总分
double average = 0; //平均分
for (int j = 0; j < userArr.size(); j++) {
JSONObject json2 = userArr.getJSONObject(j);
json.put(String.valueOf(json2.getString("assessor_id")), json2.getString("total_score"));
total = total + json2.getDoubleValue("total_score");
average = NumberUtil.div(total, userArr.size());
}
//查询出有多少个员工 要用到它们的个数 //查询出有多少个员工 要用到它们的个数
JSONArray jsonArr = WQL.getWO("QL_TEST_PERFORMANCEMST01").addParam("flag", "5").process().getResultJSONArray(0); JSONArray jsonArr = WQL.getWO("QL_TEST_PERFORMANCEMST01").addParam("flag", "5").process().getResultJSONArray(0);
json.put(String.valueOf(jsonArr.size() + 2), total); json.put(String.valueOf(jsonArr.size() + 2), total);

24
mes/hd/nladmin-system/src/main/java/org/nl/wms/pa/wql/QL_TEST_PERFORMANCEMST01.wql
View File

@@ -157,5 +157,29 @@
ENDPAGEQUERY ENDPAGEQUERY
ENDIF ENDIF
IF 输入.flag = "7"
PAGEQUERY
SELECT
mst.assessor_date,
SUM(mst.total_score) AS total_score,
mst.assessor_id
FROM
QL_TEST_PerformanceMst mst
LEFT JOIN sys_user user ON mst.assessor_id = user.user_id
WHERE
mst.status = '30'
AND mst.is_delete = '0'
OPTION 输入.assessor_date <> ""
mst.assessor_date = 输入.assessor_date
ENDOPTION
GROUP BY mst.assessor_id
ENDSELECT
ENDPAGEQUERY
ENDIF

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/rest/DailyplanController.java
View File

@@ -35,9 +35,9 @@ public class DailyplanController {
@GetMapping @GetMapping
@Log("查询月生产计划") @Log("查询月生产计划")
@ApiOperation("查询月生产计划") @ApiOperation("查询月生产计划")
public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page){ public ResponseEntity<Object> query(@RequestParam Map whereJson){
return new ResponseEntity<>(dailyplanService. return new ResponseEntity<>(dailyplanService.
queryAll(whereJson,page),HttpStatus.OK); queryAll2(whereJson),HttpStatus.OK);
} }
@GetMapping("/queryday") @GetMapping("/queryday")

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/DailyplanService.java
View File

@@ -24,7 +24,7 @@ public interface DailyplanService {
* @param page 分页参数 * @param page 分页参数
* @return Map<String,Object> * @return Map<String,Object>
*/ */
Map<String,Object> queryAll(Map whereJson, Pageable page); Map<String,Object> queryAll2(Map whereJson);
/** /**
* 查询数据分页 * 查询数据分页
* @param whereJson 条件 * @param whereJson 条件

17
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DailyplanServiceImpl.java
View File

@@ -54,7 +54,7 @@ public class DailyplanServiceImpl implements DailyplanService {
private final WorkOrdereService workOrdereService; private final WorkOrdereService workOrdereService;
@Override @Override
public Map<String, Object> queryAll(Map whereJson, Pageable page) { public Map<String, Object> queryAll2(Map whereJson) {
HashMap<String, String> map = new HashMap<>(whereJson); HashMap<String, String> map = new HashMap<>(whereJson);
String material_code = map.get("material_code"); String material_code = map.get("material_code");
@@ -62,8 +62,7 @@ public class DailyplanServiceImpl implements DailyplanService {
map.put("material_code", "%" + material_code + "%"); map.put("material_code", "%" + material_code + "%");
} }
map.put("flag", "1"); map.put("flag", "1");
JSONObject jret = WQL.getWO("QPDM_PRODUCTDAILYPLAN").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "pp.planstart_date,pp.plan_code"); JSONArray json = WQL.getWO("QPDM_PRODUCTDAILYPLAN").addParamMap(map).process().getResultJSONArray(0);
JSONArray json = jret.getJSONArray("content");
JSONArray ja = new JSONArray(); JSONArray ja = new JSONArray();
for(int i=0;i<json.size();i++){ for(int i=0;i<json.size();i++){
JSONObject jo = json.getJSONObject(i); JSONObject jo = json.getJSONObject(i);
@@ -82,6 +81,7 @@ public class DailyplanServiceImpl implements DailyplanService {
} }
ja.add(jo); ja.add(jo);
} }
Map<String, Object> jret = new HashMap<String, Object>();
jret.put("content",ja); jret.put("content",ja);
return jret; return jret;
} }
@@ -212,14 +212,6 @@ public class DailyplanServiceImpl implements DailyplanService {
map.put("flag", "2"); map.put("flag", "2");
JSONArray jret = WQL.getWO("QPDM_PRODUCTDAILYPLAN") JSONArray jret = WQL.getWO("QPDM_PRODUCTDAILYPLAN")
.addParamMap(map).process().getResultJSONArray(0); .addParamMap(map).process().getResultJSONArray(0);
if(jret.size()>0){
JSONObject form = new JSONObject();
form.put("rows",jret);
form.put("query",whereJson);
this.submit2(form);
}
jret = WQL.getWO("QPDM_PRODUCTDAILYPLAN")
.addParamMap(map).process().getResultJSONArray(0);
JSONArray ja = new JSONArray(); JSONArray ja = new JSONArray();
for(int i=0;i<jret.size();i++){ for(int i=0;i<jret.size();i++){
@@ -413,7 +405,8 @@ public class DailyplanServiceImpl implements DailyplanService {
new_jo.put("workorder_qty",jo.getString("standard_weight")); new_jo.put("workorder_qty",jo.getString("standard_weight"));
new_jo.put("planstart_time",jo.getString("planstart_date").substring(0,10)+" 08:00:00"); new_jo.put("planstart_time",jo.getString("planstart_date").substring(0,10)+" 08:00:00");
new_jo.put("planend_time",jo.getString("planend_date").substring(0,10)+" 23:59:59"); new_jo.put("planend_time",jo.getString("planend_date").substring(0,10)+" 23:59:59");
new_jo.put("status","10"); new_jo.put("status",jsonMst.getString("remark"));
new_jo.put("remark","10");
new_jo.put("create_mode","03"); new_jo.put("create_mode","03");
new_jo.put("source_bill_id",jo.getString("dailyplan_id")); new_jo.put("source_bill_id",jo.getString("dailyplan_id"));
new_jo.put("source_bill_type",jo.getString("workorder_type")); new_jo.put("source_bill_type",jo.getString("workorder_type"));

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/WorkOrderServiceImpl.java
View File

@@ -127,15 +127,12 @@ public class WorkOrderServiceImpl implements WorkOrdereService {
json.put("create_time", now); json.put("create_time", now);
json.put("sysdeptid", deptId); json.put("sysdeptid", deptId);
json.put("syscompanyid", deptId); json.put("syscompanyid", deptId);
String create_mode = json.getString("create_mode");
if("01".equals(create_mode)){
String planstart_time = json.getString("planstart_time"); String planstart_time = json.getString("planstart_time");
Date date = DateUtil.parse(planstart_time); Date date = DateUtil.parse(planstart_time);
int days = this.getDays(json.getString("material_id")); int days = this.getDays(json.getString("material_id"));
Date planend_date = DateUtil.offsetDay(date,days-1); Date planend_date = DateUtil.offsetDay(date,days-1);
String planend_time = DateUtil.formatDate(planend_date).substring(0,10); String planend_time = DateUtil.formatDate(planend_date).substring(0,10);
json.put("planend_time",planend_time+" 23:59:59"); json.put("planend_time",planend_time+" 23:59:59");
}
mstTab.insert(json); mstTab.insert(json);
this.updatePcsn(json); this.updatePcsn(json);
} }
@@ -176,15 +173,12 @@ public class WorkOrderServiceImpl implements WorkOrdereService {
this.updatePcsn(whereJson); this.updatePcsn(whereJson);
} }
} }
String create_mode = whereJson.getString("create_mode");
if("01".equals(create_mode)){
String planstart_time = whereJson.getString("planstart_time"); String planstart_time = whereJson.getString("planstart_time");
Date date = DateUtil.parse(planstart_time); Date date = DateUtil.parse(planstart_time);
int days = this.getDays(whereJson.getString("material_id")); int days = this.getDays(whereJson.getString("material_id"));
Date planend_date = DateUtil.offsetDay(date,days-1); Date planend_date = DateUtil.offsetDay(date,days-1);
String planend_time = DateUtil.formatDate(planend_date).substring(0,10); String planend_time = DateUtil.formatDate(planend_date).substring(0,10);
whereJson.put("planend_time",planend_time+" 23:59:59"); whereJson.put("planend_time",planend_time+" 23:59:59");
}
mstTab.update(whereJson); mstTab.update(whereJson);
} }

5
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_PRODUCTDAILYPLAN.wql
View File

@@ -51,7 +51,7 @@
########################################## ##########################################
IF 输入.flag = "1" IF 输入.flag = "1"
PAGEQUERY QUERY
SELECT SELECT
pp.*, pp.*,
ext.old_mark, ext.old_mark,
@@ -94,8 +94,9 @@
OPTION 输入.device_id <> "" OPTION 输入.device_id <> ""
pp.device_id = 输入.device_id pp.device_id = 输入.device_id
ENDOPTION ENDOPTION
order by pp.planstart_date,pp.plan_code
ENDSELECT ENDSELECT
ENDPAGEQUERY ENDQUERY
ENDIF ENDIF
IF 输入.flag = "2" IF 输入.flag = "2"

20
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/bigscreen/service/impl/DeviceBigScreenServiceImpl.java
View File

@@ -243,11 +243,16 @@ public class DeviceBigScreenServiceImpl implements DeviceBigScreenService {
jsonObject.put("fault_num", fault_num.getString("num")); jsonObject.put("fault_num", fault_num.getString("num"));
// 委外台数 // 委外台数
map.put("status", "30"); map.put("flag", "10");
JSONObject out_num = WQL.getWO("EM_DEVICEBIGSCREEN_01").addParamMap(map).process().uniqueResult(0); JSONObject out_num = WQL.getWO("EM_DEVICEBIGSCREEN_01").addParamMap(map).process().uniqueResult(0);
jsonObject.put("out_num", out_num.getString("num")); if (ObjectUtil.isEmpty(out_num)) {
jsonObject.put("out_num", "0");
} else {
jsonObject.put("out_num", String.valueOf(out_num.size()));
}
// 保养台数 // 保养台数
map.put("flag", "5");
map.put("status", "40"); map.put("status", "40");
JSONObject main_num = WQL.getWO("EM_DEVICEBIGSCREEN_01").addParamMap(map).process().uniqueResult(0); JSONObject main_num = WQL.getWO("EM_DEVICEBIGSCREEN_01").addParamMap(map).process().uniqueResult(0);
jsonObject.put("main_num", main_num.getString("num")); jsonObject.put("main_num", main_num.getString("num"));
@@ -328,12 +333,23 @@ public class DeviceBigScreenServiceImpl implements DeviceBigScreenService {
/* /*
* 查询保养单明细 * 查询保养单明细
*/ */
WQLObject dtlTab = WQLObject.getWQLObject("em_bi_devicemaintenanceplandtl");
JSONObject resultJson = new JSONObject(); JSONObject resultJson = new JSONObject();
JSONObject resultData = new JSONObject(); JSONObject resultData = new JSONObject();
JSONArray arr = WQL.getWO("EM_DEVICEBIGSCREEN_01").addParam("flag", "8").process().getResultJSONArray(0); JSONArray arr = WQL.getWO("EM_DEVICEBIGSCREEN_01").addParam("flag", "8").process().getResultJSONArray(0);
for (int i = 0; i < arr.size(); i++) { for (int i = 0; i < arr.size(); i++) {
JSONObject json = arr.getJSONObject(i); JSONObject json = arr.getJSONObject(i);
// 明细数
JSONArray jsonDtl = dtlTab.query("maint_plan_id = '" + json.getString("maint_plan_id") + "'").getResultJSONArray(0);
if (ObjectUtil.isEmpty(jsonDtl)) {
json.put("num", "0");
} else {
json.put("num", String.valueOf(jsonDtl.size()));
}
// 保养倒计时： 计划日期 - 当前日期 // 保养倒计时： 计划日期 - 当前日期
Date date1 = DateUtil.parse(DateUtil.today()); // 当前日期 Date date1 = DateUtil.parse(DateUtil.today()); // 当前日期
Date date2 = DateUtil.parse(json.getString("plan_time")); // 计划日期 Date date2 = DateUtil.parse(json.getString("plan_time")); // 计划日期

28
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/bigscreen/wql/EM_DEVICEBIGSCREEN_01.wql
View File

@@ -193,15 +193,9 @@
mst.real_start_date AS impl_time, mst.real_start_date AS impl_time,
mst.remark, mst.remark,
mst.real_end_date, mst.real_end_date,
dtl.num mst.maint_plan_id
FROM FROM
EM_BI_DeviceMaintenancePlanMst mst EM_BI_DeviceMaintenancePlanMst mst
LEFT JOIN
(
SELECT count(*)AS num,d.maint_plan_id FROM EM_BI_DeviceMaintenancePlanDtl d
LEFT JOIN EM_BI_DeviceMaintenancePlanMst m ON m.maint_plan_id = d.maint_plan_id
GROUP BY d.maint_plan_dtl_id
) AS dtl ON mst.maint_plan_id = dtl.maint_plan_id
LEFT JOIN EM_BI_EquipmentFile file ON mst.devicerecord_id = file.devicerecord_id LEFT JOIN EM_BI_EquipmentFile file ON mst.devicerecord_id = file.devicerecord_id
LEFT JOIN sys_dept dept ON dept.dept_id = file.use_deptid LEFT JOIN sys_dept dept ON dept.dept_id = file.use_deptid
WHERE WHERE
@@ -227,3 +221,23 @@
ENDSELECT ENDSELECT
ENDQUERY ENDQUERY
ENDIF ENDIF
IF 输入.flag = "10"
QUERY
SELECT
count(mst.devicerecord_id) AS num
FROM
EM_BI_DeviceRepairMst mst
LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = mst.devicerecord_id
LEFT JOIN sys_dept dept ON dept.dept_id = file.use_deptid
WHERE
mst.is_delete = '0'
AND file.is_delete = '0'
AND dept.code = 输入.dept_code
AND mst.invstatus = '04'
group by mst.devicerecord_id
ENDSELECT
ENDQUERY
ENDIF

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairmstServiceImpl.java
View File

@@ -128,7 +128,7 @@ public class DevicerepairmstServiceImpl implements DevicerepairmstService {
String classIds = classstandardService.getAllChildIdStr(class_idStr); String classIds = classstandardService.getAllChildIdStr(class_idStr);
map.put("classIds", classIds); map.put("classIds", classIds);
} }
JSONObject json = WQL.getWO("EM_BI_DEVICEREPAIR001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mst.input_time DESC"); JSONObject json = WQL.getWO("EM_BI_DEVICEREPAIR001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mst.invstatus,mst.input_time DESC");
return json; return json;
} }

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairrequestServiceImpl.java
View File

@@ -110,6 +110,12 @@ public class DevicerepairrequestServiceImpl implements DevicerepairrequestServic
String deptIds = deptService.getChildIdStr(Long.parseLong(dept_id)); String deptIds = deptService.getChildIdStr(Long.parseLong(dept_id));
map.put("deptIds", deptIds); map.put("deptIds", deptIds);
} }
// 归属部门
String use_groupid = MapUtil.getStr(whereJson, "use_groupid");
if (!StrUtil.isEmpty(use_groupid)) {
String use_groupidIds = deptService.getChildIdStr(Long.parseLong(use_groupid));
map.put("use_groupid", use_groupidIds);
}
JSONObject json = WQL.getWO("EM_BI_DEVICEREPAIRREQUEST001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mst.create_time DESC"); JSONObject json = WQL.getWO("EM_BI_DEVICEREPAIRREQUEST001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mst.create_time DESC");
return json; return json;
} }

5
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIRREQUEST001.wql
View File

@@ -21,6 +21,7 @@
输入.begin_time TYPEAS s_string 输入.begin_time TYPEAS s_string
输入.end_time TYPEAS s_string 输入.end_time TYPEAS s_string
输入.deptIds TYPEAS f_string 输入.deptIds TYPEAS f_string
输入.use_groupid TYPEAS f_string
[临时表] [临时表]
@@ -144,7 +145,9 @@
OPTION 输入.classIds <> "" OPTION 输入.classIds <> ""
class.class_id in 输入.classIds class.class_id in 输入.classIds
ENDOPTION ENDOPTION
OPTION 输入.use_groupid <> ""
d2.dept_id in 输入.use_groupid
ENDOPTION
OPTION 输入.deptIds <> "" OPTION 输入.deptIds <> ""
d1.dept_id in 输入.deptIds d1.dept_id in 输入.deptIds
ENDOPTION ENDOPTION

5
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/TASK_AUTOWEBSOCKETTSK.wql
View File

@@ -306,7 +306,7 @@
LEFT JOIN sys_dept dept ON dept.dept_id = file.use_deptid LEFT JOIN sys_dept dept ON dept.dept_id = file.use_deptid
WHERE WHERE
mst.is_delete = '0' mst.is_delete = '0'
AND (mst.invstatus <> '99') AND mst.invstatus not in ('06','07','99')
AND ( ISNULL( mst.source_bill_id ) OR mst.source_bill_type = 'WXJH' ) AND ( ISNULL( mst.source_bill_id ) OR mst.source_bill_type = 'WXJH' )
UNION UNION
@@ -368,6 +368,7 @@
WHERE WHERE
st.is_delete = '0' st.is_delete = '0'
AND (st.status <> '99') AND (st.status <> '99')
AND mst.invstatus not in ('06','07','99')
UNION UNION
@@ -416,7 +417,7 @@
LEFT JOIN sys_dept dept ON dept.dept_id = file.use_deptid LEFT JOIN sys_dept dept ON dept.dept_id = file.use_deptid
WHERE WHERE
mst.is_delete = '0' mst.is_delete = '0'
AND (mst.invstatus <> '99') AND mst.invstatus not in ('04','05','99')
order by input_time DESC order by input_time DESC

17
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/impl/DevicemaintenancemstServiceImpl.java
View File

@@ -12,6 +12,7 @@ import com.alibaba.fastjson.JSON;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.nl.exception.BadRequestException; import org.nl.exception.BadRequestException;
import org.nl.modules.security.service.dto.JwtUserDto; import org.nl.modules.security.service.dto.JwtUserDto;
import org.nl.modules.system.service.DeptService;
import org.nl.modules.system.service.impl.ParamServiceImpl; import org.nl.modules.system.service.impl.ParamServiceImpl;
import org.nl.modules.system.util.CodeUtil; import org.nl.modules.system.util.CodeUtil;
import org.nl.utils.SpringContextHolder; import org.nl.utils.SpringContextHolder;
@@ -116,7 +117,7 @@ public class DevicemaintenancemstServiceImpl implements DevicemaintenancemstServ
String classIds = classstandardService.getAllChildIdStr(class_idStr); String classIds = classstandardService.getAllChildIdStr(class_idStr);
map.put("classIds", classIds); map.put("classIds", classIds);
} }
JSONObject json = WQL.getWO("EM_BIDEVICEMAINTENANCE001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mst.input_time DESC"); JSONObject json = WQL.getWO("EM_BIDEVICEMAINTENANCE001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mst.invstatus,mst.input_time DESC");
return json; return json;
} }
@@ -559,6 +560,7 @@ public class DevicemaintenancemstServiceImpl implements DevicemaintenancemstServ
@Override @Override
public Map<String, Object> query4(Map whereJson, Pageable page) { public Map<String, Object> query4(Map whereJson, Pageable page) {
DeptService deptService = SpringContextHolder.getBean(DeptService.class);
String material_type_id = MapUtil.getStr(whereJson, "material_type_id"); String material_type_id = MapUtil.getStr(whereJson, "material_type_id");
String class_idStr = MapUtil.getStr(whereJson, "class_idStr"); String class_idStr = MapUtil.getStr(whereJson, "class_idStr");
String device_code = MapUtil.getStr(whereJson, "device_code"); String device_code = MapUtil.getStr(whereJson, "device_code");
@@ -585,12 +587,19 @@ public class DevicemaintenancemstServiceImpl implements DevicemaintenancemstServ
String classIds = classstandardService.getAllChildIdStr(class_idStr); String classIds = classstandardService.getAllChildIdStr(class_idStr);
map.put("classIds", classIds); map.put("classIds", classIds);
} }
// 归属部门
String dept_id = MapUtil.getStr(whereJson, "dept_id");
if (!StrUtil.isEmpty(dept_id)) {
String deptIds = deptService.getChildIdStr(Long.parseLong(dept_id));
map.put("deptIds", deptIds);
}
JSONObject json = WQL.getWO("EM_BIDEVICEMAINTENANCE001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mst.input_time DESC"); JSONObject json = WQL.getWO("EM_BIDEVICEMAINTENANCE001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mst.input_time DESC");
return json; return json;
} }
@Override @Override
public Map<String, Object> query5(Map whereJson, Pageable page) { public Map<String, Object> query5(Map whereJson, Pageable page) {
DeptService deptService = SpringContextHolder.getBean(DeptService.class);
String material_type_id = MapUtil.getStr(whereJson, "material_type_id"); String material_type_id = MapUtil.getStr(whereJson, "material_type_id");
String class_idStr = MapUtil.getStr(whereJson, "class_idStr"); String class_idStr = MapUtil.getStr(whereJson, "class_idStr");
String device_code = MapUtil.getStr(whereJson, "device_code"); String device_code = MapUtil.getStr(whereJson, "device_code");
@@ -619,6 +628,12 @@ public class DevicemaintenancemstServiceImpl implements DevicemaintenancemstServ
String classIds = classstandardService.getAllChildIdStr(class_idStr); String classIds = classstandardService.getAllChildIdStr(class_idStr);
map.put("classIds", classIds); map.put("classIds", classIds);
} }
// 归属部门
String dept_id = MapUtil.getStr(whereJson, "dept_id");
if (!StrUtil.isEmpty(dept_id)) {
String deptIds = deptService.getChildIdStr(Long.parseLong(dept_id));
map.put("deptIds", deptIds);
}
JSONObject json = WQL.getWO("EM_BIDEVICEMAINTENANCE001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "input_time DESC"); JSONObject json = WQL.getWO("EM_BIDEVICEMAINTENANCE001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "input_time DESC");
return json; return json;
} }

13
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/wql/EM_BIDEVICEMAINTENANCE001.wql
View File

@@ -23,6 +23,7 @@
输入.begin_time TYPEAS s_string 输入.begin_time TYPEAS s_string
输入.end_time TYPEAS s_string 输入.end_time TYPEAS s_string
输入.maint_object TYPEAS s_string 输入.maint_object TYPEAS s_string
输入.deptIds TYPEAS f_string
[临时表] [临时表]
@@ -197,7 +198,7 @@
mst.is_delete = '0' mst.is_delete = '0'
AND file.is_delete = '0' AND file.is_delete = '0'
AND mst.maint_object = '02' AND mst.maint_object = '02'
AND mst.invstatus not in ('01') AND mst.invstatus in ('02','03')
OPTION 输入.device_code <> "" OPTION 输入.device_code <> ""
(file.device_code like 输入.device_code or (file.device_code like 输入.device_code or
@@ -324,7 +325,9 @@
(mst.maint_code like 输入.maint_code or (mst.maint_code like 输入.maint_code or
mst.maint_code like 输入.maint_code) mst.maint_code like 输入.maint_code)
ENDOPTION ENDOPTION
OPTION 输入.deptIds <> ""
d2.dept_id in 输入.deptIds
ENDOPTION
OPTION 输入.classIds <> "" OPTION 输入.classIds <> ""
class.class_id in 输入.classIds class.class_id in 输入.classIds
ENDOPTION ENDOPTION
@@ -369,7 +372,7 @@
mst.is_delete = '0' mst.is_delete = '0'
AND file.is_delete = '0' AND file.is_delete = '0'
AND mst.maint_object = '01' AND mst.maint_object = '01'
AND mst.invstatus not in ('01') AND mst.invstatus in ('02','03')
OPTION 输入.device_code <> "" OPTION 输入.device_code <> ""
(file.device_code like 输入.device_code or (file.device_code like 输入.device_code or
@@ -384,7 +387,9 @@
OPTION 输入.classIds <> "" OPTION 输入.classIds <> ""
class.class_id in 输入.classIds class.class_id in 输入.classIds
ENDOPTION ENDOPTION
OPTION 输入.deptIds <> ""
d2.dept_id in 输入.deptIds
ENDOPTION
OPTION 输入.maintenancecycle <> "" OPTION 输入.maintenancecycle <> ""
mst.maintenancecycle = 输入.maintenancecycle mst.maintenancecycle = 输入.maintenancecycle
ENDOPTION ENDOPTION

76
mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/InbillServiceImpl.java
View File

@@ -10,6 +10,8 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.nl.exception.BadRequestException; import org.nl.exception.BadRequestException;
import org.nl.utils.SecurityUtils; import org.nl.utils.SecurityUtils;
import org.nl.wms.pcs.Enum.ProcStatusEnum;
import org.nl.wms.pcs.Enum.ReceiveStatusEnum;
import org.nl.wms.st.core.service.StorPublicService; import org.nl.wms.st.core.service.StorPublicService;
import org.nl.wql.core.bean.WQLObject; import org.nl.wql.core.bean.WQLObject;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -225,6 +227,10 @@ public class InbillServiceImpl {
WQLObject dtl_table = WQLObject.getWQLObject("ST_IVT_IOStorInvDtl"); WQLObject dtl_table = WQLObject.getWQLObject("ST_IVT_IOStorInvDtl");
WQLObject dis_table = WQLObject.getWQLObject("ST_IVT_IOStorInvDis"); WQLObject dis_table = WQLObject.getWQLObject("ST_IVT_IOStorInvDis");
WQLObject bucket_table = WQLObject.getWQLObject("md_pb_bucketrecord"); WQLObject bucket_table = WQLObject.getWQLObject("md_pb_bucketrecord");
WQLObject reMstTab = WQLObject.getWQLObject("PCS_RC_ReceiveMst"); //到货通知单主表
WQLObject reDtlTab = WQLObject.getWQLObject("PCS_RC_ReceiveDtl"); //到货通知单明细表
WQLObject procTab = WQLObject.getWQLObject("PCS_IF_PurchaseOrderProc"); //采购订单接口处理表
WQLObject dtlTab = WQLObject.getWQLObject("QL_TEST_InspectionSheetDtl"); //质检单明细表
String iostorinv_id = from.getString("iostorinv_id"); String iostorinv_id = from.getString("iostorinv_id");
Long currentUserId = SecurityUtils.getCurrentUserId(); Long currentUserId = SecurityUtils.getCurrentUserId();
@@ -280,11 +286,81 @@ public class InbillServiceImpl {
bucket_table.update(bucket_map, "storagevehicle_code = '" + dis_row.getString("storagevehicle_code") + "' AND status = '02'"); bucket_table.update(bucket_map, "storagevehicle_code = '" + dis_row.getString("storagevehicle_code") + "' AND status = '02'");
//如果单据为原辅料入库，且为寄样合格，回写到货通知单 //如果单据为原辅料入库，且为寄样合格，回写到货通知单
} }
mst_jo.put("bill_status", "99"); mst_jo.put("bill_status", "99");
mst_jo.put("confirm_optid", currentUserId); mst_jo.put("confirm_optid", currentUserId);
mst_jo.put("confirm_optname", nickName); mst_jo.put("confirm_optname", nickName);
mst_jo.put("confirm_time", now); mst_jo.put("confirm_time", now);
if("000101".equals(bill_type)){
//查询
dtl_rows = dtl_table.query("iostorinv_id = '" + iostorinv_id + "' AND bill_status = '99'").getResultJSONArray(0);
for(int i=0; i<dtl_rows.size();i++){
boolean flag = false;
JSONObject jo = dtl_rows.getJSONObject(i);
String quality_scode = jo.getString("quality_scode");
if("01".equals(quality_scode)){//合格
flag = true;
}else if("00".equals(quality_scode)){//待检品
String material_id = jo.getString("material_id");
String pcsn = jo.getString("pcsn");
JSONObject dtl = dtlTab.query("bill_status='99' and material_id='"+material_id+"' and pcsn='"+pcsn+"' and result='01'").uniqueResult(0);
if(dtl!=null){
flag = true;
}
}
if(flag){
JSONObject jsonReDtl = reDtlTab.query("receivedtl_id = '" + jo.getString("source_billdtl_id") + "'").uniqueResult(0);
if(jsonReDtl!=null){
// 如果是合格或者是放行就存入 入库数
jsonReDtl.put("instor_qty", jo.getDoubleValue("real_qty")+jsonReDtl.getDouble("instor_qty"));
//判断到货明细表中的数量与到货入库数是否相等，相同就完成，不相等就到货中
if (jsonReDtl.getDoubleValue("receive_qty") <= jsonReDtl.getDoubleValue("instor_qty")) {
jsonReDtl.put("status", ReceiveStatusEnum.AFFIRM.getCode());
} else {
jsonReDtl.put("status", ReceiveStatusEnum.ARRIVAL_NOTICE.getCode());
}
reDtlTab.update(jsonReDtl);
}
/*
* 判断到货明细单中的状态是否完成，全部完成则更新到货通知单主表完成
*/
JSONArray reDtlArr = reDtlTab.query("receive_id = '" + jsonReDtl.getString("receive_id") + "'").getResultJSONArray(0);
int flag2 = 0;
for (int j = 0; j < reDtlArr.size(); j++) {
JSONObject json1 = reDtlArr.getJSONObject(j);
if (StrUtil.equals(json1.getString("status"), ReceiveStatusEnum.AFFIRM.getCode())) {
flag2 = flag2 + 1;
}
}
JSONObject jsonReMst = reMstTab.query("receive_id = '" + jsonReDtl.getString("receive_id") + "'").uniqueResult(0);
if (reDtlArr.size() == flag2) {
jsonReMst.put("status", ReceiveStatusEnum.AFFIRM.getCode());
jsonReMst.put("confirm_optid", currentUserId);
jsonReMst.put("confirm_optname", nickName);
jsonReMst.put("confirm_time", now);
reMstTab.update(jsonReMst);
}
/*
* 如果到货单主表状态为确认，则需要更新采购订单接口处理表
*/
if (StrUtil.equals(jsonReMst.getString("status"), ReceiveStatusEnum.AFFIRM.getCode())) {
JSONObject jsonProc = procTab.query("id = '" + jsonReDtl.getString("source_billdtl_id") + "'").uniqueResult(0);
// 到货数量 = 订单数量，为完成，否则为采购中
if ((jsonReDtl.getDoubleValue("instor_qty") >= jsonProc.getDoubleValue("qty")) && (StrUtil.equals(jsonReDtl.getString("status"), "99"))) {
jsonProc.put("proc_status", ProcStatusEnum.FULFILL.getCode());
} else {
jsonProc.put("proc_status", ProcStatusEnum.BUYING_CENTER.getCode());
}
procTab.update(jsonProc);
}
}
}
}
//更新主表状态为99 //更新主表状态为99
WQLObject.getWQLObject("ST_IVT_IOStorInv").update(mst_jo); WQLObject.getWQLObject("ST_IVT_IOStorInv").update(mst_jo);
} }

12
mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/RawUatWcQueryServiceImpl.java
View File

@@ -225,11 +225,11 @@ public class RawUatWcQueryServiceImpl implements RawUatWcQueryService {
String inspection_item_id = jsonItem.getString("inspection_item_id"); String inspection_item_id = jsonItem.getString("inspection_item_id");
double value = jsonItem.getDoubleValue("value"); double value = jsonItem.getDoubleValue("value");
if (value > 0 && value < 1){ if (value > 0 && value < 1){
jsonResuft.put(inspection_item_id,"0"+NumberUtil.decimalFormat("#.00", value)); jsonResuft.put(inspection_item_id,"0"+NumberUtil.decimalFormat("#.0000", value));
} else if (value == 0){ } else if (value == 0){
jsonResuft.put(inspection_item_id,"0.00"); jsonResuft.put(inspection_item_id,"0.0000");
} else { } else {
jsonResuft.put(inspection_item_id,NumberUtil.decimalFormat("#.00", value)); jsonResuft.put(inspection_item_id,NumberUtil.decimalFormat("#.0000", value));
} }
} }
// 根据物料批次查找理化单对应的项点 // 根据物料批次查找理化单对应的项点
@@ -239,11 +239,11 @@ public class RawUatWcQueryServiceImpl implements RawUatWcQueryService {
String inspection_item_id = jsonItem.getString("inspection_item_id"); String inspection_item_id = jsonItem.getString("inspection_item_id");
double value = jsonItem.getDoubleValue("value"); double value = jsonItem.getDoubleValue("value");
if (value > 0 && value < 1) { if (value > 0 && value < 1) {
jsonResuft.put(inspection_item_id,"0"+NumberUtil.decimalFormat("#.00", value)); jsonResuft.put(inspection_item_id,"0"+NumberUtil.decimalFormat("#.0000", value));
} else if (value == 0){ } else if (value == 0){
jsonResuft.put(inspection_item_id,"0.00"); jsonResuft.put(inspection_item_id,"0.0000");
} else { } else {
jsonResuft.put(inspection_item_id,NumberUtil.decimalFormat("#.00", value)); jsonResuft.put(inspection_item_id,NumberUtil.decimalFormat("#.0000", value));
} }
} }
array.add(jsonResuft); array.add(jsonResuft);

10
mes/qd/src/api/wms/basedata/master/materialparameters.js
View File

@@ -55,4 +55,12 @@ export function getSeries() {
}) })
} }
export default { add, edit, del, save, queryMaterialParam, getUploadTemplate, getSeries } export function sync(data) {
return request({
url: 'api/MaterialParameters/sync',
method: 'post',
data
})
}
export default { add, edit, del, save, queryMaterialParam, getUploadTemplate, getSeries, sync }

48
mes/qd/src/views/wms/basedata/em/equipmentfile/index.vue
View File

@@ -218,7 +218,7 @@
> >
<el-table-column <el-table-column
v-permission="['admin','equipmentfile:del','equipmentfile:edit']" v-permission="['admin','equipmentfile:del','equipmentfile:edit']"
min-width="130" min-width="125"
label="操作" label="操作"
align="center" align="center"
fixed="right" fixed="right"
@@ -231,37 +231,37 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :selectable="checkboxT" type="selection" width="55" /> <el-table-column fixed="left" :selectable="checkboxT" type="selection" min-width="35" />
<el-table-column prop="设备代码" width="100" label="设备代码" show-overflow-tooltip> <el-table-column fixed="left" prop="设备代码" min-width="95" label="设备代码" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-link type="warning" @click="toView(scope.$index, scope.row)">{{ scope.row.device_code }}</el-link> <el-link type="warning" @click="toView(scope.$index, scope.row)">{{ scope.row.device_code }}</el-link>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="device_name" min-width="150" label="设备名称" /> <el-table-column fixed="left" prop="device_name" min-width="150" label="设备名称" />
<el-table-column prop="extend_code" min-width="100" label="内部自编号" /> <el-table-column fixed="left" prop="extend_code" min-width="100" label="内部自编号" />
<el-table-column prop="device_model" min-width="130" label="设备型号" /> <el-table-column fixed="left" prop="device_model" min-width="130" label="设备型号" />
<el-table-column prop="device_spec" min-width="130" label="设备规格" /> <el-table-column fixed="left" prop="device_spec" min-width="130" label="设备规格" />
<el-table-column prop="device_level" min-width="70" label="设备等级" :formatter="device_levelFormat" /> <el-table-column fixed="left" prop="device_level" min-width="70" label="设备等级" :formatter="device_levelFormat" />
<el-table-column prop="material_type_name" min-width="150" label="设备类别" /> <el-table-column fixed="left" prop="material_type_name" min-width="150" label="设备类别" />
<el-table-column :formatter="is_produceuseFormat" min-width="70" prop="is_produceuse" label="生产用途" /> <el-table-column fixed="left" :formatter="is_produceuseFormat" min-width="70" prop="is_produceuse" label="生产用途" />
<el-table-column :formatter="stateFormat" min-width="70" prop="status" label="设备状态" /> <el-table-column fixed="left" :formatter="stateFormat" min-width="70" prop="status" label="设备状态" />
<el-table-column prop="beginuse_date" min-width="90" label="启用日期" /> <el-table-column prop="beginuse_date" min-width="90" label="启用日期" />
<el-table-column prop="use_deptname" min-width="130" label="使用部门" /> <el-table-column prop="use_deptname" min-width="130" label="使用部门" />
<el-table-column prop="use_groupname" min-width="130" label="使用班组" /> <el-table-column prop="use_groupname" min-width="130" label="使用班组" />
<el-table-column prop="supplier_name" min-width="180" label="供应商" show-overflow-tooltip /> <el-table-column prop="supplier_name" min-width="180" label="供应商" />
<el-table-column prop="manufacturer" min-width="180" label="制造商" show-overflow-tooltip /> <el-table-column prop="manufacturer" min-width="180" label="制造商" />
<el-table-column prop="country_manufactur" min-width="90" label="制造国别" /> <el-table-column prop="country_manufactur" min-width="90" label="制造国别" />
<el-table-column prop="leavefactory_date" min-width="80" label="出厂日期" show-overflow-tooltip /> <el-table-column prop="leavefactory_date" min-width="80" label="出厂日期" />
<el-table-column prop="leavefactory_number" min-width="130" label="出厂编号" show-overflow-tooltip /> <el-table-column prop="leavefactory_number" min-width="130" label="出厂编号" />
<el-table-column prop="drawing_number" min-width="130" label="图号" show-overflow-tooltip /> <el-table-column prop="drawing_number" min-width="130" label="图号" />
<el-table-column prop="device_type" min-width="70" label="设备属性" :formatter="device_typeFormat" show-overflow-tooltip /> <el-table-column prop="device_type" min-width="70" label="设备属性" :formatter="device_typeFormat" />
<el-table-column prop="workprocedure_id" min-width="70" label="工序" :formatter="seriesFormat2" show-overflow-tooltip /> <el-table-column prop="workprocedure_id" min-width="70" label="工序" :formatter="seriesFormat2" />
<el-table-column prop="assets_code" min-width="100" label="资产编码" show-overflow-tooltip /> <el-table-column prop="assets_code" min-width="100" label="资产编码" />
<el-table-column prop="assets_name" min-width="150" label="资产名称" show-overflow-tooltip /> <el-table-column prop="assets_name" min-width="150" label="资产名称" />
<el-table-column prop="create_name" min-width="90" label="生成人" show-overflow-tooltip /> <el-table-column prop="create_name" min-width="90" label="生成人" />
<el-table-column prop="create_time" min-width="140" label="生成时间" show-overflow-tooltip /> <el-table-column prop="create_time" min-width="140" label="生成时间" />
<el-table-column prop="update_optname" min-width="90" label="修改人" show-overflow-tooltip /> <el-table-column prop="update_optname" min-width="90" label="修改人" />
<el-table-column prop="update_time" min-width="140" label="修改时间" show-overflow-tooltip /> <el-table-column prop="update_time" min-width="140" label="修改时间" />
</el-table> </el-table>
<!--分页组件--> <!--分页组件-->
<pagination /> <pagination />

24
mes/qd/src/views/wms/basedata/master/materialParameters/view/CpDialog.vue
View File

@@ -214,6 +214,7 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item label="碳平衡" prop="c_balance"> <el-form-item label="碳平衡" prop="c_balance">
<el-input-number :precision="3" :step="0.001" :max="100" v-model="formData.c_balance" :controls="false" placeholder="%" style="width: 200px;"/> <el-input-number :precision="3" :step="0.001" :max="100" v-model="formData.c_balance" :controls="false" placeholder="%" style="width: 200px;"/>
<el-button type="success" icon="el-icon-refresh" v-if="is_sync" :loading="sync_flg" @click="sync">同步</el-button>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@@ -323,11 +324,13 @@ export default {
return { return {
headers: { 'Authorization': getToken() }, headers: { 'Authorization': getToken() },
formData: {}, formData: {},
is_sync: false,
material_id: '', material_id: '',
file_name: '', file_name: '',
dialogUpload: false, dialogUpload: false,
PicDialog: false, PicDialog: false,
serieseList: [], serieseList: [],
sync_flg: false,
prules: { prules: {
is_auto_open: [ is_auto_open: [
{ required: true, message: '不能为空', trigger: 'blur' } { required: true, message: '不能为空', trigger: 'blur' }
@@ -418,6 +421,11 @@ export default {
} }
crudMaterialparameters.queryMaterialParam(param).then(res => { crudMaterialparameters.queryMaterialParam(param).then(res => {
this.formData = res this.formData = res
if (this.formData.is_sync === '0') {
this.is_sync = false
} else {
this.is_sync = true
}
}).catch(err => { }).catch(err => {
console.log(err.response.data.message) console.log(err.response.data.message)
}) })
@@ -471,6 +479,22 @@ export default {
}, },
submitUpload() { submitUpload() {
const flag = this.$refs.upload.submit() const flag = this.$refs.upload.submit()
},
sync() {
const data = this.formData
this.sync_flg = true
crudMaterialparameters.sync(data).then(res => {
debugger
if (res.c_balance === '') {
this.crud.notify('同步成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
} else {
this.formData.c_balance = res.c_balance
this.crud.notify('同步成功,请确认', CRUD.NOTIFICATION_TYPE.SUCCESS)
}
this.sync_flg = false
}).catch(() => {
this.sync_flg = false
})
} }
} }
} }

59
mes/qd/src/views/wms/pdm/produce/dailyplan/index.vue
View File

@@ -148,7 +148,30 @@
</crudOperation> </crudOperation>
<!--表格渲染--> <!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler"> <el-table ref="table" v-loading="crud.loading" :max-height="590" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column
min-width="115"
label="重排调整"
align="center"
fixed="right"
>
<template slot-scope="scope">
<el-button
type="primary"
size="mini"
icon="el-icon-top"
@click="moveUp(scope.$index, scope.row)"
>
</el-button>
<el-button
type="primary"
size="mini"
icon="el-icon-bottom"
@click="moveDown(scope.$index, scope.row)"
>
</el-button>
</template>
</el-table-column>
<el-table-column <el-table-column
v-permission="['admin','workorder:del','workorder:edit']" v-permission="['admin','workorder:del','workorder:edit']"
min-width="125" min-width="125"
@@ -165,7 +188,7 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :selectable="checkboxT" type="selection" min-width="35" /> <el-table-column fixed="left" :selectable="checkboxT" type="selection" min-width="35" />
<el-table-column prop="plan_code" label="日计划编码" min-width="105" /> <el-table-column prop="plan_code" label="日计划编码" min-width="105" />
<el-table-column :formatter="seriesFormat" min-width="70" prop="product_series_id" label="系列产线" /> <el-table-column :formatter="seriesFormat" min-width="70" prop="product_series_id" label="系列产线" />
<el-table-column prop="device_name" label="关键设备" min-width="80" /> <el-table-column prop="device_name" label="关键设备" min-width="80" />
@@ -173,7 +196,7 @@
<el-table-column prop="plan_org_name" label="申报单位" min-width="105" /> <el-table-column prop="plan_org_name" label="申报单位" min-width="105" />
<el-table-column prop="workorder_type" label="计划类型" :formatter="workorder_typeFormat" min-width="70" /> <el-table-column prop="workorder_type" label="计划类型" :formatter="workorder_typeFormat" min-width="70" />
<el-table-column prop="material_code" label="物料编码" min-width="130"/> <el-table-column prop="material_code" label="物料编码" min-width="130"/>
<el-table-column prop="old_mark" label="牌号" min-width="80" /> <el-table-column prop="old_mark" label="牌号" min-width="100" />
<el-table-column :formatter="seriesFormat2" min-width="70" prop="mater_product_series" label="产品系列" /> <el-table-column :formatter="seriesFormat2" min-width="70" prop="mater_product_series" label="产品系列" />
<el-table-column prop="product_weight" label="计划重量(kg)" :formatter="crud.formatNum0" min-width="95" /> <el-table-column prop="product_weight" label="计划重量(kg)" :formatter="crud.formatNum0" min-width="95" />
<el-table-column prop="product_num" label="批数" min-width="45" /> <el-table-column prop="product_num" label="批数" min-width="45" />
@@ -186,8 +209,6 @@
<el-table-column prop="create_name" label="创建人" min-width="60" /> <el-table-column prop="create_name" label="创建人" min-width="60" />
<el-table-column prop="remark" label="备注" min-width="200" /> <el-table-column prop="remark" label="备注" min-width="200" />
</el-table> </el-table>
<!--分页组件-->
<pagination />
</div> </div>
<AddDialog @AddChanged="querytable" /> <AddDialog @AddChanged="querytable" />
<StructIvt4 ref="child" :dialog-show.sync="structshow" :rowmst="form" @StructIvtClosed="querytable" /> <StructIvt4 ref="child" :dialog-show.sync="structshow" :rowmst="form" @StructIvtClosed="querytable" />
@@ -223,7 +244,7 @@ export default {
url: 'api/dailyplan', url: 'api/dailyplan',
idField: 'dailyplan_id', idField: 'dailyplan_id',
sort: '', sort: '',
query: { nowstart_date: new Date(),device_id: '', status: '01' }, query: { nowstart_date: new Date(), device_id: '', status: '01' },
crudMethod: { ...dailyplan }, crudMethod: { ...dailyplan },
optShow: { optShow: {
add: true, add: true,
@@ -320,14 +341,40 @@ export default {
} }
} }
}, },
moveUp(index, item) {
if (index > 0) {
const upDate = this.crud.data[index - 1]
this.crud.data.splice(index - 1, 1)
this.crud.data.splice(index, 0, upDate)
} else {
this.$message.error('已经是第一条，不可上移')
}
},
moveDown(index, item) {
if ((index + 1) === this.crud.data.length) {
this.$message.error('已经是最后一条，不可下移')
} else {
console.log(index)
const downDate = this.crud.data[index + 1]
this.crud.data.splice(index + 1, 1)
this.crud.data.splice(index, 0, downDate)
}
},
save() { save() {
if (this.crud.query.device_id === '' || this.crud.query.device_id === undefined) { if (this.crud.query.device_id === '' || this.crud.query.device_id === undefined) {
this.crud.notify('请先选择关键设备！') this.crud.notify('请先选择关键设备！')
return false return false
} }
this.checkrows = this.crud.data
if (this.checkrows.length === 0) {
this.crud.notify('当前页面无可重排数据！')
return false
}
dailyplan.submit2({ query: this.crud.query, rows: this.checkrows }).then(res => {
this.form.device_id = this.crud.query.device_id this.form.device_id = this.crud.query.device_id
this.$refs.child.getMsg(this.crud.query.device_id, this.crud.query.nowstart_date, this.crud.query.checked) this.$refs.child.getMsg(this.crud.query.device_id, this.crud.query.nowstart_date, this.crud.query.checked)
this.structshow = true this.structshow = true
})
}, },
downdtl() { downdtl() {
crud.downloadLoading = true crud.downloadLoading = true

4
mes/qd/src/views/wms/pdm/produce/workorder/index.vue
View File

@@ -247,7 +247,7 @@
</el-table-column> </el-table-column>
<el-table-column :selectable="checkboxT" type="selection" min-width="35" /> <el-table-column :selectable="checkboxT" type="selection" min-width="35" />
<el-table-column prop="workorder_date" min-width="83" label="工令日期" :formatter="workorder_dateFormat"/> <el-table-column prop="workorder_date" min-width="83" label="工令日期" :formatter="workorder_dateFormat"/>
<el-table-column prop="workorder_code" min-width="125" label="工令号"> <el-table-column prop="workorder_code" min-width="130" label="工令号">
<template slot-scope="scope"> <template slot-scope="scope">
<el-link type="warning" @click="toView(scope.$index, scope.row)">{{ scope.row.workorder_code }}</el-link> <el-link type="warning" @click="toView(scope.$index, scope.row)">{{ scope.row.workorder_code }}</el-link>
</template> </template>
@@ -257,7 +257,7 @@
<el-table-column :formatter="stateFormat" min-width="70" prop="status" label="工令状态" /> <el-table-column :formatter="stateFormat" min-width="70" prop="status" label="工令状态" />
<el-table-column prop="device_name" min-width="80" label="设备"/> <el-table-column prop="device_name" min-width="80" label="设备"/>
<el-table-column prop="material_code" min-width="130" label="物料编码"/> <el-table-column prop="material_code" min-width="130" label="物料编码"/>
<el-table-column prop="old_mark" min-width="80" label="牌号"/> <el-table-column prop="old_mark" min-width="100" label="牌号"/>
<el-table-column :formatter="seriesFormat" min-width="65" prop="product_series_id" label="系列" /> <el-table-column :formatter="seriesFormat" min-width="65" prop="product_series_id" label="系列" />
<el-table-column prop="pcsn" min-width="75" label="批次"/> <el-table-column prop="pcsn" min-width="75" label="批次"/>
<el-table-column prop="workorder_qty" min-width="70" label="计划重量" :formatter="crud.formatNum0"/> <el-table-column prop="workorder_qty" min-width="70" label="计划重量" :formatter="crud.formatNum0"/>

49
mes/qd/src/views/wms/sb/repair/devicegridcheck/index.vue
View File

@@ -101,35 +101,34 @@
</crudOperation> </crudOperation>
<!--表格渲染--> <!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler"> <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" /> <el-table-column fixed="left" type="selection" min-width="35" />
<el-table-column v-if="false" prop="repair_id" label="设备维修单标识" /> <el-table-column fixed="left" prop="repair_code" label="维修单号" min-width="120" >
<el-table-column prop="repair_code" label="维修单号" width="120px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<el-link type="warning" @click="crud.toView(scope.row)">{{ scope.row.repair_code }}</el-link> <el-link type="warning" @click="crud.toView(scope.row)">{{ scope.row.repair_code }}</el-link>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="device_code" label="设备编码" width="120px" show-overflow-tooltip /> <el-table-column fixed="left" prop="device_code" label="设备编码" min-width="85" />
<el-table-column prop="device_name" label="设备名称" show-overflow-tooltip /> <el-table-column fixed="left" prop="device_name" label="设备名称" min-width="150" />
<el-table-column prop="extend_code" label="设备自编码" width="90px" show-overflow-tooltip /> <el-table-column fixed="left" prop="extend_code" label="设备自编码" min-width="100" />
<el-table-column prop="dept_name" label="归属部门" show-overflow-tooltip /> <el-table-column fixed="left" prop="dept_name" label="归属部门" min-width="130" />
<el-table-column prop="use_name" label="使用班组" show-overflow-tooltip /> <el-table-column fixed="left" prop="use_name" label="使用班组" min-width="130" />
<el-table-column prop="invstatus" label="单据状态" :formatter="formatStatusName"/> <el-table-column fixed="left" prop="invstatus" label="单据状态" :formatter="formatStatusName" min-width="70" />
<el-table-column prop="maintenancecycle" label="单据类型" :formatter="formatTypeName"/> <el-table-column fixed="left" prop="maintenancecycle" label="单据类型" :formatter="formatTypeName" min-width="70" />
<el-table-column prop="fault_level" label="故障等级" :formatter="formatLevelName"/> <el-table-column fixed="left" prop="fault_level" label="故障等级" :formatter="formatLevelName" min-width="70" />
<el-table-column prop="plan_start_date" label="计划维修日期" width="120px" show-overflow-tooltip /> <el-table-column fixed="left" prop="plan_start_date" label="计划维修日期" min-width="95" />
<el-table-column prop="fault_desc" label="故障描述" show-overflow-tooltip /> <el-table-column prop="fault_desc" label="故障描述" min-width="200" />
<el-table-column prop="remark" label="备注" show-overflow-tooltip /> <el-table-column prop="remark" label="备注" min-width="200" />
<el-table-column prop="input_optname" label="制单人" /> <el-table-column prop="input_optname" label="制单人" min-width="90" />
<el-table-column prop="input_time" label="制单时间" width="150px" show-overflow-tooltip /> <el-table-column prop="input_time" label="制单时间" min-width="140" />
<el-table-column prop="update_optname" label="维修人" /> <el-table-column prop="update_optname" label="维修人" min-width="150" />
<el-table-column prop="real_start_date" label="开始时间" width="150px" show-overflow-tooltip /> <el-table-column prop="real_start_date" label="开始时间" min-width="140" />
<el-table-column prop="real_end_date" label="结束时间" width="150px" show-overflow-tooltip /> <el-table-column prop="real_end_date" label="结束时间" min-width="140" />
<el-table-column prop="confirm_optname" label="验收人" /> <el-table-column prop="confirm_optname" label="验收人" min-width="150" />
<el-table-column prop="confirm_time" label="验收时间" width="150px" show-overflow-tooltip /> <el-table-column prop="confirm_time" label="验收时间" min-width="140" />
<el-table-column prop="audit_optname" label="审核人" /> <el-table-column prop="audit_optname" label="审核人" min-width="90" />
<el-table-column prop="audit_time" label="审核时间" width="150px" show-overflow-tooltip /> <el-table-column prop="audit_time" label="审核时间" min-width="140" />
<el-table-column prop="source_bill_code" label="源单号" show-overflow-tooltip /> <el-table-column prop="source_bill_code" label="源单号" min-width="120px" />
<el-table-column prop="source_bill_type" label="源单业务类型" width="120px" /> <el-table-column prop="source_bill_type" label="源单业务类型" min-width="90" />
</el-table> </el-table>
<!--分页组件--> <!--分页组件-->
<pagination /> <pagination />

51
mes/qd/src/views/wms/sb/repair/devicerepair/index.vue
View File

@@ -92,36 +92,35 @@
</crudOperation> </crudOperation>
<!--表格渲染--> <!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler"> <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" /> <el-table-column fixed="left" type="selection" min-width="35" />
<el-table-column v-if="false" prop="repair_id" label="设备维修单标识" /> <el-table-column fixed="left" prop="repair_code" label="维修单号" min-width="120px" >
<el-table-column prop="repair_code" label="维修单号" width="120px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<el-link type="warning" @click="crud.toView(scope.row)">{{ scope.row.repair_code }}</el-link> <el-link type="warning" @click="crud.toView(scope.row)">{{ scope.row.repair_code }}</el-link>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="device_code" label="设备编码" width="120px" show-overflow-tooltip /> <el-table-column fixed="left" prop="device_code" label="设备编码" min-width="85" />
<el-table-column prop="device_name" label="设备名称" show-overflow-tooltip /> <el-table-column fixed="left" prop="device_name" label="设备名称" min-width="150" />
<el-table-column prop="extend_code" label="设备自编码" width="90px" show-overflow-tooltip /> <el-table-column fixed="left" prop="extend_code" label="设备自编码" min-width="100" />
<el-table-column prop="dept_name" label="归属部门" show-overflow-tooltip /> <el-table-column fixed="left" prop="dept_name" label="归属部门" min-width="130" />
<el-table-column prop="use_name" label="使用班组" show-overflow-tooltip /> <el-table-column fixed="left" prop="use_name" label="使用班组" min-width="130" />
<el-table-column prop="invstatus" label="单据状态" :formatter="formatStatusName"/> <el-table-column fixed="left" prop="invstatus" label="单据状态" :formatter="formatStatusName" min-width="70" />
<el-table-column prop="maintenancecycle" label="单据类型" :formatter="formatTypeName"/> <el-table-column fixed="left" prop="maintenancecycle" label="单据类型" :formatter="formatTypeName" min-width="70" />
<el-table-column prop="fault_level" label="故障等级" :formatter="formatLevelName"/> <el-table-column fixed="left" prop="fault_level" label="故障等级" :formatter="formatLevelName" min-width="70" />
<el-table-column prop="plan_start_date" label="计划维修日期" width="120px" show-overflow-tooltip /> <el-table-column fixed="left" prop="plan_start_date" label="计划维修日期" min-width="95" />
<el-table-column prop="fault_desc" label="故障描述" show-overflow-tooltip /> <el-table-column prop="fault_desc" label="故障描述" min-width="200" />
<el-table-column prop="remark" label="备注" show-overflow-tooltip /> <el-table-column prop="remark" label="备注" min-width="200" />
<el-table-column prop="input_optname" label="制单人" /> <el-table-column prop="input_optname" label="制单人" min-width="120px" />
<el-table-column prop="input_time" label="制单时间" width="150px" show-overflow-tooltip /> <el-table-column prop="input_time" label="制单时间" min-width="140" />
<el-table-column prop="update_optname" label="维修人" /> <el-table-column prop="update_optname" label="维修人" min-width="120px" />
<el-table-column prop="real_start_date" label="开始时间" width="150px" show-overflow-tooltip /> <el-table-column prop="real_start_date" label="开始时间" min-width="140" />
<el-table-column prop="real_end_date" label="结束时间" width="150px" show-overflow-tooltip /> <el-table-column prop="real_end_date" label="结束时间" min-width="140" />
<el-table-column prop="confirm_optname" label="确认人" /> <el-table-column prop="confirm_optname" label="确认人" min-width="120px" />
<el-table-column prop="confirm_time" label="确认时间" width="150px" show-overflow-tooltip /> <el-table-column prop="confirm_time" label="确认时间" min-width="140" />
<el-table-column prop="audit_optname" label="审核人" /> <el-table-column prop="audit_optname" label="审核人" min-width="120px" />
<el-table-column prop="audit_time" label="审核时间" width="150px" show-overflow-tooltip /> <el-table-column prop="audit_time" label="审核时间" min-width="140" />
<el-table-column prop="source_bill_code" label="源单号" show-overflow-tooltip /> <el-table-column prop="source_bill_code" label="源单号" min-width="120px" />
<el-table-column prop="source_bill_type" label="源单业务类型" width="120px" /> <el-table-column prop="source_bill_type" label="源单业务类型" min-width="90" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right"> <el-table-column v-permission="[]" label="操作" min-width="125" align="center" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<udOperation <udOperation
:data="scope.row" :data="scope.row"

53
mes/qd/src/views/wms/sb/repair/devicerepairpa/index.vue
View File

@@ -136,33 +136,32 @@
</crudOperation> </crudOperation>
<!--表格渲染--> <!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="mySelectionChange"> <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="mySelectionChange">
<el-table-column type="selection" width="55" /> <el-table-column fixed="left" type="selection" min-width="35" />
<el-table-column v-if="false" prop="repair_id" label="设备维修单标识" /> <el-table-column fixed="left" prop="repair_code" label="维修单号" min-width="105" />
<el-table-column prop="repair_code" label="维修单号" width="120px" show-overflow-tooltip /> <el-table-column fixed="left" prop="device_code" label="设备编码" min-width="85" />
<el-table-column prop="device_code" label="设备编码" width="120px" show-overflow-tooltip /> <el-table-column fixed="left" prop="device_name" label="设备名称" min-width="150" />
<el-table-column prop="device_name" label="设备名称" show-overflow-tooltip /> <el-table-column fixed="left" prop="dept_name" label="所属部门" min-width="130" />
<el-table-column prop="dept_name" label="所属部门" show-overflow-tooltip /> <el-table-column fixed="left" prop="use_name" label="使用班组" min-width="130" />
<el-table-column prop="use_name" label="使用班组" show-overflow-tooltip /> <el-table-column fixed="left" prop="extend_code" label="设备自编码" min-width="100" />
<el-table-column prop="extend_code" label="设备自编码" width="90px" show-overflow-tooltip /> <el-table-column fixed="left" prop="invstatus" label="单据状态" :formatter="formatStatusName" min-width="70" />
<el-table-column prop="invstatus" label="单据状态" :formatter="formatStatusName"/> <el-table-column fixed="left" prop="maintenancecycle" label="单据类型" :formatter="formatTypeName" min-width="70" />
<el-table-column prop="maintenancecycle" label="单据类型" :formatter="formatTypeName"/> <el-table-column fixed="left" prop="fault_level" label="故障等级" :formatter="formatLevelName" min-width="70" />
<el-table-column prop="fault_level" label="故障等级" :formatter="formatLevelName"/> <el-table-column fixed="left" prop="plan_start_date" label="计划维修日期" width="95" />
<el-table-column prop="plan_start_date" label="计划维修日期" width="120px" show-overflow-tooltip /> <el-table-column prop="fault_desc" label="故障描述" min-width="150" />
<el-table-column prop="fault_desc" label="故障描述" show-overflow-tooltip /> <el-table-column prop="request_name" label="报修人" min-width="90" />
<el-table-column prop="request_name" label="报修人" /> <el-table-column prop="remark" label="备注" min-width="200" />
<el-table-column prop="remark" label="备注" show-overflow-tooltip /> <el-table-column prop="input_optname" label="制单人" min-width="90" />
<el-table-column prop="input_optname" label="制单人" /> <el-table-column prop="input_time" label="制单时间" min-width="140" />
<el-table-column prop="input_time" label="制单时间" width="150px" show-overflow-tooltip /> <el-table-column prop="update_optname" label="维修人" min-width="150" />
<el-table-column prop="update_optname" label="维修人" show-overflow-tooltip /> <el-table-column prop="real_start_date" label="开始时间" min-width="140" />
<el-table-column prop="real_start_date" label="开始时间" width="150px" show-overflow-tooltip /> <el-table-column prop="real_end_date" label="结束时间" min-width="140" />
<el-table-column prop="real_end_date" label="结束时间" width="150px" show-overflow-tooltip /> <el-table-column prop="confirm_optname" label="验收人" min-width="90" />
<el-table-column prop="confirm_optname" label="验收人" /> <el-table-column prop="confirm_time" label="验收时间" min-width="140" />
<el-table-column prop="confirm_time" label="验收时间" width="150px" show-overflow-tooltip /> <el-table-column prop="audit_optname" label="审核人" min-width="90" />
<el-table-column prop="audit_optname" label="审核人" /> <el-table-column prop="audit_time" label="审核时间" min-width="140" />
<el-table-column prop="audit_time" label="审核时间" width="150px" show-overflow-tooltip /> <el-table-column prop="source_bill_code" label="源单号" min-width="100" />
<el-table-column prop="source_bill_code" label="源单号" show-overflow-tooltip /> <el-table-column prop="source_bill_type" label="源单业务类型" min-width="95" />
<el-table-column prop="source_bill_type" label="源单业务类型" width="120px" /> <el-table-column v-permission="[]" label="操作" min-width="125" align="center" fixed="right">
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<udOperation <udOperation
:data="scope.row" :data="scope.row"

39
mes/qd/src/views/wms/sb/repair/devicerepairplan/index.vue
View File

@@ -109,9 +109,8 @@
</crudOperation> </crudOperation>
<!--表格渲染--> <!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler"> <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" /> <el-table-column fixed="left" type="selection" min-width="35" />
<el-table-column v-if="false" prop="repair_plan_id" label="维修计划标识" /> <el-table-column fixed="left" prop="is_active" min-width="70" label="是否启用">
<el-table-column prop="is_active" label="是否启用">
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch <el-switch
:value="format_is_active(scope.row.is_active)" :value="format_is_active(scope.row.is_active)"
@@ -121,23 +120,23 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="repair_plan_code" label="计划单号" width="120px" /> <el-table-column fixed="left" prop="repair_plan_code" label="计划单号" min-width="120" />
<el-table-column prop="repair_plan_name" label="计划名称" show-overflow-tooltip /> <el-table-column fixed="left" prop="repair_plan_name" label="计划名称" min-width="150px" />
<el-table-column prop="class_name" label="设备类型" /> <el-table-column fixed="left" prop="class_name" label="设备类型" min-width="130" />
<el-table-column prop="device_code" label="设备编号" show-overflow-tooltip /> <el-table-column fixed="left" prop="device_code" label="设备编号" min-width="85" />
<el-table-column prop="device_name" label="设备名称" show-overflow-tooltip /> <el-table-column fixed="left" prop="device_name" label="设备名称" min-width="150" />
<el-table-column prop="extend_code" label="设备自编码" width="90px" show-overflow-tooltip /> <el-table-column fixed="left" prop="extend_code" label="设备自编码" min-width="100" />
<el-table-column prop="maintenancecycle" label="维修周期" :formatter="formatMainName" /> <el-table-column fixed="left" prop="maintenancecycle" label="维修周期" :formatter="formatMainName" min-width="70" />
<el-table-column prop="repair_type" label="维修类型" :formatter="formatRepairpType" /> <el-table-column fixed="left" prop="repair_type" label="维修类型" :formatter="formatRepairpType" min-width="70" />
<el-table-column prop="plan_start_date" label="计划开始日期" width="120px" /> <el-table-column fixed="left" prop="plan_start_date" label="计划开始日期" min-width="95" />
<el-table-column prop="real_start_date" label="实际开始日期" width="120px" /> <el-table-column fixed="left" prop="real_start_date" label="实际开始日期" min-width="95" />
<el-table-column prop="real_end_date" label="实际结束日期" width="120px" /> <el-table-column fixed="left" prop="real_end_date" label="实际结束日期" min-width="95" />
<el-table-column prop="create_name" label="创建人" /> <el-table-column prop="create_name" label="创建人" min-width="90" />
<el-table-column prop="create_time" label="创建时间" width="150px" /> <el-table-column prop="create_time" label="创建时间" min-width="140" />
<el-table-column prop="confirm_optname" label="审核人" /> <el-table-column prop="confirm_optname" label="审核人" min-width="90" />
<el-table-column prop="confirm_time" label="审核时间" width="150px" /> <el-table-column prop="confirm_time" label="审核时间" min-width="140" />
<el-table-column prop="remark" label="备注" show-overflow-tooltip /> <el-table-column prop="remark" label="备注" min-width="200" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right"> <el-table-column v-permission="[]" label="操作" min-width="125" align="center" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<udOperation <udOperation
:data="scope.row" :data="scope.row"

35
mes/qd/src/views/wms/sb/repair/devicerepairrequest/index.vue
View File

@@ -85,28 +85,27 @@
</crudOperation> </crudOperation>
<!--表格渲染--> <!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler"> <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" /> <el-table-column fixed="left" type="selection" min-width="35" />
<el-table-column v-if="false" prop="request_id" label="报修标识" /> <el-table-column fixed="left" prop="request_code" min-width="120px" label="报修单号" />
<el-table-column prop="request_code" width="120px" label="报修单号" show-overflow-tooltip /> <el-table-column fixed="left" prop="path" label="故障图片" min-width="70">
<el-table-column prop="path" label="故障图片" width="80px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="primary" icon="el-icon-folder-opened" circle @click="Picconfirm(scope.$index, scope.row)" /> <el-button type="primary" icon="el-icon-folder-opened" circle @click="Picconfirm(scope.$index, scope.row)" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="device_code" label="设备编码" show-overflow-tooltip /> <el-table-column fixed="left" prop="device_code" label="设备编码" min-width="85" />
<el-table-column prop="device_name" label="设备名称" show-overflow-tooltip /> <el-table-column fixed="left" prop="device_name" label="设备名称" min-width="150" />
<el-table-column prop="extend_code" label="设备自编码" width="90px" show-overflow-tooltip /> <el-table-column fixed="left" prop="extend_code" label="设备自编码" min-width="100" />
<el-table-column prop="device_faultclass_name" label="故障分类" /> <el-table-column fixed="left" prop="device_faultclass_name" label="故障分类" min-width="145" />
<el-table-column prop="fault_level" label="故障等级" :formatter="formaLevelName" /> <el-table-column fixed="left" prop="fault_level" label="故障等级" :formatter="formaLevelName" min-width="70" />
<el-table-column prop="status" label="状态" :formatter="formatStatusName"/> <el-table-column fixed="left" prop="status" label="状态" :formatter="formatStatusName" min-width="70" />
<el-table-column prop="is_passed" label="是否通过" :formatter="formatPassedName"/> <el-table-column fixed="left" prop="is_passed" label="是否通过" :formatter="formatPassedName" min-width="70" />
<el-table-column prop="fault_desc" label="故障描述" show-overflow-tooltip width="120px" /> <el-table-column prop="fault_desc" label="故障描述" min-width="150" />
<el-table-column prop="remark" label="备注" show-overflow-tooltip width="120px" /> <el-table-column prop="remark" label="备注" min-width="200" />
<el-table-column prop="fault_time" label="故障时间" width="150px" /> <el-table-column prop="fault_time" label="故障时间" min-width="140" />
<el-table-column prop="create_name" label="创建人" /> <el-table-column prop="create_name" label="创建人" min-width="90" />
<el-table-column prop="create_time" label="创建时间" width="150px" /> <el-table-column prop="create_time" label="创建时间" min-width="140" />
<el-table-column prop="process_name" label="处理人" /> <el-table-column prop="process_name" label="处理人" min-width="90" />
<el-table-column prop="process_time" label="处理时间" width="150px" /> <el-table-column prop="process_time" label="处理时间" min-width="140" />
</el-table> </el-table>
<!--分页组件--> <!--分页组件-->
<pagination /> <pagination />

45
mes/qd/src/views/wms/sb/repair/devicerepairudit/index.vue
View File

@@ -114,33 +114,32 @@
</crudOperation> </crudOperation>
<!--表格渲染--> <!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler"> <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" /> <el-table-column fixed="left" type="selection" min-width="35" />
<el-table-column v-if="false" prop="repair_id" label="设备维修单标识" /> <el-table-column fixed="left" prop="repair_code" label="维修单号" min-width="120" >
<el-table-column prop="repair_code" label="维修单号" width="120px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<el-link type="warning" @click="openReceive(scope.row)">{{ scope.row.repair_code }}</el-link> <el-link type="warning" @click="openReceive(scope.row)">{{ scope.row.repair_code }}</el-link>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="device_code" label="设备编码" width="120px" show-overflow-tooltip /> <el-table-column fixed="left" prop="device_code" label="设备编码" min-width="85" />
<el-table-column prop="device_name" label="设备名称" show-overflow-tooltip /> <el-table-column fixed="left" prop="device_name" label="设备名称" min-width="170" />
<el-table-column prop="extend_code" label="设备自编码" width="90px" show-overflow-tooltip /> <el-table-column fixed="left" prop="extend_code" label="设备自编码" min-width="100" />
<el-table-column prop="invstatus" label="单据状态" :formatter="formatStatusName"/> <el-table-column fixed="left" prop="invstatus" label="单据状态" :formatter="formatStatusName" min-width="70" />
<el-table-column prop="maintenancecycle" label="单据类型" :formatter="formatTypeName"/> <el-table-column fixed="left" prop="maintenancecycle" label="单据类型" :formatter="formatTypeName" min-width="70" />
<el-table-column prop="fault_level" label="故障等级" :formatter="formatLevelName"/> <el-table-column fixed="left" prop="fault_level" label="故障等级" :formatter="formatLevelName" min-width="70" />
<el-table-column prop="plan_start_date" label="计划维修日期" width="120px" show-overflow-tooltip /> <el-table-column fixed="left" prop="plan_start_date" label="计划维修日期" min-width="95" />
<el-table-column prop="fault_desc" label="故障描述" show-overflow-tooltip /> <el-table-column prop="fault_desc" label="故障描述" min-width="200" />
<el-table-column prop="remark" label="备注" show-overflow-tooltip /> <el-table-column prop="remark" label="备注" min-width="200" />
<el-table-column prop="input_optname" label="制单人" /> <el-table-column prop="input_optname" label="制单人" min-width="90" />
<el-table-column prop="input_time" label="制单时间" width="150px" show-overflow-tooltip /> <el-table-column prop="input_time" label="制单时间" min-width="140" />
<el-table-column prop="update_optname" label="维修人" show-overflow-tooltip /> <el-table-column prop="update_optname" label="维修人" min-width="150" />
<el-table-column prop="real_start_date" label="开始时间" width="150px" show-overflow-tooltip /> <el-table-column prop="real_start_date" label="开始时间" min-width="140" />
<el-table-column prop="real_end_date" label="结束时间" width="150px" show-overflow-tooltip /> <el-table-column prop="real_end_date" label="结束时间" min-width="140" />
<el-table-column prop="confirm_optname" label="确认人" /> <el-table-column prop="confirm_optname" label="确认人" min-width="90" />
<el-table-column prop="confirm_time" label="确认时间" width="150px" show-overflow-tooltip /> <el-table-column prop="confirm_time" label="确认时间" min-width="140" />
<el-table-column prop="audit_optname" label="审核人" /> <el-table-column prop="audit_optname" label="审核人" min-width="90" />
<el-table-column prop="audit_time" label="审核时间" width="150px" show-overflow-tooltip /> <el-table-column prop="audit_time" label="审核时间" min-width="140" />
<el-table-column prop="source_bill_code" label="源单号" show-overflow-tooltip /> <el-table-column prop="source_bill_code" label="源单号" min-width="120px" />
<el-table-column prop="source_bill_type" label="源单业务类型" width="120px" /> <el-table-column prop="source_bill_type" label="源单业务类型" min-width="90" />
</el-table> </el-table>
<!--分页组件--> <!--分页组件-->
<pagination /> <pagination />

53
mes/qd/src/views/wms/sb/repair/devicerepaorout/index.vue
View File

@@ -103,33 +103,32 @@
</crudOperation> </crudOperation>
<!--表格渲染--> <!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler"> <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" /> <el-table-column fixed="left" type="selection" min-width="35" />
<el-table-column v-if="false" prop="repair_id" label="设备维修单标识" /> <el-table-column fixed="left" prop="repair_code" label="维修单号" min-width="120" />
<el-table-column prop="repair_code" label="维修单号" width="120px" show-overflow-tooltip /> <el-table-column fixed="left" prop="device_code" label="设备编码" min-width="85" />
<el-table-column prop="device_code" label="设备编码" width="120px" show-overflow-tooltip /> <el-table-column fixed="left" prop="device_name" label="设备名称" min-width="150" />
<el-table-column prop="device_name" label="设备名称" show-overflow-tooltip /> <el-table-column fixed="left" prop="extend_code" label="设备自编码" min-width="100" />
<el-table-column prop="extend_code" label="设备自编码" width="90px" show-overflow-tooltip /> <el-table-column fixed="left" prop="invstatus" label="单据状态" :formatter="formatStatusName" min-width="70" />
<el-table-column prop="invstatus" label="单据状态" :formatter="formatStatusName"/> <el-table-column fixed="left" prop="maintenancecycle" label="单据类型" :formatter="formatTypeName" min-width="70" />
<el-table-column prop="maintenancecycle" label="单据类型" :formatter="formatTypeName"/> <el-table-column fixed="left" prop="fault_level" label="故障等级" :formatter="formatLevelName" min-width="70" />
<el-table-column prop="fault_level" label="故障等级" :formatter="formatLevelName"/> <el-table-column fixed="left" prop="plan_start_date" label="计划维修日期" min-width="95" />
<el-table-column prop="plan_start_date" label="计划维修日期" width="120px" show-overflow-tooltip /> <el-table-column prop="fault_desc" label="故障描述" min-width="150" />
<el-table-column prop="fault_desc" label="故障描述" show-overflow-tooltip /> <el-table-column prop="remark" label="备注" min-width="200" />
<el-table-column prop="remark" label="备注" show-overflow-tooltip /> <el-table-column prop="input_optname" label="制单人" min-width="90" />
<el-table-column prop="input_optname" label="制单人" /> <el-table-column prop="input_time" label="制单时间" min-width="140" />
<el-table-column prop="input_time" label="制单时间" width="150px" show-overflow-tooltip /> <el-table-column prop="update_optname" label="维修人" min-width="120" />
<el-table-column prop="update_optname" label="维修人" /> <el-table-column prop="real_start_date" label="开始时间" min-width="140" />
<el-table-column prop="real_start_date" label="开始时间" width="150px" show-overflow-tooltip /> <el-table-column prop="real_end_date" label="结束时间" min-width="140" />
<el-table-column prop="real_end_date" label="结束时间" width="150px" show-overflow-tooltip /> <el-table-column prop="outsourceaskfor_optname" label="委外申请人" min-width="120" />
<el-table-column prop="outsourceaskfor_optname" label="委外申请人" show-overflow-tooltip /> <el-table-column prop="outsourceaskfor_time" label="委外申请时间" min-width="140" />
<el-table-column prop="outsourceaskfor_time" label="委外申请时间" width="150px" show-overflow-tooltip /> <el-table-column prop="outsourceback_optname" label="委外验收" min-width="90" />
<el-table-column prop="outsourceback_optname" label="委外验收" show-overflow-tooltip /> <el-table-column prop="outsourceback_time" label="委外验收时间" min-width="140" />
<el-table-column prop="outsourceback_time" label="委外验收时间" width="150px" show-overflow-tooltip /> <el-table-column prop="confirm_optname" label="确认人" min-width="90" />
<el-table-column prop="confirm_optname" label="确认人" /> <el-table-column prop="confirm_time" label="确认时间" min-width="140" />
<el-table-column prop="confirm_time" label="确认时间" width="150px" show-overflow-tooltip /> <el-table-column prop="audit_optname" label="审核人" min-width="90" />
<el-table-column prop="audit_optname" label="审核人" /> <el-table-column prop="audit_time" label="审核时间" min-width="140" />
<el-table-column prop="audit_time" label="审核时间" width="150px" show-overflow-tooltip /> <el-table-column prop="source_bill_code" label="源单号" min-width="120" />
<el-table-column prop="source_bill_code" label="源单号" show-overflow-tooltip /> <el-table-column prop="source_bill_type" label="源单业务类型" min-width="95" />
<el-table-column prop="source_bill_type" label="源单业务类型" width="120px" />
</el-table> </el-table>
<!--分页组件--> <!--分页组件-->
<pagination /> <pagination />

82
mes/qd/src/views/wms/sb/repair/devicevprs/index.vue
View File

@@ -29,6 +29,15 @@
placeholder="请选择" placeholder="请选择"
/> />
</el-form-item> </el-form-item>
<el-form-item label="使用班组">
<treeselect
v-model="query.use_groupid"
:load-options="loadDepts"
:options="depts"
style="width: 200px;"
placeholder="请选择"
/>
</el-form-item>
<el-form-item label="设备"> <el-form-item label="设备">
<el-input <el-input
v-model="query.device_code" v-model="query.device_code"
@@ -147,32 +156,31 @@
</el-dialog> </el-dialog>
<!--表格渲染--> <!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler"> <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" /> <el-table-column fixed="left" type="selection" min-width="35" />
<el-table-column v-if="false" prop="request_id" label="报修标识" /> <el-table-column fixed="left" prop="request_code" min-width="100" label="报修单号" />
<el-table-column prop="request_code" width="120px" label="报修单号" show-overflow-tooltip /> <el-table-column fixed="left" prop="path" label="故障图片" min-width="70">
<el-table-column prop="path" label="故障图片" width="80px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="primary" icon="el-icon-folder-opened" circle @click="Picconfirm(scope.$index, scope.row)" /> <el-button type="primary" icon="el-icon-folder-opened" circle @click="Picconfirm(scope.$index, scope.row)" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="device_code" label="设备编码" show-overflow-tooltip /> <el-table-column fixed="left" prop="device_code" label="设备编码" min-width="85" />
<el-table-column prop="device_name" label="设备名称" show-overflow-tooltip /> <el-table-column fixed="left" prop="device_name" label="设备名称" min-width="150" />
<el-table-column prop="extend_code" label="设备自编码" width="90px" show-overflow-tooltip /> <el-table-column fixed="left" prop="extend_code" label="设备自编码" min-width="100" />
<el-table-column prop="dept_name" label="所属部门" show-overflow-tooltip /> <el-table-column fixed="left" prop="dept_name" label="所属部门" min-width="130" />
<el-table-column prop="use_name" label="使用班组" show-overflow-tooltip /> <el-table-column fixed="left" prop="use_name" label="使用班组" min-width="130" />
<el-table-column prop="product_person_name" label="班组配合人" width="90px" show-overflow-tooltip /> <el-table-column fixed="left" prop="product_person_name" label="班组配合人" min-width="90" />
<el-table-column prop="device_faultclass_name" label="故障分类" /> <el-table-column fixed="left" prop="device_faultclass_name" label="故障分类" min-width="145" />
<el-table-column prop="fault_level" label="故障等级" :formatter="formaLevelName" /> <el-table-column fixed="left" prop="fault_level" label="故障等级" :formatter="formaLevelName" min-width="70" />
<el-table-column prop="status" label="状态" :formatter="formatStatusName"/> <el-table-column fixed="left" prop="status" label="状态" :formatter="formatStatusName" min-width="70" />
<el-table-column prop="is_passed" label="是否通过" :formatter="formatPassedName"/> <el-table-column fixed="left" prop="is_passed" label="是否通过" :formatter="formatPassedName" min-width="70" />
<el-table-column prop="fault_desc" label="故障描述" show-overflow-tooltip width="120px" /> <el-table-column prop="fault_desc" label="故障描述" min-width="150" />
<el-table-column prop="remark" label="备注" show-overflow-tooltip width="120px" /> <el-table-column prop="remark" label="备注" min-width="200" />
<el-table-column prop="fault_time" label="故障时间" width="150px" /> <el-table-column prop="fault_time" label="故障时间" min-width="140" />
<el-table-column prop="create_name" label="报修人" /> <el-table-column prop="create_name" label="报修人" min-width="90" />
<el-table-column prop="create_time" label="创建时间" width="150px" /> <el-table-column prop="create_time" label="创建时间" min-width="140" />
<el-table-column prop="process_name" label="处理人" /> <el-table-column prop="process_name" label="处理人" min-width="90" />
<el-table-column prop="process_time" label="处理时间" width="150px" /> <el-table-column prop="process_time" label="处理时间" min-width="140" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right"> <el-table-column v-permission="[]" label="操作" min-width="125" align="center" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<udOperation <udOperation
:data="scope.row" :data="scope.row"
@@ -207,7 +215,8 @@ import crudMaterialbase from '@/api/wms/basedata/master/materialbase'
import PicDialog from '@/views/wms/sb/repair/devicerepairrequest/PicDialog' import PicDialog from '@/views/wms/sb/repair/devicerepairrequest/PicDialog'
import DeviceDialog from '@/views/wms/sb/repair/devicevprs/DeviceDialog' import DeviceDialog from '@/views/wms/sb/repair/devicevprs/DeviceDialog'
import FaultDialog from '@/views/wms/sb/repair/devicevprs/FaultDialog' import FaultDialog from '@/views/wms/sb/repair/devicevprs/FaultDialog'
import { getDepts } from '@/api/system/dept' import { getDepts, getDeptSuperior } from '@/api/system/dept'
import { mapGetters } from 'vuex'
const defaultForm = { material_type_id: null, product_person_name: null, device_faultclass_name: null, device_code: null, request_id: null, request_code: null, devicerecord_id: null, fault_time: null, device_faultclass_id: null, fault_desc: null, fault_level: null, remark: null, status: null, create_id: null, create_name: null, create_time: null, is_passed: null, process_id: null, process_name: null, process_time: null, finish_id: null, finish_name: null, finish_time: null, is_delete: null, sysdeptid: null, syscompanyid: null } const defaultForm = { material_type_id: null, product_person_name: null, device_faultclass_name: null, device_code: null, request_id: null, request_code: null, devicerecord_id: null, fault_time: null, device_faultclass_id: null, fault_desc: null, fault_level: null, remark: null, status: null, create_id: null, create_name: null, create_time: null, is_passed: null, process_id: null, process_name: null, process_time: null, finish_id: null, finish_name: null, finish_time: null, is_delete: null, sysdeptid: null, syscompanyid: null }
export default { export default {
@@ -267,6 +276,11 @@ export default {
} }
} }
}, },
computed: {
...mapGetters({
user: 'user'
})
},
created() { created() {
const param = { const param = {
'materOpt_code': this.materOpt_code 'materOpt_code': this.materOpt_code
@@ -278,6 +292,9 @@ export default {
this.queryClassId() this.queryClassId()
}) })
this.getDepts() this.getDepts()
this.query.use_groupid = this.user.dept.id
this.getSupDepts(this.user.dept.id)
this.crud.toQuery()
}, },
methods: { methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据 // 钩子：在获取表格数据之前执行，false 则代表不获取数据
@@ -402,6 +419,25 @@ export default {
return obj return obj
}) })
}) })
},
getSupDepts(deptId) {
debugger
var number = parseFloat(deptId)
getDeptSuperior(number).then(res => {
const date = res.content
this.buildDepts(date)
this.depts = date
})
},
buildDepts(depts) {
depts.forEach(data => {
if (data.children) {
this.buildDepts(data.children)
}
if (data.hasChildren && !data.children) {
data.children = null
}
})
} }
} }
} }

37
mes/qd/src/views/wms/sb/run/devicerunrecord/index.vue
View File

@@ -131,25 +131,24 @@
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;"
@cell-dblclick = "mydb" @cell-dblclick = "mydb"
@selection-change="crud.selectionChangeHandler"> @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" /> <el-table-column fixed="left" type="selection" min-width="35" />
<el-table-column v-if="false" prop="runrecord_id" label="记录标识" /> <el-table-column fixed="left" prop="run_date" label="填报日期" min-width="95" />
<el-table-column prop="run_date" label="填报日期" width="120px" show-overflow-tooltip /> <el-table-column fixed="left" prop="device_code" label="设备代码" min-width="85" />
<el-table-column prop="device_code" label="设备代码" width="120px" show-overflow-tooltip /> <el-table-column fixed="left" prop="device_name" label="设备名称" min-width="150" />
<el-table-column prop="device_name" label="设备名称" width="120px" show-overflow-tooltip /> <el-table-column fixed="left" prop="extend_code" label="自编码" min-width="100" />
<el-table-column prop="extend_code" label="自编码" /> <el-table-column fixed="left" prop="class_name" label="设备类类别" min-width="120px" />
<el-table-column prop="class_name" label="设备类类别" width="120px" show-overflow-tooltip /> <el-table-column fixed="left" prop="dept_name" label="使用班组" min-width="130" />
<el-table-column prop="dept_name" label="使用班组" width="120px" show-overflow-tooltip /> <el-table-column prop="run_times" label="工作时间(分钟)" min-width="120" />
<el-table-column prop="run_times" label="工作时间(分钟)" width="120px" /> <el-table-column prop="prepare_times" label="保养时间(分钟)" min-width="120" />
<el-table-column prop="prepare_times" label="保养时间(分钟)" width="120px" /> <el-table-column prop="error_times" label="故障时间(分钟)" min-width="120" />
<el-table-column prop="error_times" label="故障时间(分钟)" width="120px" /> <el-table-column prop="adjust_times" label="工装调整时间(分钟)" min-width="130" />
<el-table-column prop="adjust_times" label="工装调整时间(分钟)" width="130px" /> <el-table-column prop="product_qty" label="生产总量" min-width="100" />
<el-table-column prop="product_qty" label="生产总量" width="120px" /> <el-table-column prop="nok_qty" label="不合格数" min-width="100" />
<el-table-column prop="nok_qty" label="不合格数" width="120px" /> <el-table-column prop="oee_value" label="OEE指标" min-width="100" />
<el-table-column prop="oee_value" label="OEE指标" /> <el-table-column prop="remark" label="备注" min-width="200" />
<el-table-column prop="remark" label="备注" /> <el-table-column prop="create_name" label="创建人" min-width="90" />
<el-table-column prop="create_name" label="创建人" /> <el-table-column prop="create_time" label="创建时间" min-width="140" />
<el-table-column prop="create_time" label="创建时间" show-overflow-tooltip /> <el-table-column v-permission="[]" label="操作" min-width="125" align="center" fixed="right">
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<udOperation <udOperation
:data="scope.row" :data="scope.row"

50
mes/qd/src/views/wms/sb/run/devicescrap/index.vue
View File

@@ -128,31 +128,31 @@
</crudOperation> </crudOperation>
<!--表格渲染--> <!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler"> <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" /> <el-table-column fixed="left" type="selection" min-width="35" />
<el-table-column prop="device_code" label="设备代码" width="120px" show-overflow-tooltip /> <el-table-column fixed="left" prop="device_code" label="设备代码" min-width="85" />
<el-table-column prop="device_name" label="设备名称" width="120px" show-overflow-tooltip/> <el-table-column fixed="left" prop="device_name" label="设备名称" min-width="160" />
<el-table-column prop="extend_code" label="外部编码" width="120px" show-overflow-tooltip/> <el-table-column fixed="left" prop="extend_code" label="外部编码" min-width="100" />
<el-table-column prop="device_model" label="设备型号" width="120px" show-overflow-tooltip/> <el-table-column fixed="left" prop="device_model" label="设备型号" min-width="130" />
<el-table-column prop="device_spec" label="设备规格" /> <el-table-column fixed="left" prop="device_spec" label="设备规格" min-width="130" />
<el-table-column prop="class_name" label="设备类类别" /> <el-table-column fixed="left" prop="class_name" label="设备类类别" min-width="140" />
<el-table-column prop="is_produceuse" label="生产用途" :formatter="formatProduceName" /> <el-table-column fixed="left" prop="is_produceuse" label="生产用途" :formatter="formatProduceName" min-width="70" />
<el-table-column prop="status" label="设备状态" :formatter="formatStatusName" /> <el-table-column fixed="left" prop="status" label="设备状态" :formatter="formatStatusName" min-width="70" />
<el-table-column prop="beginuse_date" label="启用日期" width="120px" show-overflow-tooltip/> <el-table-column fixed="left" prop="beginuse_date" label="启用日期" min-width="85" />
<el-table-column prop="use_deptid_name" label="使用部门" /> <el-table-column fixed="left" prop="use_deptid_name" label="使用部门" min-width="130" />
<el-table-column prop="use_groupid_name" label="使用班组" show-overflow-tooltip /> <el-table-column fixed="left" prop="use_groupid_name" label="使用班组" min-width="130" />
<el-table-column prop="supplier_name" label="供应商" show-overflow-tooltip /> <el-table-column prop="supplier_name" label="供应商" min-width="200" />
<el-table-column prop="manufacturer" label="制造商" show-overflow-tooltip /> <el-table-column prop="manufacturer" label="制造商" min-width="200" />
<el-table-column prop="leavefactory_date" label="出厂日期" width="120px" show-overflow-tooltip /> <el-table-column prop="leavefactory_date" label="出厂日期" min-width="95" />
<el-table-column prop="leavefactory_number" label="出厂编号" show-overflow-tooltip /> <el-table-column prop="leavefactory_number" label="出厂编号" min-width="130" />
<el-table-column prop="drawing_number" label="图号" show-overflow-tooltip /> <el-table-column prop="drawing_number" label="图号" min-width="130" />
<el-table-column prop="device_type" label="设备属性" :formatter="formatTypeName" /> <el-table-column prop="device_type" label="设备属性" :formatter="formatTypeName" min-width="70" />
<el-table-column prop="workprocedure_name" label="工序" /> <el-table-column prop="workprocedure_name" label="工序" min-width="70" />
<el-table-column prop="assets_code" label="资产编码" show-overflow-tooltip /> <el-table-column prop="assets_code" label="资产编码" min-width="100" />
<el-table-column prop="assets_name" label="资产名称" show-overflow-tooltip /> <el-table-column prop="assets_name" label="资产名称" min-width="150" />
<el-table-column prop="create_name" label="生成人" /> <el-table-column prop="create_name" label="生成人" min-width="90" />
<el-table-column prop="create_time" label="生成时间" width="150px" show-overflow-tooltip/> <el-table-column prop="create_time" label="生成时间" min-width="140" />
<el-table-column prop="update_optname" label="修改人" /> <el-table-column prop="update_optname" label="修改人" min-width="90" />
<el-table-column prop="update_time" label="修改时间" width="150px" show-overflow-tooltip/> <el-table-column prop="update_time" label="修改时间" min-width="140" />
</el-table> </el-table>
<!--分页组件--> <!--分页组件-->
<pagination /> <pagination />

67
mes/qd/src/views/wms/sb/stat/devicerepairquery/index.vue
View File

@@ -95,44 +95,43 @@
</crudOperation> </crudOperation>
<!--表格渲染--> <!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler"> <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" /> <el-table-column fixed="left" type="selection" min-width="35" />
<el-table-column v-if="false" prop="repair_id" label="设备维修单标识" /> <el-table-column fixed="left" prop="repair_code" label="维修单号" min-width="120px" >
<el-table-column prop="repair_code" label="维修单号" width="120px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<el-link type="warning" @click="showView(scope.row)">{{ scope.row.repair_code }}</el-link> <el-link type="warning" @click="showView(scope.row)">{{ scope.row.repair_code }}</el-link>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="device_code" label="设备编码" width="120px" show-overflow-tooltip /> <el-table-column fixed="left" prop="device_code" label="设备编码" min-width="85" />
<el-table-column prop="device_name" label="设备名称" show-overflow-tooltip /> <el-table-column fixed="left" prop="device_name" label="设备名称" min-width="150"/>
<el-table-column prop="extend_code" label="设备自编码" width="90px" show-overflow-tooltip /> <el-table-column fixed="left" prop="extend_code" label="设备自编码" min-width="100" />
<el-table-column prop="use_name" label="使用班组" show-overflow-tooltip /> <el-table-column fixed="left" prop="use_name" label="使用班组" min-width="130"/>
<el-table-column prop="fault_level" label="故障等级" :formatter="formatLevelName" /> <el-table-column fixed="left" prop="fault_level" label="故障等级" :formatter="formatLevelName" min-width="70"/>
<el-table-column prop="invstatus" label="单据状态" :formatter="formatStatusName" /> <el-table-column fixed="left" prop="invstatus" label="单据状态" :formatter="formatStatusName" min-width="70"/>
<el-table-column prop="plan_start_date" label="计划维修日期" width="120px" show-overflow-tooltip /> <el-table-column fixed="left" prop="plan_start_date" label="计划维修日期" width="95" />
<el-table-column prop="input_optname" label="创建人" /> <el-table-column fixed="left" prop="input_optname" label="创建人" min-width="90"/>
<el-table-column prop="input_time" label="创建时间" width="120px" show-overflow-tooltip /> <el-table-column fixed="left" prop="input_time" label="创建时间" min-width="140" />
<el-table-column prop="bx_name" label="报修人" /> <el-table-column prop="bx_name" label="报修人" min-width="90"/>
<el-table-column prop="bx_time" label="报修时间" width="120px" show-overflow-tooltip /> <el-table-column prop="bx_time" label="报修时间" min-width="140" />
<el-table-column prop="update_optname" label="维修人" /> <el-table-column prop="update_optname" label="维修人" min-width="150"/>
<el-table-column prop="real_start_date" label="维修开始时间" width="150px" show-overflow-tooltip /> <el-table-column prop="real_start_date" label="维修开始时间" min-width="140" />
<el-table-column prop="real_end_date" label="维修结束时间" width="150px" show-overflow-tooltip /> <el-table-column prop="real_end_date" label="维修结束时间" min-width="140" />
<el-table-column prop="repair_time" label="维修用时(h)" width="90px" /> <el-table-column prop="repair_time" label="维修用时(h)" min-width="90px" />
<el-table-column prop="outsourceaskfor_optname" label="委外申请人" width="90px" /> <el-table-column prop="outsourceaskfor_optname" label="委外申请人" min-width="90" />
<el-table-column prop="outsourceaskfor_time" label="委外申请时间" width="120px" show-overflow-tooltip /> <el-table-column prop="outsourceaskfor_time" label="委外申请时间" min-width="140" />
<el-table-column prop="outsourceback_remark" label="委外单位" show-overflow-tooltip /> <el-table-column prop="outsourceback_remark" label="委外单位" min-width="120px"/>
<el-table-column prop="outsourceback_optname" label="委外验收人" width="90px" /> <el-table-column prop="outsourceback_optname" label="委外验收人" min-width="90" />
<el-table-column prop="outsourceback_time" label="委外验收时间" width="120px" show-overflow-tooltip /> <el-table-column prop="outsourceback_time" label="委外验收时间" min-width="140" />
<el-table-column prop="confirm_optname" label="维修确认人" width="90px" /> <el-table-column prop="confirm_optname" label="维修确认人" min-width="90" />
<el-table-column prop="confirm_time" label="维修确认时间" width="120px" show-overflow-tooltip /> <el-table-column prop="confirm_time" label="维修确认时间" min-width="140" />
<el-table-column prop="device_faultclass_name" label="故障类别" show-overflow-tooltip /> <el-table-column prop="device_faultclass_name" label="故障类别" min-width="70"/>
<el-table-column prop="fault_comment" label="故障描述" show-overflow-tooltip /> <el-table-column prop="fault_comment" label="故障描述" min-width="150" />
<el-table-column prop="fault_cause" label="故障原因" show-overflow-tooltip /> <el-table-column prop="fault_cause" label="故障原因" min-width="150"/>
<el-table-column prop="fault_analysis" label="问题分析" show-overflow-tooltip /> <el-table-column prop="fault_analysis" label="问题分析" min-width="150"/>
<el-table-column prop="measure" label="处理措施" show-overflow-tooltip /> <el-table-column prop="measure" label="处理措施" min-width="150"/>
<el-table-column prop="audit_optname" label="审核人" /> <el-table-column prop="audit_optname" label="审核人" min-width="90"/>
<el-table-column prop="audit_time" label="审核时间" width="150px" show-overflow-tooltip /> <el-table-column prop="audit_time" label="审核时间" min-width="140" />
<el-table-column prop="source_bill_code" label="源单号" show-overflow-tooltip /> <el-table-column prop="source_bill_code" label="源单号" min-width="120px"/>
<el-table-column prop="source_bill_type" label="源单业务类型" width="120px" :formatter="fprmatTypeName"/> <el-table-column prop="source_bill_type" label="源单业务类型" min-width="95" :formatter="fprmatTypeName"/>
</el-table> </el-table>
<!--分页组件--> <!--分页组件-->
<pagination /> <pagination />

45
mes/qd/src/views/wms/sb/upkeep/devicemaintenance/index.vue
View File

@@ -103,32 +103,31 @@
</crudOperation> </crudOperation>
<!--表格渲染--> <!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler"> <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" /> <el-table-column fixed="left" type="selection" min-width="35" />
<el-table-column v-if="false" prop="maint_id" label="保养单标识" /> <el-table-column fixed="left" prop="maint_code" label="保养单号" min-width="115" >
<el-table-column prop="maint_code" label="保养单号" width="120px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<el-link type="warning" @click="crud.toView(scope.row)">{{ scope.row.maint_code }}</el-link> <el-link type="warning" @click="crud.toView(scope.row)">{{ scope.row.maint_code }}</el-link>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="device_code" label="设备编码" show-overflow-tooltip /> <el-table-column fixed="left" prop="device_code" label="设备编码" min-width="85" />
<el-table-column prop="device_name" label="设备名称" show-overflow-tooltip /> <el-table-column fixed="left" prop="device_name" label="设备名称" min-width="150" />
<el-table-column prop="extend_code" label="设备自编码" width="90px" show-overflow-tooltip /> <el-table-column fixed="left" prop="extend_code" label="设备自编码" min-width="100" />
<el-table-column prop="dept_name" label="归属部门" show-overflow-tooltip /> <el-table-column fixed="left" prop="dept_name" label="归属部门" min-width="130" />
<el-table-column prop="use_name" label="使用班组" show-overflow-tooltip /> <el-table-column fixed="left" prop="use_name" label="使用班组" min-width="130" />
<el-table-column prop="maint_object" label="保养对象" :formatter="formatMainObject"/> <el-table-column fixed="left" prop="maint_object" label="保养对象" :formatter="formatMainObject" min-width="70" />
<el-table-column prop="invstatus" label="单据状态" show-overflow-tooltip :formatter="formatInvsName" /> <el-table-column fixed="left" prop="invstatus" label="单据状态" :formatter="formatInvsName" min-width="70" />
<el-table-column prop="maintenancecycle" label="单据类型" :formatter="formatMainName" /> <el-table-column fixed="left" prop="maintenancecycle" label="单据类型" :formatter="formatMainName" min-width="70" />
<el-table-column prop="plan_start_date" label="计划保养日期" width="150px" /> <el-table-column fixed="left" prop="plan_start_date" label="计划保养日期" min-width="95" />
<el-table-column prop="input_optname" label="创建人" /> <el-table-column prop="input_optname" label="创建人" min-width="90" />
<el-table-column prop="input_time" label="创建时间" width="150px" /> <el-table-column prop="input_time" label="创建时间" min-width="140" />
<el-table-column prop="update_optname" label="保养人" /> <el-table-column prop="update_optname" label="保养人" min-width="90" />
<el-table-column prop="real_start_date" label="开始时间" width="150px" /> <el-table-column prop="real_start_date" label="开始时间" min-width="140" />
<el-table-column prop="real_end_date" label="结束时间" width="150px" /> <el-table-column prop="real_end_date" label="结束时间" min-width="140" />
<el-table-column prop="confirm_optname" label="确认人" /> <el-table-column prop="confirm_optname" label="确认人" min-width="90" />
<el-table-column prop="confirm_time" label="确认时间" width="150px" /> <el-table-column prop="confirm_time" label="确认时间" min-width="140" />
<el-table-column prop="audit_optname" label="审核人" /> <el-table-column prop="audit_optname" label="审核人" min-width="90" />
<el-table-column prop="audit_time" label="审核时间" width="150px" /> <el-table-column prop="audit_time" label="审核时间" min-width="140" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right"> <el-table-column v-permission="[]" label="操作" min-width="125" align="center" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<udOperation <udOperation
:data="scope.row" :data="scope.row"
@@ -169,7 +168,7 @@ export default {
mixins: [presenter(), header(), crud()], mixins: [presenter(), header(), crud()],
cruds() { cruds() {
return CRUD({ return CRUD({
title: '设备保养单', title: '保养单维护',
url: 'api/devicemaintenancemst', url: 'api/devicemaintenancemst',
idField: 'maint_id', idField: 'maint_id',
sort: 'maint_id,desc', sort: 'maint_id,desc',

35
mes/qd/src/views/wms/sb/upkeep/devicemaintenanceaudit/index.vue
View File

@@ -92,24 +92,23 @@
</crudOperation> </crudOperation>
<!--表格渲染--> <!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler"> <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" /> <el-table-column fixed="left" type="selection" min-width="35" />
<el-table-column v-if="false" prop="maint_id" label="保养单标识" /> <el-table-column fixed="left" prop="maint_code" label="保养单号" min-width="100" />
<el-table-column prop="maint_code" label="保养单号" width="120px" show-overflow-tooltip /> <el-table-column fixed="left" prop="device_code" label="设备编码" min-width="85" />
<el-table-column prop="device_code" label="设备编码" show-overflow-tooltip /> <el-table-column fixed="left" prop="device_name" label="设备名称" min-width="150" />
<el-table-column prop="device_name" label="设备名称" show-overflow-tooltip /> <el-table-column fixed="left" prop="extend_code" label="设备自编码" min-width="100" />
<el-table-column prop="extend_code" label="设备自编码" width="90px" show-overflow-tooltip /> <el-table-column fixed="left" prop="invstatus" label="单据状态" :formatter="formatInvsName" min-width="70" />
<el-table-column prop="invstatus" label="单据状态" show-overflow-tooltip :formatter="formatInvsName" /> <el-table-column fixed="left" prop="maintenancecycle" label="单据类型" :formatter="formatMainName" min-width="70" />
<el-table-column prop="maintenancecycle" label="单据类型" :formatter="formatMainName" /> <el-table-column fixed="left" prop="plan_start_date" label="计划保养日期" min-width="95" />
<el-table-column prop="plan_start_date" label="计划保养日期" width="150px" /> <el-table-column prop="input_optname" label="创建人" min-width="90" />
<el-table-column prop="input_optname" label="创建人" /> <el-table-column prop="input_time" label="创建时间" min-width="140" />
<el-table-column prop="input_time" label="创建时间" width="150px" /> <el-table-column prop="update_optname" label="保养人" min-width="90" />
<el-table-column prop="update_optname" label="保养人" /> <el-table-column prop="real_start_date" label="开始时间" min-width="140" />
<el-table-column prop="real_start_date" label="开始时间" width="150px" /> <el-table-column prop="real_end_date" label="结束时间" min-width="140" />
<el-table-column prop="real_end_date" label="结束时间" width="150px" /> <el-table-column prop="confirm_optname" label="确认人" min-width="90" />
<el-table-column prop="confirm_optname" label="确认人" /> <el-table-column prop="confirm_time" label="确认时间" min-width="140" />
<el-table-column prop="confirm_time" label="确认时间" width="150px" /> <el-table-column prop="audit_optname" label="审核人" min-width="90" />
<el-table-column prop="audit_optname" label="审核人" /> <el-table-column prop="audit_time" label="审核时间" min-width="140" />
<el-table-column prop="audit_time" label="审核时间" width="150px" />
</el-table> </el-table>
<!--分页组件--> <!--分页组件-->
<pagination /> <pagination />

111
mes/qd/src/views/wms/sb/upkeep/devicemaintenancegrid/index.vue
View File

@@ -29,6 +29,15 @@
@keyup.enter.native="crud.toQuery" @keyup.enter.native="crud.toQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="使用班组">
<treeselect
v-model="query.dept_id"
:load-options="loadDepts"
:options="depts"
style="width: 200px;"
placeholder="请选择"
/>
</el-form-item>
<el-form-item label="保养类型"> <el-form-item label="保养类型">
<el-select <el-select
v-model="query.maintenancecycle" v-model="query.maintenancecycle"
@@ -103,32 +112,31 @@
</crudOperation> </crudOperation>
<!--表格渲染--> <!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler"> <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" /> <el-table-column fixed="left" type="selection" min-width="35" />
<el-table-column v-if="false" prop="maint_id" label="保养单标识" /> <el-table-column fixed="left" prop="maint_code" label="保养单号" min-width="115" >
<el-table-column prop="maint_code" label="保养单号" width="120px" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<el-link type="warning" @click="crud.toView(scope.row)">{{ scope.row.maint_code }}</el-link> <el-link type="warning" @click="crud.toView(scope.row)">{{ scope.row.maint_code }}</el-link>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="device_code" label="设备编码" show-overflow-tooltip /> <el-table-column fixed="left" prop="device_code" label="设备编码" min-width="85" />
<el-table-column prop="device_name" label="设备名称" show-overflow-tooltip /> <el-table-column fixed="left" prop="device_name" label="设备名称" min-width="150" />
<el-table-column prop="extend_code" label="设备自编码" width="90px" show-overflow-tooltip /> <el-table-column fixed="left" prop="extend_code" label="设备自编码" min-width="100" />
<el-table-column prop="dept_name" label="归属部门" show-overflow-tooltip /> <el-table-column fixed="left" prop="dept_name" label="归属部门" min-width="130" />
<el-table-column prop="use_name" label="使用班组" show-overflow-tooltip /> <el-table-column fixed="left" prop="use_name" label="使用班组" min-width="130" />
<el-table-column prop="maint_object" label="保养对象" :formatter="formatMainObject" /> <el-table-column fixed="left" prop="maint_object" label="保养对象" :formatter="formatMainObject" min-width="70" />
<el-table-column prop="invstatus" label="单据状态" show-overflow-tooltip :formatter="formatInvsName" /> <el-table-column fixed="left" prop="invstatus" label="单据状态" :formatter="formatInvsName" min-width="70" />
<el-table-column prop="maintenancecycle" label="单据类型" :formatter="formatMainName" /> <el-table-column fixed="left" prop="maintenancecycle" label="单据类型" :formatter="formatMainName" min-width="70" />
<el-table-column prop="plan_start_date" label="计划保养日期" width="150px" /> <el-table-column fixed="left" prop="plan_start_date" label="计划保养日期" min-width="95" />
<el-table-column prop="input_optname" label="创建人" /> <el-table-column prop="input_optname" label="创建人" min-width="90" />
<el-table-column prop="input_time" label="创建时间" width="150px" /> <el-table-column prop="input_time" label="创建时间" min-width="140" />
<el-table-column prop="update_optname" label="保养人" /> <el-table-column prop="update_optname" label="保养人" min-width="90" />
<el-table-column prop="real_start_date" label="开始时间" width="150px" /> <el-table-column prop="real_start_date" label="开始时间" min-width="140" />
<el-table-column prop="real_end_date" label="结束时间" width="150px" /> <el-table-column prop="real_end_date" label="结束时间" min-width="140" />
<el-table-column prop="confirm_optname" label="确认人" /> <el-table-column prop="confirm_optname" label="确认人" min-width="90" />
<el-table-column prop="confirm_time" label="确认时间" width="150px" /> <el-table-column prop="confirm_time" label="确认时间" min-width="140" />
<el-table-column prop="audit_optname" label="审核人" /> <el-table-column prop="audit_optname" label="审核人" min-width="90" />
<el-table-column prop="audit_time" label="审核时间" width="150px" /> <el-table-column prop="audit_time" label="审核时间" min-width="140" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right"> <el-table-column v-permission="[]" label="操作" min-width="125" align="center" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<udOperation <udOperation
:data="scope.row" :data="scope.row"
@@ -161,6 +169,8 @@ import DateRangePicker from '@/components/DateRangePicker'
import AddDialog from '@/views/wms/sb/upkeep/devicemaintenancegrid/AddDialog' import AddDialog from '@/views/wms/sb/upkeep/devicemaintenancegrid/AddDialog'
import { download } from '@/api/data' import { download } from '@/api/data'
import { downloadFile } from '@/utils' import { downloadFile } from '@/utils'
import { mapGetters } from 'vuex'
import { getDepts, getDeptSuperior } from '@/api/system/dept'
export default { export default {
name: 'Devicemaintenancegrid', name: 'Devicemaintenancegrid',
@@ -169,7 +179,7 @@ export default {
mixins: [presenter(), header(), crud()], mixins: [presenter(), header(), crud()],
cruds() { cruds() {
return CRUD({ return CRUD({
title: '设备保养单', title: '班组保养维护',
url: 'api/devicemaintenancemst/query4', url: 'api/devicemaintenancemst/query4',
idField: 'maint_id', idField: 'maint_id',
sort: 'maint_id,desc', sort: 'maint_id,desc',
@@ -186,12 +196,18 @@ export default {
data() { data() {
return { return {
classes: [], classes: [],
depts: [],
class_idStr: null, class_idStr: null,
materOpt_code: '23', materOpt_code: '23',
permission: { permission: {
} }
} }
}, },
computed: {
...mapGetters({
user: 'user'
})
},
created() { created() {
const param = { const param = {
'materOpt_code': this.materOpt_code 'materOpt_code': this.materOpt_code
@@ -202,6 +218,10 @@ export default {
this.crud.toQuery() this.crud.toQuery()
this.queryClassId() this.queryClassId()
}) })
this.getDepts()
this.query.dept_id = this.user.dept.id
this.getSupDepts(this.user.dept.id)
this.crud.toQuery()
}, },
methods: { methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据 // 钩子：在获取表格数据之前执行，false 则代表不获取数据
@@ -267,6 +287,51 @@ export default {
this.crud.toQuery() this.crud.toQuery()
downloadFile(result, name, 'xlsx') downloadFile(result, name, 'xlsx')
}) })
},
// 获取弹窗内部门数据
loadDepts({ action, parentNode, callback }) {
if (action === LOAD_CHILDREN_OPTIONS) {
getDepts({ enabled: true, pid: parentNode.id }).then(res => {
parentNode.children = res.content.map(function(obj) {
if (obj.hasChildren) {
obj.children = null
}
return obj
})
setTimeout(() => {
callback()
}, 200)
})
}
},
getDepts() {
getDepts({ enabled: true }).then(res => {
this.depts = res.content.map(function(obj) {
if (obj.hasChildren) {
obj.children = null
}
return obj
})
})
},
getSupDepts(deptId) {
debugger
var number = parseFloat(deptId)
getDeptSuperior(number).then(res => {
const date = res.content
this.buildDepts(date)
this.depts = date
})
},
buildDepts(depts) {
depts.forEach(data => {
if (data.children) {
this.buildDepts(data.children)
}
if (data.hasChildren && !data.children) {
data.children = null
}
})
} }
} }
} }

41
mes/qd/src/views/wms/sb/upkeep/devicemaintenancepa/index.vue
View File

@@ -141,27 +141,26 @@
</crudOperation> </crudOperation>
<!--表格渲染--> <!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="mySelectionChange"> <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="mySelectionChange">
<el-table-column type="selection" width="55" /> <el-table-column fixed="left" type="selection" min-width="35" />
<el-table-column v-if="false" prop="maint_id" label="保养单标识" /> <el-table-column fixed="left" prop="maint_code" label="保养单号" min-width="100" />
<el-table-column prop="maint_code" label="保养单号" width="120px" show-overflow-tooltip /> <el-table-column fixed="left" prop="device_code" label="设备编码" min-width="85" />
<el-table-column prop="device_code" label="设备编码" show-overflow-tooltip /> <el-table-column fixed="left" prop="device_name" label="设备名称" min-width="150" />
<el-table-column prop="device_name" label="设备名称" show-overflow-tooltip /> <el-table-column fixed="left" prop="dept_name" label="所属部门" min-width="130" />
<el-table-column prop="dept_name" label="所属部门" show-overflow-tooltip /> <el-table-column fixed="left" prop="use_name" label="使用班组" min-width="130" />
<el-table-column prop="use_name" label="使用班组" show-overflow-tooltip /> <el-table-column fixed="left" prop="extend_code" label="设备自编码" min-width="100" />
<el-table-column prop="maint_object" label="保养对象" show-overflow-tooltip :formatter="formatMainObject"/> <el-table-column fixed="left" prop="maint_object" label="保养对象" :formatter="formatMainObject" min-width="70" />
<el-table-column prop="extend_code" label="设备自编码" width="90px" show-overflow-tooltip /> <el-table-column fixed="left" prop="invstatus" label="单据状态" :formatter="formatInvsName" min-width="70" />
<el-table-column prop="invstatus" label="单据状态" show-overflow-tooltip :formatter="formatInvsName" /> <el-table-column fixed="left" prop="maintenancecycle" label="单据类型" :formatter="formatMainName" min-width="70" />
<el-table-column prop="maintenancecycle" label="单据类型" :formatter="formatMainName" /> <el-table-column fixed="left" prop="plan_start_date" label="计划保养日期" min-width="95" />
<el-table-column prop="plan_start_date" label="计划保养日期" width="150px" /> <el-table-column prop="input_optname" label="创建人" min-width="90" />
<el-table-column prop="input_optname" label="创建人" /> <el-table-column prop="input_time" label="创建时间" min-width="140" />
<el-table-column prop="input_time" label="创建时间" width="150px" /> <el-table-column prop="update_optname" label="保养人" min-width="90" />
<el-table-column prop="update_optname" label="保养人" /> <el-table-column prop="real_start_date" label="开始时间" min-width="140" />
<el-table-column prop="real_start_date" label="开始时间" width="150px" /> <el-table-column prop="real_end_date" label="结束时间" min-width="140" />
<el-table-column prop="real_end_date" label="结束时间" width="150px" /> <el-table-column prop="confirm_optname" label="确认人" min-width="90" />
<el-table-column prop="confirm_optname" label="确认人" /> <el-table-column prop="confirm_time" label="确认时间" min-width="140" />
<el-table-column prop="confirm_time" label="确认时间" width="150px" /> <el-table-column prop="audit_optname" label="审核人" min-width="90" />
<el-table-column prop="audit_optname" label="审核人" /> <el-table-column prop="audit_time" label="审核时间" min-width="140" />
<el-table-column prop="audit_time" label="审核时间" width="150px" />
</el-table> </el-table>
<!--分页组件--> <!--分页组件-->
<pagination /> <pagination />

107
mes/qd/src/views/wms/sb/upkeep/devicemaintenancepagrid/index.vue
View File

@@ -29,6 +29,15 @@
@keyup.enter.native="crud.toQuery" @keyup.enter.native="crud.toQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="使用班组">
<treeselect
v-model="query.dept_id"
:load-options="loadDepts"
:options="depts"
style="width: 200px;"
placeholder="请选择"
/>
</el-form-item>
<el-form-item label="保养类型"> <el-form-item label="保养类型">
<el-select <el-select
v-model="query.maintenancecycle" v-model="query.maintenancecycle"
@@ -141,27 +150,26 @@
</crudOperation> </crudOperation>
<!--表格渲染--> <!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="mySelectionChange"> <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="mySelectionChange">
<el-table-column type="selection" width="55" /> <el-table-column fixed="left" type="selection" min-width="35" />
<el-table-column v-if="false" prop="maint_id" label="保养单标识" /> <el-table-column fixed="left" prop="maint_code" label="保养单号" min-width="100" />
<el-table-column prop="maint_code" label="保养单号" width="120px" show-overflow-tooltip /> <el-table-column fixed="left" prop="device_code" label="设备编码" min-width="85" />
<el-table-column prop="device_code" label="设备编码" show-overflow-tooltip /> <el-table-column fixed="left" prop="device_name" label="设备名称" min-width="150" />
<el-table-column prop="device_name" label="设备名称" show-overflow-tooltip /> <el-table-column fixed="left" prop="dept_name" label="所属部门" min-width="130" />
<el-table-column prop="dept_name" label="所属部门" show-overflow-tooltip /> <el-table-column fixed="left" prop="use_name" label="使用班组" min-width="130" />
<el-table-column prop="use_name" label="使用班组" show-overflow-tooltip /> <el-table-column fixed="left" prop="extend_code" label="设备自编码" min-width="100" />
<el-table-column prop="maint_object" label="保养对象" show-overflow-tooltip :formatter="formatMainObject"/> <el-table-column fixed="left" prop="maint_object" label="保养对象" :formatter="formatMainObject" min-width="70" />
<el-table-column prop="extend_code" label="设备自编码" width="90px" show-overflow-tooltip /> <el-table-column fixed="left" prop="invstatus" label="单据状态" :formatter="formatInvsName" min-width="70" />
<el-table-column prop="invstatus" label="单据状态" show-overflow-tooltip :formatter="formatInvsName" /> <el-table-column fixed="left" prop="maintenancecycle" label="单据类型" :formatter="formatMainName" min-width="70" />
<el-table-column prop="maintenancecycle" label="单据类型" :formatter="formatMainName" /> <el-table-column fixed="left" prop="plan_start_date" label="计划保养日期" min-width="95" />
<el-table-column prop="plan_start_date" label="计划保养日期" width="150px" /> <el-table-column prop="input_optname" label="创建人" min-width="90" />
<el-table-column prop="input_optname" label="创建人" /> <el-table-column prop="input_time" label="创建时间" min-width="140" />
<el-table-column prop="input_time" label="创建时间" width="150px" /> <el-table-column prop="update_optname" label="保养人" min-width="90" />
<el-table-column prop="update_optname" label="保养人" /> <el-table-column prop="real_start_date" label="开始时间" min-width="140" />
<el-table-column prop="real_start_date" label="开始时间" width="150px" /> <el-table-column prop="real_end_date" label="结束时间" min-width="140" />
<el-table-column prop="real_end_date" label="结束时间" width="150px" /> <el-table-column prop="confirm_optname" label="确认人" min-width="90" />
<el-table-column prop="confirm_optname" label="确认人" /> <el-table-column prop="confirm_time" label="确认时间" min-width="140" />
<el-table-column prop="confirm_time" label="确认时间" width="150px" /> <el-table-column prop="audit_optname" label="审核人" min-width="90" />
<el-table-column prop="audit_optname" label="审核人" /> <el-table-column prop="audit_time" label="审核时间" min-width="140" />
<el-table-column prop="audit_time" label="审核时间" width="150px" />
</el-table> </el-table>
<!--分页组件--> <!--分页组件-->
<pagination /> <pagination />
@@ -185,6 +193,8 @@ import crudMaterialbase from '@/api/wms/basedata/master/materialbase'
import DateRangePicker from '@/components/DateRangePicker' import DateRangePicker from '@/components/DateRangePicker'
import ExecuteDialog from '@/views/wms/sb/upkeep/devicemaintenancepagrid/ExecuteDialog' import ExecuteDialog from '@/views/wms/sb/upkeep/devicemaintenancepagrid/ExecuteDialog'
import StartDialog from '@/views/wms/sb/upkeep/devicemaintenancepagrid/StartDialog' import StartDialog from '@/views/wms/sb/upkeep/devicemaintenancepagrid/StartDialog'
import { getDepts, getDeptSuperior } from '@/api/system/dept'
import { mapGetters } from 'vuex'
export default { export default {
name: 'Devicemaintenancepagrid', name: 'Devicemaintenancepagrid',
@@ -214,6 +224,7 @@ export default {
end_flag: true, end_flag: true,
confirm_flag: true, confirm_flag: true,
classes: [], classes: [],
depts: [],
class_idStr: null, class_idStr: null,
materOpt_code: '23', materOpt_code: '23',
openParam: null, openParam: null,
@@ -223,6 +234,11 @@ export default {
} }
} }
}, },
computed: {
...mapGetters({
user: 'user'
})
},
created() { created() {
const param = { const param = {
'materOpt_code': this.materOpt_code 'materOpt_code': this.materOpt_code
@@ -233,6 +249,10 @@ export default {
this.crud.toQuery() this.crud.toQuery()
this.queryClassId() this.queryClassId()
}) })
this.getDepts()
this.query.dept_id = this.user.dept.id
this.getSupDepts(this.user.dept.id)
this.crud.toQuery()
}, },
methods: { methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据 // 钩子：在获取表格数据之前执行，false 则代表不获取数据
@@ -370,6 +390,51 @@ export default {
this.execu_flag = true this.execu_flag = true
this.end_flag = true this.end_flag = true
this.confirm_flag = true this.confirm_flag = true
},
// 获取弹窗内部门数据
loadDepts({ action, parentNode, callback }) {
if (action === LOAD_CHILDREN_OPTIONS) {
getDepts({ enabled: true, pid: parentNode.id }).then(res => {
parentNode.children = res.content.map(function(obj) {
if (obj.hasChildren) {
obj.children = null
}
return obj
})
setTimeout(() => {
callback()
}, 200)
})
}
},
getDepts() {
getDepts({ enabled: true }).then(res => {
this.depts = res.content.map(function(obj) {
if (obj.hasChildren) {
obj.children = null
}
return obj
})
})
},
getSupDepts(deptId) {
debugger
var number = parseFloat(deptId)
getDeptSuperior(number).then(res => {
const date = res.content
this.buildDepts(date)
this.depts = date
})
},
buildDepts(depts) {
depts.forEach(data => {
if (data.children) {
this.buildDepts(data.children)
}
if (data.hasChildren && !data.children) {
data.children = null
}
})
} }
} }
} }

30
mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/DeviceDialog.vue
View File

@@ -95,7 +95,8 @@ import pagination from '@crud/Pagination'
import crudDevicemaintenanceplanmst from '@/api/wms/sb/devicemaintenanceplanmst' import crudDevicemaintenanceplanmst from '@/api/wms/sb/devicemaintenanceplanmst'
import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect' import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css' import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import { getDepts } from '@/api/system/dept' import { getDepts, getDeptSuperior } from '@/api/system/dept'
import { mapGetters } from 'vuex'
export default { export default {
name: 'Device', name: 'Device',
@@ -135,8 +136,16 @@ export default {
} }
} }
}, },
computed: {
...mapGetters({
user: 'user'
})
},
created() { created() {
this.getDepts() this.getDepts()
this.query.use_id = this.user.dept.id
this.getSupDepts(this.user.dept.id)
this.crud.toQuery()
}, },
methods: { methods: {
clickChange(item) { clickChange(item) {
@@ -209,6 +218,25 @@ export default {
return obj return obj
}) })
}) })
},
getSupDepts(deptId) {
debugger
var number = parseFloat(deptId)
getDeptSuperior(number).then(res => {
const date = res.content
this.buildDepts(date)
this.depts = date
})
},
buildDepts(depts) {
depts.forEach(data => {
if (data.children) {
this.buildDepts(data.children)
}
if (data.hasChildren && !data.children) {
data.children = null
}
})
} }
} }
} }

41
mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/index.vue
View File

@@ -108,9 +108,8 @@
</crudOperation> </crudOperation>
<!--表格渲染--> <!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler"> <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" /> <el-table-column fixed="left" type="selection" min-width="35" />
<el-table-column v-if="false" prop="maint_plan_id" label="设备保养计划标识" /> <el-table-column fixed="left" prop="is_active" label="是否启用" min-width="70">
<el-table-column prop="is_active" label="是否启用">
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch <el-switch
:value="format_is_active(scope.row.is_active)" :value="format_is_active(scope.row.is_active)"
@@ -120,24 +119,24 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="maint_plan_code" label="保养计划单号" width="120px" show-overflow-tooltip /> <el-table-column fixed="left" prop="maint_plan_code" label="保养计划单号" min-width="115" />
<el-table-column prop="maint_plan_name" label="保养计划名称" width="120px" show-overflow-tooltip /> <el-table-column fixed="left" prop="maint_plan_name" label="保养计划名称" min-width="130" />
<el-table-column prop="class_name" label="设备类型" width="120px" show-overflow-tooltip /> <el-table-column fixed="left" prop="class_name" label="设备类型" min-width="130" />
<el-table-column prop="device_code" label="设备编码" show-overflow-tooltip /> <el-table-column fixed="left" prop="device_code" label="设备编码" min-width="85" />
<el-table-column prop="device_name" label="设备名称" show-overflow-tooltip /> <el-table-column fixed="left" prop="device_name" label="设备名称" min-width="150" />
<el-table-column prop="extend_code" label="设备自编码" width="90px" show-overflow-tooltip /> <el-table-column fixed="left" prop="extend_code" label="设备自编码" min-width="100" />
<el-table-column prop="maintenancecycle" label="保养周期" :formatter="formatMainName"/> <el-table-column fixed="left" prop="maintenancecycle" label="保养周期" :formatter="formatMainName" min-width="70" />
<el-table-column prop="maint_object" label="保养对象" :formatter="formatMainObject"/> <el-table-column fixed="left" prop="maint_object" label="保养对象" :formatter="formatMainObject" min-width="70" />
<el-table-column prop="detail_count" label="明细数" /> <el-table-column prop="detail_count" label="明细数" min-width="60" />
<el-table-column prop="plan_start_date" label="计划开始日期" width="150px" /> <el-table-column prop="plan_start_date" label="计划开始日期" min-width="95" />
<el-table-column prop="real_start_date" label="实际开始日期" width="150px" /> <el-table-column prop="real_start_date" label="实际开始日期" min-width="95" />
<el-table-column prop="real_end_date" label="实际结束日期" width="150px" /> <el-table-column prop="real_end_date" label="实际结束日期" min-width="95" />
<el-table-column prop="remark" label="备注" /> <el-table-column prop="create_name" label="创建人" min-width="90" />
<el-table-column prop="create_name" label="创建人" /> <el-table-column prop="create_time" label="创建时间" min-width="140" />
<el-table-column prop="create_time" label="创建时间" width="150px" /> <el-table-column prop="confirm_optname" label="审核人" min-width="90" />
<el-table-column prop="confirm_optname" label="审核人" /> <el-table-column prop="confirm_time" label="审核时间" min-width="140" />
<el-table-column prop="confirm_time" label="审核时间" width="150px" /> <el-table-column prop="remark" label="备注" min-width="200px" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right"> <el-table-column v-permission="[]" label="操作" min-width="125" align="center" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<udOperation <udOperation
:data="scope.row" :data="scope.row"