From 793ef827d6b025f09f3bada89082ea3bea32d3bb Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 29 三月 2024 10:28:23 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 6b12b1a..3dd7728 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
+import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.controller.CrnController;
import com.zy.asrs.controller.OpenController;
@@ -270,6 +271,7 @@
if (staNoCrnNo==0){
basDevp.setStaErr(1);
basDevpService.updateById(basDevp);
+ log.error("绔欑偣鍙峰紓甯�"+inSta.getStaNo());
throw new CoolException("绔欑偣鍙峰紓甯�"+inSta.getStaNo());
}else {
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
@@ -278,6 +280,7 @@
if (Cools.isEmpty(locMast)){
basDevp.setStaErr(1);
basDevpService.updateById(basDevp);
+ log.error("绔欑偣鍙峰紓甯�"+inSta.getStaNo());
throw new CoolException("绔欑偣鍙峰紓甯�"+inSta.getStaNo());
}
}
@@ -285,6 +288,7 @@
// log.error("鎵爜妫�娴嬬▼搴忓紓甯�"+inSta.getStaNo()+"寮傚父淇℃伅"+e);
// 閫�鍥�
log.error("鎵爜妫�娴嬬▼搴忓紓甯�"+inSta.getStaNo()+errMsg);
+ log.error("鎵爜妫�娴嬬▼搴忓紓甯�,寮傚父淇℃伅"+e);
staProtocol.setWorkNo((short)9999);
staProtocol.setStaNo(inSta.getStaNo().shortValue());
@@ -327,7 +331,7 @@
);
}catch (Exception e){
log.error("wcs娲惧彂搴撲綅涓嶄负绌轰笂鎶ms", getWmsDto.getWrkNo());
- throw new CoolException("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms澶辫触");
+ throw new CoolException("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms澶辫触锛屽紓甯镐俊鎭細"+e);
}
}
@@ -400,10 +404,18 @@
if (taskWrk == null) {
continue;
}
- siteController.siteDetlUpdate(Integer.valueOf(taskWrk.getTargetPoint()),taskWrk.getWrkNo().shortValue(),(short)0,"Y",false,false);
- taskWrk.setStatus(5);
- taskWrk.setWrkSts(14);
- taskWrkService.updateById(taskWrk);
+ log.info("涓嬪彂杈撻�佺嚎浠诲姟锛歵askWrk:"+JSON.toJSONString(taskWrk));
+ R r = siteController.siteDetlUpdate(Integer.valueOf(taskWrk.getTargetPoint()), taskWrk.getWrkNo().shortValue(), (short) 0, "Y", false, false);
+ JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(r));
+ if (jsonObject.getInteger("code").equals(200)){
+ log.info("涓嬪彂杈撻�佺嚎浠诲姟鎴愬姛锛歵askWrk:"+JSON.toJSONString(taskWrk));
+ taskWrk.setStatus(5);
+ taskWrk.setWrkSts(14);
+ taskWrkService.updateById(taskWrk);
+ }else {
+ log.error("涓嬪彂杈撻�佺嚎浠诲姟澶辫触锛歵askWrk:"+JSON.toJSONString(taskWrk));
+ log.error("涓嬪彂杈撻�佺嚎浠诲姟澶辫触锛氬紓甯镐俊鎭�:"+JSON.toJSONString(r));
+ }
}
}
@@ -934,7 +946,7 @@
crnController.crnTaskComplete(crnOperatorParam);
if(!Cools.isEmpty(taskWrk)){
- if(taskWrk.getIoType()==1&&taskWrk.getWrkSts()==3){
+ if(taskWrk.getIoType()==1 && taskWrk.getWrkSts()==3){
taskWrk.setWrkSts(4);//鍏ュ簱瀹屾垚
taskWrk.setStatus(5);//瀹岀粨
//鏇存柊搴撲綅鐘舵��
--
Gitblit v1.9.1