From 00e1f09d1ce3ed8ab3a9976d7b7af7ef558625af Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期日, 15 十月 2023 16:41:21 +0800
Subject: [PATCH] AGV工作档取消和完成
---
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 229 +++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 156 insertions(+), 73 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
index 94e9f96..49b58a7 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -1,10 +1,9 @@
package com.zy.asrs.task.handler;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.core.common.Cools;
-import com.core.common.DateUtils;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.DocType;
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.service.ApiLogService;
@@ -14,16 +13,16 @@
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.common.service.erp.ErpService;
-import com.zy.common.service.erp.entity.VoucherDetail;
+import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
-import java.util.Date;
-import java.util.List;
+import java.text.SimpleDateFormat;
+import java.util.*;
/**
* Created by vincent on 2020/7/7
@@ -45,78 +44,162 @@
@Autowired
private ErpService erpService;
+ @Value("${u8.url}")
+ private String url;
+
+ @Value("${u8.orderReportPath}")
+ private String orderReportPath;
+
@Transactional
public ReturnT<String> start(Order order) {
- DocType docType = docTypeService.selectById(order.getDocType());
- if (null == docType) {
- return SUCCESS;
- }
- if (!Cools.isEmpty(docType.getMemo())) {
- if (docType.getMemo().equals("hand")) {
- // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
- if (!orderService.updateSettle(order.getId(), 6L, null)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
- }
- return SUCCESS;
- }
- }
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ Map<String, Object> param = new HashMap<>();
+ param.put("id",order.getOrderNo());
+ param.put("dDate",sdf.format(new Date()));
+ param.put("cHandler","");
+
+ List<Map<String,Object>> orderDetlsParam = new ArrayList<>();
+ param.put("orderDetails",orderDetlsParam);
+
List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+
+ for (OrderDetl orderDetl : orderDetls){
+ Map<String, Object> odMap = new HashMap<>();
+ odMap.put("autoid",orderDetl.getItemNum());
+ odMap.put("iQuantity",orderDetl.getQty());
+ orderDetlsParam.add(odMap);
+ }
+
+// Map<String, Object> param = new HashMap<>();
+// param.put("id",order.getOrderNo());
+// param.put("dDate",new Date());
+// param.put("cHandler",9527);
+
+ int code = doHttpRequest(param, "鍗曟嵁瀹℃牳", url, orderReportPath, null, "127.0.0.1");
+ if(code == 0){
+ order.setSettle(6L);
+ orderService.updateById(order);
+ }
+
+
+// DocType docType = docTypeService.selectById(order.getDocType());
+// if (null == docType) {
+// return SUCCESS;
+// }
+// if (!Cools.isEmpty(docType.getMemo())) {
+// if (docType.getMemo().equals("hand")) {
+// // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
+// if (!orderService.updateSettle(order.getId(), 6L, null)) {
+// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+// }
+// return SUCCESS;
+// }
+// }
+
+// List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
// 鍏ュ簱瀹屾垚涓婃姤
- if (docType.getPakin() == 1) {
- try {
- // erp 鍚屾
- int state = 2;
- if (!erpService.updateStateForVoucher(order.getOrderNo(), state)) {
- throw new CoolException(order.getOrderNo() + "璁㈠崟淇敼State涓�"+state+"澶辫触");
- } else {
- erpService.updateTimeForVoucherDetail(order.getOrderNo());
- }
-
- // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
- if (!orderService.updateSettle(order.getId(), 6L, null)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
- }
-
- } catch (Exception e) {
- log.error("fail", e);
- return FAIL.setMsg(e.getMessage());
- }
- }
- // 鍑哄簱瀹屾垚涓婃姤
- if (docType.getPakout() == 1) {
- try {
- // erp 鍚屾
- int state = 2;
- if (!erpService.updateStateForVoucher(order.getOrderNo(), state)) {
- throw new CoolException(order.getOrderNo() + "璁㈠崟淇敼State涓�"+state+"澶辫触");
- } else {
- Date now = new Date();
- for (OrderDetl orderDetl : orderDetls) {
- if (null == erpService.selectVoucherDetail(order.getOrderNo(), orderDetl.getBatch())) {
- VoucherDetail voucherDetail = new VoucherDetail();
- voucherDetail.setVoucherID(order.getOrderNo());
- voucherDetail.setPickID("fepvnn0496");
- voucherDetail.setBarcode(orderDetl.getBatch());
- voucherDetail.setLastUpdatedDate(DateUtils.convert(now));
- if (!erpService.insertVoucherDetail(voucherDetail)) {
- throw new CoolException(order.getOrderNo() + "璁㈠崟娣诲姞VoucherDetail"+ JSON.toJSONString(voucherDetail)+"澶辫触");
- }
- }
- }
- }
-
- // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
- if (!orderService.updateSettle(order.getId(), 6L, null)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
- }
-
- } catch (Exception e) {
- log.error("fail", e);
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg(e.getMessage());
- }
- }
+// if (docType.getPakin() == 1) {
+// try {
+// // erp 鍚屾
+// int state = 2;
+// if (!erpService.updateStateForVoucher(order.getOrderNo(), state)) {
+// throw new CoolException(order.getOrderNo() + "璁㈠崟淇敼State涓�"+state+"澶辫触");
+// } else {
+// erpService.updateTimeForVoucherDetail(order.getOrderNo());
+// }
+//
+// // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
+// if (!orderService.updateSettle(order.getId(), 6L, null)) {
+// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+// }
+//
+// } catch (Exception e) {
+// log.error("fail", e);
+// return FAIL.setMsg(e.getMessage());
+// }
+// }
+// // 鍑哄簱瀹屾垚涓婃姤
+// if (docType.getPakout() == 1) {
+// try {
+// double TotalNum = 0.0;
+// Integer TotalCount = orderDetls.size();
+// // erp 鍚屾
+// int state = 2;
+// if (!erpService.updateStateForVoucher(order.getOrderNo(), state)) {
+// throw new CoolException(order.getOrderNo() + "璁㈠崟淇敼State涓�"+state+"澶辫触");
+// } else {
+// Date now = new Date();
+// for (OrderDetl orderDetl : orderDetls) {
+// TotalNum = TotalNum + orderDetl.getAnfme();
+// if (null == erpService.selectVoucherDetail(order.getOrderNo(), orderDetl.getBatch())) {
+// VoucherDetail voucherDetail = new VoucherDetail();
+// voucherDetail.setVoucherID(order.getOrderNo());
+// voucherDetail.setPickID("fepvnn0496");
+// voucherDetail.setBarcode(orderDetl.getBatch());
+// voucherDetail.setLastUpdatedDate(DateUtils.convert(now));
+// if (!erpService.insertVoucherDetail(voucherDetail)) {
+// throw new CoolException(order.getOrderNo() + "璁㈠崟娣诲姞VoucherDetail"+ JSON.toJSONString(voucherDetail)+"澶辫触");
+// }
+// }
+// }
+// }
+// // 鏇存柊閲嶉噺鍜屾暟閲�
+// if (!erpService.updateStateForVoucher(order.getOrderNo(), TotalNum, TotalCount)) {
+// throw new CoolException(order.getOrderNo() + "璁㈠崟淇敼閲嶉噺鍜屾暟閲忓け璐�");
+// }
+//
+// // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
+// if (!orderService.updateSettle(order.getId(), 6L, null)) {
+// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+// }
+//
+// } catch (Exception e) {
+// log.error("fail", e);
+// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+// return FAIL.setMsg(e.getMessage());
+// }
+// }
return SUCCESS;
}
+ private int doHttpRequest(Object requestParam, String namespace, String url, String path, String appkey, String ip){
+ String response = "";
+ boolean success = false;
+
+ try {
+ response = new HttpHandler.Builder()
+ .setUri(url)
+ .setPath(path)
+ .setJson(JSONObject.toJSONString(requestParam))
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+
+ if(Cools.isEmpty(jsonObject.get("errCode"))){
+ throw new CoolException(jsonObject.get("Message").toString());
+ }
+
+ int code = (int) jsonObject.get("errCode");
+ if(code != 0){
+ throw new CoolException(jsonObject.get("errMsg").toString());
+ }
+ success = true;
+ return code;
+ }catch (Exception e){
+ log.error(e.getMessage());
+ throw new CoolException("璋冪敤鎺ュ彛鍝嶅簲閿欒");
+ }finally {
+ apiLogService.save(
+ namespace,
+ url + path,
+ appkey,
+ ip,
+ JSON.toJSONString(JSONObject.toJSONString(requestParam)),
+ response,
+ success
+ );
+ }
+
+ }
+
}
--
Gitblit v1.9.1