From febdfeb2706c861cba37f54dcfd39a2c546f2389 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 25 十月 2023 14:51:09 +0800
Subject: [PATCH] Changes
---
mes-basic/src/main/java/com/chinaztt/mes/basic/service/PartService.java | 2 +-
mes-technology/src/main/java/com/chinaztt/mes/technology/service/impl/RoutingServiceImpl.java | 11 +++++------
mes-basic/src/main/java/com/chinaztt/mes/basic/controller/PartController.java | 5 ++---
mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/PartServiceImpl.java | 25 ++++++++++++++-----------
mes-web/src/main/resources/bootstrap.yml | 4 ++--
5 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/PartController.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/PartController.java
index 996755c..37b623f 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/PartController.java
+++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/controller/PartController.java
@@ -100,8 +100,7 @@
if (redisTemplate.hasKey(key)) {
throw new RuntimeException("鏈夊悓姝ヤ换鍔℃鍦ㄥ鐞�");
}
- partService.syncNewIfs(date);
- return R.ok();
+ return R.ok(partService.syncNewIfs(date));
}
/**
* 鍒嗛〉鏌ヨ宸插叧鑱旀娴嬫ā鏉跨殑闆朵欢
@@ -120,7 +119,7 @@
/**
* 鏍规嵁闆朵欢鍙峰拰闆朵欢鎻忚堪鏌ヨ搴撳瓨淇℃伅鎺ュ彛
*
- * @param part 闆朵欢
+ * @param 闆朵欢
* @return
*/
@ApiOperation(value = "鏍规嵁闆朵欢鍙峰拰闆朵欢鎻忚堪鏌ヨ搴撳瓨淇℃伅鎺ュ彛", notes = "鏍规嵁闆朵欢鍙峰拰闆朵欢鎻忚堪鏌ヨ搴撳瓨淇℃伅鎺ュ彛")
diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/service/PartService.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/service/PartService.java
index 877deca..30b53d9 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/service/PartService.java
+++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/service/PartService.java
@@ -131,5 +131,5 @@
void syncPart();
- void syncNewIfs(Date date);
+ Long syncNewIfs(Date date);
}
diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/PartServiceImpl.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/PartServiceImpl.java
index a0cb006..eafca3e 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/PartServiceImpl.java
+++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/PartServiceImpl.java
@@ -369,7 +369,7 @@
@Transactional(rollbackFor = Exception.class)
@Override
- public void syncNewIfs(Date date) {
+ public Long syncNewIfs(Date date) {
Map<String, String> dicmattype = dictUtils.getDicKey("material_type");
Map<String, String> dicunit = dictUtils.getDicKey("unit");
String key = "syncPart_lock" + SecurityUtils.getUser().getId();
@@ -379,13 +379,13 @@
redisTemplate.opsForValue().set(key, 1, 1000 * 3600);
Map<String, Object>map=new HashMap<>();
map.put("MODIFY_DATE", DateUtil.format(date,"yyyy-MM-dd"));
+ List<Part>partList=new ArrayList<Part>();
try {
String url = "http://192.168.20.47:8008/PurchService.ashx?contract=ZTKJ&contractKey=4ttDeLKNsZuhstjtROMcRE1USNFXKdFYE7lQ2p1m5Bo=&procedureName=QUERY_INVENTORY_PART_INFO_STD&userId=7632&inAttr="+new ObjectMapper().writeValueAsString(map);
String body = HttpRequest.get(url).execute().body();
Map<String, Object> mapResult = JsonUtil.jsonToPojo(body, Map.class);
List<Map<String, Object>> data = JsonUtil.jsonToPojo(JsonUtil.jsonToString(mapResult.get("INVENTORY_PART_INFO")), List.class);
List<String>no=new ArrayList<String>();
- List<Part>partList=new ArrayList<Part>();
data.forEach(l->{
Part part = new Part();
part.setPartNo(String.valueOf(l.get("PART_NO")));
@@ -408,20 +408,23 @@
part.setSunit(dicunit.get(l.get("UNIT_MEAS_FOR_WEIGHT")));
partList.add(part);
});
- QueryWrapper<Part>queryWrapper=new QueryWrapper<>();
- queryWrapper.lambda().select(Part::getPartNo).in(Part::getPartNo,no);
- List<Part> selectList = baseMapper.selectList(queryWrapper);
- //System.out.println(baseMapper.selectList(queryWrapper));
- partList.removeIf(mainObj -> selectList.stream().anyMatch(subObj -> subObj.getPartNo().equals(mainObj.getPartNo())));
- //System.out.println(partList);
- partList.forEach(l->{
- baseMapper.insert(l);
- });
+ if(partList.size()>0) {
+ QueryWrapper<Part> queryWrapper = new QueryWrapper<>();
+ queryWrapper.lambda().select(Part::getPartNo).in(Part::getPartNo, no);
+ List<Part> selectList = baseMapper.selectList(queryWrapper);
+ //System.out.println(baseMapper.selectList(queryWrapper));
+ partList.removeIf(mainObj -> selectList.stream().anyMatch(subObj -> subObj.getPartNo().equals(mainObj.getPartNo())));
+ //System.out.println(partList);
+ partList.forEach(l -> {
+ baseMapper.insert(l);
+ });
+ }
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException(e.getMessage());
} finally {
redisTemplate.delete(key);
}
+ return (long) partList.size();
}
}
diff --git a/mes-technology/src/main/java/com/chinaztt/mes/technology/service/impl/RoutingServiceImpl.java b/mes-technology/src/main/java/com/chinaztt/mes/technology/service/impl/RoutingServiceImpl.java
index 30fd0b6..532d7c0 100644
--- a/mes-technology/src/main/java/com/chinaztt/mes/technology/service/impl/RoutingServiceImpl.java
+++ b/mes-technology/src/main/java/com/chinaztt/mes/technology/service/impl/RoutingServiceImpl.java
@@ -44,7 +44,6 @@
import com.chinaztt.mes.technology.entity.*;
import com.chinaztt.mes.technology.excel.RoutingData;
import com.chinaztt.mes.technology.excel.RoutingExcelData;
-import com.chinaztt.mes.technology.excel.StructureData;
import com.chinaztt.mes.technology.mapper.*;
import com.chinaztt.mes.technology.service.RoutingService;
import com.chinaztt.mes.technology.state.routing.RoutingStateMachineConfig;
@@ -1264,11 +1263,11 @@
//缁撴瀯绫诲瀷
batchinfoJsonObj.put("BOM_TYPE_DB", routingDTO.getBomTypeDb());
//鍚敤鏃堕棿
- batchinfoJsonObj.put("PHASE_IN_DATE", DateTimeFormatter.ofPattern("yyyyMMdd").format(routingDTO.getPhaseInDate()));
- if (routingDTO.getPhaseOutDate() != null) {
- //寮冪敤鏃堕棿
- batchinfoJsonObj.put("PHASE_OUT_DATE", DateTimeFormatter.ofPattern("yyyyMMdd").format(routingDTO.getPhaseOutDate()));
- }
+ //batchinfoJsonObj.put("PHASE_IN_DATE", DateTimeFormatter.ofPattern("yyyyMMdd").format(routingDTO.getPhaseInDate()));
+ //if (routingDTO.getPhaseOutDate() != null) {
+ // //寮冪敤鏃堕棿
+ // batchinfoJsonObj.put("PHASE_OUT_DATE", DateTimeFormatter.ofPattern("yyyyMMdd").format(routingDTO.getPhaseOutDate()));
+ //}
JSONArray alternateInfo = new JSONArray();
JSONObject alobj = new JSONObject()
.fluentPut("ALTERNATIVE_NO", routingDTO.getAlternativeNo())
diff --git a/mes-web/src/main/resources/bootstrap.yml b/mes-web/src/main/resources/bootstrap.yml
index 4ada563..7d0d312 100644
--- a/mes-web/src/main/resources/bootstrap.yml
+++ b/mes-web/src/main/resources/bootstrap.yml
@@ -6,9 +6,9 @@
druid:
username: postgres
# password: postgres123
- password: 123456
+ password: root2022
# 灏勯寮�鍙戞暟鎹簱
- url: jdbc:postgresql://114.132.189.42:9005/zs_db
+ url: jdbc:postgresql://127.0.0.1:5432/postgres
application:
name: ztt-mes
cloud:
--
Gitblit v1.9.3