From 5d24aead2d1a45452942ddfc300fe6a232301a99 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 25 九月 2023 11:07:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inventory-server/src/main/java/com/yuanchu/mom/Task/SyncOrder.java | 47 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 37 insertions(+), 10 deletions(-)
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 02a3419..f7b4363 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
@@ -6,10 +6,7 @@
import com.yuanchu.mom.vo.Result;
import sun.net.www.http.HttpClient;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -28,7 +25,9 @@
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_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 IMPORT_POL_RECEIVE = "http://192.168.20.47:8081/ErpServices/PurchaseReceiptService/importPolReceive";
private static final String IFS_UPDATE="http://192.168.20.47:8081/ErpServices/PurchaseReceiptService/importPolReceive";
@@ -36,15 +35,19 @@
private static final Map<String, Object> USER_INFO = new HashMap<>(4);
+ private static final Map<String, Object> importPolReceiveMap = new HashMap<>();
+
static {
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");
+
+ importPolReceiveMap.put("contract", "ZTKJ");
+ importPolReceiveMap.put("contractKey", "4ttDeLKNsZuhstjtROMcRE1USNFXKdFYE7lQ2p1m5Bo=");
+ importPolReceiveMap.put("userId", "mes_user");
}
private static String getToken() {
@@ -96,13 +99,37 @@
/**
* ifs
+ *
* @return
*/
- public static List<Map<String, Object>>ifsInterfaces(){
+ public static List<Map<String, Object>> ifsInterfaces() {
String result = HttpRequest.get(IFS_URL)
.execute().body();
- Map<String, Object>map=JsonUtil.jsonToPojo(result,Map.class);
- return JsonUtil.jsonToPojo(JsonUtil.jsonToString(map.get("LIST_INFO")),List.class);
+ Map<String, Object> map = JsonUtil.jsonToPojo(result, Map.class);
+ return JsonUtil.jsonToPojo(JsonUtil.jsonToString(map.get("LIST_INFO")), List.class);
+ }
+
+ public static String importPolReceive(List<BatchInfo> batchInfoList) {
+ importPolReceiveMap.put("inAttr", new InAttr(batchInfoList));
+ return HttpRequest.post(IMPORT_POL_RECEIVE)
+ .body(JsonUtil.jsonToString(importPolReceiveMap))
+ .header("content-type", "application/json")
+ .execute().body();
+ }
+
+ public static void main(String[] args) {
+ BatchInfo batchInfo = new BatchInfo();
+ batchInfo.setOrderNo("260984");
+ batchInfo.setReleaseNo("1");
+ batchInfo.setLineNo("1");
+ batchInfo.setPartNo("A0190008000400");
+ batchInfo.setLotBatchNo("*");
+ batchInfo.setLocationNo("QC01");
+ batchInfo.setQtyToReceive(1);
+ batchInfo.setQtyToInspect(0);
+ batchInfo.setReceiveCase("鎺ユ敹鍒版潵鏂欏尯");
+ List<BatchInfo> batchInfos = Arrays.asList(batchInfo);
+ System.out.println(importPolReceive(batchInfos));
}
public static void ifsUpdate(){
--
Gitblit v1.9.3