From a9f7a73efb4fc132ad2c9a353d300b708430e961 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 22 十月 2025 17:16:16 +0800
Subject: [PATCH] 3.销售订单出库上报完善 4.普通订单上报
---
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 177 +++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 124 insertions(+), 53 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 ea00821..9903c31 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -1,26 +1,27 @@
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;
+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.constant.MesConstant;
-import com.zy.common.model.MesPakinParam;
-import com.zy.common.utils.HttpHandler;
+import com.zy.third.entity.ExdInstockTarget;
+import com.zy.third.entity.ExdOutstockTarget;
+import com.zy.third.service.ExdInstockTargetService;
+import com.zy.third.service.ExdOutstockTargetService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-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;
/**
@@ -30,63 +31,133 @@
@Service
public class OrderSyncHandler extends AbstractHandler<String> {
- @Autowired
- private JdbcTemplate jdbcTemplate;
+
@Autowired
private OrderService orderService;
@Autowired
private OrderDetlService orderDetlService;
@Autowired
private ApiLogService apiLogService;
+ @Autowired
+ private DocTypeService docTypeService;
+
+ @Autowired
+ private ExdInstockTargetService exdInstockTargetService;
+
+ @Autowired
+ private ExdOutstockTargetService exdOutstockTargetService;
@Transactional
public ReturnT<String> start(Order order) {
- List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
-
- MesPakinParam pakinParam = new MesPakinParam();
- pakinParam.setPakinTime(DateUtils.convert(order.getUpdateTime()));
- pakinParam.setLgortFrom("5008");
- pakinParam.setLgortTo("5006");
- for (OrderDetl orderDetl : orderDetls) {
- pakinParam.getList().add(new MesPakinParam.Detl(orderDetl.getMatnr(), orderDetl.getAnfme()));
+ DocType docType = docTypeService.selectById(order.getDocType());
+ if (null == docType) {
+ return SUCCESS;
}
- String response = "";
- boolean success = false;
- try {
- response = new HttpHandler.Builder()
- .setUri(MesConstant.URL)
- .setPath(MesConstant.PAKIN_URL)
- .setJson(JSON.toJSONString(pakinParam))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("code").equals(200)) {
- success = true;
- // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
- if (!orderService.updateSettle(order.getId(), 6L, null)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
- }
- } else {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PAKIN_URL, JSON.toJSONString(pakinParam), response);
- throw new CoolException("涓婃姤mes绯荤粺澶辫触");
+ List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+ if (orderDetls.isEmpty()) {
+ return SUCCESS;
+ }
+ // 鍏ュ簱瀹屾垚涓婃姤
+ if (docType.getPakin() == 1) {
+ ExdInstockTarget exdInstockTarge = null;
+ for (OrderDetl orderDetl : orderDetls) {
+ exdInstockTarge = new ExdInstockTarget();
+ exdInstockTarge.setFinterid(orderDetl.getDeadWarn());
+ exdInstockTarge.setFbillno(orderDetl.getOrderNo());
+ exdInstockTarge.setFtrantype(order.getDocType().intValue());
+ exdInstockTarge.setFdate(DateUtils.convert(order.getOrderTime()));
+ exdInstockTarge.setFrob(orderDetl.getInspect());
+ exdInstockTarge.setFuserid(Integer.getInteger(orderDetl.getColor()));
+ exdInstockTarge.setWritetime(new Date());
+ exdInstockTarge.setWritor("WMS");
+ exdInstockTarge.setStatus(0);
+ exdInstockTargetService.insert(exdInstockTarge);
}
- } catch (Exception e) {
- log.error("fail", e);
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg(e.getMessage());
- } finally {
- try {
- // 淇濆瓨鎺ュ彛鏃ュ織
-// apiLogService.save(
-// "鎴愬搧搴撳叆搴撲笂鎶�",
-// MesConstant.URL + MesConstant.PAKIN_URL,
-// null,
-// "127.0.0.1",
-// JSON.toJSONString(pakinParam),
-// response,
-// success
-// );
- } catch (Exception e) { log.error("", e); }
+ if (!orderService.updateSettle(order.getId(), 6L, null)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
+ } else if (docType.getPakout() == 1) {
+ // 鍑哄簱瀹屾垚涓婃姤
+ ExdOutstockTarget exdOutstockTarget = null;
+ for (OrderDetl orderDetl : orderDetls) {
+ exdOutstockTarget = new ExdOutstockTarget();
+ exdOutstockTarget.setFinterid(orderDetl.getDeadWarn());
+ exdOutstockTarget.setFbillno(orderDetl.getOrderNo());
+ if (order.getDocType() == 42) {
+ exdOutstockTarget.setFtrantype(41);
+ } else {
+ exdOutstockTarget.setFtrantype(order.getDocType().intValue());
+ }
+ exdOutstockTarget.setFdate(DateUtils.convert(order.getOrderTime()));
+ exdOutstockTarget.setFrob(orderDetl.getInspect());
+ exdOutstockTarget.setFuserid(Integer.getInteger(orderDetl.getColor()));
+ exdOutstockTarget.setWritetime(new Date());
+ exdOutstockTarget.setWritor("WMS");
+ exdOutstockTarget.setStatus(0);
+ exdOutstockTargetService.insert(exdOutstockTarget);
+
+ }
+ if (!orderService.updateSettle(order.getId(), 6L, null)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
+ }
+ return SUCCESS;
+ }
+
+ @Transactional
+ public ReturnT<String> start1(Order order, OrderDetl orderDetl) {
+ DocType docType = docTypeService.selectById(order.getDocType());
+ if (null == docType) {
+ return SUCCESS;
+ }
+ List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+ if (orderDetls.isEmpty()) {
+ return SUCCESS;
+ }
+
+ double count = orderDetl.getQty() - (Cools.isEmpty(orderDetl.getUnits()) ? 0.0 : orderDetl.getUnits());
+ if (docType.getPakout() == 1) {
+ // 鍑哄簱瀹屾垚涓婃姤
+ ExdOutstockTarget exdOutstockTarget = null;
+ exdOutstockTarget = new ExdOutstockTarget();
+ //璁㈠崟鍐呯爜
+ exdOutstockTarget.setFinterid(orderDetl.getDeadWarn());
+ //鍗曞彿 = erp璁㈠崟鍙�+鐗╂枡缂栧彿+涓婃姤娆℃暟
+ exdOutstockTarget.setFbillno(orderDetl.getOrderNo() + "--" + orderDetl.getMatnr() + "--" + orderDetl.getInspect());
+
+ //閮ㄩ棬ID
+ exdOutstockTarget.setFdeptid(0);
+ //渚涘簲鍟�/瀹㈡埛ID
+ exdOutstockTarget.setFsupplyid(0);
+ //鍒跺崟鐢ㄦ埛ID
+ exdOutstockTarget.setFbillerid(0);
+ //缁嗚〃ID
+ exdOutstockTarget.setFentryid(0);
+ //鐗╂枡ID
+ exdOutstockTarget.setFitemid(0);
+ //婧愬崟鏁伴噺
+ exdOutstockTarget.setFqtymust(0.0);
+ //鍑哄簱鏁伴噺
+ //鍗曟嵁绫诲瀷
+ exdOutstockTarget.setFtrantype(21);
+
+ //鍗曟嵁鏃ユ湡
+ exdOutstockTarget.setFdate(DateUtils.convert(order.getOrderTime()));
+ //绾㈣摑瀛�
+ exdOutstockTarget.setFrob(orderDetl.getBeBatch());
+ //鎿嶄綔鐢ㄦ埛
+ exdOutstockTarget.setFuserid(Integer.getInteger(orderDetl.getColor()));
+ //鍐欏叆鏃堕棿
+ exdOutstockTarget.setWritetime(new Date());
+ //鍐欏叆鑰�
+ exdOutstockTarget.setWritor("WMS");
+ //鐘舵��
+ exdOutstockTarget.setStatus(0);
+ if (exdOutstockTargetService.insert(exdOutstockTarget)) {
+ orderDetl.setInspect((Cools.isEmpty(orderDetl.getInspect()) ? 1 : (orderDetl.getInspect() + 1)));
+ orderDetl.setUnits(count + (Cools.isEmpty(orderDetl.getUnits()) ? 0.0 : orderDetl.getUnits()));
+ orderDetlService.updateById(orderDetl);
+ }
}
return SUCCESS;
}
--
Gitblit v1.9.1