From 575050abff9ef8fbe1c3d58d34ab1954eac2d2ea Mon Sep 17 00:00:00 2001
From: "HUOJIN\\92525" <925258474@qq.com>
Date: Thu, 13 Jun 2024 15:25:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E9=85=8D=E7=BA=BF=E5=8F=AB=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../appupdate/inputJson/AssemblyLineCall.java | 22 +++++++++++++++++++
 .../appupdate/rest/BydAppController.java      | 22 +++++++++++++++++--
 2 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 youchain-system/src/main/java/com/youchain/appupdate/inputJson/AssemblyLineCall.java

diff --git a/youchain-system/src/main/java/com/youchain/appupdate/inputJson/AssemblyLineCall.java b/youchain-system/src/main/java/com/youchain/appupdate/inputJson/AssemblyLineCall.java
new file mode 100644
index 0000000..16c80e7
--- /dev/null
+++ b/youchain-system/src/main/java/com/youchain/appupdate/inputJson/AssemblyLineCall.java
@@ -0,0 +1,22 @@
+package com.youchain.appupdate.inputJson;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 装配线叫料入参
+ */
+@Data
+public class AssemblyLineCall {
+    @ApiModelProperty(value = "工单号")
+    String orderNo;
+
+    @ApiModelProperty(value = "物料编号")
+    String itemCode;
+
+    @ApiModelProperty(value = "需求工位")
+    String workStation;
+
+    @ApiModelProperty(value = "需求点位")
+    String pointCode;
+}
diff --git a/youchain-system/src/main/java/com/youchain/appupdate/rest/BydAppController.java b/youchain-system/src/main/java/com/youchain/appupdate/rest/BydAppController.java
index e307d76..d7f3b09 100644
--- a/youchain-system/src/main/java/com/youchain/appupdate/rest/BydAppController.java
+++ b/youchain-system/src/main/java/com/youchain/appupdate/rest/BydAppController.java
@@ -2,6 +2,7 @@ package com.youchain.appupdate.rest;
 
 import com.youchain.annotation.AnonymousAccess;
 import com.youchain.annotation.Log;
+import com.youchain.appupdate.inputJson.AssemblyLineCall;
 import com.youchain.appupdate.inputJson.CallStock;
 import com.youchain.appupdate.inputJson.ContainerIn;
 import com.youchain.appupdate.inputJson.BindStock;
@@ -59,11 +60,11 @@ public class BydAppController {
         return successRequest("出场成功!");
     }
 
-    @PostMapping("/bindStock")
+    @PostMapping("/materialIn")
     @Log("原材料入库")
     @ApiOperation("原材料入库")
     @AnonymousAccess
-    public ResponseEntity<Object> bindStock(@RequestBody BindStock bindStock) {
+    public ResponseEntity<Object> materialIn(@RequestBody BindStock bindStock) {
         try {
             //二维码格式：P:A17A;V:148795;M:DP_001/PCS;B:240512JFET;Lot:20240427;S:124051200181131;PO:5913490946/00020;Q:36/20/32;D:2024-04-27;SN:;YX:2025-04-26;DN:D12405120005031AS
             String QRCode = bindStock.getItemCode();//Mo票二维码
@@ -76,6 +77,23 @@ public class BydAppController {
         return successRequest("入库成功!");
     }
 
+    @PostMapping("/assemblyLineCall")
+    @Log("装配线叫料")
+    @ApiOperation("装配线叫料")
+    @AnonymousAccess
+    public ResponseEntity<Object> assemblyLineCall(@RequestBody AssemblyLineCall assemblyLineCall) {
+        try {
+            String orderNo = assemblyLineCall.getOrderNo();//工单号
+            String itemCode = assemblyLineCall.getItemCode();//物料编号
+            String workStation = assemblyLineCall.getWorkStation();//需求工位
+            String pointCode = assemblyLineCall.getPointCode();//需求点位;
+
+        } catch (Exception e) {
+            return badRequest(e.getMessage());
+        }
+        return successRequest("入库成功!");
+    }
+
     @PostMapping("/callStock")
     @Log("呼叫容器")
     @ApiOperation("呼叫容器")