From 5c1927cae2e50e31a4fe56762c040837bd80334b Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 11 十一月 2025 16:43:44 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/OrderPakoutController.java | 83 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 83 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderPakoutController.java b/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
index 95377a2..1011d48 100644
--- a/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
@@ -1,5 +1,6 @@
package com.zy.asrs.controller;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -9,11 +10,16 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.OrderDomainParam;
+import com.zy.asrs.entity.param.QualityGroupListParam;
+import com.zy.asrs.entity.result.OrderPakoutDetailVo;
import com.zy.asrs.entity.result.OrderPakoutMainVo;
import com.zy.asrs.entity.result.WrkTraceVo;
import com.zy.asrs.service.*;
+import com.zy.common.constant.MesConstant;
import com.zy.common.model.DetlDto;
+import com.zy.common.utils.HttpHandler;
import com.zy.common.web.BaseController;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -21,6 +27,7 @@
import java.util.*;
+@Slf4j
@RestController
@RequestMapping("order/pakout")
public class OrderPakoutController extends BaseController {
@@ -43,6 +50,8 @@
private WrkMastService wrkMastService;
@Autowired
private WrkMastLogService wrkMastLogService;
+ @Autowired
+ private ApiLogService apiLogService;
@RequestMapping(value = "/order/nav/list/auth")
@ManagerAuth
@@ -352,4 +361,78 @@
}
return R.error();
}
+
+
+
+ @RequestMapping(value = "/actual/shipment/order/report/auth")
+ @ManagerAuth(memo = "涓婃姤MES瀹為檯缁勮揣鍗�")
+ public R actualShipmentOrder(@RequestParam String itemName) {
+ Long userId = getUserId();
+ List<OrderPakoutDetailVo> OrderPakoutDetailVoList = orderDetlService.selectOrderPakoutDetailVoListV1(itemName);
+ List<String> boxList = new ArrayList<>();
+ List<String> rollList = new ArrayList<>();
+ for (OrderPakoutDetailVo orderDetl : OrderPakoutDetailVoList){
+ if (!boxList.contains(orderDetl.getBatch())){
+ boxList.add(orderDetl.getBatch());
+ }
+ if (!rollList.contains(orderDetl.getModel())){
+ rollList.add(orderDetl.getModel());
+ }
+ }
+ String box = String.join(",", boxList);
+ String roll = String.join(",", rollList);
+
+ QualityGroupListParam qualityGroupListParam = new QualityGroupListParam(itemName,box,roll);
+
+
+
+ String response = "";
+ boolean success = false;
+ try {
+ response = new HttpHandler.Builder()
+ .setUri(MesConstant.URL)
+ .setPath(MesConstant.PAKIN_URL)
+ .setJson(JSON.toJSONString(qualityGroupListParam))
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ if (jsonObject.getBoolean("state")) {
+ success = true;
+ // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 16.宸蹭笂鎶�
+ if (!orderService.updateItemName(itemName, 16L, userId)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
+ } else {
+ // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 17.宸蹭笂鎶�
+ if (!orderService.updateItemName(itemName, 17L, userId)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PAKIN_URL, JSON.toJSONString(qualityGroupListParam), response);
+ throw new CoolException("涓婃姤mes绯荤粺澶辫触");
+ }
+ } catch (Exception e) {
+ // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 17.宸蹭笂鎶�
+ if (!orderService.updateItemName(itemName, 17L, userId)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
+ log.error("fail", e);
+ } finally {
+ try {
+ // 淇濆瓨鎺ュ彛鏃ュ織
+ apiLogService.save(
+ "涓婃姤MES瀹為檯缁勮揣鍗�",
+ MesConstant.URL + MesConstant.PAKIN_URL,
+ null,
+ "127.0.0.1",
+ JSON.toJSONString(qualityGroupListParam),
+ response,
+ success
+ );
+ } catch (Exception e) { log.error("", e); }
+ }
+
+
+
+ return R.ok();
+ }
}
--
Gitblit v1.9.1