From 527cbd85e37842d93d081f33916dca5c6f7156e0 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期日, 24 九月 2023 09:53:58 +0800
Subject: [PATCH] 修改 9.22
---
system-run/src/test/java/com/yuanchu/mom/SystemRunApplicationTest.java | 22 +++----
base-server/src/main/java/com/yuanchu/mom/service/impl/TechnologyTemplateServiceImpl.java | 7 ++
inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java | 2
inventory-server/src/main/java/com/yuanchu/mom/Task/DataPullTask.java | 2
inventory-server/src/main/java/com/yuanchu/mom/controller/SaleController.java | 9 +++
inventory-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java | 24 +++++++-
inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/ConsignmentDto2.java | 12 ++++
inventory-server/src/main/resources/mapper/SaleMapper.xml | 3
inventory-server/src/main/java/com/yuanchu/mom/service/SaleService.java | 7 ++
inventory-server/src/main/java/com/yuanchu/mom/Task/SyncOrder.java | 59 +++++++++++++------
inventory-server/src/main/java/com/yuanchu/mom/pojo/Sale.java | 6 ++
inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/ConsignmentDto1.java | 12 ----
12 files changed, 115 insertions(+), 50 deletions(-)
diff --git a/base-server/src/main/java/com/yuanchu/mom/service/impl/TechnologyTemplateServiceImpl.java b/base-server/src/main/java/com/yuanchu/mom/service/impl/TechnologyTemplateServiceImpl.java
index 3bbbdcc..92b5905 100644
--- a/base-server/src/main/java/com/yuanchu/mom/service/impl/TechnologyTemplateServiceImpl.java
+++ b/base-server/src/main/java/com/yuanchu/mom/service/impl/TechnologyTemplateServiceImpl.java
@@ -34,6 +34,9 @@
TechnicalModelMapper technicalModelMapper;
@Resource
+ SelfcheckModelMapper selfcheckModelMapper;
+
+ @Resource
RecordModelMapper recordModelMapper;
@Resource
@@ -117,6 +120,8 @@
technologyTemplateMapper.updateById(technologyTemplate);
//鍒犻櫎鎶�鏈寚鏍囩淮鎶よ〃
technicalModelMapper.delTeMoByTechId(id);
+ //鍒犻櫎鑷椤圭洰缁存姢琛�
+ selfcheckModelMapper.delSelfByTechId(id);
//鍒犻櫎璁板綍鍐呭缁存姢琛�
recordModelMapper.delRecordByTechId(id);
//鍒犻櫎鐗╂枡娓呭崟缁存姢琛�
@@ -131,6 +136,8 @@
technologyTemplateMapper.delAllTech(ids);
//鎵归噺鍒犻櫎鎸囨爣缁存姢琛�
technicalModelMapper.delAllByTechId(ids);
+ //鎵归噺鍒犻櫎鑷椤圭洰缁存姢琛�
+ selfcheckModelMapper.delAllByTechId(ids);
//鎵归噺鍒犻櫎璁板綍鍐呭缁存姢琛�
recordModelMapper.delAllByTechId(ids);
//鎵归噺鍒犻櫎鐗╂枡娓呭崟缁存姢琛�
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java
index 5d1290b..175cb11 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java
@@ -140,7 +140,7 @@
.build();
inspectUnacceptedMapper.insert(rawUnaccepted);
}
- return "涓婃姤鎴愬姛!";
+ return rawInspect.getJudgeState().toString();
}
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/Task/DataPullTask.java b/inventory-server/src/main/java/com/yuanchu/mom/Task/DataPullTask.java
index 6946b88..48f4d8e 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/Task/DataPullTask.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/Task/DataPullTask.java
@@ -46,6 +46,8 @@
sale.setDelTime(DateUtil.parseDate(orde.get("wantedDeliveryDate").toString()));//浜よ揣鏃ユ湡
sale.setCreateTime(DateUtil.parseDate(orde.get("orderDate").toString()));//涓嬪崟鏃ユ湡
sale.setNote(String.valueOf(orde.get("comment")));//澶囨敞
+ sale.setOrderId((Integer) orde.get("id"));
+ sale.setOrderType(orde.get("orderClassification").toString());
return sale;
}).collect(Collectors.toList());
//鍘婚噸
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/Task/SyncOrder.java b/inventory-server/src/main/java/com/yuanchu/mom/Task/SyncOrder.java
index e44997f..5ab2ee7 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/Task/SyncOrder.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/Task/SyncOrder.java
@@ -17,28 +17,32 @@
*/
public class SyncOrder {
- private static final String TOKEN_URL="http://192.168.18.16:9999/auth/oauth/token";
+ private static final String TOKEN_URL = "http://192.168.18.16:9999/auth/oauth/token";
- private static final String GET_ORDER_MAIN_URL="http://192.168.18.16:9999/order/otcService/getOrderInfoForHyxtMes";
+ private static final String GET_ORDER_MAIN_URL = "http://192.168.18.16:9999/order/otcService/getOrderInfoForHyxtMes";
- private static final String GET_ORDER_INNER_URL="http://192.168.18.16:9999/order/otcService/getOrderLineForHyxtMes";
+ private static final String GET_ORDER_INNER_URL = "http://192.168.18.16:9999/order/otcService/getOrderLineForHyxtMes";
- private static final Map<String, String> GET_TOKEN_HEADER=new HashMap<>(2);
+ private static final String GET_ATTACHMENT_BY_ORDERID = "http://192.168.18.16:9999/order/otcService/getAttachmentByOrderId/";
- private static final Map<String, Object>USER_INFO=new HashMap<>(4);
+ private static final String DOWN_LOAD = "http://192.168.18.16:9999/order/otcService/download/";
+
+ private static final Map<String, String> GET_TOKEN_HEADER = new HashMap<>(2);
+
+ private static final Map<String, Object> USER_INFO = new HashMap<>(4);
static {
- GET_TOKEN_HEADER.put("Authorization","Basic cGlnOnBpZw==");
- GET_TOKEN_HEADER.put("Content-Type","application/x-www-form-urlencoded");
+ GET_TOKEN_HEADER.put("Authorization", "Basic cGlnOnBpZw==");
+ GET_TOKEN_HEADER.put("Content-Type", "application/x-www-form-urlencoded");
- USER_INFO.put("username","external_interface_hyxt_mes");
- USER_INFO.put("password","uCc+u3iP83WhO2dAU+5HUkCgfINnKfrHXMT/lwI/1f0=");
- USER_INFO.put("scope","server");
- USER_INFO.put("grant_type","password");
+ USER_INFO.put("username", "external_interface_hyxt_mes");
+ USER_INFO.put("password", "uCc+u3iP83WhO2dAU+5HUkCgfINnKfrHXMT/lwI/1f0=");
+ USER_INFO.put("scope", "server");
+ USER_INFO.put("grant_type", "password");
}
- private static String getToken(){
+ private static String getToken() {
String body = HttpRequest.post(TOKEN_URL)
.headerMap(GET_TOKEN_HEADER, true)
.form(USER_INFO)//琛ㄥ崟鍐呭
@@ -47,26 +51,41 @@
return String.valueOf(JsonUtil.jsonToPojo(body, Map.class).get("access_token"));
}
- public static List<Map<String, Object>> getMainOrder(String time){
- Map<String,Object> orderCondition = new HashMap<String,Object>();
+ public static List<Map<String, Object>> getMainOrder(String time) {
+ Map<String, Object> orderCondition = new HashMap<String, Object>();
orderCondition.put("selectTime", time);
String result = HttpRequest.get(GET_ORDER_MAIN_URL)
.header("Authorization", "Bearer " + getToken())
.form(orderCondition)
.execute().body();
- List<Map<String, Object>>list = JsonUtil.jsonToPojo(JsonUtil.jsonToString(JsonUtil.jsonToPojo(result,Result.class).getData()),List.class);
- return list.stream().filter(l-> Objects.equals(l.get("status"),"宸蹭笅杈�")).collect(Collectors.toList());
+ List<Map<String, Object>> list = JsonUtil.jsonToPojo(JsonUtil.jsonToString(JsonUtil.jsonToPojo(result, Result.class).getData()), List.class);
+ return list.stream().filter(l -> Objects.equals(l.get("status"), "宸蹭笅杈�")).collect(Collectors.toList());
}
- public static List<Map<String, Object>> getInnerOrder(String time,String orderNo){
- Map<String,Object> orderCondition = new HashMap<String,Object>();
+ public static List<Map<String, Object>> getInnerOrder(String time, String orderNo) {
+ Map<String, Object> orderCondition = new HashMap<String, Object>();
orderCondition.put("selectTime", time);
- orderCondition.put("orderNo",orderNo);
+ orderCondition.put("orderNo", orderNo);
String result = HttpRequest.get(GET_ORDER_INNER_URL)
.header("Authorization", "Bearer " + getToken())
.form(orderCondition)
.execute().body();
- List<Map<String, Object>>list = JsonUtil.jsonToPojo(JsonUtil.jsonToString(JsonUtil.jsonToPojo(result,Result.class).getData()),List.class);
+ List<Map<String, Object>> list = JsonUtil.jsonToPojo(JsonUtil.jsonToString(JsonUtil.jsonToPojo(result, Result.class).getData()), List.class);
return list;
}
+
+ public static List<Map<String, Object>> getAttachmentByOrderId(Integer orderId) {
+ String result = HttpRequest.get(GET_ATTACHMENT_BY_ORDERID + orderId)
+ .header("Authorization", "Bearer " + getToken())
+ .execute().body();
+ List<Map<String, Object>> list = JsonUtil.jsonToPojo(JsonUtil.jsonToString(JsonUtil.jsonToPojo(result, Result.class).getData()), List.class);
+ return list;
+ }
+
+ public static String download(Integer id) {
+ String result = HttpRequest.get(DOWN_LOAD + id)
+ .header("Authorization", "Bearer " + getToken())
+ .execute().body();
+ return result;
+ }
}
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/controller/SaleController.java b/inventory-server/src/main/java/com/yuanchu/mom/controller/SaleController.java
index 572c0c4..dfc3a62 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/controller/SaleController.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/controller/SaleController.java
@@ -139,4 +139,13 @@
return Result.success(saleService.synchronization());
}
+ @ApiOperation(value = "涓嬭浇闄勪欢")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "id", value = "閿�鍞崟id", dataTypeClass = Integer.class, required = true)
+ })
+ @PostMapping("/download")
+ public Result download(Integer id){
+ return Result.success(saleService.download(id));
+ }
+
}
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/pojo/Sale.java b/inventory-server/src/main/java/com/yuanchu/mom/pojo/Sale.java
index 04c7520..14d732c 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/pojo/Sale.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/pojo/Sale.java
@@ -84,4 +84,10 @@
@ApiModelProperty(value = "澶囨敞")
private String note;
+ @ApiModelProperty(value = "otc涓殑璁㈠崟id")
+ private Integer orderId;
+
+ @ApiModelProperty(value = "璁㈠崟绫诲瀷")
+ private String orderType;
+
}
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/ConsignmentDto1.java b/inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/ConsignmentDto1.java
index 5b7df7f..66cf59f 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/ConsignmentDto1.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/ConsignmentDto1.java
@@ -22,18 +22,6 @@
@JsonSerialize
private String proname;
- //鍒拌揣鍦板潃
- @JsonSerialize
- private String adress;
-
- //鏀惰揣鑱旂郴浜�
- @JsonSerialize
- private String username;
-
- //鎵嬫満鍙�
- @JsonSerialize
- private String phone ;
-
//浜у搧淇℃伅
@JsonSerialize
private List<ConsignmentDto2> messages;
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/ConsignmentDto2.java b/inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/ConsignmentDto2.java
index b029f59..09debff 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/ConsignmentDto2.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/ConsignmentDto2.java
@@ -29,4 +29,16 @@
@NotBlank(message = "鍙戣揣鏁伴噺涓嶈兘涓虹┖")
@JsonSerialize
private Integer number;
+
+ //鍒拌揣鍦板潃
+ @JsonSerialize
+ private String adress;
+
+ //鏀惰揣鑱旂郴浜�
+ @JsonSerialize
+ private String username;
+
+ //鎵嬫満鍙�
+ @JsonSerialize
+ private String phone ;
}
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/service/SaleService.java b/inventory-server/src/main/java/com/yuanchu/mom/service/SaleService.java
index 94453b6..c420b22 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/service/SaleService.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/service/SaleService.java
@@ -83,4 +83,11 @@
* @return
*/
String synchronization();
+
+ /**
+ * 涓嬭浇闄勪欢
+ * @param id
+ * @return
+ */
+ List<String> download(Integer id);
}
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java b/inventory-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java
index ea3ff9d..85abcc8 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java
@@ -63,6 +63,7 @@
Sale sale = new Sale();
BeanUtils.copyProperties(saleDto, sale);
sale.setSaleman(saleman);
+ sale.setOrderType("鎵嬪伐璁㈠崟");
saleMapper.insert(sale);
//娣诲姞閿�鍞骇鍝佸崟
List<SaleMaterialDto> saleMaterialDtoList = saleDto.getSaleMaterialList();
@@ -186,9 +187,6 @@
.orderCode(orderNumber)
.customerCode(sale.getCode())
.proname(sale.getProname())
- //.adress(sale.getAdress())
- //.username(sale.getUsername())
- //.phone(sale.getPhone())
.messages(dto2List)
.build();
return consignmentDto1;
@@ -215,6 +213,8 @@
sale.setDelTime(DateUtil.parseDate(orde.get("wantedDeliveryDate").toString()));//浜よ揣鏃ユ湡
sale.setCreateTime(DateUtil.parseDate(orde.get("orderDate").toString()));//涓嬪崟鏃ユ湡
sale.setNote(String.valueOf(orde.get("comment")));//澶囨敞
+ sale.setOrderId((Integer) orde.get("id")); //otc璁㈠崟id
+ sale.setOrderType(orde.get("orderClassification").toString()); //璁㈠崟绫诲瀷
return sale;
}).collect(Collectors.toList());
//鍘婚噸
@@ -239,4 +239,22 @@
}
return "鍚屾鎴愬姛!";
}
+
+
+ //涓嬭浇闄勪欢
+ @Override
+ public List<String> download(Integer id) {
+ Integer orderId = saleMapper.selectById(id).getOrderId();
+ List<Map<String, Object>> attachment = SyncOrder.getAttachmentByOrderId(orderId);
+ List<String> list = new ArrayList<>();
+ if (ObjectUtils.isEmpty(attachment)) {
+ list.add("璇ヨ鍗曟病鏈夐檮浠�");
+ return list;
+ }
+ for (Map<String, Object> attch : attachment) {
+ String path = attch.get("path").toString();
+ list.add(path);
+ }
+ return list;
+ }
}
diff --git a/inventory-server/src/main/resources/mapper/SaleMapper.xml b/inventory-server/src/main/resources/mapper/SaleMapper.xml
index ef27ecf..5bcccc2 100644
--- a/inventory-server/src/main/resources/mapper/SaleMapper.xml
+++ b/inventory-server/src/main/resources/mapper/SaleMapper.xml
@@ -15,7 +15,8 @@
proname,
type,
DATE_FORMAT(delTime, '%Y-%m-%d') '浜よ揣鏃ユ湡',
- note
+ note,
+ order_type
from mom_ocean.sale
where state=1
<if test="orderNumber!=null and orderNumber!=''">
diff --git a/system-run/src/test/java/com/yuanchu/mom/SystemRunApplicationTest.java b/system-run/src/test/java/com/yuanchu/mom/SystemRunApplicationTest.java
index 030a81b..cd45d30 100644
--- a/system-run/src/test/java/com/yuanchu/mom/SystemRunApplicationTest.java
+++ b/system-run/src/test/java/com/yuanchu/mom/SystemRunApplicationTest.java
@@ -1,19 +1,12 @@
package com.yuanchu.mom;
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
import com.yuanchu.mom.Task.SyncOrder;
import com.yuanchu.mom.pojo.Sale;
import com.yuanchu.mom.pojo.SaleMaterial;
-import com.yuanchu.mom.vo.Result;
-import javafx.scene.input.DataFormat;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;
@@ -37,7 +30,6 @@
return sale;
}).collect(Collectors.toList());
//System.out.println(list);
-
for (Sale sale : list) {
List<Map<String, Object>> innerOrder = SyncOrder.getInnerOrder("2023-08-01 10:00:00", sale.getOrderNumber());
List<SaleMaterial> saleMaterials = innerOrder.stream().map(inorder -> {
@@ -45,7 +37,7 @@
saleMaterial.setName(inorder.get("productName").toString()); //浜у搧鍚嶇О
saleMaterial.setSpecifications(inorder.get("specificationModel").toString()); //浜у搧瑙勬牸鍨嬪彿
saleMaterial.setUnit(inorder.get("unit").toString()); //鍗曚綅
- saleMaterial.setNumber((int)Double.parseDouble(inorder.get("quantity").toString())); //鏁伴噺
+ saleMaterial.setNumber((int) Double.parseDouble(inorder.get("quantity").toString())); //鏁伴噺
saleMaterial.setPrice(inorder.get("unitPriceInclTax").toString()); //鍗曚环
saleMaterial.setSaleId(sale.getId()); //鍏宠仈 閿�鍞崟id
saleMaterial.setAdress(String.valueOf(inorder.get("shippingAddress"))); //鏀惰揣鍦板潃
@@ -59,9 +51,13 @@
@Test
void aaa() {
- String pattern = "yyyy-MM-dd HH:mm:ss";
- DateTimeFormatter formatter = DateTimeFormatter.ofPattern(pattern);
- System.out.println(LocalDateTime.now().minusDays(1).with(LocalTime.of(0,0,0)).format(formatter));
- System.out.println(LocalDateTime.now().with(LocalTime.of(4, 0, 0)).format(formatter));
+ int orderId = 773699;
+ List<Map<String, Object>> attachment = SyncOrder.getAttachmentByOrderId(orderId);
+ List<String> list = new ArrayList<>();
+ for (Map<String, Object> attch : attachment) {
+ String path = attch.get("path").toString();
+ list.add(path);
+ }
+ System.out.println(list);
}
}
--
Gitblit v1.9.3