From 40254eb1fc7ad9bef6e820c0ffc0cc5a63e9e53e Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 21 十月 2025 09:53:54 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java |   35 +++++++++++++++++++++++++++++++----
 1 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 9b7804d..833b36a 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1,5 +1,6 @@
 package com.zy.asrs.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.common.Cools;
 import com.core.common.SnowflakeIdWorker;
@@ -13,6 +14,7 @@
 import com.zy.asrs.utils.MatUtils;
 import com.zy.common.model.DetlDto;
 import com.zy.common.utils.NodeUtils;
+import com.zy.erp.kingdee.enums.KingDeeUtilType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -55,9 +57,20 @@
     @Autowired
     private WrkDetlLogServiceImpl wrkDetlLogService;
 
+    @Autowired
+    private ApiLogService apiLogService;
+
+    public void callApiLogSaveOrder(Object order,  String name, Boolean bool) {
+        apiLogService.save(name, "null", null,null,
+                 JSON.toJSONString(order),
+                null, bool);
+    }
+
     @Override
     @Transactional
     public void pakinOrderCreate(OpenOrderPakinParam param) {
+        callApiLogSaveOrder(param,"鍏ュ簱鍗�", true);
+
         Order order = orderService.selectByNo(param.getOrderNo());
         if (!Cools.isEmpty(order) && order.getSettle() !=1) {
             throw new CoolException(param.getOrderNo() + "鍗曟嵁宸叉湁宸ヤ綔浠诲姟");
@@ -67,7 +80,12 @@
             boolean orderNo1 = orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_no", param.getOrderNo()));
 
         }
-        DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.TRUE);
+        DocType docType;
+        if (param.getOrderType().equals("璋冩嫧鍗�")){
+             docType = docTypeService.selectOrAdd("璋冩嫧鍗�(鍏�)", Boolean.TRUE);
+        }else {
+             docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.TRUE);
+        }
         Date now = new Date();
         // 鍗曟嵁涓绘。
         order = new Order(
@@ -106,7 +124,7 @@
                 now,    // 淇敼鏃堕棿
                 null    // 澶囨敞
         );
-        order.setShipCode(param.getQuality());
+        //order.setShipCode(String.valueOf(param.getDetails().get(0).getQuality()));
         if (!orderService.insert(order)) {
             throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
         }
@@ -116,6 +134,7 @@
         for (DetlDto detail : orderDetails) {
             DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme(),detail.getFromOrderNo()
                     , detail.getMark(),detail.getCustomer(),detail.getSuppName(),detail.getTemp1(),detail.getTemp2(),detail.getTemp3(),detail.getTemp4());
+            dto.setQuality(detail.getQuality());
             if (DetlDto.has(list, dto)) {
                 DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
                 assert detlDto != null;
@@ -151,6 +170,7 @@
             orderDetl.setTemp2(detlDto.getTemp2());
             orderDetl.setTemp3(detlDto.getTemp3());
             orderDetl.setTemp4(detlDto.getTemp4());
+            orderDetl.setInspect(detlDto.getQuality());
             if (!orderDetlService.insert(orderDetl)) {
                 throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
             }
@@ -160,6 +180,7 @@
     @Override
     @Transactional
     public List<OpenOrderCompeteResult> pakinOrderComplete(OpenOrderCompleteParam param) {
+        callApiLogSaveOrder(param,"鍑哄簱鍗�", true);
         List<OpenOrderCompeteResult> results = new ArrayList<>();
         if (!Cools.isEmpty(param) && !Cools.isEmpty(param.getOrderNo())) {
             // 鎸囧畾璁㈠崟
@@ -206,6 +227,7 @@
     @Override
     @Transactional
     public void pakoutOrderCreate(OpenOrderPakoutParam param) {
+        callApiLogSaveOrder(param,"鍑哄簱鍗�", true);
         Order order = orderService.selectByNo(param.getOrderNo());
         // 濡傛灉鍗曟嵁涓嶅瓨鍦ㄥ垯娣诲姞锛涘鏋滃崟鎹瓨鍦紝浣滀笟涓棤娉曚慨鏀癸紝鍙嶄箣鍒欎慨鏀瑰崟鎹�
         if (!Cools.isEmpty(order)) {
@@ -214,7 +236,12 @@
             }
             orderService.remove(order.getId());
         }
-        DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.FALSE);
+        DocType docType;
+        if (param.getOrderType().equals("璋冩嫧鍗�")){
+            docType = docTypeService.selectOrAdd("璋冩嫧鍗�(鍑�)", Boolean.FALSE);
+        }else {
+            docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.FALSE);
+        }
         Date now = new Date();
         // 鍗曟嵁涓绘。
         order = new Order(
@@ -261,7 +288,7 @@
         List<DetlDto> list = new ArrayList<>();
         List<DetlDto> orderDetails = param.getDetails();
         for (DetlDto detail : orderDetails) {
-            DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme(),detail.getFromOrderNo()
+            DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme(),param.getFromOrderNo()
                     , detail.getMark(),detail.getCustomer(),detail.getSuppName(),detail.getTemp1(),detail.getTemp2(),detail.getTemp3(),detail.getTemp4());
             dto.setTemp1(param.getQuality());
             if (DetlDto.has(list, dto)) {

--
Gitblit v1.9.1