From 4448779d76ff424e666d65f2f168a5890642c857 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 12 十一月 2025 14:04:22 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 154 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 144 insertions(+), 10 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 28eccbc..dc1c627 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -2,16 +2,18 @@
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.common.SnowflakeIdWorker;
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.*;
+import com.zy.asrs.entity.param.OrderMesXGHYParam;
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.service.impl.WrkDetlServiceImpl;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.common.constant.MesConstant;
@@ -20,10 +22,12 @@
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.ArrayList;
import java.util.List;
/**
@@ -43,6 +47,15 @@
private ApiLogService apiLogService;
@Autowired
private DocTypeService docTypeService;
+ @Autowired
+ private WrkDetlServiceImpl wrkDetlService;
+ @Autowired
+ private SnowflakeIdWorker snowflakeIdWorker;
+
+ @Value("${srXghyMes.productInventoryUrl}")
+ private String productInventoryUrl;
+ @Value("${srXghyMes.productInventory}")
+ private String productInventory;
@Transactional
public ReturnT<String> start(Order order) {
@@ -102,13 +115,15 @@
}
// 鍑哄簱瀹屾垚涓婃姤
if (docType.getPakout() == 1) {
- if (true) {
- return SUCCESS;
- }
MesPakoutParam pakoutParam = new MesPakoutParam();
- pakoutParam.setPakoutTime(DateUtils.convert(order.getUpdateTime())); // todo:luxiaotao
- pakoutParam.setLgortFrom("5008"); // todo:luxiaotao
- pakoutParam.setLgortTo("5006"); // todo:luxiaotao
+ pakoutParam.setTag(!order.getDocType$().equalsIgnoreCase("鎵嬪姩鍑哄簱鍗�"));
+ pakoutParam.setPakoutTime(DateUtils.convert(order.getUpdateTime()));
+ pakoutParam.setLgortFrom("5006");
+ pakoutParam.setLgortTo("1111");
+ if (!pakoutParam.isTag()) {
+ pakoutParam.setKunnr("C1000");
+ }
+ pakoutParam.setOrderNo(order.getOrderNo());
for (OrderDetl orderDetl : orderDetls) {
String serial = Cools.isEmpty(orderDetl.getBatch()) ? "" : orderDetl.getBatch();
pakoutParam.getList().add(new MesPakoutParam.Detl(orderDetl.getMatnr() + (Cools.isEmpty(serial) ? "" : "-" + serial), orderDetl.getAnfme()));
@@ -118,7 +133,7 @@
try {
response = new HttpHandler.Builder()
.setUri(MesConstant.URL)
- .setPath(MesConstant.PAKOUT_URL) // todo:luxiaotao
+ .setPath(MesConstant.PAKOUT_URL)
.setJson(JSON.toJSONString(pakoutParam))
.build()
.doPost();
@@ -155,4 +170,123 @@
return SUCCESS;
}
+ @Transactional
+ public ReturnT<String> startV1(WrkMast wrkMast) {
+// List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+ List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<>());
+ if (wrkDetls.isEmpty()) {
+ return SUCCESS;
+ }
+ String packageGroupNo; //鍖呰缁勫彿锛堝緪宸ユ病鏈夛紝鍙湁绠卞彿鍗峰彿涓�瀵逛竴锛� //null
+ String outOrIn; //out 鍑猴紱in鍏ワ紱
+ /*
+ * 鎺ュ彛1=銆嬩笉鍚堟牸鍝佸嚭搴撲簩妤硷細 涓嶅悎鏍煎搧鍑哄簱
+ * 鐩樼偣鍑哄簱锛氱洏鐐瑰嚭搴�
+ * 鐩樼偣鍏ュ簱锛氱洏鐐瑰叆搴�
+ *
+ *
+ * 鎺ュ彛2=銆嬫甯稿嚭搴撲簩妤硷細 鎷嗗寘瑁呮鍑哄簱
+ * 1妤奸��搴擄細閫�璐у叆搴�
+ *
+ * 缁勮揣鍗曞嚭锛氭垚鍝佸嚭搴�
+ *
+ * 2妤兼満姊拌噦鍏ュ簱锛氭垚鍝佸叆搴�
+ * 1妤兼墜鍔ㄥ嚭搴擄細鎴愬搧鍑哄簱
+ * */
+ String stockType = null; //鍗曟嵁绫诲瀷
+// and (wrk_sts=5 or wrk_sts=15 or (wrk_sts!=5 and (io_type = 53 or io_type = 57)) or io_type = 107)
+ if (wrkMast.getIoType()==1){
+ outOrIn = "in";
+ } else if (wrkMast.getIoType()==101 || wrkMast.getIoType()==53) {
+ outOrIn = "out";
+ } else if (wrkMast.getIoType()==107) {
+ outOrIn = "out";
+ stockType = "鐩樼偣鍑哄簱";
+ } else if (wrkMast.getIoType()==57) {
+ outOrIn = "in";
+ stockType = "鐩樼偣鍏ュ簱";
+ } else {
+ return SUCCESS;
+ }
+ for (WrkDetl wrkDetl : wrkDetls) {
+ if (outOrIn.equals("out")){
+ if (!Cools.isEmpty(stockType) && stockType.equals("鐩樼偣鍑哄簱")){
+ wrkDetl.setManu("鐩樼偣鍑哄簱");
+ } else if (!Cools.isEmpty(wrkDetl.getOrderNo()) && !wrkDetl.getOrderNo().equals("涓嶅悎鏍煎搧鍑哄簱")){
+ Order order = orderService.selectByNo(wrkDetl.getOrderNo());
+ if (!Cools.isEmpty(order)){
+ DocType docType = docTypeService.selectById(order.getDocType());
+ if (!Cools.isEmpty(docType)) {
+ if (docType.getDocName().equals("缁勮揣鍗�")){
+// packageGroupNo = order.getItemName();
+ wrkDetl.setDeadTime(order.getItemName());
+ }
+ wrkDetl.setManu(docType.getDocName$());
+ } else {
+ wrkDetl.setManu("鎴愬搧鍑哄簱");
+ }
+ } else {
+ wrkDetl.setManu("鎴愬搧鍑哄簱");
+ }
+ } else if (wrkDetl.getOrderNo().equals("涓嶅悎鏍煎搧鍑哄簱")){
+ wrkDetl.setManu("涓嶅悎鏍煎搧鍑哄簱");
+ }
+ } else {
+ wrkDetl.setManu("鎴愬搧鍏ュ簱");
+ if (!Cools.isEmpty(stockType) && stockType.equals("鐩樼偣鍏ュ簱")){
+ wrkDetl.setManu("鐩樼偣鍏ュ簱");
+ } else if (!Cools.isEmpty(wrkDetl.getOrderNo())){
+ Order order = orderService.selectByNo(wrkDetl.getOrderNo());
+ if (!Cools.isEmpty(order)){
+ DocType docType = docTypeService.selectById(order.getDocType());
+ if (!Cools.isEmpty(docType)) {
+ wrkDetl.setManu(docType.getDocName$());
+ }
+ }
+ }
+ }
+ }
+
+ OrderMesXGHYParam orderMesXGHYParam = new OrderMesXGHYParam(wrkDetls,outOrIn);
+ orderMesXGHYParam.setBarcode(String.valueOf(snowflakeIdWorker.nextId()));
+ orderMesXGHYParam.setPalletizingNo(1);
+
+
+
+ String response = "";
+ boolean success = false;
+ try {
+ response = new HttpHandler.Builder()
+ .setUri(productInventoryUrl)
+ .setPath(productInventory)
+ .setJson(JSON.toJSONString(orderMesXGHYParam))
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ if (jsonObject.getInteger("code").equals(200)) {
+ success = true;
+ } else {
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", productInventoryUrl+"/"+productInventory, JSON.toJSONString(orderMesXGHYParam), response);
+ }
+ } catch (Exception e) {
+ log.error("fail", e);
+// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg(e.getMessage());
+ } finally {
+ try {
+ // 淇濆瓨鎺ュ彛鏃ュ織
+ apiLogService.save(
+ "鎴愬搧搴撳叆搴撲笂鎶�",
+ productInventoryUrl+"/"+productInventory,
+ null,
+ "127.0.0.1",
+ JSON.toJSONString(orderMesXGHYParam),
+ response,
+ success
+ );
+ } catch (Exception e) { log.error("", e); }
+ }
+ return SUCCESS;
+ }
+
}
--
Gitblit v1.9.1