From 45333415b7634fc20b03b7e8ae3b7eee91101bda Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 07 十二月 2023 10:48:31 +0800
Subject: [PATCH] 增加筛选条件
---
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 101 +++++++-------------------------------------------
1 files changed, 14 insertions(+), 87 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 49b58a7..9da4362 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.core.common.Cools;
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;
@@ -12,7 +13,6 @@
import com.zy.asrs.service.OrderService;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
-import com.zy.common.service.erp.ErpService;
import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -41,8 +41,6 @@
private ApiLogService apiLogService;
@Autowired
private DocTypeService docTypeService;
- @Autowired
- private ErpService erpService;
@Value("${u8.url}")
private String url;
@@ -52,11 +50,23 @@
@Transactional
public ReturnT<String> start(Order order) {
+
+ DocType docType = docTypeService.selectById(order.getDocType());
+ if("鎵嬪姩鍑哄簱鍗�".equals(docType.getDocName())
+ || "鎵嬪姩鍏ュ簱鍗�".equals(docType.getDocName())
+ || "鑷姩琛ヨ揣鍗�".equals(docType.getDocName())
+ || "浜哄伐琛ヨ揣鍗�".equals(docType.getDocName())){
+ order.setSettle(8L);
+ orderService.updateById(order);
+ 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","");
+ param.put("cHandler","WMS绯荤粺");
List<Map<String,Object>> orderDetlsParam = new ArrayList<>();
param.put("orderDetails",orderDetlsParam);
@@ -70,95 +80,12 @@
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 {
-// 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;
}
--
Gitblit v1.9.1