From 4da947497187262b4634befef891fab16ba33e6c Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 21 十月 2023 13:08:39 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java | 36 +++++++++---------------------------
1 files changed, 9 insertions(+), 27 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 9c619a2..d3ae5a6 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
@@ -15,6 +15,7 @@
import com.zy.erp.kingdee.entity.param.InFormIdParam;
import com.zy.erp.kingdee.enums.KingDeeUtilType;
import com.zy.common.utils.HttpHandler;
+import com.zy.erp.kingdee.utils.KingDeeUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -22,8 +23,6 @@
import org.springframework.transaction.annotation.Transactional;
import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.HashMap;
@@ -67,17 +66,12 @@
SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
//鐧诲綍閲戣澏
ReturnT<String> start = loginAuthenticationHandler.start();
- for(int i=0;i<docTypeService.selectCount(new EntityWrapper<>())+2;i++) {
+ for(KingDeeUtilType kingDeeUtilType : KingDeeUtilType.values()) {
InFormIdParam inFormIdParam = new InFormIdParam();
- 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();
String FDocumentStatus=null;
//鏉′欢鍜岄渶瑕佽幏寰楃殑缁撴灉鎷兼帴
@@ -89,7 +83,7 @@
if(inFormIdParam.getFormId().equals("BD_MATERIAL")){
Tag tag = tagService.selectById(20);
//鏈�鏂版椂闂�
- time=tag.getCreateTime();
+ Date time=tag.getCreateTime();
//鐗╂枡鐘舵�� FUseOrgId .FNumber
FDocumentStatus="C";
jsonObject.put("FilterString", "FCreateDate>'"+sdf.format(time)+"' and FDocumentStatus='"+FDocumentStatus+"' and FUseOrgId .FNumber='201'");
@@ -134,7 +128,7 @@
JSONArray data = JSON.parseArray(response);
if(data.size()<=0) continue;
if (data.getJSONArray(0).get(0).toString().length()>=20) continue;
- if (i == 0) {
+ if (kingDeeUtilType.formId.equals("BD_MATERIAL")) {//鐗╂枡妗ｆ
for (int j = 0; j < data.size(); j++) {
JSONArray jsonArray = data.getJSONArray(j);
//鐢熸垚鍟嗗搧妗ｆ
@@ -148,11 +142,7 @@
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);
+ Date date = KingDeeUtil.KingDeeDate(jsonArray.get(2).toString());
mat.setCreateTime(date);//鍟嗗搧鍒涘缓鏃堕棿
mat.setUpdateTime(new Date());
mat.setStatus(1);
@@ -209,14 +199,10 @@
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);
+ Date jsonDate = KingDeeUtil.KingDeeDate(jsonArray.get(2).toString());
+ docType.setCreateTime(jsonDate);
docTypeService.updateById(docType);
if (!orderService.insert(order)) {
throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
@@ -243,11 +229,7 @@
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);
+ Date date = KingDeeUtil.KingDeeDate(jsonArray.get(1).toString());
//鏈�鏂版姄鍙栨椂闂�
docType.setCreateTime(date);
if (!orderDetlService.insert(orderDetl)) {
--
Gitblit v1.9.1