From f60955e2ffe9b183e72911e361fa0632e3c780c7 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期五, 16 一月 2026 08:23:35 +0800
Subject: [PATCH] 修复订单上报订单完成时间
---
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 419 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 361 insertions(+), 58 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 659eec7..19f7567 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -1,27 +1,29 @@
package com.zy.asrs.task.handler;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.Order;
-import com.zy.asrs.entity.OrderDetl;
-import com.zy.asrs.service.ApiLogService;
-import com.zy.asrs.service.OrderDetlService;
-import com.zy.asrs.service.OrderService;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.service.*;
+import com.zy.asrs.service.impl.OrderDetl1ServiceImpl;
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.system.entity.User;
+import com.zy.system.service.UserService;
+import com.zy.third.entity.*;
+import com.zy.third.mapper.ExdMaterialMapper;
+import com.zy.third.service.ExdInstockTargetService;
+import com.zy.third.service.ExdOutstockSourceService;
+import com.zy.third.service.ExdOutstockTargetService;
+import com.zy.third.service.ExdStockService;
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.math.BigDecimal;
+import java.util.Date;
import java.util.List;
/**
@@ -31,66 +33,367 @@
@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;
+ @Autowired
+ private MatService matService;
+ @Autowired
+ private OrderDetl1ServiceImpl orderDetl1Service;
+ @Autowired
+ private ExdMaterialMapper exdMaterialMapper;
+ @Autowired
+ private Order1Service order1Service;
+ @Autowired
+ private ExdOutstockSourceService exdOutstockSourceService;
+ @Autowired
+ private UserService userService;
+ @Autowired
+ private ExdStockService exdStockService;
@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) {
- String serial = Cools.isEmpty(orderDetl.getBatch()) ? "" : orderDetl.getBatch();
- pakinParam.getList().add(new MesPakinParam.Detl(orderDetl.getMatnr() + (Cools.isEmpty(serial) ? "" : "-" + serial), 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("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+ if (orderDetls.isEmpty()) {
+ return SUCCESS;
+ }
+ boolean boo=false;
+ // 鍏ュ簱瀹屾垚涓婃姤
+ if (docType.getPakin() == 1) {
+ ExdInstockTarget exdInstockTarge = null;
+ for (OrderDetl orderDetl : orderDetls) {
+ exdInstockTarge = new ExdInstockTarget();
+ exdInstockTarge.setFinterid(orderDetl.getDeadWarn());
+ exdInstockTarge.setFbillno(orderDetl.getOrderNo());
+ Integer decType = order.getDocType().intValue();
+ if(order.getDocType().intValue()==42){
+ decType = 41;
+ }else if(order.getDocType().intValue()==25){
+ decType = 24;
+ }else if(order.getDocType().intValue()==3){
+ decType = 1;
}
- } else {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PAKIN_URL, JSON.toJSONString(pakinParam), response);
- throw new CoolException("涓婃姤mes绯荤粺澶辫触");
+ exdInstockTarge.setFtrantype(decType);
+ exdInstockTarge.setFdate(order.getUpdateTime());
+ Integer frob = 1;
+ if(order.getDocType().intValue()==21||order.getDocType().intValue()==24||order.getDocType().intValue()==2||order.getDocType().intValue()==3){
+ frob = -1;
+ }
+ exdInstockTarge.setFrob(frob);
+ //鎿嶄綔鐢ㄦ埛
+ User id = userService.selectOne(new EntityWrapper<User>().eq("id", orderDetl.getUpdateBy()));
+ exdInstockTarge.setFuserid(Integer.valueOf(id.getEmail()));
+ exdInstockTarge.setWritetime(new Date());
+ exdInstockTarge.setWritor("WMS");
+ exdInstockTarge.setStatus(0);
+ exdInstockTarge.setProdinkind(orderDetl.getItemNum());
+ 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 {
+// boo = true;
+ }
+ } 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(order.getDocType().intValue()==2? -1:1);
+ //鎿嶄綔鐢ㄦ埛
+ User id = userService.selectOne(new EntityWrapper<User>().eq("id", orderDetl.getUpdateBy()));
+ exdOutstockTarget.setFuserid(Integer.valueOf(id.getEmail()));
+ exdOutstockTarget.setWritetime(new Date());
+ exdOutstockTarget.setWritor("WMS");
+ exdOutstockTarget.setStatus(0);
+ exdOutstockTarget.setProdinkind(orderDetl.getItemNum());
+ exdOutstockTargetService.insert(exdOutstockTarget);
+
+ }
+ if (!orderService.updateSettle(order.getId(), 6L, null)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }else {
+ boo = true;
+ }
+ }
+ //鏅�氬叆鍑鸿鍗曞瓙鍗曞畬鎴�
+ if (boo){
+ Order1 orderNo = order1Service.selectOne(new EntityWrapper<Order1>().like("order_no", order.getOrderNo()));
+ orderNo.setSettle(6L);
+ order1Service.update(orderNo,new EntityWrapper<Order1>().eq("order_no",order.getOrderNo()));
}
return SUCCESS;
}
+ @Transactional
+ public ReturnT<String> start1(Order1 order) {
+ DocType docType = docTypeService.selectById(order.getDocType());
+ if (null == docType) {
+ return FAIL;
+ }
+ List<OrderDetl1> orderDetls = orderDetl1Service.selectByOrderId(order.getId());
+ if (orderDetls.isEmpty()) {
+ return FAIL;
+ }
+
+ int i = 1;
+ for (OrderDetl1 orderDetl : orderDetls) {
+
+ ExdvYanbu bacode = exdMaterialMapper.getBacode(orderDetl.getBatch());
+ //鑾峰彇涓昏〃鏄庣粏
+ OrderDetl orderDetl1 = orderDetlService.selectItem(orderDetl.getOrderNo().split("-")[0], orderDetl.getMatnr(), null);
+ //涓婃姤鏁伴噺
+ BigDecimal anfme = new BigDecimal(orderDetl1.getAnfme());
+ BigDecimal Units = new BigDecimal((Cools.isEmpty(orderDetl1.getUnits()) ? 0.0 : orderDetl1.getUnits()));
+ BigDecimal result = anfme.subtract(Units);
+ double count = result.doubleValue();
+
+// //鍓╀綑鏁伴噺
+// BigDecimal Anfme = new BigDecimal(orderDetl.getAnfme());
+// BigDecimal subtract = Anfme.subtract(Qty);
+
+
+ // 鍑哄簱瀹屾垚涓婃姤
+ ExdOutstockTarget exdOutstockTarget = null;
+ exdOutstockTarget = new ExdOutstockTarget();
+ //璁㈠崟鍐呯爜
+ exdOutstockTarget.setFinterid(orderDetl.getDeadWarn());
+ //鍗曞彿 = erp璁㈠崟鍙�+鐗╂枡缂栧彿+涓婃姤娆℃暟
+ exdOutstockTarget.setFbillno(order.getOrderNo());
+
+ //鍗曟嵁绫诲瀷
+ exdOutstockTarget.setFtrantype(21);
+
+ //鍗曟嵁鏃ユ湡
+ exdOutstockTarget.setFdate(order.getUpdateTime());
+ //绾㈣摑瀛�
+ exdOutstockTarget.setFrob(1);
+ //鎿嶄綔鐢ㄦ埛
+ User id = userService.selectOne(new EntityWrapper<User>().eq("id", orderDetl.getCreateBy()));
+ exdOutstockTarget.setFuserid(Integer.valueOf(id.getEmail()));
+
+ //閮ㄩ棬ID
+ exdOutstockTarget.setFdeptid(7502);
+ //渚涘簲鍟�/瀹㈡埛ID
+ exdOutstockTarget.setFsupplyid(0);
+ //鍒跺崟鐢ㄦ埛ID
+ exdOutstockTarget.setFbillerid(Integer.valueOf(id.getEmail()));
+ //缁嗚〃ID
+ Integer c = Integer.valueOf(order.getOrderNo().split("-")[1]);
+ exdOutstockTarget.setFentryid(i++);
+ //鐗╂枡ID
+ Mat mat = matService.selectByMatnr(orderDetl.getMatnr());
+ exdOutstockTarget.setFitemid(Integer.valueOf(mat.getUuid()));
+ //婧愬崟鏁伴噺
+ exdOutstockTarget.setFqtymust(count);
+ //鍑哄簱鏁伴噺
+ exdOutstockTarget.setFqty(bacode.getQty());
+ //鍗曚环
+ exdOutstockTarget.setFprice(0.0);
+ //鎵瑰彿 鏆傚畾
+ exdOutstockTarget.setFbatchno(orderDetl.getBatch());
+ //鍗曚綅ID
+ exdOutstockTarget.setFunitid(0);
+ //婧愬崟鍙�
+ exdOutstockTarget.setFsourcebillno(orderDetl.getOrderNo().split("-")[0]);
+ ExdOutstockSource exdOutstockSource = exdOutstockSourceService.selectOne(new EntityWrapper<ExdOutstockSource>()
+ .eq("FBillNo", orderDetl.getOrderNo().split("-")[0])
+ .eq("FItemID", mat.getUuid()));
+ //婧愬崟缁嗚〃ID
+ exdOutstockTarget.setFsourceentryid(exdOutstockSource.getFentryid());
+ //婧愬崟鍐呯爜
+ exdOutstockTarget.setFsourceinterid(exdOutstockSource.getFinterid());
+ //婧愬崟鍗曟嵁绫诲瀷
+ exdOutstockTarget.setFsourcetrantype(81);
+ //搴撲綅ID
+ exdOutstockTarget.setFdcspid(0);
+ //浠撳簱ID
+ Integer Fdcstockid = 19382;
+ if(!Cools.isEmpty(bacode.getProdinkind())){
+ ExdStock fname = exdStockService.selectOne(new EntityWrapper<ExdStock>().eq("Fname", orderDetl.getBrand()));
+ Fdcstockid = Integer.valueOf(fname.getId());
+ }
+ exdOutstockTarget.setFdcstockid(Fdcstockid);
+ //閿�鍞鍗曞崟鍙� 鏆傚畾
+ exdOutstockTarget.setForderbillno(exdOutstockSource.getForderbillno());
+ //閿�鍞鍗曠粏琛↖D 鏆傚畾
+ exdOutstockTarget.setForderentryid(exdOutstockSource.getForderentryid());
+ //閿�鍞鍗曞唴鐮� 鏆傚畾
+ exdOutstockTarget.setForderinterid(exdOutstockSource.getForderinterid());
+ //璁″垝妯″紡
+ exdOutstockTarget.setFplanmode(0);
+
+
+
+ exdOutstockTarget.setBarcode(orderDetl.getBatch());
+ exdOutstockTarget.setGross(BigDecimal.valueOf(bacode.getGross()));
+ exdOutstockTarget.setWidth(BigDecimal.valueOf(bacode.getWidth()));
+ exdOutstockTarget.setDefects(BigDecimal.valueOf(bacode.getDefects()));
+ exdOutstockTarget.setBackcode(bacode.getBackcode());
+ exdOutstockTarget.setWritetime(new Date());
+ exdOutstockTarget.setWritor("WMS");
+ exdOutstockTarget.setStatus(0);
+//
+// //浠撳簱
+ exdOutstockTarget.setProdinkind(bacode.getProdinkind());
+
+ //鍐欏叆鏃堕棿
+ exdOutstockTarget.setWritetime(new Date());
+ //鍐欏叆鑰�
+ exdOutstockTarget.setWritor("WMS");
+ //鐘舵��
+ exdOutstockTarget.setStatus(0);
+ if (exdOutstockTargetService.insert(exdOutstockTarget)) {
+
+
+
+ }
+ }
+ for (OrderDetl1 orderDetl : orderDetls) {
+ OrderDetl orderDetl1 = orderDetlService.selectItem(orderDetl.getOrderNo().split("-")[0], orderDetl.getMatnr(), null);
+ orderDetl1.setUnits(orderDetl.getAnfme() + (Cools.isEmpty(orderDetl1.getUnits()) ? 0.0 : orderDetl1.getUnits()));
+ orderDetl1.setUpdateTime(new Date());
+ orderDetlService.updateById(orderDetl1);
+ }
+ 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;
+// }
+//
+//// ExdvYanbu bacode = exdMaterialMapper.getBacode(wrkDetl.getThreeCode());
+//
+// //涓婃姤鏁伴噺
+// BigDecimal Qty = new BigDecimal(orderDetl.getQty());
+// BigDecimal Units = new BigDecimal((Cools.isEmpty(orderDetl.getUnits()) ? 0.0 : orderDetl.getUnits()));
+// BigDecimal result = Qty.subtract(Units);
+// double count = result.doubleValue();
+//
+// //鍓╀綑鏁伴噺
+// BigDecimal Anfme = new BigDecimal(orderDetl.getAnfme());
+// BigDecimal subtract = Anfme.subtract(Qty);
+//
+//
+// // 鍑哄簱瀹屾垚涓婃姤
+// ExdOutstockTarget exdOutstockTarget = null;
+// exdOutstockTarget = new ExdOutstockTarget();
+// //璁㈠崟鍐呯爜
+// exdOutstockTarget.setFinterid(orderDetl.getDeadWarn());
+// //鍗曞彿 = erp璁㈠崟鍙�+鐗╂枡缂栧彿+涓婃姤娆℃暟
+// exdOutstockTarget.setFbillno(orderDetl.getOrderNo() + "--" + orderDetl.getMatnr() + "--" + (Cools.isEmpty(orderDetl.getInspect()) ? 1 : (orderDetl.getInspect() + 1)));
+//
+// //閮ㄩ棬ID
+// exdOutstockTarget.setFdeptid(7502);
+// //渚涘簲鍟�/瀹㈡埛ID
+// exdOutstockTarget.setFsupplyid(0);
+// //鍒跺崟鐢ㄦ埛ID
+// exdOutstockTarget.setFbillerid(Math.toIntExact(orderDetl.getUpdateBy()));
+// //缁嗚〃ID
+// exdOutstockTarget.setFentryid((Cools.isEmpty(orderDetl.getInspect()) ? 1 : (orderDetl.getInspect() + 1)));
+// //鐗╂枡ID
+// Mat mat = matService.selectByMatnr(orderDetl.getMatnr());
+// exdOutstockTarget.setFitemid(Integer.valueOf(mat.getUuid()));
+// //婧愬崟鏁伴噺
+// exdOutstockTarget.setFqtymust(subtract.doubleValue());
+// //鍑哄簱鏁伴噺
+// exdOutstockTarget.setFqty(count);
+// //鍗曚环
+// exdOutstockTarget.setFprice(0.0);
+// //鎵瑰彿 鏆傚畾
+// exdOutstockTarget.setFbatchno(orderDetl.getBatch());
+// //鍗曚綅ID
+// exdOutstockTarget.setFunitid(0);
+// //婧愬崟鍙�
+// exdOutstockTarget.setFsourcebillno(orderDetl.getOrderNo());
+// //婧愬崟缁嗚〃ID 鏆傚畾
+// exdOutstockTarget.setFsourceentryid(0);
+// //婧愬崟鍐呯爜 鏆傚畾
+// exdOutstockTarget.setFsourceinterid(0);
+// //婧愬崟鍗曟嵁绫诲瀷
+// exdOutstockTarget.setFsourcetrantype(0);
+// //搴撲綅ID
+// exdOutstockTarget.setFdcspid(0);
+// //浠撳簱ID 鏆傚畾
+// exdOutstockTarget.setFdcstockid(0);
+// //閿�鍞鍗曞崟鍙� 鏆傚畾
+// exdOutstockTarget.setForderbillno(orderDetl.getOrderNo());
+// //閿�鍞鍗曠粏琛↖D 鏆傚畾
+// exdOutstockTarget.setForderentryid(0);
+// //閿�鍞鍗曞唴鐮� 鏆傚畾
+// exdOutstockTarget.setForderinterid(0);
+// //璁″垝妯″紡
+// exdOutstockTarget.setFplanmode(0);
+//
+// //鍗曟嵁绫诲瀷
+// exdOutstockTarget.setFtrantype(21);
+//
+// //鍗曟嵁鏃ユ湡
+// exdOutstockTarget.setFdate(DateUtils.convert(order.getOrderTime()));
+// //绾㈣摑瀛�
+// exdOutstockTarget.setFrob(orderDetl.getBeBatch());
+// //鎿嶄綔鐢ㄦ埛
+// exdOutstockTarget.setFuserid(Integer.getInteger(orderDetl.getColor()));
+//
+//// exdOutstockTarget.setBarcode(wrkDetl.getBatch());
+//// exdOutstockTarget.setGross(bacode.getGross());
+//// exdOutstockTarget.setWidth(bacode.getWidth());
+//// exdOutstockTarget.setDefects(bacode.getDefects());
+//// exdOutstockTarget.setBackcode(bacode.getBackcode());
+//// exdOutstockTarget.setWritetime(new Date());
+//// exdOutstockTarget.setWritor("WMS");
+//// exdOutstockTarget.setStatus(0);
+////
+//// //浠撳簱
+//// exdOutstockTarget.setProdinkind(bacode.getProdinkind());
+//
+// //鍐欏叆鏃堕棿
+// 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