From c82b14f3a882698cbca62ef168615d31711320ca Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 03 七月 2025 15:12:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 40 +++++++---------------------------------
1 files changed, 7 insertions(+), 33 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
index 9968c92..31595fe 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
@@ -99,14 +99,14 @@
return Result.OK("娣诲姞澶辫触锛�");
}
//璋冪敤mdcEquipment鎻掑叆MDC璁惧
- if (CommonConstant.DEFAULT_1.equals(eamEquipment.getMdcFlag())) {
+// if (CommonConstant.DEFAULT_1.equals(eamEquipment.getMdcFlag())) {
//鎻掑叆MDC璁惧
// MdcEquipment mdcEquipment = new MdcEquipment();
// mdcEquipment.setEquipmentId(entity.getEquipmentCode());
// mdcEquipment.setEquipmentType(entity.getDeviceType());
// mdcEquipment.setEquipmentName(entity.getEquipmentName());
// mdcEquipmentService.addNewEquipmentFromEam(mdcEquipment, eamEquipment.getOrgId());
- }
+// }
return Result.OK("娣诲姞鎴愬姛锛�");
}
@@ -119,7 +119,7 @@
@ApiOperation(value = "璁惧鍙拌处-缂栬緫", notes = "璁惧鍙拌处-缂栬緫")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<?> edit(@RequestBody EamEquipment eamEquipment) {
- eamEquipmentService.updateById(eamEquipment);
+ eamEquipmentService.updateEquipment(eamEquipment);
return Result.OK("缂栬緫鎴愬姛!");
}
@@ -183,9 +183,9 @@
JSONObject item = JSONObject.parseObject(json, Feature.OrderedField);
translateDictTextUtils.translateField("createBy", eamEquipment.getCreateBy(), item, "sys_user,realname,username");
translateDictTextUtils.translateField("updateBy", eamEquipment.getUpdateBy(), item, "sys_user,realname,username");
- translateDictTextUtils.translateField("technologyStatus", eamEquipment.getTechnologyStatus(), item, "technology_status");
- translateDictTextUtils.translateField("orgId", eamEquipment.getOrgId(), item, "mdc_production,production_name,id");
- translateDictTextUtils.translateField("equipmentManager", eamEquipment.getEquipmentManager(), item, "sys_user,realname,username");
+// translateDictTextUtils.translateField("technologyStatus", eamEquipment.getTechnologyStatus(), item, "technology_status");
+// translateDictTextUtils.translateField("orgId", eamEquipment.getOrgId(), item, "mdc_production,production_name,id");
+// translateDictTextUtils.translateField("equipmentManager", eamEquipment.getEquipmentManager(), item, "sys_user,realname,username");
translateDictTextUtils.translateField("equipmentCategory", eamEquipment.getEquipmentCategory(), item, "equipment_category");
translateDictTextUtils.translateField("assetStatus", eamEquipment.getAssetStatus(), item, "asset_status");
translateDictTextUtils.translateField("repairStatus", eamEquipment.getRepairStatus(), item, "equipment_repair_status");
@@ -222,7 +222,7 @@
// 鑾峰彇涓婁紶鏂囦欢瀵硅薄
MultipartFile file = entity.getValue();
ImportParams params = new ImportParams();
- params.setTitleRows(0);
+ params.setTitleRows(2);
params.setHeadRows(1);
params.setNeedSave(true);
params.setStartSheetIndex(0);
@@ -243,25 +243,10 @@
sb.append(String.format("璁惧缂栫爜[%s]璁惧鍒嗙被涓虹┖锛屾棤娉曞鍏n\n", eamEquipment.getEquipmentCode()));
continue;
}
- if (StringUtils.isBlank(eamEquipment.getOrgId()) || StringUtils.isBlank(eamEquipment.getEquipmentManager())) {
- sb.append(String.format("璁惧缂栫爜[%s]浣跨敤杞﹂棿鎴栬澶囩鐞嗗憳涓虹┖锛屾棤娉曞鍏n\n", eamEquipment.getEquipmentCode()));
- continue;
- }
-// if (eamEquipment.getAcceptanceCheckDate() == null) {
-// sb.append(String.format("璁惧缂栫爜[%s]楠屾敹涓虹┖锛屾棤娉曞鍏n\r", eamEquipment.getEquipmentCode()));
-// continue;
-// }
-// if (StringUtils.isBlank(eamEquipment.getTechnologyStatus())) {
-// sb.append(String.format("璁惧缂栫爜[%s]鎶�鏈姸鎬佷负绌猴紝鏃犳硶瀵煎叆\n\r", eamEquipment.getEquipmentCode()));
-// continue;
-// }
EamEquipment one = eamEquipmentService.getOne(new LambdaQueryWrapper<EamEquipment>().eq(EamEquipment::getEquipmentCode, eamEquipment.getEquipmentCode()).eq(EamEquipment::getDelFlag, CommonConstant.DEL_FLAG_0));
if (one != null) {
sb.append(String.format("璁惧缂栫爜[%s]宸插瓨鍦紝鏃犳硶閲嶅瀵煎叆\n\r", eamEquipment.getEquipmentCode()));
continue;
- }
- if (!CommonConstant.DEFAULT_1.equals(eamEquipment.getMdcFlag())) {
- eamEquipment.setMdcFlag(CommonConstant.DEFAULT_0);
}
EamEquipment equipment = eamEquipmentService.saveEquipment(eamEquipment);
if (equipment == null) {
@@ -269,18 +254,7 @@
sb.append(String.format("璁惧缂栫爜[%s]淇濆瓨澶辫触锛屾棤娉曞鍏n\r", eamEquipment.getEquipmentCode()));
continue;
}
- //璋冪敤mdcEquipment鎻掑叆MDC璁惧
- if (CommonConstant.DEFAULT_1.equals(eamEquipment.getMdcFlag())) {
- //鎻掑叆MDC璁惧
-// MdcEquipment mdcEquipment = new MdcEquipment();
-// mdcEquipment.setEquipmentId(eamEquipment.getEquipmentCode());
-// mdcEquipment.setEquipmentType(eamEquipment.getDeviceType());
-// mdcEquipment.setEquipmentName(eamEquipment.getEquipmentName());
-// mdcEquipmentService.addNewEquipmentFromEam(mdcEquipment, eamEquipment.getOrgId());
- }
}
- //400鏉� saveBatch娑堣�楁椂闂�1592姣 寰幆鎻掑叆娑堣�楁椂闂�1947姣
- //1200鏉� saveBatch娑堣�楁椂闂�3687姣 寰幆鎻掑叆娑堣�楁椂闂�5212姣
log.info("娑堣�楁椂闂�" + (System.currentTimeMillis() - start) + "姣");
//update-end-author:taoyan date:20190528 for:鎵归噺鎻掑叆鏁版嵁
if (sb.length() > 0) {
--
Gitblit v1.9.3