From d17a7346759fbb432cea1c83de63d29c6a3d330d Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 24 五月 2024 10:14:06 +0800
Subject: [PATCH] # 自动回流取消任务更改源库位为D
---
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 170 +++++++++++++++++++++++++-------------------------------
1 files changed, 75 insertions(+), 95 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 0169056..04d1f5d 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -2,26 +2,28 @@
import com.alibaba.fastjson.JSON;
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.entity.param.ReportErpParam;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.DocTypeService;
import com.zy.asrs.service.OrderDetlService;
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;
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 java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
/**
* Created by vincent on 2020/7/7
@@ -31,8 +33,6 @@
public class OrderSyncHandler extends AbstractHandler<String> {
@Autowired
- private JdbcTemplate jdbcTemplate;
- @Autowired
private OrderService orderService;
@Autowired
private OrderDetlService orderDetlService;
@@ -40,8 +40,6 @@
private ApiLogService apiLogService;
@Autowired
private DocTypeService docTypeService;
- @Autowired
- private ErpService erpService;
@Value("${u8.url}")
private String url;
@@ -52,96 +50,72 @@
@Transactional
public ReturnT<String> start(Order order) {
- Map<String, Object> param = new HashMap<>();
- param.put("id",order.getOrderNo());
- param.put("dDate",new Date());
- param.put("cHandler",9527);
+ List<String> docNames = new ArrayList<>(Arrays.asList("閾跺骇閲囪喘鍏ュ簱鍗�","閾跺骇濮斿鏉愭枡鍑哄簱鍗�","閾跺骇濮斿鍏ュ簱鍗�","閾跺骇鐢熶骇鏉愭枡鍑哄簱鍗�"));
+
+ DocType docType = docTypeService.selectById(order.getDocType());
+ if(!docNames.contains(docType.getDocName())){
+ order.setSettle(8L);
+ orderService.updateById(order);
+ return SUCCESS;
+ }
+// if("鎵嬪姩鍑哄簱鍗�".equals(docType.getDocName())
+// || "鎵嬪姩鍏ュ簱鍗�".equals(docType.getDocName())
+// || "鑷姩琛ヨ揣鍗�".equals(docType.getDocName())
+// || "浜哄伐琛ヨ揣鍗�".equals(docType.getDocName())){
+// order.setSettle(8L);
+// orderService.updateById(order);
+// return SUCCESS;
+// }
+
+ List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());
+
+ ReportErpParam param = new ReportErpParam();
+ mappingParam(order,param);
+ mappingParamChildren(orderDetlList,param);
int code = doHttpRequest(param, "鍗曟嵁瀹℃牳", url, orderReportPath, null, "127.0.0.1");
- if(code == 200){
+ 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;
+ }
+
+ private void mappingParam(Order order, ReportErpParam param){
+ param.set鎿嶄綔绯荤粺鍙�(order.getDefNumber());
+ param.set鎿嶄綔鍗曟嵁(order.getDocType$());
+ param.set鎿嶄綔绫诲瀷("add");
+ param.setDdate(order.getOrderTime());
+ param.setCWhCode("");
+ param.setCDepCode("YZ");
+ param.setCOrderCode(order.getOrderNo());
+ param.setCMaker("");
+ param.setCHandler("");
+ param.setCDefine14(order.getOrderNo());
+ }
+
+ private void mappingParamChildren(List<OrderDetl> orderDetlList, ReportErpParam param){
+ List<ReportErpParam.ChildInfo> paramChild = new ArrayList<>();
+ param.setChildren(paramChild);
+ for (OrderDetl orderDetl : orderDetlList){
+ ReportErpParam.ChildInfo childInfo = new ReportErpParam.ChildInfo();
+ childInfo.setIrowno(orderDetl.getItemNum());
+ childInfo.setCInvCode(orderDetl.getMatnr());
+ childInfo.setIQuantity(orderDetl.getQty() + "");
+ childInfo.setCBatch(orderDetl.getBatch());
+ childInfo.setINum(orderDetl.getLength() + "");
+ childInfo.setIinvexchrate("");
+ childInfo.setBFree1(orderDetl.getDeadTime());
+ childInfo.setIPOsID(orderDetl.getSku());
+ childInfo.setCOrderCode(orderDetl.getOrderNo());
+ childInfo.setIvouchrowno(orderDetl.getItemNum());
+ childInfo.setCBatch("");
+ childInfo.setDefine22(orderDetl.getThreeCode());
+
+ paramChild.add(childInfo);
+ }
+
}
private int doHttpRequest(Object requestParam, String namespace, String url, String path, String appkey, String ip){
@@ -157,9 +131,15 @@
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
- int code = (int) jsonObject.get("code");
- if(code != 200){
- throw new CoolException(jsonObject.get("msg").toString());
+ if(Cools.isEmpty(jsonObject.get("succeed"))){
+ throw new CoolException(jsonObject.get("dsc").toString());
+ }
+
+ String succeed = jsonObject.get("succeed").toString();
+
+ int code = Cools.eq("0",succeed) ? 0 : 1;
+ if(code != 0){
+ throw new CoolException(jsonObject.get("dsc").toString());
}
success = true;
return code;
--
Gitblit v1.9.1