From 37a8b4bd1b8a5f09ad9e258733d4d12d6b19c6fa Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期五, 04 八月 2023 16:21:01 +0800
Subject: [PATCH] erp轮询，登录，查询创建物料，查询创建订单,审核
---
src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java | 66 ++++++++++++++++++++-------------
1 files changed, 40 insertions(+), 26 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 d7b1150..ca000fd 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
@@ -71,7 +71,7 @@
@Transactional
public synchronized ReturnT<String> start() {
SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- //鐧诲綍閲戣澏r
+ //鐧诲綍閲戣澏
ReturnT<String> start = loginAuthenticationHandler.start();
for(int i=0;i<14;i++) {
InFormIdParam inFormIdParam = new InFormIdParam();
@@ -89,7 +89,7 @@
//鐢熶骇棰嗘枡
case 3 : inFormIdParam.setFormId("PRD_PickMtrl");docName=22;anfme ="FActualQty"; break;
//鐢熶骇閫�鏂�
- case 4 : inFormIdParam.setFormId("BD_MATERIAL");docName=24;anfme ="FQty"; break;
+ case 4 : inFormIdParam.setFormId("PRD_ReturnMtrl");docName=24;anfme ="FQty"; break;
//鐢熶骇琛ユ枡
case 5 : inFormIdParam.setFormId("PRD_FeedMtrl");docName=25;anfme ="FActualQty"; break;
//鐩存帴璋冩嫧鍗�
@@ -109,7 +109,7 @@
//閿�鍞��璐�
case 13 : inFormIdParam.setFormId("SAL_RETURNSTOCK");docName=33;anfme ="FRealQty"; break;
}
- inFormIdParam.setLimit(10);
+ inFormIdParam.setLimit(100);
inFormIdParam.setStartRow("0");
Date time=new Date();
String FDocumentStatus=null;
@@ -124,9 +124,9 @@
Tag tag = tagService.selectById(20);
//鏈�鏂版椂闂�
time=tag.getCreateTime();
- //鐗╂枡鐘舵��
+ //鐗╂枡鐘舵�� FUseOrgId .FNumber
FDocumentStatus="C";
- jsonObject.put("FilterString", "FCreateDate>'"+sdf.format(time)+"' and FDocumentStatus='"+FDocumentStatus+"'");
+ jsonObject.put("FilterString", "FCreateDate>'"+sdf.format(time)+"' and FDocumentStatus='"+FDocumentStatus+"' and FUseOrgId .FNumber='201'");
jsonObject.put("FieldKeys", "FName,FNumber,FCreateDate,FSpecification,FDocumentStatus");
// FName : 鐗╂枡鍚嶇О 锛�
// FNumber 锛氱墿鏂欑紪鍙凤紱
@@ -137,7 +137,7 @@
//鑾峰彇鏈�鏂版椂闂�
DocType docType= docTypeService.selectById(docName);
//鍗曟嵁鐘舵��
- FDocumentStatus="C";
+ FDocumentStatus="B";
jsonObject.put("FilterString", "FCreateDate>'"+sdf.format(docType.getCreateTime())+"' and FDocumentStatus='"+FDocumentStatus+"'");
jsonObject.put("FieldKeys", "FBillNo,FCreateDate,FMaterialId.FNumber,FMaterialId.FName,FMaterialId.FSpecification,"+anfme+",FDocumentStatus");
// FBillNo :鍗曟嵁缂栧彿锛�
@@ -152,8 +152,6 @@
JSONObject jsonObject1 = new JSONObject();
jsonObject1.put("data", jsonObject);
String add = jsonObject1.toJSONString();
- System.out.println(add);
-
//涓婃姤
String response = "";
boolean success = false;
@@ -169,6 +167,9 @@
.build()
.doPost();
JSONArray data = JSON.parseArray(response);
+ if(data.size()>0){
+ success = true;
+ }
if(i==0){
for (int j = 0; j < data.size(); j++) {
JSONArray jsonArray = data.getJSONArray(j);
@@ -181,8 +182,9 @@
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");
+ 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);
@@ -192,18 +194,18 @@
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());
-// }
+ 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());
+ Order order = orderService.selectByNo(jsonArray.get(0).toString());
if (Cools.isEmpty(order)) {
DocType docType = docTypeService.selectById(docName);
Date now = new Date();
@@ -245,23 +247,28 @@
null // 澶囨敞
);
//瀵圭編鍥芥椂闂磋繘琛岃浆鎹�
- DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ 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("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
-// }
+ 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);
@@ -274,9 +281,16 @@
orderDetl.setUpdateTime(new Date());
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
-// if (!orderDetlService.insert(orderDetl)) {
-// throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
-// }
+ 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) {
@@ -287,8 +301,8 @@
try {
// 淇濆瓨鎺ュ彛鏃ュ織
apiLogService.save(
- "鐧诲綍閲戣澏",
- MesConstant.URL + MesConstant.PAKIN_URL,
+ "杞鏁版嵁",
+ URL + inaddress,
null,
"127.0.0.1",
add,
--
Gitblit v1.9.1