From e7dd8396e19f538e5f51ced927e2f62e1f75fa63 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 29 三月 2024 10:29:54 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 1064 ++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 691 insertions(+), 373 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 95d3a6d..679348b 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -5,18 +5,18 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.R;
-import com.core.common.SpringUtils;
import com.core.exception.CoolException;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import com.zy.asrs.controller.CrnController;
+import com.zy.asrs.controller.OpenController;
+import com.zy.asrs.controller.SiteController;
import com.zy.asrs.domain.enums.TaskStatusType;
+import com.zy.asrs.domain.enums.WorkNoType;
+import com.zy.asrs.domain.param.CrnOperatorParam;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.TaskOverToWms;
-import com.zy.asrs.entity.param.WMSAndAGVInterfaceParam;
-import com.zy.asrs.entity.param.taskCreateParam;
import com.zy.asrs.mapper.*;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.CommandUtils;
-import com.zy.asrs.utils.PostMesDataUtils;
import com.zy.asrs.utils.Utils;
import com.zy.common.service.CommonService;
import com.zy.common.utils.HttpHandler;
@@ -34,16 +34,15 @@
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.BarcodeThread;
-import com.zy.core.thread.LedThread;
import com.zy.core.thread.SiemensDevpThread;
import com.zy.system.entity.Config;
import com.zy.system.service.ConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
import java.io.IOException;
import java.util.*;
@@ -91,30 +90,41 @@
@Autowired
private ApiLogService apiLogService;
+ @Autowired
+ private CommonService commonService;
@Value("${wms.url}")
private String wmsUrl;
+ @Value("${wms.inboundTaskApplyPath}")
+ private String inboundTaskApplyPath;
@Value("${wms.movePath}")
private String movePath;
+ @Value("${wms.taskStatusFeedbackPath}")
+ private String taskStatusFeedbackPath;
+ @Autowired
+ private CrnController crnController;
+ @Autowired
+ private SiteController siteController;
public void generateStoreWrkFile() throws IOException, InterruptedException {
- // 鏍规嵁杈撻�佺嚎plc閬嶅巻
- for (DevpSlave devp : slaveProperties.getDevp()) {
- // 閬嶅巻鍏ュ簱鍙�
- for (DevpSlave.Sta inSta : devp.getInSta()) {
- // 鑾峰彇鍏ュ簱绔欎俊鎭�
- DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
- StaProtocol staProtocol = devpThread.getStation().get(inSta.getStaNo());
- if (staProtocol == null) {
- continue;
- } else {
- staProtocol = staProtocol.clone();
- }
- Short workNo = staProtocol.getWorkNo();
- Short stano = staProtocol.getStaNo();
+ try {
+ // 鏍规嵁杈撻�佺嚎plc閬嶅巻
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ // 閬嶅巻鍏ュ簱鍙�
+ for (DevpSlave.Sta inSta : devp.getInSta()) {
+ // 鑾峰彇鍏ュ簱绔欎俊鎭�
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+ StaProtocol staProtocol = devpThread.getStation().get(inSta.getStaNo());
+ if (staProtocol == null) {
+ continue;
+ } else {
+ staProtocol = staProtocol.clone();
+ }
+ Short workNo = staProtocol.getWorkNo();
+ Short stano = staProtocol.getStaNo();
// 灏哄妫�娴嬪紓甯�
boolean back = false;
@@ -155,12 +165,14 @@
if (workNo == 0 && stano == 0){
continue;
}
+ if (!staProtocol.isPakMk()){
+ continue;
+ }
// News.warn("鎵爜鍏ュ簱澶辫触锛寋}鍏ュ簱绔欏洜{}寮傚父锛屾墭鐩樺凡琚��鍥�", inSta.getStaNo(), errMsg);
staProtocol.setWorkNo(workNo);
- staProtocol.setStaNo(inSta.getBackSta().shortValue());
+ staProtocol.setStaNo(inSta.getStaNo().shortValue());
devpThread.setPakMk(staProtocol.getSiteId(), false);
- MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, staProtocol));
-
+ MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
TaskWrk taskWrk = taskWrkMapper.selectByWrkNo(Integer.valueOf(workNo));
if (taskWrk != null) {
taskWrk.setMemo(errMsg);//灏嗛敊璇爜瀛樺叆澶囨敞瀛楁杩涜灞曠ず
@@ -168,96 +180,203 @@
}
continue;
}
- // 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
- if (staProtocol.isAutoing() && staProtocol.isLoading()
- && staProtocol.isInEnable()
- && !staProtocol.isEmptyMk() && (workNo >= 0)
- && staProtocol.isPakMk()) {
- // 鑾峰彇鏉＄爜鎵弿浠俊鎭�
- BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode());
- if (barcodeThread == null) {
- continue;
- }
- String barcode = barcodeThread.getBarcode();
- if(!Cools.isEmpty(barcode)) {
- StaDescService staDescService = SpringUtils.getBean(StaDescService.class);
-
- ToWmsDTO toWmsDTO = new ToWmsDTO();
- Map<String, Object> map = new HashMap<>();
- map.put("x-api-key","7a15b5db-29b6-552c-8cff-0cfec3756da2");
- List<Integer> list = openServiceImpl.getInEnableRoadway();
- TaskWrk taskWrk = taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("barcode", barcode));
-
- if (Cools.isEmpty(taskWrk)){
+ // 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
+ if (staProtocol.isAutoing() && staProtocol.isLoading()
+ && staProtocol.isInEnable()
+ && !staProtocol.isEmptyMk() && (workNo == 9991 )
+ && staProtocol.isPakMk()) {
+ // 鑾峰彇鏉＄爜鎵弿浠俊鎭�
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode());
+ if (barcodeThread == null) {
continue;
}
- //StaDesc staDesc1 = staDescService.selectOne(new EntityWrapper<StaDesc>().eq("stn_no",inSta.getBackSta()));
- if (taskWrk.getTargetPoint() != null && taskWrk.getStartPoint() != null){
- if ( taskWrk.getWrkNo() != null && taskWrk.getWrkNo().shortValue() == workNo ){
- continue;
+ String barcode = barcodeThread.getBarcode();
+ if(!Cools.isEmpty(barcode) && !barcode.equals("99999999")) {
+ // 璇锋眰wms鎺ュ彛锛岃幏鍙栧伐浣滃彿鍜岀洰鏍囧簱浣�
+ ToWmsDTO toWmsDTO = new ToWmsDTO(barcode,staProtocol.getSiteId(),staProtocol.isHigh() ? 2 : 1);
+ TaskWrk taskWrk1=taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("barcode",barcode));
+ if(!Cools.isEmpty(taskWrk1)){
+ log.info("鎵樼洏鐮侊細"+barcode+"浠诲姟妗ｅ瓨鍦�");
+ if (taskWrk1.getIoType()==1 && taskWrk1.getStartPoint().equals(staProtocol.getSiteId().toString())){
+ StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
+ .eq("crn_no", taskWrk1.getCrnNo()).eq("type_no",1).eq("stn_no",staProtocol.getSiteId()));
+ if (Cools.isEmpty(staDesc)){
+ log.info("鎵樼洏鐮侊細"+barcode+"浠诲姟妗ｅ瓨鍦�");
+ return;
+ }else {
+ staProtocol.setWorkNo(taskWrk1.getWrkNo().shortValue());
+ staProtocol.setStaNo(staDesc.getCrnStn().shortValue());
+ MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ }
+ }
+ return;
}
- //鑾峰彇鍫嗗灈鏈虹珯鐐�
- StaDesc staDesc = new StaDesc();
- if (devp.getId() <= 1){
- staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
- .eq("crn_no", taskWrk.getCrnNo()).eq("type_no",1).lt("stn_no", 200));
- }else {
- staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
- .eq("crn_no", taskWrk.getCrnNo()).eq("type_no",1).lt("stn_no", 400).ge("stn_no", 250));
- }
- staProtocol.setWorkNo(taskWrk.getWrkNo().shortValue());
- staProtocol.setStaNo(staDesc.getCrnStn().shortValue());
- MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, staProtocol));
- Thread.sleep(200);
- }else {
- //TaskWrk taskWrk = taskWrkService.selectByTaskNo(param.getTaskNo());
- toWmsDTO.setWarehouseId("1688469798893297665");
- toWmsDTO.setContainerCode(barcode);
- toWmsDTO.setApplyType("TUNNEL_LOCATION");
- toWmsDTO.setTaskTunnel(taskWrk.getCrnNo());
- toWmsDTO.setCanInboundTunnels(list);
- String response = null;
- try {
+ HashMap<String, Object> headParam = new HashMap<>();
+ headParam.put("Content-Type","application/json");
+ String response;
+ try{
response = new HttpHandler.Builder()
- .setHeaders(map)
+ // .setHeaders(headParam)
.setUri(wmsUrl)
- .setPath("wcsManager/wcsInterface/inboundTaskApply")
+ .setPath(inboundTaskApplyPath)
.setJson(JSON.toJSONString(toWmsDTO))
.build()
.doPost();
}catch (Exception e){
- log.error("wms閫氳澶辫触,"+e.getMessage());
+ log.error("璇锋眰鍏ュ簱璋冪敤鎺ュ彛澶辫触");
+ log.error("寮傚父淇℃伅鎵撳嵃锛�"+e);
+ try{
+ BasDevp basDevp = basDevpService.selectById(inSta.getStaNo());
+ if (Cools.isEmpty(basDevp)){
+ log.error("绔欑偣鍙峰紓甯�"+inSta.getStaNo());
+ } else if (basDevp.getStaErr()!=0){
+ basDevp.setStaErr(2);
+ basDevpService.updateById(basDevp);
+ }
+ }catch (Exception e1){
+ // 閫�鍥�
+ log.error("鎵爜妫�娴嬬▼搴忓紓甯�"+inSta.getStaNo()+"寮傚父淇℃伅"+e1);
+ }
+ staProtocol.setWorkNo((short)9999);
+ staProtocol.setStaNo(inSta.getStaNo().shortValue());
+ devpThread.setPakMk(staProtocol.getSiteId(), false);
+ MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+// TaskWrk taskWrk = taskWrkMapper.selectByWrkNo(Integer.valueOf(workNo));
+// if (taskWrk != null) {
+// taskWrk.setMemo(errMsg);//灏嗛敊璇爜瀛樺叆澶囨敞瀛楁杩涜灞曠ず
+// taskWrkMapper.updateById(taskWrk);
+// }
continue;
}
+
+ JSONObject jsonObject = JSON.parseObject(response);
apiLogService.save("wms璇锋眰鍏ュ簱璐т綅鎺ュ彛"
- ,wmsUrl+"wcsManager/wcsInterface/inboundTaskApply"
+ ,wmsUrl+inboundTaskApplyPath
,null
,"127.0.0.1"
,JSON.toJSONString(toWmsDTO)
,response
,true
);
- JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("code").equals(200)) {
+ log.info("鍏ュ簱璇锋眰鍙傛暟{}" + JSON.toJSONString(toWmsDTO));
+ if (jsonObject.getInteger("code").equals(200) && !Cools.isEmpty(jsonObject.get("data").toString())) {
GetWmsDto getWmsDto = JSON.parseObject(jsonObject.get("data").toString(), GetWmsDto.class);
- taskWrk.setOriginTargetPoint(getWmsDto.getTargetLocationCode());
- taskWrk.setTargetPoint(Utils.getWcsLocNo(getWmsDto.getTargetLocationCode()));
- taskWrk.setStartPoint(String.valueOf(inSta.getBackSta()));
- if (!taskWrkService.updateById(taskWrk)){
- log.error("淇濆瓨wms搴撲綅鍙峰け璐�");
+ try{
+ BasDevp basDevp = basDevpService.selectById(inSta.getStaNo());
+ if (Cools.isEmpty(basDevp)){
+ log.error("绔欑偣鍙峰紓甯�"+inSta.getStaNo());
+ throw new CoolException("绔欑偣鍙峰紓甯�"+inSta.getStaNo());
+ }
+ Integer staNoCrnNo = Utils.StaNoCrnNo(inSta.getStaNo());
+ 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>()
+ .eq("crn_no", staNoCrnNo.longValue())
+ .eq("loc_no", getWmsDto.getLocNo()));
+ if (Cools.isEmpty(locMast)){
+ basDevp.setStaErr(1);
+ basDevpService.updateById(basDevp);
+ log.error("绔欑偣鍙峰紓甯�"+inSta.getStaNo());
+ throw new CoolException("绔欑偣鍙峰紓甯�"+inSta.getStaNo());
+ }
+ }
+ } catch (Exception e){
+// log.error("鎵爜妫�娴嬬▼搴忓紓甯�"+inSta.getStaNo()+"寮傚父淇℃伅"+e);
+ // 閫�鍥�
+ log.error("鎵爜妫�娴嬬▼搴忓紓甯�"+inSta.getStaNo()+errMsg);
+ log.error("鎵爜妫�娴嬬▼搴忓紓甯�,寮傚父淇℃伅"+e);
+
+ staProtocol.setWorkNo((short)9999);
+ staProtocol.setStaNo(inSta.getStaNo().shortValue());
+ devpThread.setPakMk(staProtocol.getSiteId(), false);
+ MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+// TaskWrk taskWrk = taskWrkMapper.selectByWrkNo(Integer.valueOf(workNo));
+// if (taskWrk != null) {
+// taskWrk.setMemo(errMsg);//灏嗛敊璇爜瀛樺叆澶囨敞瀛楁杩涜灞曠ず
+// taskWrkMapper.updateById(taskWrk);
+// }
+ continue;
+ }
+ //鏌ョ湅璇ュ簱浣嶆槸鍚︿负绌哄簱浣�
+ LocMast locMast=locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("loc_sts","O")
+ .eq("loc_no",getWmsDto.getLocNo()));
+ if(Cools.isEmpty(locMast)){
+ try{
+ HashMap<String, Object> headParam1 = new HashMap<>();
+ headParam1.put("taskNo",getWmsDto.getTaskNo());
+ headParam1.put("status",6);
+ headParam1.put("ioType",1);
+ headParam1.put("barcode",barcode);
+ String response2;
+ response2 = new HttpHandler.Builder()
+ // .setHeaders(headParam)
+ .setUri(wmsUrl)
+ .setPath(taskStatusFeedbackPath)
+ .setJson(JSON.toJSONString(headParam1))
+ .build()
+ .doPost();
+ JSONObject jsonObject1 = JSON.parseObject(response2);
+ apiLogService.save("wcs娲惧彂搴撲綅涓嶄负绌轰笂鎶ms"
+ ,wmsUrl+taskStatusFeedbackPath
+ ,null
+ ,"127.0.0.1"
+ ,JSON.toJSONString(headParam1)
+ ,response
+ ,true
+ );
+ }catch (Exception e){
+ log.error("wcs娲惧彂搴撲綅涓嶄负绌轰笂鎶ms", getWmsDto.getWrkNo());
+ throw new CoolException("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms澶辫触锛屽紓甯镐俊鎭細"+e);
+ }
+ }
+
+ // 鍒涙柊涓�涓叆搴撳伐浣滄。
+ TaskWrk taskWrk = taskWrkService.selectByTaskNo(getWmsDto.getWrkNo());
+ if(Cools.isEmpty(taskWrk)) {
+ taskWrk = createTask(getWmsDto,barcode);
+ if (Cools.isEmpty(taskWrk)){
+ log.error("搴撲綅寮傚父锛屽簱浣嶅彿锛歿}", getWmsDto.getTargetLocationCode());
+ }else {
+ taskWrkService.insert(taskWrk);
+ StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
+ .eq("crn_no", taskWrk.getCrnNo()).eq("type_no",1).eq("stn_no",staProtocol.getSiteId()));
+ staProtocol.setWorkNo(taskWrk.getWrkNo().shortValue());
+ staProtocol.setStaNo(staDesc.getCrnStn().shortValue());
+ MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ }
}
}else {
- log.error("wms閫氳澶辫触,"+jsonObject.get("msg"));
+ continue;
+ }
+ } else {
+ // 閫�鍥�
+ log.error("鎵爜鍏ュ簱澶辫触锛寋}鍏ュ簱绔欏洜{}寮傚父锛屾墭鐩樺凡琚��鍥�", inSta.getStaNo(), errMsg);
+
+ staProtocol.setWorkNo((short)9999);
+ staProtocol.setStaNo(inSta.getStaNo().shortValue());
+ devpThread.setPakMk(staProtocol.getSiteId(), false);
+ MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ TaskWrk taskWrk = taskWrkMapper.selectByWrkNo(Integer.valueOf(workNo));
+ if (taskWrk != null) {
+ taskWrk.setMemo(errMsg);//灏嗛敊璇爜瀛樺叆澶囨敞瀛楁杩涜灞曠ず
+ taskWrkMapper.updateById(taskWrk);
}
}
-
}
+
+
}
-
-
}
+ } catch (Exception e) {
+ log.error("generateStoreWrkFile e", e);
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
}
}
@@ -265,65 +384,42 @@
/**
* 鍫嗗灈鏈虹珯鍑哄簱鍒板嚭搴撶珯
*/
- @Async
public void crnStnToOutStn() {
for (CrnSlave crnSlave : slaveProperties.getCrn()) {
// 閬嶅巻鍫嗗灈鏈哄嚭搴撶珯
for (CrnSlave.CrnStn crnStn : crnSlave.getCrnOutStn()) {
List<StaDesc> staDescs = staDescMapper.selectList(new EntityWrapper<StaDesc>().eq("crn_no", crnSlave.getId()).eq("crn_stn", crnStn.getStaNo()));
for (StaDesc staDesc : staDescs){
- // 鑾峰彇鍫嗗灈鏈哄嚭搴撶珯淇℃伅
- DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, crnStn.getDevpPlcId());
- StaProtocol staProtocol = devpThread.getStation().get(crnStn.getStaNo());
- if (staProtocol == null) {
- continue;
- } else {
- staProtocol = staProtocol.clone();
- }
- if (staProtocol.isAutoing() && staProtocol.isLoading() && (staProtocol.getWorkNo() == 0 || staProtocol.getStaNo() == 0)) {
- // 鏌ヨ宸ヤ綔妗�
- TaskWrk taskWrk = taskWrkMapper.selectCrnStaWorking(crnSlave.getId(), staDesc.getStnNo().toString());
- if (taskWrk == null) {
+ try{
+ // 鑾峰彇鍫嗗灈鏈哄嚭搴撶珯淇℃伅
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, crnStn.getDevpPlcId());
+ StaProtocol staProtocol = devpThread.getStation().get(crnStn.getStaNo());
+ if (staProtocol == null) {
continue;
+ } else {
+ staProtocol = staProtocol.clone();
}
- // 鍒ゆ柇宸ヤ綔妗ｆ潯浠�
- if (taskWrk.getWrkSts() == 12 && taskWrk.getIoType() == 2) {
- // 鍒ゆ柇鍚婅溅鏄惁瀹為檯宸插畬鎴愶紝涓旂數鑴戠姸鎬佸湪move涓紝浠ュ鐢佃剳杩涜鏇存柊宸ヤ綔妗�
- CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, taskWrk.getCrnNo());
- CrnProtocol crnProtocol = crnThread.getCrnProtocol();
- if (crnProtocol.statusType == CrnStatusType.FETCHING || crnProtocol.statusType == CrnStatusType.PUTTING) {
- // 绉诲姩涓�
+ if (staProtocol.isAutoing() && staProtocol.isLoading() && (staProtocol.getWorkNo() == 0 || staProtocol.getStaNo() == 0)) {
+ // 鏌ヨ宸ヤ綔妗�
+ TaskWrk taskWrk = taskWrkMapper.selectCrnStaWorking(crnSlave.getId(), staDesc.getStnNo().toString());
+ if (taskWrk == null) {
continue;
}
- // 鍒ゆ柇鍫嗗灈鏈虹姸鎬佺瓑寰呯‘璁�
- if (crnProtocol.statusType == CrnStatusType.HANDLING_COMPLETED && crnProtocol.modeType == CrnModeType.AUTO && crnProtocol.getTaskNo().equals(taskWrk.getWrkNo().shortValue())
- && crnProtocol.getTaskFinish() == 0
- && crnProtocol.forkPosType == CrnForkPosType.HOME) {
- // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
-
- //鍙栧嚭杈撻�佺嚎鍛戒护
- List<CommandInfo> commandInfos = commandInfoService.selectByTaskNo(taskWrk.getTaskNo());
- if (commandInfos.isEmpty()) {
- continue;//鍛戒护绌�
- }
-
-// CommandPackage commandPackage = JSON.parseObject(commandInfo.getCommand(), CommandPackage.class);//鍙栧嚭鍛戒护鎶ユ枃
-// CrnCommand crnCommand = JSON.parseObject(commandPackage.getCommand().toString(), CrnCommand.class);
- Integer commandStep = taskWrk.getCommandStep();
- CommandInfo commandInfo = commandInfos.get(commandStep);
- CommandPackage commandPackage = JSON.parseObject(commandInfo.getCommand(), CommandPackage.class);//鍙栧嚭鍛戒护鎶ユ枃
- //StaProtocol staProtocol1 = JSON.parseObject(commandInfo.getCommand(), StaProtocol.class);
- StaProtocol staProtocol1 = JSON.parseObject(commandPackage.getCommand().toString(), StaProtocol.class);
- if (!MessageQueue.offer(SlaveType.Devp, crnStn.getDevpPlcId(), new Task(2, staProtocol1))) {
- log.error("杈撻�佺嚎鍛戒护涓嬫柟澶辫触锛侊紒锛� [宸ヤ綔鍙�:{}]", taskWrk.getWrkNo());
- continue;//鍛戒护涓嬪彂澶辫触
- }
-
- // 澶嶄綅鍫嗗灈鏈�
- crnThread.setResetFlag(true);
-
+ 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));
}
}
+ }catch (Exception e){
+ log.error("鍑哄簱鍒板嚭搴撶珯寮傚父:寮傚父淇℃伅锛�"+e);
}
}
@@ -405,6 +501,7 @@
if (!flag) {
continue;
}
+
// 鑾峰彇宸ヤ綔鐘舵�佷负2锛堣澶囦笂璧帮級鐨勫叆搴撳伐浣滄。
TaskWrk taskWrk = taskWrkMapper.selectPakIn(slave.getId(), staProtocol.getWorkNo().intValue(), staDesc.getStnNo().toString());
if(null == taskWrk) {
@@ -421,51 +518,27 @@
continue;
}
- //鍙栧嚭鍛戒护
- List<CommandInfo> commandInfos = commandInfoService.selectByTaskNo(taskWrk.getTaskNo());
- Integer commandStep = taskWrk.getCommandStep();
- if (commandInfos.isEmpty()) {
- continue;//鍛戒护绌�
- }
- CommandInfo commandInfo = commandInfos.get(commandStep);
- CommandPackage commandPackage = JSON.parseObject(commandInfo.getCommand(), CommandPackage.class);//鍙栧嚭鍛戒护鎶ユ枃
- CrnCommand crnCommand = JSON.parseObject(commandPackage.getCommand().toString(), CrnCommand.class);
+ int workNo = commonService.getWorkNo(WorkNoType.PAKIN.type);//鑾峰彇鍏ュ簱宸ヤ綔鍙�
+ taskWrk.setWrkNo(workNo);//宸ヤ綔鍙�
+ taskWrk.setStatus(TaskStatusType.DISTRIBUTE.id);//娲惧彂鐘舵��
+ taskWrk.setAssignTime(new Date());//娲惧彂鏃堕棿
+ taskWrk.setWrkSts(3);//宸ヤ綔鐘舵�� 3.鍚婅溅鍏ュ簱
+ taskWrk.setCrnNo(staDesc.getCrnNo());//鍫嗗灈鏈哄彿
+ taskWrk.setModiTime(new Date());
+ taskWrk.setModiUser(9988L);
+ taskWrkService.updateById(taskWrk);
- if (!MessageQueue.offer(SlaveType.Crn, taskWrk.getCrnNo(), new Task(2, crnCommand))) {
- log.error("鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", taskWrk.getCrnNo(), JSON.toJSON(crnCommand));
- } else {
- // 淇敼宸ヤ綔妗ｇ姸鎬� 2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓�
- Date now = new Date();
- taskWrk.setWrkSts(3);
- taskWrk.setModiTime(now);
- if (taskWrkMapper.updateById(taskWrk) == 0) {
- log.error("淇敼宸ヤ綔妗ｇ姸鎬� 2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", taskWrk.getWrkNo());
- }
- //寮�濮嬭繍琛�
- String response = CrnStartRunning(taskWrk);
- JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("code").equals(200)) {
-
- }else {
- log.error("鍏ュ簱寮�濮嬭繍琛岄�氳澶辫触,"+jsonObject.get("msg"));
-
- }
- }
-
-// // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
-// CrnCommand crnCommand = new CrnCommand();
-// crnCommand.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
-// crnCommand.setTaskNo(taskWrk.getWrkNo().shortValue()); // 宸ヤ綔鍙�
-// crnCommand.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
-// crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 浠诲姟妯″紡: 搴撲綅绉昏浆
-// crnCommand.setSourcePosX(crnStn.getBay().shortValue()); // 婧愬簱浣嶅垪
-// crnCommand.setSourcePosY(crnStn.getLev().shortValue()); // 婧愬簱浣嶅眰
-// crnCommand.setSourcePosZ(crnStn.getRow().shortValue()); // 婧愬簱浣嶆帓
-// crnCommand.setDestinationPosX(Utils.getBayShort(taskWrk.getTargetPoint())); // 鐩爣搴撲綅鍒�
-// crnCommand.setDestinationPosY(Utils.getLevShort(taskWrk.getTargetPoint())); // 鐩爣搴撲綅灞�
-// crnCommand.setDestinationPosZ(Utils.getRowShort(taskWrk.getTargetPoint())); // 鐩爣搴撲綅鎺�
-// crnCommand.setCommand((short)1);
-// if (!CommandUtils.offer(SlaveType.Crn, taskWrk.getCrnNo(), new Task(2, crnCommand))) {
+// //鍙栧嚭鍛戒护
+// List<CommandInfo> commandInfos = commandInfoService.selectByTaskNo(taskWrk.getTaskNo());
+// Integer commandStep = taskWrk.getCommandStep();
+// if (commandInfos.isEmpty()) {
+// continue;//鍛戒护绌�
+// }
+// CommandInfo commandInfo = commandInfos.get(commandStep);
+// CommandPackage commandPackage = JSON.parseObject(commandInfo.getCommand(), CommandPackage.class);//鍙栧嚭鍛戒护鎶ユ枃
+// CrnCommand crnCommand = JSON.parseObject(commandPackage.getCommand().toString(), CrnCommand.class);
+//
+// if (!MessageQueue.offer(SlaveType.Crn, taskWrk.getCrnNo(), new Task(2, crnCommand))) {
// log.error("鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", taskWrk.getCrnNo(), JSON.toJSON(crnCommand));
// } else {
// // 淇敼宸ヤ綔妗ｇ姸鎬� 2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓�
@@ -475,10 +548,66 @@
// if (taskWrkMapper.updateById(taskWrk) == 0) {
// log.error("淇敼宸ヤ綔妗ｇ姸鎬� 2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", taskWrk.getWrkNo());
// }
+// //寮�濮嬭繍琛�
+// String response = CrnStartRunning(taskWrk);
+// JSONObject jsonObject = JSON.parseObject(response);
+// if (jsonObject.getInteger("code").equals(200)) {
+//
+// }else {
+// log.error("鍏ュ簱寮�濮嬭繍琛岄�氳澶辫触,"+jsonObject.get("msg"));
+//
+// }
// }
+
+ // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
+ CrnCommand crnCommand = new CrnCommand();
+ crnCommand.setCrnNo(staDesc.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
+ crnCommand.setTaskNo(taskWrk.getWrkNo().shortValue()); // 宸ヤ綔鍙�
+ crnCommand.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
+ crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 浠诲姟妯″紡: 搴撲綅绉昏浆
+ crnCommand.setSourcePosX(crnStn.getRow().shortValue()); // 婧愬簱浣嶅垪
+ crnCommand.setSourcePosY(crnStn.getBay().shortValue()); // 婧愬簱浣嶅眰
+ crnCommand.setSourcePosZ(crnStn.getLev().shortValue()); // 婧愬簱浣嶆帓
+ crnCommand.setDestinationPosX(Utils.getRowShort(taskWrk.getTargetPoint())); // 鐩爣搴撲綅鍒�
+ crnCommand.setDestinationPosY(Utils.getBayShort(taskWrk.getTargetPoint())); // 鐩爣搴撲綅灞�
+ crnCommand.setDestinationPosZ(Utils.getLevShort(taskWrk.getTargetPoint())); // 鐩爣搴撲綅鎺�
+ crnCommand.setCommand((short)1);
+ if (!CommandUtils.offer(SlaveType.Crn, taskWrk.getCrnNo(), new Task(2, crnCommand),false)) {
+ log.error("鍫嗗灈鏈哄懡浠ょ敓鎴愬け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", taskWrk.getCrnNo(), JSON.toJSON(crnCommand));
+ throw new CoolException("鍫嗗灈鏈哄懡浠ょ敓鎴愬け璐�");
+ }else{
+ try{
+ HashMap<String, Object> headParam = new HashMap<>();
+ headParam.put("taskNo",taskWrk.getTaskNo());
+ headParam.put("status",taskWrk.getStatus());
+ headParam.put("ioType",taskWrk.getIoType());
+ headParam.put("barcode",taskWrk.getBarcode());
+ String response;
+ response = new HttpHandler.Builder()
+ // .setHeaders(headParam)
+ .setUri(wmsUrl)
+ .setPath(taskStatusFeedbackPath)
+ .setJson(JSON.toJSONString(headParam))
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ apiLogService.save("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms"
+ ,wmsUrl+taskStatusFeedbackPath
+ ,null
+ ,"127.0.0.1"
+ ,JSON.toJSONString(headParam)
+ ,response
+ ,true
+ );
+ }catch (Exception e){
+ log.error("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms澶辫触", taskWrk);
+ throw new CoolException("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms澶辫触");
+ }
+
+ }
}
- // return;
+ // return;
}
}
@@ -536,71 +665,108 @@
break;
}
- // 鍙屾繁搴撲綅涓旀祬搴撲綅鏈夎揣锛屽垯闇�鍏堝娴呭簱浣嶈繘琛屽簱浣嶇Щ杞�
- if (Utils.isDeepLoc(slaveProperties, taskWrk.getStartPoint())) {
- taskWrkMapper.selectPakOutIoType(taskWrk.getCrnNo());
+ // 淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓�
+ Date now = new Date();
+ taskWrk.setWrkSts(12);
+ taskWrk.setStatus(2);
+ taskWrk.setModiTime(now);
+ if (taskWrkMapper.updateById(taskWrk) == 0) {
+ log.error("淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", taskWrk.getWrkNo());
+ }
+ CrnCommand command = new CrnCommand();
+ command.setCrnNo(taskWrk.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
+ command.setTaskNo(taskWrk.getWrkNo().shortValue()); // 宸ヤ綔鍙�
+ command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
+ command.setTaskMode(CrnTaskModeType.PAKIN); // 浠诲姟妯″紡
+ command.setSourcePosX(Utils.getRowShort(taskWrk.getStartPoint())); // 婧愬簱浣嶆帓
+ command.setSourcePosY(Utils.getBayShort(taskWrk.getStartPoint())); // 婧愬簱浣嶅垪
+ command.setSourcePosZ(Utils.getLevShort(taskWrk.getStartPoint())); // 婧愬簱浣嶅眰
+ command.setDestinationPosX(crnStn.getRow().shortValue()); // 鐩爣搴撲綅鎺�
+ command.setDestinationPosY(crnStn.getBay().shortValue()); // 鐩爣搴撲綅鍒�
+ command.setDestinationPosZ(crnStn.getLev().shortValue()); // 鐩爣搴撲綅灞�
+ command.setCommand((short)1);
+ if (!CommandUtils.offer(SlaveType.Crn, taskWrk.getCrnNo(), new Task(2, command),false)) {
+ log.error("鍫嗗灈鏈哄懡浠ょ敓鎴愬け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", taskWrk.getCrnNo(), JSON.toJSON(command));
+ throw new CoolException("鍫嗗灈鏈哄懡浠ょ敓鎴愬け璐�");
+ }else{
+ try{
+ HashMap<String, Object> headParam = new HashMap<>();
+ headParam.put("taskNo",taskWrk.getTaskNo());
+ headParam.put("status",taskWrk.getStatus());
+ headParam.put("ioType",taskWrk.getIoType());
+ headParam.put("barcode",taskWrk.getBarcode());
+ String response;
+ response = new HttpHandler.Builder()
+ // .setHeaders(headParam)
+ .setUri(wmsUrl)
+ .setPath(taskStatusFeedbackPath)
+ .setJson(JSON.toJSONString(headParam))
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ apiLogService.save("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms"
+ ,wmsUrl+taskStatusFeedbackPath
+ ,null
+ ,"127.0.0.1"
+ ,JSON.toJSONString(headParam)
+ ,response
+ ,true
+ );
+ }catch (Exception e){
+ log.error("wcs娲惧彂鍑哄簱浠诲姟涓婃姤wms澶辫触", taskWrk);
+ throw new CoolException("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms澶辫触");
+ }
- List<TaskWrk> taskWrks1 = taskWrkMapper.selectPakOutIoType(taskWrk.getCrnNo());
- if (Cools.isEmpty(taskWrks1) && taskWrks1.size()!=0){
- continue;
- }
- String shallowLocNo = Utils.getShallowLoc(slaveProperties, taskWrk.getStartPoint());
- TaskWrk hallowLocNoTask = taskWrkMapper.selectByStartPoint(shallowLocNo);
- if (!Cools.isEmpty(hallowLocNoTask)){
-// if (!Cools.isEmpty(hallowLocNoTask.getTargetPoint())){
-// continue;
-// }
-//// new PostMesDataUtils().postMesData("绉诲簱浠诲姟鍒嗛厤搴撲綅",wmsUrl,movePath,hallowLocNoTask);
-// try {
-// String response = new HttpHandler.Builder()
-// .setUri(wmsUrl)
-// .setPath(movePath)
-// .setJson(JSON.toJSONString(hallowLocNoTask))
-// .build()
-// .doPost();
-// System.out.println("response:"+response);
-// JSONObject jsonObject = JSON.parseObject(response);
-// if (jsonObject.getInteger("code").equals(200)) {
-// //瑙ｆ瀽
-// }
-// }catch (Exception e){
-// log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl+"/"+movePath, JSON.toJSONString(hallowLocNoTask), "璇锋眰绉诲簱浠诲姟鍒嗛厤搴撲綅");
-// }
- continue;
- }
}
- //鍙栧嚭鍛戒护
- List<CommandInfo> commandInfos = commandInfoService.selectByTaskNo(taskWrk.getTaskNo());
- Integer commandStep = taskWrk.getCommandStep();
- if (commandInfos.isEmpty()) {
- continue;//鍛戒护绌�
- }
- CommandInfo commandInfo = commandInfos.get(commandStep);
- CommandPackage commandPackage = JSON.parseObject(commandInfo.getCommand(), CommandPackage.class);//鍙栧嚭鍛戒护鎶ユ枃
- CrnCommand crnCommand = JSON.parseObject(commandPackage.getCommand().toString(), CrnCommand.class);
-
- if (!MessageQueue.offer(SlaveType.Crn, taskWrk.getCrnNo(), new Task(2, crnCommand))) {
- log.error("鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", taskWrk.getCrnNo(), JSON.toJSON(crnCommand));
- } else {
- // 淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓�
- Date now = new Date();
- taskWrk.setWrkSts(12);
- taskWrk.setModiTime(now);
- if (taskWrkMapper.updateById(taskWrk) == 0) {
- log.error("淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", taskWrk.getWrkNo());
- }
- //寮�濮嬭繍琛�
- String response = CrnStartRunning(taskWrk);
- JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("code").equals(200)) {
-
- }else {
- log.error("鍑哄簱寮�濮嬭繍琛岄�氳澶辫触,"+jsonObject.get("msg"));
-
- }
- }
+// // 鍙屾繁搴撲綅涓旀祬搴撲綅鏈夎揣锛屽垯闇�鍏堝娴呭簱浣嶈繘琛屽簱浣嶇Щ杞�
+// if (Utils.isDeepLoc(slaveProperties, taskWrk.getStartPoint())) {
+//
+// taskWrkMapper.selectPakOutIoType(taskWrk.getCrnNo());
+//
+// List<TaskWrk> taskWrks1 = taskWrkMapper.selectPakOutIoType(taskWrk.getCrnNo());
+// if (Cools.isEmpty(taskWrks1) && taskWrks1.size()!=0){
+// continue;
+// }
+// String shallowLocNo = Utils.getShallowLoc(slaveProperties, taskWrk.getStartPoint());
+// TaskWrk hallowLocNoTask = taskWrkMapper.selectByStartPoint(shallowLocNo);
+// if (!Cools.isEmpty(hallowLocNoTask)){
+// continue;
+// }
+// }
+//
+// //鍙栧嚭鍛戒护
+// List<CommandInfo> commandInfos = commandInfoService.selectByTaskNo(taskWrk.getTaskNo());
+// Integer commandStep = taskWrk.getCommandStep();
+// if (commandInfos.isEmpty()) {
+// continue;//鍛戒护绌�
+// }
+//
+// //鍒ゆ柇鏈鍛戒护鏄惁鎵ц
+// CommandInfo commandInfo2 = commandInfos.get(commandInfos.size() - 1);
+// if (commandInfo2.getCommandStatus() != CommandStatusType.CREATE.id) {
+// continue;//鎸囦护宸叉墽琛�
+// }
+//
+// CommandInfo commandInfo = commandInfos.get(commandStep);
+// CommandPackage commandPackage = JSON.parseObject(commandInfo.getCommand(), CommandPackage.class);//鍙栧嚭鍛戒护鎶ユ枃
+// CrnCommand crnCommand = JSON.parseObject(commandPackage.getCommand().toString(), CrnCommand.class);
+//
+// if (!MessageQueue.offer(SlaveType.Crn, taskWrk.getCrnNo(), new Task(2, crnCommand))) {
+// log.error("鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", taskWrk.getCrnNo(), JSON.toJSON(crnCommand));
+// } else {
+//
+// //寮�濮嬭繍琛�
+// String response = CrnStartRunning(taskWrk);
+// JSONObject jsonObject = JSON.parseObject(response);
+// if (jsonObject.getInteger("code").equals(200)) {
+//
+// }else {
+// log.error("鍑哄簱寮�濮嬭繍琛岄�氳澶辫触,"+jsonObject.get("msg"));
+//
+// }
+// }
}
}
@@ -619,44 +785,25 @@
.eq("wrk_sts",11)
.eq("io_type",3));
for (TaskWrk taskWrk : taskWrks){
- if (Cools.isEmpty(taskWrk.getTargetPoint())){
- List<Integer> list = openServiceImpl.getInEnableRoadway();
- Map<String, Object> map = new HashMap<>();
- map.put("x-api-key","7a15b5db-29b6-552c-8cff-0cfec3756da2");
- ToWmsDTO toWmsDTO = new ToWmsDTO();
- toWmsDTO.setWarehouseId("1688469798893297665");
- toWmsDTO.setContainerCode(taskWrk.getBarcode());
- toWmsDTO.setApplyType("TUNNEL_LOCATION");
- toWmsDTO.setTaskTunnel(taskWrk.getCrnNo());
- toWmsDTO.setCanInboundTunnels(list);
- String response = null;
- try {
- response = new HttpHandler.Builder()
- .setHeaders(map)
- .setUri(wmsUrl)
- .setPath("wcsManager/wcsInterface/inboundTaskApply")
- .setJson(JSON.toJSONString(toWmsDTO))
- .build()
- .doPost();
- }catch (Exception e){
- log.error("wms閫氳澶辫触,"+e.getMessage());
- continue;
- }
- JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("code").equals(200)) {
- GetWmsDto getWmsDto = JSON.parseObject(jsonObject.get("data").toString(), GetWmsDto.class);
- taskWrk.setOriginTargetPoint(getWmsDto.getTargetLocationCode());
- taskWrk.setTargetPoint(Utils.getWcsLocNo(getWmsDto.getTargetLocationCode()));
- if (!taskWrkService.updateById(taskWrk)){
- log.error("淇濆瓨wms搴撲綅鍙峰け璐�");
- }
- continue;
- }else {
- log.error("wms閫氳澶辫触,"+jsonObject.get("msg"));
- continue;
- }
- }
+ // 鍙屾繁搴撲綅涓旀祬搴撲綅鏈夎揣锛屽垯闇�鍏堝娴呭簱浣嶈繘琛屽簱浣嶇Щ杞�
+// if (Utils.isDeepLoc(slaveProperties, taskWrk.getStartPoint())) {
+// String shallowLocNo = Utils.getShallowLoc(slaveProperties, taskWrk.getStartPoint());
+// TaskWrk hallowLocNoTask = taskWrkMapper.selectByStartPoint(shallowLocNo);
+// if (!Cools.isEmpty(hallowLocNoTask)){
+// continue;
+// }
+// }
+ // 鍫嗗灈鏈烘帶鍒惰繃婊�
+ if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE) || crnProtocol.getTaskNo() != 0) {
+ continue;
+ }
+
+ // 宸茬粡瀛樺湪鍚婅溅鎵ц浠诲姟鏃讹紝鍒欒繃婊�
+ if (taskWrkMapper.selectCrnWorking(slave.getId()) != null) {
+ continue;
+ }
+
if (taskWrk == null || Cools.isEmpty(taskWrk.getTargetPoint()) || taskWrk.getTargetPoint().equals("") || taskWrk.getWrkNo() == null) {
continue;
}
@@ -668,15 +815,7 @@
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
- // 鍫嗗灈鏈烘帶鍒惰繃婊�
- if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE) || crnProtocol.getTaskNo() != 0) {
- continue;
- }
- // 宸茬粡瀛樺湪鍚婅溅鎵ц浠诲姟鏃讹紝鍒欒繃婊�
- if (taskWrkMapper.selectCrnWorking(slave.getId()) != null) {
- continue;
- }
// 1.鍫嗗灈鏈哄紑濮嬬Щ鍔�
@@ -685,12 +824,12 @@
crnCommand.setTaskNo(taskWrk.getWrkNo().shortValue()); // 宸ヤ綔鍙�
crnCommand.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 浠诲姟妯″紡: 搴撲綅绉昏浆
- crnCommand.setSourcePosZ(Utils.getRowShort(taskWrk.getStartPoint())); // 婧愬簱浣嶆帓
- crnCommand.setSourcePosX(Utils.getBayShort(taskWrk.getStartPoint())); // 婧愬簱浣嶅垪
- crnCommand.setSourcePosY(Utils.getLevShort(taskWrk.getStartPoint())); // 婧愬簱浣嶅眰
- crnCommand.setDestinationPosZ(Utils.getRowShort(taskWrk.getTargetPoint())); // 鐩爣搴撲綅鎺�
- crnCommand.setDestinationPosX(Utils.getBayShort(taskWrk.getTargetPoint())); // 鐩爣搴撲綅鍒�
- crnCommand.setDestinationPosY(Utils.getLevShort(taskWrk.getTargetPoint())); // 鐩爣搴撲綅灞�
+ crnCommand.setSourcePosX(Utils.getRowShort(taskWrk.getStartPoint())); // 婧愬簱浣嶆帓
+ crnCommand.setSourcePosY(Utils.getBayShort(taskWrk.getStartPoint())); // 婧愬簱浣嶅垪
+ crnCommand.setSourcePosZ(Utils.getLevShort(taskWrk.getStartPoint())); // 婧愬簱浣嶅眰
+ crnCommand.setDestinationPosX(Utils.getRowShort(taskWrk.getTargetPoint())); // 鐩爣搴撲綅鎺�
+ crnCommand.setDestinationPosY(Utils.getBayShort(taskWrk.getTargetPoint())); // 鐩爣搴撲綅鍒�
+ crnCommand.setDestinationPosZ(Utils.getLevShort(taskWrk.getTargetPoint())); // 鐩爣搴撲綅灞�
crnCommand.setCommand((short) 1);
if (!CommandUtils.offer(SlaveType.Crn, taskWrk.getCrnNo(), new Task(2, crnCommand),false)) {
log.error("鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", taskWrk.getCrnNo(), JSON.toJSON(crnCommand));
@@ -698,20 +837,39 @@
// 淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓�
Date now = new Date();
taskWrk.setWrkSts(12);
+ taskWrk.setStatus(2);
taskWrk.setModiTime(now);
if (taskWrkMapper.updateById(taskWrk) == 0) {
log.error("淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", taskWrk.getWrkNo());
}
- //寮�濮嬭繍琛�
- String response = CrnStartRunning(taskWrk);
- JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("code").equals(200)) {
-
- }else {
- log.error("绉诲簱浠诲姟寮�濮嬭繍琛岄�氳澶辫触,"+jsonObject.get("msg"));
- continue;
+ try{
+ HashMap<String, Object> headParam = new HashMap<>();
+ headParam.put("taskNo",taskWrk.getTaskNo());
+ headParam.put("status",taskWrk.getStatus());
+ headParam.put("ioType",taskWrk.getIoType());
+ headParam.put("barcode",taskWrk.getBarcode());
+ String response;
+ response = new HttpHandler.Builder()
+ // .setHeaders(headParam)
+ .setUri(wmsUrl)
+ .setPath(taskStatusFeedbackPath)
+ .setJson(JSON.toJSONString(headParam))
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ apiLogService.save("wcs娲惧彂绉诲簱浠诲姟涓婃姤wms"
+ ,wmsUrl+taskStatusFeedbackPath
+ ,null
+ ,"127.0.0.1"
+ ,JSON.toJSONString(headParam)
+ ,response
+ ,true
+ );
+ }catch (Exception e){
+ log.error("wcs娲惧彂鍑哄簱浠诲姟涓婃姤wms澶辫触", taskWrk);
+ throw new CoolException("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms澶辫触");
}
- break;
+
}
return;
}
@@ -722,8 +880,55 @@
/**
* 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
*/
- @Async
- public void storeFinished() {
+// public void storeFinished() {
+// for (CrnSlave crn : slaveProperties.getCrn()) {
+// // 鑾峰彇鍫嗗灈鏈轰俊鎭�
+// CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
+// CrnProtocol crnProtocol = crnThread.getCrnProtocol();
+// if (crnProtocol == null) { continue; }
+//
+// // 鐘舵�侊細绛夊緟纭 骞朵笖 浠诲姟瀹屾垚浣� = 1
+// if (crnProtocol.getTaskFinish() == 0 && crnProtocol.statusType == CrnStatusType.HANDLING_COMPLETED && crnProtocol.getTaskNo() != 0) {
+// //鑾峰彇鍏ュ簱寰呯‘璁ゅ伐浣滄。
+// TaskWrk taskWrk = taskWrkMapper.selectCrnNoInWorking(crn.getId(),crnProtocol.getTaskNo().intValue());
+// if (Cools.isEmpty(taskWrk)) {
+//// log.error("鍫嗗灈鏈哄浜庣瓑寰呯‘璁や笖浠诲姟瀹屾垚鐘舵�侊紝浣嗘湭鎵惧埌宸ヤ綔妗ｃ�傚爢鍨涙満鍙�={}锛屽伐浣滃彿={}", crn.getId(), crnProtocol.getTaskNo());
+// continue;
+// }
+//
+// //鑾峰彇鎸囦护ID
+// Integer commandId = crnProtocol.getCommandId();
+// CommandInfo commandInfo = new CommandInfo();
+// if (Cools.isEmpty(commandId)){
+// commandInfo = commandInfoService.selectOne(new EntityWrapper<CommandInfo>()
+// .eq("wrk_no",crnProtocol.getTaskNo())
+// .eq("device","Crn"));
+// }else {
+// commandInfo = commandInfoService.selectById(commandId);
+// }
+//
+//
+// if (commandInfo == null) {
+// //鎸囦护涓嶅瓨鍦�
+// continue;
+// }
+// if (commandInfo.getCommandStatus() == 3){
+// continue;
+// }
+// commandInfo.setCommandStatus(CommandStatusType.COMPLETE.id);//鎸囦护瀹屾垚
+// commandInfo.setCompleteTime(new Date());//鎸囦护瀹屾垚鏃堕棿
+// if (commandInfoService.updateById(commandInfo)) {//淇敼鎴愬姛鍚庡浣嶅爢鍨涙満
+// // 鍫嗗灈鏈哄浣�
+// crnThread.setResetFlag(true);
+// }
+// }
+// }
+// }
+
+ /**
+ * 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
+ */
+ public void storeFinished() throws InterruptedException {
for (CrnSlave crn : slaveProperties.getCrn()) {
// 鑾峰彇鍫嗗灈鏈轰俊鎭�
CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
@@ -734,88 +939,101 @@
if (crnProtocol.getTaskFinish() == 0 && crnProtocol.statusType == CrnStatusType.HANDLING_COMPLETED && crnProtocol.getTaskNo() != 0) {
//鑾峰彇鍏ュ簱寰呯‘璁ゅ伐浣滄。
TaskWrk taskWrk = taskWrkMapper.selectCrnNoInWorking(crn.getId(),crnProtocol.getTaskNo().intValue());
- if (Cools.isEmpty(taskWrk)) {
-// log.error("鍫嗗灈鏈哄浜庣瓑寰呯‘璁や笖浠诲姟瀹屾垚鐘舵�侊紝浣嗘湭鎵惧埌宸ヤ綔妗ｃ�傚爢鍨涙満鍙�={}锛屽伐浣滃彿={}", crn.getId(), crnProtocol.getTaskNo());
+ if (Cools.isEmpty(taskWrk)&&crnProtocol.getTaskNo() !=999) {
+ log.error("鍫嗗灈鏈哄浜庣瓑寰呯‘璁や笖浠诲姟瀹屾垚鐘舵�侊紝浣嗘湭鎵惧埌宸ヤ綔妗ｃ�傚爢鍨涙満鍙�={}锛屽伐浣滃彿={}", crn.getId(), crnProtocol.getTaskNo());
continue;
}
+ Thread.sleep(300);
+ //纭瀹屾垚淇″彿
+ CrnOperatorParam crnOperatorParam=new CrnOperatorParam();
+ crnOperatorParam.setCrnNo(crn.getId());
- //鑾峰彇鎸囦护ID
- Integer commandId = crnProtocol.getCommandId();
- CommandInfo commandInfo = new CommandInfo();
- if (Cools.isEmpty(commandId)){
- commandInfo = commandInfoService.selectOne(new EntityWrapper<CommandInfo>()
- .eq("wrk_no",crnProtocol.getTaskNo())
- .eq("device","Crn"));
- }else {
- commandInfo = commandInfoService.selectById(commandId);
- }
+ crnController.crnTaskComplete(crnOperatorParam);
+ if(!Cools.isEmpty(taskWrk)){
+ if(taskWrk.getIoType()==1 && taskWrk.getWrkSts()==3){
+ taskWrk.setWrkSts(4);//鍏ュ簱瀹屾垚
+ taskWrk.setStatus(5);//瀹岀粨
+ //鏇存柊搴撲綅鐘舵��
+ LocMast locMast = locMastService.selectByLocNo(taskWrk.getTargetPoint());
+ locMast.setLocSts("F");//F.鍦ㄥ簱
+ locMast.setBarcode(taskWrk.getBarcode());//鎵樼洏鐮�
+ locMast.setModiTime(new Date());
+ locMast.setModiUser(9999L);
+ locMastService.updateById(locMast);
+ }else if(taskWrk.getIoType()==2&&taskWrk.getWrkSts()==12){
+ taskWrk.setWrkSts(13);//鍑哄簱瀹屾垚
+ taskWrk.setStatus(5);//瀹岀粨
+ //鏇存柊搴撲綅鐘舵��
+ LocMast locMast = locMastService.selectByLocNo(taskWrk.getStartPoint());
+ locMast.setLocSts("O");//O.绌哄簱浣�
+ locMast.setBarcode("");//鎵樼洏鐮�
+ locMast.setModiTime(new Date());
+ locMast.setModiUser(9999L);
+ locMastService.updateById(locMast);
+ }else if(taskWrk.getIoType()==3&&taskWrk.getWrkSts()==12){
+ taskWrk.setWrkSts(4);//鍏ュ簱瀹屾垚
+ taskWrk.setStatus(5);//瀹岀粨
+ //鏇存柊搴撲綅鐘舵��
+ LocMast locMast = locMastService.selectByLocNo(taskWrk.getTargetPoint());
+ locMast.setLocSts("F");//F.鍦ㄥ簱
+ locMast.setBarcode(taskWrk.getBarcode());//鎵樼洏鐮�
+ locMast.setModiTime(new Date());
+ locMast.setModiUser(9999L);
+ locMastService.updateById(locMast);
+
+ LocMast locMast1 = locMastService.selectByLocNo(taskWrk.getStartPoint());
+ locMast1.setLocSts("O");//O.绌哄簱浣�
+ locMast1.setBarcode("");//鎵樼洏鐮�
+ locMast1.setModiTime(new Date());
+ locMast1.setModiUser(9999L);
+ locMastService.updateById(locMast1);
+ }
+ taskWrkService.updateById(taskWrk);
- if (commandInfo == null) {
- //鎸囦护涓嶅瓨鍦�
- continue;
+ try{
+ HashMap<String, Object> headParam = new HashMap<>();
+ headParam.put("taskNo",taskWrk.getTaskNo());
+ headParam.put("status",taskWrk.getStatus());
+ headParam.put("ioType",taskWrk.getIoType());
+ headParam.put("barcode",taskWrk.getBarcode());
+ String response;
+ log.error("wcs瀹岀粨浠诲姟涓婃姤wms==銆�", headParam);
+
+ response = new HttpHandler.Builder()
+ // .setHeaders(headParam)
+ .setUri(wmsUrl)
+ .setPath(taskStatusFeedbackPath)
+ .setJson(JSON.toJSONString(headParam))
+ .build()
+ .doPost();
+ log.error("wcs瀹岀粨浠诲姟涓婃姤wms==銆�", response);
+
+// JSONObject jsonObject = JSON.parseObject(response);
+// log.error("wcs瀹岀粨浠诲姟涓婃姤wms==銆�", jsonObject);
+
+ apiLogService.save("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms"
+ ,wmsUrl+taskStatusFeedbackPath
+ ,null
+ ,"127.0.0.1"
+ ,JSON.toJSONString(headParam)
+ ,response
+ ,true
+ );
+ }catch (Exception e){
+ log.error("wcs瀹岀粨浠诲姟涓婃姤wms澶辫触", taskWrk);
+ log.error("wcs瀹岀粨浠诲姟涓婃姤wms澶辫触,鎶ラ敊淇℃伅锛�", e);
+// throw new CoolException("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms澶辫触");
+ }
}
- if (commandInfo.getCommandStatus() == 3){
- continue;
- }
- commandInfo.setCommandStatus(CommandStatusType.COMPLETE.id);//鎸囦护瀹屾垚
- commandInfo.setCompleteTime(new Date());//鎸囦护瀹屾垚鏃堕棿
- if (commandInfoService.updateById(commandInfo)) {//淇敼鎴愬姛鍚庡浣嶅爢鍨涙満
- // 鍫嗗灈鏈哄浣�
- crnThread.setResetFlag(true);
- }
+
}
}
}
-// /**
-// * 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
-// */
-// @Async
-// public void storeFinished() {
-// for (CrnSlave crn : slaveProperties.getCrn()) {
-// // 鑾峰彇鍫嗗灈鏈轰俊鎭�
-// CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
-// CrnProtocol crnProtocol = crnThread.getCrnProtocol();
-// if (crnProtocol == null) { continue; }
-// // 鐘舵�侊細绛夊緟纭 骞朵笖 浠诲姟瀹屾垚浣� = 1
-// if (crnProtocol.getTaskFinish() == 0 && crnProtocol.statusType == CrnStatusType.HANDLING_COMPLETED && crnProtocol.getTaskNo() != 0) {
-// // 鑾峰彇鍏ュ簱寰呯‘璁ゅ伐浣滄。
-// TaskWrk taskWrk = taskWrkMapper.selectCrnNoWorking(crn.getId(),crnProtocol.getTaskNo().intValue());
-// if (Cools.isEmpty(taskWrk)) {
-// log.error("鍫嗗灈鏈哄浜庣瓑寰呯‘璁や笖浠诲姟瀹屾垚鐘舵�侊紝浣嗘湭鎵惧埌宸ヤ綔妗ｃ�傚爢鍨涙満鍙�={}锛屽伐浣滃彿={}", crn.getId(), crnProtocol.getTaskNo());
-// continue;
-// }
-// // 鍏ュ簱 + 搴撲綅杞Щ ==> 4.鍏ュ簱瀹屾垚
-// if ((taskWrk.getWrkSts() == 3 && taskWrk.getIoType() == 1) || (taskWrk.getWrkSts() == 12 && taskWrk.getIoType() == 3)) {
-// taskWrk.setWrkSts(4);
-// } else {
-// continue;
-// }
-// Date now = new Date();
-// taskWrk.setModiTime(now);
-// Integer integerTaskWrk = taskWrkMapper.updateById(taskWrk);
-// // 淇敼鎴愬姛鍚庡浣嶅爢鍨涙満
-// if (integerTaskWrk > 0) {
-// // 鍫嗗灈鏈哄浣�
-// crnThread.setResetFlag(true);
-//
-// //鏇存柊搴撲綅鐘舵��
-// LocMast locMast = locMastService.selectByLocNo(taskWrk.getTargetPoint());
-// locMast.setLocSts("F");//F.鍦ㄥ簱
-// locMast.setBarcode(taskWrk.getBarcode());//鎵樼洏鐮�
-// locMast.setModiTime(now);
-// locMast.setModiUser(9999L);
-// locMastService.updateById(locMast);
-// }
-// }
-// }
-// }
-
/**
* 鍫嗗灈鏈哄紓甯镐俊鎭褰�
*/
- @Async
public void recCrnErr(){
Date now = new Date();
for (CrnSlave crn : slaveProperties.getCrn()) {
@@ -877,7 +1095,7 @@
}
}
}
- // 鏃犱换鍔�
+ // 鏃犱换鍔�
} else {
BasErrLog latest = basErrLogService.findLatest(crn.getId());
// 鏈夊紓甯�
@@ -913,7 +1131,7 @@
log.error("鍫嗗灈鏈簆lc寮傚父璁板綍澶辫触 ===>> [id:{}] [error:{}]", crn.getId(), errName);
}
}
- // 鏃犲紓甯�
+ // 鏃犲紓甯�
} else {
// 寮傚父淇
if (latest != null && latest.getStatus() == 1) {
@@ -943,6 +1161,7 @@
}
for (TaskWrk taskWrk : taskWrkService.selectReceive()) {
+
try {
taskWrkService.distribute(taskWrk.getTaskNo(), 9527L);
} catch (CoolException e) {
@@ -951,7 +1170,64 @@
}
}
- //鑷姩瀹屾垚浠诲姟
+ //agv鍙栨斁璐т换鍔″畬鎴�
+ public synchronized void autoCompleteAGV() {
+ List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
+ try{
+ Thread.sleep(500);
+ }catch (Exception e){
+
+ }
+
+ for (BasDevp basDevp:basDevps){
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 1);
+ StaProtocol staProtocol = devpThread.getStation().get(basDevp.getDevNo());
+ if (staProtocol == null) {
+ continue;
+ } else {
+ staProtocol = staProtocol.clone();
+ }
+ if (basDevp.getWrkNo()!=0){
+ if (basDevp.getAgvTargetPick()!=0){//鍙栬揣
+ staProtocol.setAgvTypeSign((short)0);
+ staProtocol.setStaNo(basDevp.getDevNo().shortValue());
+ MessageQueue.offer(SlaveType.Devp, 1, new Task(4, staProtocol));
+ }
+ boolean sign = true;
+ if (basDevp.getAgvTargetPlace()!=0){
+ sign = false;
+ basDevp.setAgvTargetPlace(0);
+ basDevpService.updateById(basDevp);
+ staProtocol.setAgvTypeSign((short)3);//1
+ staProtocol.setStaNo(basDevp.getDevNo().shortValue());
+ MessageQueue.offer(SlaveType.Devp, 1, new Task(4, staProtocol));
+ }
+ }else {
+ if (basDevp.getAgvTargetPlace()!=0){
+ if (basDevp.getLoading().equals("Y")){
+ staProtocol.setAgvTypeSign((short)1);
+ staProtocol.setStaNo(basDevp.getDevNo().shortValue());
+ MessageQueue.offer(SlaveType.Devp, 1, new Task(4, staProtocol));
+ }else {
+ log.error("AGV鏀捐揣瀹屾垚浣嗚緭閫佺嚎鏃犵墿锛屽浣嶄俊鍙� ===>> [staNo:{}] [basDevp:{}]", basDevp.getDevNo(), basDevp);
+ basDevp.setAgvTargetPlace(0);
+ basDevpService.updateById(basDevp);
+ staProtocol.setAgvTypeSign((short)3);//1
+ staProtocol.setStaNo(basDevp.getDevNo().shortValue());
+ MessageQueue.offer(SlaveType.Devp, 1, new Task(4, staProtocol));
+ }
+
+ }
+ if (basDevp.getAgvTargetPick()!=0){
+ basDevp.setAgvTargetPick(0);
+ basDevpService.updateById(basDevp);
+ staProtocol.setAgvTypeSign((short)2);//0
+ staProtocol.setStaNo(basDevp.getDevNo().shortValue());
+ MessageQueue.offer(SlaveType.Devp, 1, new Task(4, staProtocol));
+ }
+ }
+ }
+ }
public synchronized void autoCompleteTask() {
List<TaskWrk> taskWrks = taskWrkMapper.selectWorkingTask();
for (TaskWrk taskWrk : taskWrks) {
@@ -1066,5 +1342,47 @@
return response;
}
+ private TaskWrk createTask(GetWmsDto dto, String barcode){
+ String wcsLocNo = dto.getLocNo();
+ if(Cools.isEmpty(wcsLocNo)){
+ return null;
+ }
+ Date now = new Date();
+ TaskWrk taskWrk = new TaskWrk();
+ int workNo1 = commonService.getWorkNo(WorkNoType.PAKIN.type);//鑾峰彇鍏ュ簱宸ヤ綔鍙�
+ taskWrk.setTaskNo(dto.getWrkNo());//浠诲姟鍙�
+ taskWrk.setWrkNo(workNo1);
+ taskWrk.setStatus(TaskStatusType.RECEIVE.id);//浠诲姟鐘舵�侊細鎺ユ敹
+ taskWrk.setCreateTime(now);
+ taskWrk.setIoType(1);//浠诲姟绫诲瀷
+ taskWrk.setIoPri(Cools.isEmpty(dto.getTaskPriority()) ? 300 : Integer.parseInt(dto.getTaskPriority()));//浼樺厛绾�
+ taskWrk.setBarcode(barcode);//鏉＄爜
+ LocMast locMast = locMastService.selectByLocNo(wcsLocNo);
+ taskWrk.setCrnNo(locMast.getCrnNo());
+ taskWrk.setTargetPoint(wcsLocNo);
+ taskWrk.setStartPoint(dto.getStaNo().toString());
+ if(taskWrk.getIoType() == 1){
+ taskWrk.setWrkSts(2);
+ if (!Cools.isEmpty(taskWrk.getTargetPoint())) {
+ taskWrk.setOriginTargetPoint(taskWrk.getTargetPoint());
+ }
+
+// } else if (param.getIoType() == 2) {
+// taskWrk.setWrkSts(11);
+// if (!Cools.isEmpty(param.getStartPoint())) {
+// taskWrk.setStartPoint(Utils.getWcsLocNo(param.getStartPoint()));//璧风偣
+// taskWrk.setOriginStartPoint(param.getStartPoint());
+// }
+// taskWrk.setTargetPoint(param.getTargetPoint());
+// }else if (param.getIoType() == 3){
+// taskWrk.setWrkSts(11);
+// if (!Cools.isEmpty(param.getStartPoint())) {
+// taskWrk.setStartPoint(param.getStartPoint());//璧风偣
+// taskWrk.setOriginStartPoint(param.getStartPoint());
+// }
+ }
+ return taskWrk;
+ }
+
}
--
Gitblit v1.9.1