From 5ac80d6a06f686a62c307c52c652e511e3896fb7 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 27 十一月 2023 16:44:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghtzwcsOld' into ghtzwcsOld
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 118 ++++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 84 insertions(+), 34 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index f03926f..1819c4a 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1,58 +1,108 @@
package com.zy.asrs.service.impl;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.core.common.Cools;
+import com.core.common.R;
import com.core.exception.CoolException;
-import com.zy.asrs.domain.enums.WmsWrkStatusType;
-import com.zy.asrs.entity.WmsWrk;
-import com.zy.asrs.entity.param.WmsWrkCreateParam;
+import com.zy.asrs.domain.enums.TaskStatusType;
+import com.zy.asrs.entity.TaskWrk;
+import com.zy.asrs.entity.ToWmsDTO;
+import com.zy.asrs.entity.param.WMSAndAGVInterfaceParam;
+import com.zy.asrs.entity.param.taskCreateParam;
import com.zy.asrs.service.OpenService;
-import com.zy.asrs.service.WmsWrkService;
+import com.zy.asrs.service.TaskWrkService;
+import com.zy.common.utils.HttpHandler;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
-import java.util.Date;
+import java.io.IOException;
+import java.util.*;
@Service
public class OpenServiceImpl implements OpenService {
@Autowired
- private WmsWrkService wmsWrkService;
+ private TaskWrkService taskWrkService;
+
+ @Value("${wms.url}")
+ private String wmsUrl;
@Override
- public void wmsWrkCreate(WmsWrkCreateParam param) {
- WmsWrk wmsWrk = wmsWrkService.selectByWmsWrkNo(param.getWmsWrkNo());
- if (wmsWrk != null) {
- throw new CoolException(param.getWmsWrkNo() + "浠诲姟宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦");
+ public void taskCreate(taskCreateParam param) {
+ TaskWrk taskWrk = taskWrkService.selectByTaskNo(param.getTaskNo());
+ if (taskWrk != null) {
+ throw new CoolException(param.getTaskNo() + "浠诲姟宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦");
+ }
+ if (param.getIoType().equals(0)){
+ throw new CoolException("鐢熸垚浠诲姟澶辫触锛屼换鍔＄被鍨嬩笉瀛樺湪锛�");
}
Date now = new Date();
- wmsWrk = new WmsWrk();
- wmsWrk.setWmsWrkNo(param.getWmsWrkNo());//WMS浠诲姟鍙�
- wmsWrk.setWmsStatus(WmsWrkStatusType.RECEIVE.id);//WMS鐘舵�侊細鎺ユ敹
- wmsWrk.setCreateTime(now);
- wmsWrk.setAppeTime(now);
- wmsWrk.setAppeUser(9527L);
- wmsWrk.setIoType(param.getIoType());//浠诲姟绫诲瀷
- wmsWrk.setIoPri(13D);//浼樺厛绾�
- wmsWrk.setBarcode(param.getBarcode());//鏉＄爜
- if (!Cools.isEmpty(param.getLocNo())) {
- wmsWrk.setLocNo(param.getLocNo());//鐩爣搴撲綅
- }
- if (!Cools.isEmpty(param.getSourceLocNo())) {
- wmsWrk.setSourceLocNo(param.getSourceLocNo());//婧愬簱浣�
- }
- if (!Cools.isEmpty(param.getStaNo())) {
- wmsWrk.setStaNo(param.getStaNo());//鐩爣绔�
- }
- if (!Cools.isEmpty(param.getSourceStaNo())) {
- wmsWrk.setSourceStaNo(param.getSourceStaNo());//婧愮珯
- }
- if (!Cools.isEmpty(param.getMemo())) {
- wmsWrk.setMemo(param.getMemo());//澶囨敞
+ taskWrk = new TaskWrk();
+ taskWrk.setTaskNo(param.getTaskNo());//浠诲姟鍙�
+ taskWrk.setStatus(TaskStatusType.RECEIVE.id);//浠诲姟鐘舵�侊細鎺ユ敹
+ taskWrk.setCreateTime(now);
+ taskWrk.setIoType(param.getIoType());//浠诲姟绫诲瀷
+ taskWrk.setIoPri(param.getTaskPriority());//浼樺厛绾�
+ taskWrk.setBarcode(param.getBarcode());//鏉＄爜
+ taskWrk.setCrnNo(param.getCrn());
+ if(param.getIoType() == 1){
+ taskWrk.setWrkSts(1);
+ } else if (param.getIoType() == 2) {
+ taskWrk.setWrkSts(11);
}
- if (!wmsWrkService.insert(wmsWrk)) {
+ if (!Cools.isEmpty(param.getStartPoint())) {
+ taskWrk.setStartPoint(param.getStartPoint());//璧风偣
+ }
+ if (!Cools.isEmpty(param.getTargetPoint())) {
+ taskWrk.setTargetPoint(param.getTargetPoint());//缁堢偣
+ }
+ if (!Cools.isEmpty(param.getMemo())) {
+ taskWrk.setMemo(param.getMemo());//澶囨敞
+ }
+
+ if (!taskWrkService.insert(taskWrk)) {
throw new CoolException("鐢熸垚浠诲姟澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
}
+
+ @Override
+ public R AgvToWCSToWms(WMSAndAGVInterfaceParam param) throws IOException {
+ ToWmsDTO toWmsDTO = new ToWmsDTO();
+ Map<String, Object> map = new HashMap<>();
+ map.put("x-api-key","7a15b5db-29b6-552c-8cff-0cfec3756da2");
+ List<Integer> list = new ArrayList<>();
+ list.add(1);
+ list.add(4);
+ //TaskWrk taskWrk = taskWrkService.selectByTaskNo(param.getTaskNo());
+ toWmsDTO.setWarehouseId("1688469798893297665");
+ toWmsDTO.setContainerCode(param.getContainerCode());
+ toWmsDTO.setApplyType("TUNNEL");
+ toWmsDTO.setWharfSource(null);
+ toWmsDTO.setCanInboundTunnels(list);
+ String response = new HttpHandler.Builder()
+ .setHeaders(map)
+ .setUri(wmsUrl)
+ .setPath("wcsManager/wcsInterface/inboundTaskApply")
+ .setJson(JSON.toJSONString(toWmsDTO))
+ .build()
+ .doPost();
+
+ JSONObject jsonObject = JSON.parseObject(response);
+ if (jsonObject.getInteger("code").equals(200)) {
+ //瑙ｆ瀽
+ List<WMSAndAGVInterfaceParam> params = new ArrayList<>();
+ params.add(param);
+ WMSAndAGVInterfaceParam data = JSONObject.parseObject(jsonObject.get("data").toString(), WMSAndAGVInterfaceParam.class);
+
+ taskCreate(new taskCreateParam(data));
+ return R.ok(jsonObject.get("data"));
+ }else {
+ return R.error((String) jsonObject.get("msg"));
+ }
+
+ }
}
--
Gitblit v1.9.1