From d613408e745a87c2ed77506a96097b0185352d78 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 05 五月 2025 14:52:18 +0800
Subject: [PATCH] pda呼叫空板、出库确认
---
src/main/java/com/zy/asrs/controller/OpenController.java | 41 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 38 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 1974537..b0b802a 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,11 +1,15 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.AppAuth;
import com.core.common.*;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.OpenService;
+import com.zy.asrs.service.WrkMastService;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
@@ -13,9 +17,7 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
/**
* Created by vincent on 2022/4/8
@@ -32,6 +34,8 @@
@Autowired
private OpenService openService;
+ @Autowired
+ private WrkMastService wrkMastService;
@PostMapping("/order/matSync/default/v1")
@AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
@@ -206,5 +210,36 @@
/*********************************鍚屾鐗╂枡妗ｆ鍜岃鍗�****************************************************/
+ /*********************************RCS浠诲姟缁撴潫鎺ュ彛****************************************************/
+ /**
+ * 搴撳瓨缁熻
+ */
+ @RequestMapping("/taskOver")
+ public HashMap taskOver(@RequestBody HashMap<String,Object> param) {
+ HashMap map = new HashMap();
+ Map<String ,Object > map1 = (Map<String, Object>)param.get("Data");
+
+ String id = (String) map1.get("Id");
+ String status = (String) map1.get("Status");
+ if (!status.equals("finished_manual")){
+ map.put("IsSuccess", true);
+ return map;
+ }
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no",Integer.valueOf(id)));
+ if (wrkMast == null) {
+ map.put("IsSuccess", false);
+ map.put("ErrorCode","1");
+ map.put("Message","娌℃湁鎵惧埌璇ヤ换鍔″彿:"+id);
+ return map;
+ }
+ if(wrkMast.getIoType()==101||wrkMast.getIoType()==110){
+ wrkMast.setWrkSts(15L);//鎼繍瀹屾垚锛屼换鍔¤浆鍘嗗彶妗�
+ }else if(wrkMast.getIoType()==103||wrkMast.getIoType()==107){
+ wrkMast.setWrkSts(14L);//鎼繍瀹屾垚,浠诲姟鐘舵�佸洖鍒�14
+ }
+ wrkMastService.updateById(wrkMast);
+ map.put("IsSuccess", true);
+ return map;
+ }
}
--
Gitblit v1.9.1