From 384a1fd5039fe57c51ae5254aa56493c50492b55 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 25 九月 2023 11:07:22 +0800
Subject: [PATCH] 修改1.0 9.25
---
system-run/src/test/java/com/yuanchu/mom/SystemRunApplicationTest.java | 64 --------------------------------
inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java | 2 +
inspect-server/src/main/java/com/yuanchu/mom/pojo/vo/RawInsProductVo.java | 2 -
inventory-server/src/main/java/com/yuanchu/mom/Task/SyncOrder.java | 8 +++
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java | 11 +++--
5 files changed, 15 insertions(+), 72 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/vo/RawInsProductVo.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/vo/RawInsProductVo.java
index 154df8d..647d3bf 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/vo/RawInsProductVo.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/vo/RawInsProductVo.java
@@ -29,14 +29,12 @@
/**
* 鏍囧噯鍊�
**/
- @NotBlank(message = "鏍囧噯鍊间笉鑳戒负绌�!")
@JsonSerialize
private String required;
/**
* 鍐呮帶鍊�
**/
- @NotBlank(message = "鍐呮帶鍊间笉鑳戒负绌�!")
@JsonSerialize
private String internal;
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java
index 62abb6b..54b3d17 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java
@@ -34,15 +34,15 @@
@Autowired
private RawInspectService rawInspectService;
- // // 鍘熸潗鏂欐楠屽瓙鏁版嵁
+ //鍘熸潗鏂欐楠屽瓙鏁版嵁
@Autowired
private RawInsProductService rawInsProductService;
- // 鍗婃垚鍝佹楠�
+ //浜у搧妫�楠�
@Autowired
private FinishedInspectService finishedInspectService;
- // 鍦ㄥ埗鍝佹楠�
+ //杩囩▼妫�楠�
@Autowired
private ProcessInspectService processInspectService;
@@ -79,6 +79,7 @@
return inspectUnacceptedMapper.update(new InspectUnaccepted(), updateWrapper);
}
+ //缂栬緫澶勭疆鎰忚纭畾鎸夐挳
@Override
public Integer editDisposalOpinionConfirmation(Integer rawUnacceptedId, String opinionTell, Integer way, Integer type) {
LambdaUpdateWrapper<InspectUnaccepted> updateWrapper = Wrappers.<InspectUnaccepted>lambdaUpdate()
@@ -97,11 +98,11 @@
// 鎵归噺淇濆瓨瀛愮骇
rawInsProductService.batchAddInsProduct(rawInspect.getId(), map.getRawInsProducts());
}
- // 绛変簬1锛氬崐鎴愬搧
+ // 绛変簬1锛氫骇鍝�
else if (type == 1) {
// TODO 璇ユ帴鍙ｅ彧鍓╀綑杩欎袱澶�
}
- // 绛変簬2锛氬湪鍒跺搧
+ // 绛変簬2锛氳繃绋�
else if (type == 2) {
// TODO 璇ユ帴鍙ｅ彧鍓╀綑杩欎袱澶�
}
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 aeb59ef..3b863f5 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
@@ -183,6 +183,8 @@
.build();
inspectUnacceptedMapper.insert(rawUnaccepted);
}
+ /*妫�楠屽畬鎴愬悗锛屾棤璁哄悎鏍间笌鍚︼紝灏咺FS鎶ユ鐘舵�佹洿鏀逛负宸叉帴鏀�*/
+
return rawInspect.getJudgeState().toString();
}
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 00cfc7d..02a3419 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
@@ -4,6 +4,7 @@
import cn.hutool.http.HttpRequest;
import com.yuanchu.mom.utils.JsonUtil;
import com.yuanchu.mom.vo.Result;
+import sun.net.www.http.HttpClient;
import java.util.HashMap;
import java.util.List;
@@ -28,6 +29,8 @@
private static final String DOWN_LOAD = "http://192.168.18.16:9999/order/otcService/download/";
private static final String IFS_URL="http://192.168.20.47:8008/PurchService.ashx?contract=ZTKJ&contractKey=4ttDeLKNsZuhstjtROMcRE1USNFXKdFYE7lQ2p1m5Bo=&procedureName=QUERY_POL_RECEIPT_STD&userId=mes_user&inAttr={\"ORDER_NO\":\"-2050314\"}";
+
+ private static final String IFS_UPDATE="http://192.168.20.47:8081/ErpServices/PurchaseReceiptService/importPolReceive";
private static final Map<String, String> GET_TOKEN_HEADER = new HashMap<>(2);
@@ -97,9 +100,12 @@
*/
public static List<Map<String, Object>>ifsInterfaces(){
String result = HttpRequest.get(IFS_URL)
- .header("Authorization", "Bearer " + getToken())
.execute().body();
Map<String, Object>map=JsonUtil.jsonToPojo(result,Map.class);
return JsonUtil.jsonToPojo(JsonUtil.jsonToString(map.get("LIST_INFO")),List.class);
}
+
+ public static void ifsUpdate(){
+
+ }
}
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 43087a4..f271419 100644
--- a/system-run/src/test/java/com/yuanchu/mom/SystemRunApplicationTest.java
+++ b/system-run/src/test/java/com/yuanchu/mom/SystemRunApplicationTest.java
@@ -17,71 +17,7 @@
@Test
void contextLoads() {
- List<Map<String, Object>> order = SyncOrder.getMainOrder("2023-08-01 10:00:00 ");
- List<Sale> list = order.stream().map(orde -> {
- Sale sale = new Sale();
- sale.setOrderNumber(orde.get("orderNo").toString());//璁㈠崟缂栧彿
- sale.setCode(String.valueOf(orde.get("customerContractNumber")));//瀹㈡埛鍚堝悓缂栧彿
- sale.setName(orde.get("projectName").toString());//宸ョ▼鍚嶇О
- sale.setProname(orde.get("customerName").toString());//瀹㈡埛鍚嶇О
- sale.setOrderName(orde.get("createdName").toString());//涓嬪崟浜�
- sale.setSaleman(orde.get("salesmanName").toString());//涓氬姟鍛�
- sale.setDelTime(DateUtil.parseDate(orde.get("wantedDeliveryDate").toString()));//浜よ揣鏃ユ湡
- sale.setCreateTime(DateUtil.parseDate(orde.get("orderDate").toString()));//涓嬪崟鏃ユ湡
- sale.setNote(String.valueOf(orde.get("comment")));//澶囨敞
- 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 -> {
- SaleMaterial saleMaterial = new SaleMaterial();
- 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.setPrice(inorder.get("unitPriceInclTax").toString()); //鍗曚环
- saleMaterial.setSaleId(sale.getId()); //鍏宠仈 閿�鍞崟id
- saleMaterial.setAdress(String.valueOf(inorder.get("shippingAddress"))); //鏀惰揣鍦板潃
- saleMaterial.setUsername(String.valueOf(inorder.get("receivingContact"))); //鑱旂郴浜�
- saleMaterial.setPhone(String.valueOf(inorder.get("receivingContactPhone"))); //鎵嬫満鍙�
- return saleMaterial;
- }).collect(Collectors.toList());
- System.out.println(saleMaterials);
- }
- }
- @Test
- void aaa() {
- 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);
- }
-
- @Test
- void bb() {
- List<Map<String, Object>> mapList = SyncOrder.ifsInterfaces();
- List<RawInspect> rawInspectList = mapList.stream().map(map -> {
- RawInspect rawInspect = new RawInspect();
- if (map.get("PART_NO").toString().equals("A0410008010700")) {
- rawInspect.setCode(map.get("PART_NO").toString()); //鍘熸潗鏂欑紪鐮�
- String[] split = map.get("PART_DESC").toString().split("锛�");
- rawInspect.setName(split[0]); //鍘熸潗鏂欏悕绉�
- rawInspect.setSpecifications(split[1]); //鍨嬪彿瑙勬牸
- rawInspect.setUnit(map.get("BUY_UNIT_MEAS").toString()); //鍗曚綅
- rawInspect.setNumber(Integer.parseInt(String.valueOf(map.get("QTY_TO_INSPECT")))); //鏁伴噺
- rawInspect.setInsState(0); //鏈楠�
- rawInspect.setFormTime(DateUtil.parse(map.get("APPROVED_DATE").toString())); //鏉ユ枡鏃ユ湡
- rawInspect.setSupplier(map.get("SUPPLIER_NAME").toString()); //渚涘簲鍟�
- }
- return rawInspect;
- }).collect(Collectors.toList());
- System.out.println(rawInspectList);
}
}
--
Gitblit v1.9.3