From 55364b8819e0bc7dc7a12de668f904bed16e8faf Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 21 十月 2023 10:41:00 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/kingdee/handler/LoginAuthenticationHandler.java | 2
src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java | 69 ++++++
src/main/java/com/zy/erp/kingdee/utils/KingDeeUtil.java | 7
src/main/java/com/zy/erp/kingdee/utils/PostMesDataUtils.java | 119 +++++++++++
src/main/resources/application.yml | 6
src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java | 292 ++++++++++++----------------
src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java | 61 -----
src/main/java/com/zy/erp/kingdee/entity/param/InFormIdParam.java | 2
src/main/java/com/zy/erp/kingdee/entity/param/LoginParam.java | 2
9 files changed, 333 insertions(+), 227 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
index da0cc5c..9c619a2 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
@@ -9,10 +9,11 @@
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
-import com.zy.asrs.entity.kingdee.*;
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
+import com.zy.erp.kingdee.entity.param.InFormIdParam;
+import com.zy.erp.kingdee.enums.KingDeeUtilType;
import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -66,42 +67,14 @@
SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
//鐧诲綍閲戣澏
ReturnT<String> start = loginAuthenticationHandler.start();
- for(int i=0;i<14;i++) {
+ for(int i=0;i<docTypeService.selectCount(new EntityWrapper<>())+2;i++) {
InFormIdParam inFormIdParam = new InFormIdParam();
- //瀵瑰簲璁㈠崟绫诲瀷ID
- int docName=0;
- //鏁伴噺瀛楁
- String anfme =null;
- switch (i){
- //鐗╂枡妗ｆ
- case 0 : inFormIdParam.setFormId("BD_MATERIAL"); break;
- //閲囪喘鍏ュ簱
- case 1 : inFormIdParam.setFormId("STK_InStock");docName=13;anfme ="FRealQty"; break;
- //閲囪喘閫�鏂�
- case 2 : inFormIdParam.setFormId("PUR_MRB");docName=21;anfme ="FRMREALQTY"; break;
- //鐢熶骇棰嗘枡
- case 3 : inFormIdParam.setFormId("PRD_PickMtrl");docName=22;anfme ="FActualQty"; break;
- //鐢熶骇閫�鏂�
- case 4 : inFormIdParam.setFormId("PRD_ReturnMtrl");docName=24;anfme ="FQty"; break;
- //鐢熶骇琛ユ枡
- case 5 : inFormIdParam.setFormId("PRD_FeedMtrl");docName=25;anfme ="FActualQty"; break;
- //鐩存帴璋冩嫧鍗�
- case 6 : inFormIdParam.setFormId("STK_TransferDirect");docName=26;anfme ="FQty"; break;
- //鐩樼泩鍗�
- case 7 : inFormIdParam.setFormId("STK_StockCountGain");docName=28;anfme ="FGainQty"; break;
- //鐩樹簭鍗�
- case 8 : inFormIdParam.setFormId("STK_StockCountLoss");docName=29;anfme ="FLossQty"; break;
- //鍏朵粬鍑哄簱
- case 9 : inFormIdParam.setFormId("STK_MisDelivery");docName=30;anfme ="FQty"; break;
- //绠�鍗曠敓浜ч鏂�
- case 10 : inFormIdParam.setFormId("SP_PickMtrl");docName=31;anfme ="FActualQty"; break;
- //绠�鍗曠敓浜ч��鏂�
- case 11 : inFormIdParam.setFormId("SP_ReturnMtrl");docName=32;anfme ="FQty"; break;
- //閿�鍞嚭搴�
- case 12 : inFormIdParam.setFormId("SAL_OUTSTOCK");docName=14;anfme ="FRealQty"; break;
- //閿�鍞��璐�
- case 13 : inFormIdParam.setFormId("SAL_RETURNSTOCK");docName=33;anfme ="FRealQty"; break;
+ KingDeeUtilType kingDeeUtilType = KingDeeUtilType.get((short)i);
+ if (Cools.isEmpty(kingDeeUtilType)){
+ continue;
}
+ DocType docType = docTypeService.selectOne(new EntityWrapper<DocType>().eq("doc_name", kingDeeUtilType.desc));
+ inFormIdParam.setFormId(kingDeeUtilType.formId);
inFormIdParam.setLimit(100);
inFormIdParam.setStartRow("0");
Date time=new Date();
@@ -113,7 +86,7 @@
jsonObject.put("Limit", inFormIdParam.getLimit());
jsonObject.put("StartRow", inFormIdParam.getStartRow());
//鐗╂枡妗ｆ鏌ヨ
- if(i==0){
+ if(inFormIdParam.getFormId().equals("BD_MATERIAL")){
Tag tag = tagService.selectById(20);
//鏈�鏂版椂闂�
time=tag.getCreateTime();
@@ -128,11 +101,10 @@
// FDocumentStatus 锛氱墿鏂欑姸鎬�
}else{
//鑾峰彇鏈�鏂版椂闂�
- DocType docType= docTypeService.selectById(docName);
//鍗曟嵁鐘舵��
FDocumentStatus="B";
jsonObject.put("FilterString", "FCreateDate>'"+sdf.format(docType.getCreateTime())+"' and FStockId.Fname='绔嬪簱'"+" and FDocumentStatus='"+FDocumentStatus+"'");
- jsonObject.put("FieldKeys", "FBillNo,FCreateDate,FMaterialId.FNumber,FMaterialId.FName,FMaterialId.FSpecification,"+anfme+",FDocumentStatus");
+ jsonObject.put("FieldKeys", "FBillNo,FCreateDate,FMaterialId.FNumber,FMaterialId.FName,FMaterialId.FSpecification,"+kingDeeUtilType.anfme+",FDocumentStatus");
// FBillNo :鍗曟嵁缂栧彿锛�
// FCreateDate 锛氬崟鎹垱寤烘椂闂达紱
// FMaterialId.FNumber : 鐗╂枡缂栫爜锛�
@@ -160,134 +132,128 @@
.build()
.doPost();
JSONArray data = JSON.parseArray(response);
- if(data.size()>0) {
- if (data.getJSONArray(0).get(0).toString().length()<20) {
- if (i == 0) {
- for (int j = 0; j < data.size(); j++) {
- JSONArray jsonArray = data.getJSONArray(j);
- //鐢熸垚鍟嗗搧妗ｆ
- //鍟嗗搧缂栧彿
- Mat mat = matService.selectByMatnr(jsonArray.get(1).toString());
- if (mat == null) {
- mat = new Mat();
- Tag tag = new Tag();
- mat.setMatnr(jsonArray.get(1).toString());
- mat.setMaktx(jsonArray.get(0).toString());
- mat.setSpecs(jsonArray.get(3).toString());//瑙勬牸
- mat.setTagId(20L);
- //瀵圭編鍥芥椂闂磋繘琛岃浆鎹�
- DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");
- DateTimeFormatter formatter = DateTimeFormatter.ISO_LOCAL_DATE_TIME;
- LocalDateTime dateTime = LocalDateTime.parse(jsonArray.get(2).toString(), formatter);
- String format = dateFormat.format(dateTime);
- Date date = sdf.parse(format);
- mat.setCreateTime(date);//鍟嗗搧鍒涘缓鏃堕棿
- mat.setUpdateTime(new Date());
- mat.setStatus(1);
- //鏈�鏂版姄鍙栧晢鍝佹椂闂�
- tag.setCreateTime(date);
- tagService.update(tag, new EntityWrapper<Tag>().eq("id", 20));
- if (!matService.insert(mat)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
- } else {
- log.info("鍚屾鏂扮墿鏂橻鍟嗗搧缂栧彿锛歿}]", mat.getMatnr());
- }
- }
- }
- } else {
- for (int j = 0; j < data.size(); j++) {
- JSONArray jsonArray = data.getJSONArray(j);
- Order order = orderService.selectByNo(jsonArray.get(0).toString());
- if (Cools.isEmpty(order)) {
- DocType docType = docTypeService.selectById(docName);
- Date now = new Date();
- // 鍗曟嵁涓绘。
- order = new Order(
- String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
- jsonArray.get(0).toString(), // 璁㈠崟缂栧彿
- DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
- docType.getDocId(), // 鍗曟嵁绫诲瀷
- null, // 椤圭洰缂栧彿
- null, //
- null, // 璋冩嫧椤圭洰缂栧彿
- null, // 鍒濆绁ㄦ嵁鍙�
- null, // 绁ㄦ嵁鍙�
- null, // 瀹㈡埛缂栧彿
- null, // 瀹㈡埛
- null, // 鑱旂郴鏂瑰紡
- null, // 鎿嶄綔浜哄憳
- null, // 鍚堣閲戦
- null, // 浼樻儬鐜�
- null, // 浼樻儬閲戦
- null, // 閿�鍞垨閲囪喘璐圭敤鍚堣
- null, // 瀹炰粯閲戦
- null, // 浠樻绫诲瀷
- null, // 涓氬姟鍛�
- null, // 缁撶畻澶╂暟
- null, // 閭垂鏀粯绫诲瀷
- null, // 閭垂
- null, // 浠樻鏃堕棿
- null, // 鍙戣揣鏃堕棿
- null, // 鐗╂祦鍚嶇О
- null, // 鐗╂祦鍗曞彿
- 1L, // 璁㈠崟鐘舵��
- 1, // 鐘舵��
- 9527L, // 娣诲姞浜哄憳
- now, // 娣诲姞鏃堕棿
- 9527L, // 淇敼浜哄憳
- now, // 淇敼鏃堕棿
- null // 澶囨敞
- );
- //瀵圭編鍥芥椂闂磋繘琛岃浆鎹�
- DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");
- DateTimeFormatter formatter = DateTimeFormatter.ISO_LOCAL_DATE_TIME;
- LocalDateTime dateTime = LocalDateTime.parse(jsonArray.get(1).toString(), formatter);
- String format = dateFormat.format(dateTime);
- Date date = sdf.parse(format);
- //鏈�鏂版姄鍙栨椂闂�
- docType.setCreateTime(date);
- docTypeService.update(docType, new EntityWrapper<DocType>().eq("doc_id", docName));
- if (!orderService.insert(order)) {
- throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }
- }
- //鐗╂枡缂栫爜
- Mat mat = matService.selectByMatnr(jsonArray.get(2).toString());
- if (Cools.isEmpty(mat)) {
- throw new CoolException(jsonArray.get(2).toString() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
- }
- OrderDetl orderDetl1 = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", jsonArray.get(0).toString()).eq("matnr", jsonArray.get(2).toString()));
- if (!Cools.isEmpty(orderDetl1)) {
- continue;
- }
- DocType docType = docTypeService.selectById(docName);
- OrderDetl orderDetl = new OrderDetl();
- orderDetl.sync(mat);
- orderDetl.setBatch(null);
- orderDetl.setAnfme(Double.parseDouble(jsonArray.get(5).toString()));
- orderDetl.setOrderId(order.getId());
- orderDetl.setOrderNo(order.getOrderNo());
- orderDetl.setCreateBy(9527L);
- orderDetl.setCreateTime(new Date());
- orderDetl.setUpdateBy(9527L);
- orderDetl.setUpdateTime(new Date());
- orderDetl.setStatus(1);
- orderDetl.setQty(0.0D);
- DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");
- DateTimeFormatter formatter = DateTimeFormatter.ISO_LOCAL_DATE_TIME;
- LocalDateTime dateTime = LocalDateTime.parse(jsonArray.get(1).toString(), formatter);
- String format = dateFormat.format(dateTime);
- Date date = sdf.parse(format);
- //鏈�鏂版姄鍙栨椂闂�
- docType.setCreateTime(date);
- if (!orderDetlService.insert(orderDetl)) {
- throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }
+ if(data.size()<=0) continue;
+ if (data.getJSONArray(0).get(0).toString().length()>=20) continue;
+ if (i == 0) {
+ for (int j = 0; j < data.size(); j++) {
+ JSONArray jsonArray = data.getJSONArray(j);
+ //鐢熸垚鍟嗗搧妗ｆ
+ //鍟嗗搧缂栧彿
+ Mat mat = matService.selectByMatnr(jsonArray.get(1).toString());
+ if (mat == null) {
+ mat = new Mat();
+ Tag tag = new Tag();
+ mat.setMatnr(jsonArray.get(1).toString());
+ mat.setMaktx(jsonArray.get(0).toString());
+ mat.setSpecs(jsonArray.get(3).toString());//瑙勬牸
+ mat.setTagId(20L);
+ //瀵圭編鍥芥椂闂磋繘琛岃浆鎹�
+ DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");
+ DateTimeFormatter formatter = DateTimeFormatter.ISO_LOCAL_DATE_TIME;
+ LocalDateTime dateTime = LocalDateTime.parse(jsonArray.get(2).toString(), formatter);
+ String format = dateFormat.format(dateTime);
+ Date date = sdf.parse(format);
+ mat.setCreateTime(date);//鍟嗗搧鍒涘缓鏃堕棿
+ mat.setUpdateTime(new Date());
+ mat.setStatus(1);
+ //鏈�鏂版姄鍙栧晢鍝佹椂闂�
+ tag.setCreateTime(date);
+ tagService.update(tag, new EntityWrapper<Tag>().eq("id", 20));
+ if (!matService.insert(mat)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ } else {
+ log.info("鍚屾鏂扮墿鏂橻鍟嗗搧缂栧彿锛歿}]", mat.getMatnr());
}
}
- }else {
}
- }else {
+ } else {
+ for (int j = 0; j < data.size(); j++) {
+ JSONArray jsonArray = data.getJSONArray(j);
+ Order order = orderService.selectByNo(jsonArray.get(0).toString());
+ if (Cools.isEmpty(order)) {
+ Date now = new Date();
+ // 鍗曟嵁涓绘。
+ order = new Order(
+ String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
+ jsonArray.get(0).toString(), // 璁㈠崟缂栧彿
+ DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
+ docType.getDocId(), // 鍗曟嵁绫诲瀷
+ null, // 椤圭洰缂栧彿
+ null, //
+ null, // 璋冩嫧椤圭洰缂栧彿
+ null, // 鍒濆绁ㄦ嵁鍙�
+ null, // 绁ㄦ嵁鍙�
+ null, // 瀹㈡埛缂栧彿
+ null, // 瀹㈡埛
+ null, // 鑱旂郴鏂瑰紡
+ null, // 鎿嶄綔浜哄憳
+ null, // 鍚堣閲戦
+ null, // 浼樻儬鐜�
+ null, // 浼樻儬閲戦
+ null, // 閿�鍞垨閲囪喘璐圭敤鍚堣
+ null, // 瀹炰粯閲戦
+ null, // 浠樻绫诲瀷
+ null, // 涓氬姟鍛�
+ null, // 缁撶畻澶╂暟
+ null, // 閭垂鏀粯绫诲瀷
+ null, // 閭垂
+ null, // 浠樻鏃堕棿
+ null, // 鍙戣揣鏃堕棿
+ null, // 鐗╂祦鍚嶇О
+ null, // 鐗╂祦鍗曞彿
+ 1L, // 璁㈠崟鐘舵��
+ 1, // 鐘舵��
+ 9527L, // 娣诲姞浜哄憳
+ now, // 娣诲姞鏃堕棿
+ 9527L, // 淇敼浜哄憳
+ now, // 淇敼鏃堕棿
+ null // 澶囨敞
+ );
+ //瀵圭編鍥芥椂闂磋繘琛岃浆鎹�
+ DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");
+ DateTimeFormatter formatter = DateTimeFormatter.ISO_LOCAL_DATE_TIME;
+ LocalDateTime dateTime = LocalDateTime.parse(jsonArray.get(1).toString(), formatter);
+ String format = dateFormat.format(dateTime);
+ Date date = sdf.parse(format);
+ //鏈�鏂版姄鍙栨椂闂�
+ docType.setCreateTime(date);
+ docTypeService.updateById(docType);
+ if (!orderService.insert(order)) {
+ throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+ }
+ //鐗╂枡缂栫爜
+ Mat mat = matService.selectByMatnr(jsonArray.get(2).toString());
+ if (Cools.isEmpty(mat)) {
+ throw new CoolException(jsonArray.get(2).toString() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
+ }
+ OrderDetl orderDetl1 = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", jsonArray.get(0).toString()).eq("matnr", jsonArray.get(2).toString()));
+ if (!Cools.isEmpty(orderDetl1)) {
+ continue;
+ }
+ OrderDetl orderDetl = new OrderDetl();
+ orderDetl.sync(mat);
+ orderDetl.setBatch(null);
+ orderDetl.setAnfme(Double.parseDouble(jsonArray.get(5).toString()));
+ orderDetl.setOrderId(order.getId());
+ orderDetl.setOrderNo(order.getOrderNo());
+ orderDetl.setCreateBy(9527L);
+ orderDetl.setCreateTime(new Date());
+ orderDetl.setUpdateBy(9527L);
+ orderDetl.setUpdateTime(new Date());
+ orderDetl.setStatus(1);
+ orderDetl.setQty(0.0D);
+ DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");
+ DateTimeFormatter formatter = DateTimeFormatter.ISO_LOCAL_DATE_TIME;
+ LocalDateTime dateTime = LocalDateTime.parse(jsonArray.get(1).toString(), formatter);
+ String format = dateFormat.format(dateTime);
+ Date date = sdf.parse(format);
+ //鏈�鏂版姄鍙栨椂闂�
+ docType.setCreateTime(date);
+ if (!orderDetlService.insert(orderDetl)) {
+ throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+ }
}
} catch (Exception e) {
log.error("fail", e);
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/LoginAuthenticationHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/LoginAuthenticationHandler.java
index ab9982b..a7f19ce 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/LoginAuthenticationHandler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/LoginAuthenticationHandler.java
@@ -5,11 +5,11 @@
import com.alibaba.fastjson.JSONObject;
import com.core.common.Cools;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.kingdee.*;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.common.utils.HttpHandler;
+import com.zy.erp.kingdee.entity.param.LoginParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java
index 653cc6f..161cf10 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java
@@ -6,7 +6,6 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.zy.asrs.entity.DocType;
import com.zy.asrs.entity.Order;
-import com.zy.asrs.entity.kingdee.*;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.DocTypeService;
import com.zy.asrs.service.OrderDetlService;
@@ -14,6 +13,7 @@
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.common.utils.HttpHandler;
+import com.zy.erp.kingdee.enums.KingDeeUtilType;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -59,69 +59,14 @@
if (null == docType) {
return SUCCESS;
}
- InFormIdParam inFormIdParam = new InFormIdParam();
- int docId = Long.valueOf(docType.getDocId()).intValue();
- switch (docId) {
- //閲囪喘鍏ュ簱
- case 13:
- inFormIdParam.setFormId("STK_InStock");
- break;
- //閲囪喘閫�鏂�
- case 21:
- inFormIdParam.setFormId("PUR_MRB");
- break;
- //鐢熶骇棰嗘枡
- case 22:
- inFormIdParam.setFormId("PRD_PickMtrl");
- break;
- //鐢熶骇閫�鏂�
- case 24:
- inFormIdParam.setFormId("PRD_ReturnMtrl");
- break;
- //鐢熶骇琛ユ枡
- case 25:
- inFormIdParam.setFormId("PRD_FeedMtrl");
- break;
- //鐩存帴璋冩嫧鍗�
- case 26:
- inFormIdParam.setFormId("STK_TransferDirect");
- break;
- //鐩樼泩鍗�
- case 28:
- inFormIdParam.setFormId("STK_StockCountGain");
- break;
- //鐩樹簭鍗�
- case 29:
- inFormIdParam.setFormId("STK_StockCountLoss");
- break;
- //鍏朵粬鍑哄簱
- case 30:
- inFormIdParam.setFormId("STK_MisDelivery");
- break;
- //绠�鍗曠敓浜ч鏂�
- case 31:
- inFormIdParam.setFormId("SP_PickMtrl");
- break;
- //绠�鍗曠敓浜ч��鏂�
- case 32:
- inFormIdParam.setFormId("SP_ReturnMtrl");
- break;
- //閿�鍞嚭搴�
- case 14:
- inFormIdParam.setFormId("SAL_OUTSTOCK");
- break;
- //閿�鍞��璐�
- case 33:
- inFormIdParam.setFormId("SAL_RETURNSTOCK");
- break;
- }
+ KingDeeUtilType kingDeeUtilType = KingDeeUtilType.get(docType.getDocName());
//鏉′欢鎷兼帴
JSONObject jsonObject = new JSONObject();
jsonObject.put("Numbers",order.getOrderNo());
JSONObject jsonObject1 = new JSONObject();
jsonObject1.put("data", jsonObject);
- jsonObject1.put("FormId",inFormIdParam.getFormId());
+ jsonObject1.put("FormId",kingDeeUtilType.formId);
String add = jsonObject1.toJSONString();
//涓婃姤
String response = "";
diff --git a/src/main/java/com/zy/asrs/entity/kingdee/InFormIdParam.java b/src/main/java/com/zy/erp/kingdee/entity/param/InFormIdParam.java
similarity index 94%
rename from src/main/java/com/zy/asrs/entity/kingdee/InFormIdParam.java
rename to src/main/java/com/zy/erp/kingdee/entity/param/InFormIdParam.java
index c548dbf..89c6f06 100644
--- a/src/main/java/com/zy/asrs/entity/kingdee/InFormIdParam.java
+++ b/src/main/java/com/zy/erp/kingdee/entity/param/InFormIdParam.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.entity.kingdee;
+package com.zy.erp.kingdee.entity.param;
import lombok.Data;
diff --git a/src/main/java/com/zy/asrs/entity/kingdee/LoginParam.java b/src/main/java/com/zy/erp/kingdee/entity/param/LoginParam.java
similarity index 83%
rename from src/main/java/com/zy/asrs/entity/kingdee/LoginParam.java
rename to src/main/java/com/zy/erp/kingdee/entity/param/LoginParam.java
index 05820d2..1eb3ee4 100644
--- a/src/main/java/com/zy/asrs/entity/kingdee/LoginParam.java
+++ b/src/main/java/com/zy/erp/kingdee/entity/param/LoginParam.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.entity.kingdee;
+package com.zy.erp.kingdee.entity.param;
import lombok.Data;
diff --git a/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java b/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java
new file mode 100644
index 0000000..9552056
--- /dev/null
+++ b/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java
@@ -0,0 +1,69 @@
+package com.zy.erp.kingdee.enums;
+
+public enum KingDeeUtilType {
+ BD_MATERIAL(0, "鐗╂枡妗ｆ","BD_MATERIAL",""),
+ STK_InStock(1, "閲囪喘鍏ュ簱","STK_InStock","FRealQty"),
+ PUR_MRB(2, "閲囪喘閫�鏂�","PUR_MRB","FRMREALQTY"),
+ PRD_PickMtrl(3, "鐢熶骇棰嗘枡","PRD_PickMtrl","FActualQty"),
+ PRD_ReturnMtrl(4, "鐢熶骇閫�鏂�","PRD_ReturnMtrl","FQty"),
+ PRD_FeedMtrl(5, "鐢熶骇琛ユ枡","PRD_FeedMtrl","FActualQty"),
+ STK_TransferDirect(6, "鐩存帴璋冩嫧鍗�","STK_TransferDirect","FQty"),
+ STK_StockCountGain(7, "鐩樼泩鍗�","STK_StockCountGain","FGainQty"),
+ STK_StockCountLoss(8, "鐩樹簭鍗�","STK_StockCountLoss","FLossQty"),
+ STK_MisDelivery(9, "鍏朵粬鍑哄簱","STK_MisDelivery","FQty"),
+ SP_PickMtrl(10, "绠�鍗曠敓浜ч鏂�","SP_PickMtrl","FActualQty"),
+ SP_ReturnMtrl(11, "绠�鍗曠敓浜ч��鏂�","SP_ReturnMtrl","FQty"),
+ SAL_OUTSTOCK(12, "閿�鍞嚭搴�","SAL_OUTSTOCK","FRealQty"),
+ SAL_RETURNSTOCK(13, "閿�鍞��璐�","SAL_RETURNSTOCK","FRealQty"),
+ SAL_DELIVERYNOTICE(14, "鍙戣揣閫氱煡鍗�","SAL_DELIVERYNOTICE",""),
+ STK_MISCELLANEOUS(15, "鍏朵粬鍏ュ簱鍗�","STK_MISCELLANEOUS",""),
+ BD_Supplier(16, "渚涘簲鍟�","BD_Supplier",""),
+ ;
+ public Integer id;
+ public String desc;
+ public String formId;
+ public String anfme;
+
+ KingDeeUtilType(Integer id, String desc,String formId,String anfme){
+ this.id = id;
+ this.desc = desc;
+ this.formId = formId;
+ this.anfme = anfme;
+ }
+
+ public static KingDeeUtilType get(Short id) {
+ if (null == id) {
+ return null;
+ }
+ for (KingDeeUtilType type : KingDeeUtilType.values()) {
+ if (type.id.equals(id.intValue())) {
+ return type;
+ }
+ }
+ return null;
+ }
+
+ public static KingDeeUtilType get(String desc) {
+ if (null == desc) {
+ return null;
+ }
+ for (KingDeeUtilType type : KingDeeUtilType.values()) {
+ if (type.desc.equals(desc)) {
+ return type;
+ }
+ }
+ return null;
+ }
+
+ public static KingDeeUtilType get(KingDeeUtilType type) {
+ if (null == type) {
+ return null;
+ }
+ for (KingDeeUtilType crnLiftPosType : KingDeeUtilType.values()) {
+ if (crnLiftPosType == type) {
+ return crnLiftPosType;
+ }
+ }
+ return null;
+ }
+}
diff --git a/src/main/java/com/zy/erp/kingdee/utils/KingDeeUtil.java b/src/main/java/com/zy/erp/kingdee/utils/KingDeeUtil.java
new file mode 100644
index 0000000..4691fbf
--- /dev/null
+++ b/src/main/java/com/zy/erp/kingdee/utils/KingDeeUtil.java
@@ -0,0 +1,7 @@
+package com.zy.erp.kingdee.utils;
+
+public class KingDeeUtil {
+
+
+
+}
diff --git a/src/main/java/com/zy/erp/kingdee/utils/PostMesDataUtils.java b/src/main/java/com/zy/erp/kingdee/utils/PostMesDataUtils.java
new file mode 100644
index 0000000..1b89571
--- /dev/null
+++ b/src/main/java/com/zy/erp/kingdee/utils/PostMesDataUtils.java
@@ -0,0 +1,119 @@
+package com.zy.erp.kingdee.utils;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.core.common.SpringUtils;
+import com.core.exception.CoolException;
+import com.zy.asrs.service.ApiLogService;
+import com.zy.asrs.task.AbstractHandler;
+import com.zy.asrs.task.core.ReturnT;
+import com.zy.common.utils.HttpHandler;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.Map;
+
+@Slf4j
+public class PostMesDataUtils extends AbstractHandler<String> {
+
+ public ReturnT<String> postMesData(String name, String URL, String mesPath, Object combParam){
+// if (true){
+// System.out.println("name:"+name+",URL:"+URL+",mesPath:"+mesPath+",combParam:"+combParam);
+// return SUCCESS;
+// }
+ if(combParam != null){
+ String response = "";
+ boolean success = false;
+ try {
+// Map<String, Object> map = new HashMap<>()
+// map.put("appkey","ea1f0459efc02a79f046f982767939ae");
+ response = new HttpHandler.Builder()
+// .setHeaders(map)
+ .setUri(URL)
+ .setPath(mesPath)
+ .setJson(JSON.toJSONString(combParam))
+ .build()
+ .doPost();
+ System.out.println("response:"+response);
+ JSONObject jsonObject = JSON.parseObject(response);
+
+ if (jsonObject.getInteger("code").equals(200)) {
+ success = true;
+ } else {
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL+"/"+mesPath, JSON.toJSONString(combParam), response);
+ throw new CoolException("涓婃姤"+name);
+ }
+ } catch (Exception e) {
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL+"/"+mesPath, JSON.toJSONString(combParam), response);
+// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg(e.getMessage());
+ } finally {
+ try {
+ // 淇濆瓨鎺ュ彛鏃ュ織
+ ApiLogService apiLogService = SpringUtils.getBean(ApiLogService.class);
+ apiLogService.save(
+ "涓婃姤"+name,
+ URL +"/"+ mesPath,
+ null,
+ "127.0.0.1",
+ JSON.toJSONString(combParam),
+ response,
+ success
+ );
+ } catch (Exception e) {
+ log.error("", e); }
+ }
+ }
+ return SUCCESS;
+ }
+
+ public ReturnT<String> postMesData(String name, String URL, String mesPath, Object combParam,Map<String, Object> map){
+// if (true){
+// System.out.println("name:"+name+",URL:"+URL+",mesPath:"+mesPath+",combParam:"+combParam);
+// return SUCCESS;
+// }
+ if(combParam != null){
+ String response = "";
+ boolean success = false;
+ try {
+// Map<String, Object> map = new HashMap<>();
+// map.put("appkey","ea1f0459efc02a79f046f982767939ae");
+ response = new HttpHandler.Builder()
+ .setHeaders(map)
+ .setUri(URL)
+ .setPath(mesPath)
+ .setJson(JSON.toJSONString(combParam))
+ .build()
+ .doPost();
+ System.out.println("response:"+response);
+ JSONObject jsonObject = JSON.parseObject(response);
+
+ if (jsonObject.getInteger("code").equals(200)) {
+ success = true;
+ } else {
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL+"/"+mesPath, JSON.toJSONString(combParam), response);
+ throw new CoolException("涓婃姤"+name);
+ }
+ } catch (Exception e) {
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL+"/"+mesPath, JSON.toJSONString(combParam), response);
+// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg(e.getMessage());
+ } finally {
+ try {
+ // 淇濆瓨鎺ュ彛鏃ュ織
+ ApiLogService apiLogService = SpringUtils.getBean(ApiLogService.class);
+ apiLogService.save(
+ "涓婃姤"+name,
+ URL +"/"+ mesPath,
+ null,
+ "127.0.0.1",
+ JSON.toJSONString(combParam),
+ response,
+ success
+ );
+ } catch (Exception e) {
+ log.error("", e); }
+ }
+ }
+ return SUCCESS;
+ }
+}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index ed79808..37ee5f3 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -66,9 +66,9 @@
erp:
# 寮�鍏�
switch:
- InboundOrderSwitch: true
- LoginAuthenticationSwitch: true
- ReviewOrderSwitch: true
+ InboundOrderSwitch: false
+ LoginAuthenticationSwitch: false
+ ReviewOrderSwitch: false
# 鍦板潃
address:
URL: http://ht01.wlgear.com:16001
--
Gitblit v1.9.1