From a5ee5055f053cbb4f13710fc251adbd780f3a43f Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期三, 31 八月 2022 17:28:52 +0800
Subject: [PATCH] #
---
src/main/java/com/slcf/controller/AsrsController.java | 108 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 94 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/slcf/controller/AsrsController.java b/src/main/java/com/slcf/controller/AsrsController.java
index a86d8f9..c983a97 100644
--- a/src/main/java/com/slcf/controller/AsrsController.java
+++ b/src/main/java/com/slcf/controller/AsrsController.java
@@ -16,6 +16,8 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import com.slcf.pojo.*;
+import com.slcf.service.*;
import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -26,16 +28,6 @@
import org.springframework.web.bind.annotation.ResponseBody;
import com.slcf.erp.ErpBean;
-import com.slcf.pojo.LocDetailBean;
-import com.slcf.pojo.LocationBean;
-import com.slcf.pojo.WaitCheckBean;
-import com.slcf.pojo.WaitPakInBean;
-import com.slcf.pojo.WaitPakOutBean;
-import com.slcf.service.LocDetailService;
-import com.slcf.service.LocationService;
-import com.slcf.service.WaitCheckService;
-import com.slcf.service.WaitPakInService;
-import com.slcf.service.WaitPakOutService;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -55,6 +47,10 @@
LocationService locationService;
@Autowired
LocDetailService locDetailService;
+ @Autowired
+ MatCodeService matCodeService;
+ @Autowired
+ WorkFileService workFileService;
Logger logger=Logger.getLogger(AsrsController.class);
@@ -424,7 +420,7 @@
*/
@ResponseBody
@RequestMapping(value="/waitPakOut.action",method={ RequestMethod.GET, RequestMethod.POST })
- public JSONObject getWaitPakOut(@RequestBody String requestBody,HttpServletRequest request){
+ public synchronized JSONObject getWaitPakOut(@RequestBody String requestBody,HttpServletRequest request){
JSONObject map = new JSONObject();
logger.error("SAP Retrieve Interface Data22-----" + requestBody);
String lgnum="0";
@@ -532,6 +528,21 @@
arrRet.add(jsonRet);
logger.error("SAP Retrieve Interface Error-----涓嬫灦鎸囦护鎺ユ敹澶辫触" + sloc_no + "搴撳瓨鏁伴噺灏忎簬涓嬫灦鏁伴噺--" + vsolm);
continue;
+ }
+ // (搴撳瓨鏁伴噺-鍑哄簱閫氱煡妗ｆ暟閲�) < 涓嬫灦鏁伴噺
+ List<WaitPakOutBean> waitPakOutBeanList = waitPakOutService.queryWaitOutPak(locDetailBean.getLoc_no(), locDetailBean.getMatnr());
+ if (waitPakOutBeanList.size() > 0) {
+ Double realAnfme = new Double(locDetailBean.getAnfme() - waitPakOutBeanList.get(0).getVsolm());
+ if (realAnfme < vsolm) {
+ jsonRet.put("lgnum", job.get("lgnum").toString());
+ jsonRet.put("tanum", job.get("tanum").toString().equals("")?0:Integer.parseInt(job.get("tanum").toString()));
+ jsonRet.put("tapos", job.get("tapos").toString().equals("")?0:Integer.parseInt(job.get("tapos").toString()));
+ jsonRet.put("zstatus", "E");
+ jsonRet.put("message", "涓嬫灦鎸囦护鎺ユ敹澶辫触," + sloc_no + "搴撳瓨鏁伴噺灏忎簬涓嬫灦鏁伴噺--" + vsolm);
+ arrRet.add(jsonRet);
+ logger.error("SAP Retrieve Interface Error-----涓嬫灦鎸囦护鎺ユ敹澶辫触" + sloc_no + "搴撳瓨鏁伴噺灏忎簬涓嬫灦鏁伴噺--" + vsolm);
+ continue;
+ }
}
String nltyp=job.get("vlpla").toString();
String dloc_no=job.get("nlpla").toString();
@@ -661,7 +672,8 @@
String loc_no=job.get("lgpla").toString();
LocationBean locBean = locationService.queryLocationById(loc_no);
- if(locBean==null || !locBean.getLoc_sts().equals("F")) {
+ WaitCheckBean waitCheckBean = waitCheckService.getWaitCheckByLoc(loc_no);
+ if(locBean==null || (!locBean.getLoc_sts().equals("F") && null == waitCheckBean)) {
jsonRet.put("lgnum", job.get("lgnum").toString());
jsonRet.put("ivnum", job.get("ivnum").toString());
jsonRet.put("ivpos", job.get("ivpos").toString());
@@ -694,7 +706,12 @@
waitCheck.setLgtyp(job.get("lgtyp").toString());
waitCheck.setLgpla(job.get("lgpla").toString());
- int result = waitCheckService.insertWaitCheck(waitCheck);
+ if(job.has("bname")) {
+ waitCheck.setModi_user(job.get("bname").toString());
+ }
+// if(null == waitCheckBean) {
+ int result = waitCheckService.insertWaitCheck(waitCheck);
+// }
jsonRet.put("lgnum", job.get("lgnum").toString());
jsonRet.put("ivnum", job.get("ivnum").toString());
@@ -774,7 +791,70 @@
}
return map;
}
-
+
+ /**
+ * 搴撲綅淇℃伅杩斿洖鎺ュ彛
+ * @param requestBody
+ * @param request
+ * @return
+ */
+ @ResponseBody
+ @RequestMapping(value="/queryWrkDetl.action",method={ RequestMethod.GET, RequestMethod.POST })
+ public JSONObject queryWrkDetl(@RequestBody String requestBody,HttpServletRequest request){
+
+ JSONObject map = new JSONObject();
+ logger.info("宸ヤ綔鏄庣粏杩斿洖鎺ュ彛璋冪敤锛�" + requestBody);
+ try {
+ JSONArray result = new JSONArray();
+ JSONObject json = JSONObject.fromObject(requestBody);
+ String zpallet = json.get("zpallet").toString();
+
+ List<WorkDetailBean> detls = workFileService.getWorkDetlList(zpallet);
+ for (WorkDetailBean detl : detls) {
+ WaitPakOutBean wrapper = new WaitPakOutBean();
+ wrapper.setLgnum(detl.getLgnum());
+ wrapper.setTanum(detl.getTbnum());
+ wrapper.setTapos(detl.getTbpos());
+ WaitPakOutBean waitPakout = waitPakOutService.queryWaitPakOutByNum(wrapper);
+
+ JSONObject detlJSON = new JSONObject();
+ detlJSON.put("LGNUM", detl.getLgnum());
+ detlJSON.put("TANUM", detl.getTbnum());
+ detlJSON.put("BDATU", detl.getModi_time());
+ detlJSON.put("BZEIT", detl.getModi_time());
+ detlJSON.put("TRART", "");
+ detlJSON.put("TAPOS", detl.getTbpos());
+ detlJSON.put("MATNR", detl.getMatnr());
+ detlJSON.put("MAKTX", detl.getMaktx());
+ detlJSON.put("WERKS", detl.getWerks());
+ detlJSON.put("LGORT", "");
+ detlJSON.put("MEINS", detl.getAltme());
+ detlJSON.put("VLTYP", waitPakout == null ? "" : waitPakout.getVltyp().toString());
+ detlJSON.put("NLTYP", waitPakout == null ? "" : waitPakout.getNltyp());
+ detlJSON.put("NLBER", "");
+ detlJSON.put("NLPLA", waitPakout == null ? "" : waitPakout.getNlpla());
+ detlJSON.put("VSOLM", detl.getAnfme());
+ detlJSON.put("BNAME", detl.getBname().toString());
+ result.add(detlJSON);
+ }
+ if (result.size() == 0){
+ map.put("item", result);
+ map.put("zstatus", "E");
+ map.put("message", "鏌ヨ涓嶅埌璇ユ墭鐩樼爜鐨勫伐浣滄槑缁�");
+ }else {
+ map.put("item", result);
+ map.put("zstatus", "S");
+ map.put("message", "杩斿洖鏄庣粏淇℃伅鎴愬姛");
+ }
+
+ }catch (Exception e){
+ map.put("item", "");
+ map.put("zstatus", "E");
+ map.put("message", "杩斿洖鏄庣粏淇℃伅澶辫触" + e.getMessage());
+ }
+ return map;
+ }
+
/**
* 鍏ュ簱瀹屾垚锛岃皟鐢╯ap鎺ュ彛涓婁紶瀹屾垚淇℃伅
*/
--
Gitblit v1.9.1