From 08d1f864b8b0baf443dca52b6534aab68448081a Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期四, 20 十一月 2025 12:50:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs
---
src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java | 420 ++++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 256 insertions(+), 164 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 2392f5d..2193811 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
@@ -38,10 +38,15 @@
//绔彛
private String URL;
- @Value("${erp.address.inaddress}")
- //鍗曟嵁锛屽晢鍝佹。妗堝湴鍧�
- private String inaddress;
-
+ @Value("${erp.address.mataddress}")
+ //鍟嗗搧妗ｆ鍦板潃
+ private String matAddress;
+ @Value("${erp.address.orgaddress}")
+ //璐т富妗ｆ鍦板潃
+ private String orgAddress;
+ @Value("${erp.address.impurreceivebilladdress}")
+ //鏀舵枡鍗曟煡璇�
+ private String imPurreceiveBillAddress;
@Autowired
private ApiLogService apiLogService;
@@ -83,7 +88,7 @@
for(KingDeeUtilType kingDeeUtilType : KingDeeUtilType.values()) {
- MatLoadParam matLoadParam = new MatLoadParam();
+// MatLoadParam matLoadParam = new MatLoadParam();
DocType docType = docTypeService.selectOne(new EntityWrapper<DocType>().eq("doc_name", kingDeeUtilType.desc));
if (Cools.isEmpty(docType) && !kingDeeUtilType.formId.equals("BD_MATERIAL")){
docType = docTypeService.selectOrAdd(kingDeeUtilType.desc, kingDeeUtilType.pakIn.equals(1));
@@ -91,38 +96,47 @@
String FDocumentStatus=null;
//鏉′欢鍜岄渶瑕佽幏寰楃殑缁撴灉鎷兼帴
JSONObject jsonObject = new JSONObject();
- //鐗╂枡妗ｆ鏌ヨ
- if(kingDeeUtilType.formId.equals("BD_MATERIAL")){
- Tag tag = tagService.selectByName("鍏ㄩ儴", 1);
- jsonObject.put("id", null);//id
- jsonObject.put("number", null);//缂栫爜
- jsonObject.put("createorg_number", null);//鍒涘缓缁勭粐
- jsonObject.put("start_createtime", "2025-01-01 00:00:00");//鍒涘缓璧峰
- jsonObject.put("end_createtime", sdf1.format(new Date()));//鍒涘缓鎴
- jsonObject.put("start_modifytime", "2025-01-01 00:00:00");//鏇存柊璧峰
- jsonObject.put("end_modifytime", sdf1.format(new Date()));//鏇存柊鎴
- jsonObject.put("start_approvedate", "2025-01-01");//瀹℃牳璧峰
- jsonObject.put("end_approvedate", sdf2.format(new Date()));//瀹℃牳鎴
- jsonObject.put("status", Arrays.asList("B", "C"));//鏁版嵁鐘舵�� [A:鏆傚瓨, B:宸叉彁浜�, C:宸插鏍竇
-
- }else{
- //鑾峰彇鏈�鏂版椂闂�
- //鍗曟嵁鐘舵��
- FDocumentStatus="B";
- jsonObject.put("FilterString", "FCreateDate>'"+sdf1.format(docType.getCreateTime())+"'"+" and FStockId.Fname='绔嬪簱'"+" and FDocumentStatus='"+FDocumentStatus+"'");
- jsonObject.put("FieldKeys", "FBillNo,FCreateDate,FMaterialId.FNumber,FMaterialId.FName,FMaterialId.FSpecification,"+kingDeeUtilType.anfme+",FDocumentStatus");
- // FBillNo :鍗曟嵁缂栧彿锛�
- // FCreateDate 锛氬崟鎹垱寤烘椂闂达紱
- // FMaterialId.FNumber : 鐗╂枡缂栫爜锛�
- // FMaterialName 锛氱墿鏂欏悕绉帮紱
- // FMaterialId.FSpecification锛氱墿鏂欒鏍�
- // anfme : 鐗╂枡鏁伴噺
- // FDocumentStatus 锛氬崟鎹姸鎬侊紱
-
+ String path = null;
+ Date now = new Date();
+ String latestUpdateTime = sdf1.format(docType.getUpdateTime());
+ switch (kingDeeUtilType.formId) {
+ case "BD_MATERIAL": //鐗╂枡鍚屾
+ jsonObject.put("id", null);//id
+ jsonObject.put("number", null);//缂栫爜
+ jsonObject.put("createorg_number", null);//鍒涘缓缁勭粐
+ jsonObject.put("start_createtime", "2025-01-01 00:00:00");//鍒涘缓璧峰
+ jsonObject.put("end_createtime", sdf1.format(now));//鍒涘缓鎴
+ jsonObject.put("start_modifytime", latestUpdateTime);//鏇存柊璧峰
+ jsonObject.put("end_modifytime", sdf1.format(now));//鏇存柊鎴
+ jsonObject.put("start_approvedate", "2025-01-01");//瀹℃牳璧峰
+ jsonObject.put("end_approvedate", sdf2.format(now));//瀹℃牳鎴
+ jsonObject.put("status", Arrays.asList("B", "C"));//鏁版嵁鐘舵�� [A:鏆傚瓨, B:宸叉彁浜�, C:宸插鏍竇
+ path = matAddress;
+ break;
+ case "BD_RRGANIZATION": //璐т富鍚屾
+ jsonObject.put("start_createtime", "2025-01-01 00:00:00");//id
+ jsonObject.put("end_createtime", sdf1.format(now));
+ jsonObject.put("id", null);
+ jsonObject.put("number", null);
+ jsonObject.put("createorg_number", null);
+ jsonObject.put("status", Arrays.asList("B", "C"));//鏁版嵁鐘舵�� [A:鏆傚瓨, B:宸叉彁浜�, C:宸插鏍竇
+ path = orgAddress;
+ break;
+ case "PUR_RECEIVEBIll": //宸插鏍告敹鏂欏崟鏌ヨ
+ jsonObject.put("start_biztime", latestUpdateTime);//涓氬姟璧峰鏃ユ湡
+ jsonObject.put("end_biztime", sdf1.format(now));//涓氬姟缁撴潫鏃ユ湡
+ jsonObject.put("billno", null);
+ jsonObject.put("billstatus", Arrays.asList("C"));//鏁版嵁鐘舵�� [A:鏆傚瓨, B:宸叉彁浜�, C:宸插鏍竇
+ jsonObject.put("start_auditdate", null);//id
+ jsonObject.put("end_auditdate", null);
+ jsonObject.put("org_number", null);
+ jsonObject.put("supplier_number", null);
+ path = imPurreceiveBillAddress;
+ break;
}
JSONObject jsonObject1 = new JSONObject();
jsonObject1.put("data", jsonObject);
- jsonObject1.put("pageSize", 10);
+ jsonObject1.put("pageSize", 20);
jsonObject1.put("pageNo", 1);
String add = jsonObject1.toJSONString();
@@ -137,7 +151,7 @@
response = new HttpHandler.Builder()
.setHeaders(headers)
.setUri(URL)
- .setPath(inaddress)
+ .setPath(path)
.setJson(add)
.build()
.doPost();
@@ -152,7 +166,6 @@
//鍟嗗搧妗ｆ鍚屾
if (kingDeeUtilType.formId.equals("BD_MATERIAL")) {
Tag tag = tagService.selectByName("鍏ㄩ儴", 1);
-
// 澶勭悊鍒嗛〉锛氭牴鎹繑鍥炵殑totalCount鍜宲ageSize璁＄畻椤垫暟
int pageSize = jsonResponse.getJSONObject("data").getIntValue("pageSize");
int totalCount = jsonResponse.getJSONObject("data").getIntValue("totalCount");
@@ -165,7 +178,7 @@
response = new HttpHandler.Builder()
.setHeaders(headers)
.setUri(URL)
- .setPath(inaddress)
+ .setPath(path)
.setJson(add)
.build()
.doPost();
@@ -177,7 +190,7 @@
Date modifyTime = sdf1.parse(jsonObjectNew.get("modifytime").toString());
String matnr = jsonObjectNew.get("number").toString();
String name = jsonObjectNew.get("name").toString();
- String createtime = jsonObjectNew.get("createtime").toString();
+ String createTime = jsonObjectNew.get("createtime").toString();
Double grossweight = jsonObjectNew.get("grossweight") != null ? new BigDecimal(jsonObjectNew.get("grossweight").toString()).doubleValue() : 0.0;
Double height = jsonObjectNew.get("height") != null ? new BigDecimal(jsonObjectNew.get("height").toString()).doubleValue() : 0.0;
Double width = jsonObjectNew.get("width") != null ? new BigDecimal(jsonObjectNew.get("width").toString()).doubleValue() : 0.0;
@@ -194,7 +207,7 @@
mat.setManLength(length);
mat.setHeight(height);
mat.setWidth(width);
- mat.setCreateTime(sdf1.parse(createtime));
+ mat.setCreateTime(sdf1.parse(createTime));
mat.setUpdateTime(modifyTime);
mat.setStatus(1);
if (!matService.insert(mat)) {
@@ -202,6 +215,7 @@
log.info("鍚屾鏂扮墿鏂欏嚭閿欙紒鍙傛暟锛歔{}]銆乕{}]", mat, jsonObjectNew);
} else {
callApiLogSaveMat(mat, kingDeeUtilType, "鍚屾鏂扮墿鏂欐垚鍔燂紒", true);
+ success = true;
}
} else {
boolean isUpdated = false;
@@ -212,153 +226,221 @@
if (mat.getManLength().compareTo(length) != 0) mat.setManLength(length);
if (mat.getHeight().compareTo(height) != 0) mat.setHeight(height);
if (mat.getWidth().compareTo(width) != 0) mat.setWidth(width);
- if (mat.getCreateTime().compareTo(sdf1.parse(createtime)) != 0)
- mat.setCreateTime(sdf1.parse(createtime));
+ if (mat.getCreateTime().compareTo(sdf1.parse(createTime)) != 0)
+ mat.setCreateTime(sdf1.parse(createTime));
mat.setUpdateTime(modifyTime);
isUpdated = true;
}
// 鎵ц鏇存柊鎿嶄綔
if (isUpdated) {
- mat.setUpdateTime(new Date());
if (!matService.updateById(mat)) {
callApiLogSaveMat(mat, kingDeeUtilType, "鏇存柊鐗╂枡鍑洪敊锛�" + mat, false);
log.info("鏇存柊鐗╂枡[鍟嗗搧缂栧彿锛歿}], 鏇存柊澶辫触锛�", mat.getMatnr());
} else {
callApiLogSaveMat(mat, kingDeeUtilType, "鏇存柊鐗╂枡鎴愬姛锛�", true);
+ success = true;
log.info("鏇存柊鐗╂枡[鍟嗗搧缂栧彿锛歿}]", mat.getMatnr());
}
}
}
}
}
- }else if(kingDeeUtilType.formId.equals("BD_RRGANIZATION")){
-
- } else {
- for (int j = 0; j < data.size(); j++) {
- JSONArray jsonArray = data.getJSONArray(j);
- //鏈�鏂版姄鍙栨椂闂�
- Date jsonDate = KingDeeUtil.KingDeeDate(jsonArray.get(1).toString());
- docType.setCreateTime(jsonDate);
- Order order = OrderInAndOutUtil.selectByNo(kingDeeUtilType.pakIn == 1, jsonArray.get(0).toString());
-// Order order = orderService.selectByNo(jsonArray.get(0).toString());
- LocOwner locOwner = null;
- if (!Cools.isEmpty(1)) {
- locOwner = locOwnerService.selectById(1);
- } else {
- locOwner = locOwnerService.selectById(1);
- }
- 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, // 椤圭洰缂栧彿
- "1", //椤圭洰鍚嶇О 瀹㈡埛PO鍙�
- null, // 璋冩嫧椤圭洰缂栧彿
- null, // 鍒濆绁ㄦ嵁鍙�
- null, // 绁ㄦ嵁鍙�
- locOwner.getOwnerUuid(), // 瀹㈡埛缂栧彿
- locOwner.getOwner(), // 瀹㈡埛
- null, // 鑱旂郴鏂瑰紡
- null, // 鎿嶄綔浜哄憳
- null, // 鍚堣閲戦
- null, // 浼樻儬鐜�
- null, // 浼樻儬閲戦
- null, // 閿�鍞垨閲囪喘璐圭敤鍚堣
- null, // 瀹炰粯閲戦
- null, // 浠樻绫诲瀷
- null, // 涓氬姟鍛�
- null, // 缁撶畻澶╂暟
- null, // 閭垂鏀粯绫诲瀷
- null, // 閭垂
- null, // 浠樻鏃堕棿
- null, // 鍙戣揣鏃堕棿
- null, // 鐗╂祦鍚嶇О
- null, // 鐗╂祦鍗曞彿
- 1L, // 璁㈠崟鐘舵��
- 1, // 鐘舵��
- 9527L, // 娣诲姞浜哄憳
- now, // 娣诲姞鏃堕棿
- 9527L, // 淇敼浜哄憳
- now, // 淇敼鏃堕棿
- null // 澶囨敞
- );
- OrderInAndOutUtil.insertOrder(kingDeeUtilType.pakIn == 1, order);
-
-// if (!orderService.insert(order)) {
-// if (!jsonDate.equals(docType.getCreateTime())){
-// callApiLogSaveOrder(order,kingDeeUtilType, "鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�"+order, false);
-// }
-// continue;
-//// throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
-// }
- }
- //鐗╂枡缂栫爜
- Mat mat = matService.selectByMatnr(jsonArray.get(2).toString());
- if (Cools.isEmpty(mat)) {
- if (!jsonDate.equals(docType.getCreateTime())){
- callApiLogSaveOrder(order,kingDeeUtilType, "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧"+jsonArray.get(2).toString(), false);
- }
- continue;
- }
-// 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;
-// }
- Order order1 = OrderInAndOutUtil.selectByNo(kingDeeUtilType.pakIn == 1, jsonArray.get(0).toString());
- List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(kingDeeUtilType.pakIn == 1, order1.getId());
- boolean sign = false;
- for (OrderDetl orderDetl : orderDetls){
- if (orderDetl.getMatnr().equals( jsonArray.get(2).toString())){
- sign = true;
- break;
- }
- }
- if (sign){
- 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);
-// if (!orderDetlService.insert(orderDetl)) {
-// callApiLogSaveOrder(order,kingDeeUtilType, "鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�!璁㈠崟鍙凤細"+order.getOrderNo(), false);
-//// throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
-// }
- OrderInAndOutUtil.insertOrderDetl(kingDeeUtilType.pakIn == 1,order,orderDetl);
+ if(success){
+ docType.setUpdateTime(now);
+ docTypeService.updateById(docType);
}
- docTypeService.updateById(docType);
+ }
+ else if(kingDeeUtilType.formId.equals("BD_RRGANIZATION")){//璐т富鍚屾
+ int pageSize = jsonResponse.getJSONObject("data").getIntValue("pageSize");
+ int totalCount = jsonResponse.getJSONObject("data").getIntValue("totalCount");
+ int totalPages = (int) Math.ceil((double) totalCount / pageSize);
+
+ for (int page = 1; page <= totalPages; page++) {
+ jsonObject1.put("pageNo", page);
+ add = jsonObject1.toJSONString();
+ // 閲嶆柊鍙戣捣璇锋眰浠ヨ幏鍙栬椤电殑鏁版嵁
+ response = new HttpHandler.Builder()
+ .setHeaders(headers)
+ .setUri(URL)
+ .setPath(path)
+ .setJson(add)
+ .build()
+ .doPost();
+
+ jsonResponse = JSON.parseObject(response);
+ data = jsonResponse.getJSONObject("data").getJSONArray("rows");
+ for (int j = 0; j < data.size(); j++) {
+ JSONObject jsonObjectNew = data.getJSONObject(j);
+ Date updateTime = sdf1.parse(jsonObjectNew.get("modifytime").toString());
+ String ownerUuid = jsonObjectNew.get("number").toString();
+ String owner = jsonObjectNew.get("name").toString();
+ Date createTime = sdf1.parse(jsonObjectNew.get("createtime").toString());
+ // 鐢熸垚鍟嗗搧妗ｆ
+ LocOwner locOwner = locOwnerService.selectByUuid(ownerUuid);
+ if (locOwner == null) {
+ locOwner = new LocOwner();
+ locOwner.setOwner(owner);
+ locOwner.setOwnerUuid(ownerUuid);
+ locOwner.setCreateTime(createTime);
+ locOwner.setUpdateTime(updateTime);
+ locOwner.setStatus(1);
+ if (!locOwnerService.insert(locOwner)) {
+ callApiLogSaveOwner(locOwner, kingDeeUtilType, "鍚屾鏂拌揣涓诲嚭閿欙紒" + locOwner, false);
+ log.info("鍚屾鏂拌揣涓诲嚭閿欙紒鍙傛暟锛歔{}]銆乕{}]", locOwner, jsonObjectNew);
+ } else {
+ callApiLogSaveOwner(locOwner, kingDeeUtilType, "鍚屾鏂拌揣涓绘垚鍔燂紒", true);
+ success = true;
+ }
+ } else {
+ boolean isUpdated = false;
+ if (locOwner.getUpdateTime().compareTo(updateTime) != 0) {
+ // 鏇存柊瀛楁
+ if (!locOwner.getOwner().equals(owner)) locOwner.setOwner(owner);
+ if (!locOwner.getOwnerUuid().equals(ownerUuid)) locOwner.setOwnerUuid(ownerUuid);
+
+ if (locOwner.getCreateTime().compareTo(createTime) != 0)
+ locOwner.setCreateTime(createTime);
+ locOwner.setUpdateTime(updateTime);
+ isUpdated = true;
+ }
+ // 鎵ц鏇存柊鎿嶄綔
+ if (isUpdated) {
+ if (!locOwnerService.updateById(locOwner)) {
+ callApiLogSaveOwner(locOwner, kingDeeUtilType, "鏇存柊鐗╂枡鍑洪敊锛�" + locOwner, false);
+ log.info("鏇存柊璐т富[璐т富缂栧彿锛歿}], 鏇存柊澶辫触锛�", locOwner.getOwnerUuid());
+ } else {
+ callApiLogSaveOwner(locOwner, kingDeeUtilType, "鏇存柊鐗╂枡鎴愬姛锛�", true);
+ success = true;
+ log.info("鏇存柊璐т富[璐т富缂栧彿锛歿}]", locOwner.getOwnerUuid());
+ }
+ }
+ }
+ }
+ }
+ }
+ else {
+ int pageSize = jsonResponse.getJSONObject("data").getIntValue("pageSize");
+ int totalCount = jsonResponse.getJSONObject("data").getIntValue("totalCount");
+ int totalPages = (int) Math.ceil((double) totalCount / pageSize);
+ for (int page = 1; page <= totalPages; page++) {
+ jsonObject1.put("pageNo", page);
+ add = jsonObject1.toJSONString();
+ // 閲嶆柊鍙戣捣璇锋眰浠ヨ幏鍙栬椤电殑鏁版嵁
+ response = new HttpHandler.Builder()
+ .setHeaders(headers)
+ .setUri(URL)
+ .setPath(path)
+ .setJson(add)
+ .build()
+ .doPost();
+
+ jsonResponse = JSON.parseObject(response);
+ data = jsonResponse.getJSONObject("data").getJSONArray("rows");
+ for (int j = 0; j < data.size(); j++) {
+ JSONObject jsonObjectNew = data.getJSONObject(j);
+ Date updateTime = sdf1.parse(jsonObjectNew.get("modifytime").toString());
+ String ownerUuid = jsonObjectNew.get("supplier_number").toString();//璐т富缂栫爜
+ String owner = jsonObjectNew.get("supplier_name").toString();//璐т富鍚嶇О
+ Date createTime = sdf1.parse(jsonObjectNew.get("createtime").toString());
+ String billNo = jsonObjectNew.get("billno").toString();
+
+ Order order = OrderInAndOutUtil.selectByNo(kingDeeUtilType.pakIn == 1, billNo);//妫�绱㈠崟鎹�
+ LocOwner locOwner = null;
+ if (ownerUuid != null) {
+ locOwner = locOwnerService.selectByUuid(ownerUuid);
+ if (locOwner == null) {
+ callApiLogSaveOrder(order,kingDeeUtilType, "璐т富妫�绱㈠け璐ワ紝璇峰厛娣诲姞瀵瑰簲璐т富缂栧彿锛�"+ownerUuid, false);continue;
+ }
+ } else{
+ callApiLogSaveOrder(order,kingDeeUtilType, "璐т富妫�绱㈠け璐ワ紝鏈煡璇㈠埌璐т富缂栧彿锛�", false);continue;
+ }
+ if (Cools.isEmpty(order)) {
+ // 鍗曟嵁涓绘。
+ order = new Order(
+ String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
+ billNo, // 璁㈠崟缂栧彿
+ createTime.toString(), // 鍗曟嵁鏃ユ湡
+ docType.getDocId(), // 鍗曟嵁绫诲瀷
+ null, // 椤圭洰缂栧彿
+ "1", //椤圭洰鍚嶇О 瀹㈡埛PO鍙� 鏆傛椂涓嶇煡閬撳瓧娈垫槸鍝釜
+ null, // 璋冩嫧椤圭洰缂栧彿
+ null, // 鍒濆绁ㄦ嵁鍙�
+ null, // 绁ㄦ嵁鍙�
+ null, // 椤圭洰id
+ locOwner.getOwner(), // 瀹㈡埛
+ null, // 鑱旂郴鏂瑰紡
+ null, // 鎿嶄綔浜哄憳
+ null, // 鍚堣閲戦
+ null, // 浼樻儬鐜�
+ null, // 浼樻儬閲戦
+ null, // 閿�鍞垨閲囪喘璐圭敤鍚堣
+ null, // 瀹炰粯閲戦
+ null, // 浠樻绫诲瀷
+ null, // 涓氬姟鍛�
+ null, // 缁撶畻澶╂暟
+ null, // 閭垂鏀粯绫诲瀷
+ null, // 閭垂
+ null, // 浠樻鏃堕棿
+ null, // 鍙戣揣鏃堕棿
+ null, // 鐗╂祦鍚嶇О
+ null, // 鐗╂祦鍗曞彿
+ 1L, // 璁㈠崟鐘舵��
+ 1, // 鐘舵��
+ 9527L, // 娣诲姞浜哄憳
+ now, // 娣诲姞鏃堕棿
+ 9527L, // 淇敼浜哄憳
+ now, // 淇敼鏃堕棿
+ null // 澶囨敞
+ );
+ OrderInAndOutUtil.insertOrder(kingDeeUtilType.pakIn == 1, order);
+ }
+ JSONArray billEntryArray = jsonObjectNew.getJSONArray("billentry");
+ for (int k = 0; k < billEntryArray.size(); k++) {
+ JSONObject entry = billEntryArray.getJSONObject(k);
+ String matnr = entry.getString("material_number");
+ Double qty = entry.getDouble("qty");
+ //鐗╂枡缂栫爜
+ Mat mat = matService.selectByMatnr(matnr);
+ if (Cools.isEmpty(mat)) {
+ callApiLogSaveOrder(order,kingDeeUtilType, "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧"+matnr, false);
+ continue;
+ }
+ Order order1 = OrderInAndOutUtil.selectByNo(kingDeeUtilType.pakIn == 1, billNo);
+ List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(kingDeeUtilType.pakIn == 1, order1.getId());
+ boolean sign = false;
+ for (OrderDetl orderDetl : orderDetls){
+ if (orderDetl.getMatnr().equals(matnr)){
+ sign = true;
+ break;
+ }
+ }
+ if (sign){
+ continue;
+ }
+ OrderDetl orderDetl = new OrderDetl();
+ orderDetl.sync(mat);
+ orderDetl.setBatch(null);
+ orderDetl.setAnfme(qty);
+ 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);
+ OrderInAndOutUtil.insertOrderDetl(kingDeeUtilType.pakIn == 1,order,orderDetl);
+ }
+ }
+ docTypeService.updateById(docType);
+ }
}
} catch (Exception e) {
log.error("fail", e);
// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg(e.getMessage());
} finally {
-// try {
-// // 淇濆瓨鎺ュ彛鏃ュ織
-// apiLogService.save(
-// "杞鏁版嵁",
-// URL + inaddress,
-// null,
-// "127.0.0.1",
-// add,
-// response,
-// success
-// );
-// } catch (Exception e) {
-// log.error("", e);
-// }
+
}
}
return SUCCESS;
@@ -366,7 +448,17 @@
public void callApiLogSaveMat(Mat mat, KingDeeUtilType kingDeeUtilType, String response, Boolean bool) {
apiLogService.save("鑾峰彇"+kingDeeUtilType.desc, kingDeeUtilType.formId, "null", URL,
- "鐗╂枡缂栧彿锛�" + mat.getMatnr() + "銆佺墿鏂欏悕绉帮細" + mat.getName() + "銆佺被鍨嬶細" + mat.getTagId$() + "銆佺姸鎬侊細" + mat.getStatus$(),
+ "鐗╂枡缂栧彿锛�" + mat.getMatnr() + "銆佺墿鏂欏悕绉帮細" + mat.getMaktx() + "銆佹瘺閲嶏細" + mat.getWeight()
+ + "銆侀暱锛�" + mat.getManLength()
+ + "銆佸锛�" + mat.getWidth()
+ + "銆侀珮锛�" + mat.getHeight()
+ + "銆佺姸鎬侊細" + mat.getStatus$(),
+ response, bool);
+ }
+
+ public void callApiLogSaveOwner(LocOwner locOwner, KingDeeUtilType kingDeeUtilType, String response, Boolean bool) {
+ apiLogService.save("鑾峰彇"+kingDeeUtilType.desc, kingDeeUtilType.formId, "null", URL,
+ "璐т富缂栧彿锛�" + locOwner.getOwnerUuid() + "銆佽揣涓诲悕绉帮細" + locOwner.getOwner(),
response, bool);
}
--
Gitblit v1.9.1