From bf945f3086a3d0334dbff0ef1d64d6a1d87dffc9 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期二, 16 十二月 2025 08:24:52 +0800
Subject: [PATCH] no message

---
 src/main/java/com/zy/api/controller/KopenApiController.java |   31 ++++++++++++++++++++++++-------
 1 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zy/api/controller/KopenApiController.java b/src/main/java/com/zy/api/controller/KopenApiController.java
index 2d52128..1d62be6 100644
--- a/src/main/java/com/zy/api/controller/KopenApiController.java
+++ b/src/main/java/com/zy/api/controller/KopenApiController.java
@@ -1,11 +1,12 @@
 package com.zy.api.controller;
 
-import com.alibaba.fastjson.JSON;
+
 import com.core.common.R;
 import com.zy.api.entity.OrderParams;
+import com.zy.api.entity.PubOrderParams;
+import com.zy.api.entity.ReportOrderParam;
 import com.zy.api.entity.SyncMatParmas;
 import com.zy.api.service.KopenApiService;
-import com.zy.asrs.entity.Mat;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -13,8 +14,6 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-import java.util.Map;
 import java.util.Objects;
 
 @RestController
@@ -33,8 +32,8 @@
      * @return com.core.common.R
      */
     @ApiOperation("涓婃灦娲惧伐鍗�")
-    @PostMapping("/order/add")
-    public R receiveOrders(@RequestBody OrderParams params) {
+    @PostMapping("/sendInDispatch")
+    public R receiveOrders(@RequestBody PubOrderParams params) {
         if (Objects.isNull(params)) {
             return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
         }
@@ -53,7 +52,7 @@
      * @return com.core.common.R
      */
     @ApiOperation("闆朵欢淇℃伅鏁版嵁鏇存柊")
-    @PostMapping("/sync/mat")
+    @PostMapping("/sendPartsMaster")
     public R basMatUpdate(@RequestBody SyncMatParmas params) {
         if (Objects.isNull(params)) {
             return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
@@ -66,5 +65,23 @@
     }
 
 
+    /**
+     * 涓婃灦娲惧伐鍗曞弽棣�
+     * @author Ryan
+     * @date 2025/11/24 15:20
+     * @param params
+     * @return com.core.common.R
+     */
+    @ApiOperation("涓婃灦娲惧伐鍗曞弽棣�")
+    @PostMapping("/getInDispatchResult")
+    public R getInDispatchResult(@RequestBody ReportOrderParam params) {
+        if (Objects.isNull(params)) {
+            return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+        }
+        if (Objects.isNull(params.getKopen_id()) && Objects.isNull(params.getInv_no()) && Objects.isNull(params.getDispatch_no())) {
+            return R.error("鍙栨秷鏉′欢涓嶈兘涓虹┖锛侊紒");
+        }
+        return kopenApiService.getInDispatchResult(params);
+    }
 
 }

--
Gitblit v1.9.1