From 4df2e7ad9023f08490f3f164745f302e63c55124 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 31 一月 2024 14:04:42 +0800
Subject: [PATCH] #出入库流程工作档生成
---
src/main/java/com/zy/asrs/controller/OpenController.java | 53 +++++++-------------------
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 23 -----------
src/main/java/com/zy/asrs/entity/param/TaskCreateParam.java | 12 ++++++
src/main/java/com/zy/asrs/entity/ToWmsDTO.java | 5 +-
pom.xml | 2
src/main/java/com/zy/asrs/entity/param/CarryParam.java | 25 ++++++++++++
6 files changed, 56 insertions(+), 64 deletions(-)
diff --git a/pom.xml b/pom.xml
index afc0f15..5b3e5d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -200,7 +200,7 @@
</dependencies>
<build>
- <finalName>ryzhwcs</finalName>
+ <finalName>wxwcs</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index f25afd6..aefa075 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -8,6 +8,7 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.CarryParam;
import com.zy.asrs.entity.param.TaskOverParam;
import com.zy.asrs.entity.param.WMSAndAGVInterfaceParam;
import com.zy.asrs.entity.param.TaskCreateParam;
@@ -234,23 +235,20 @@
@PostMapping("/outboundTaskSend")
@Transactional
public R outboundTaskSend(@RequestHeader String appkey,
- @RequestBody List<WMSAndAGVInterfaceParam> params,
+ @RequestBody List<CarryParam> params,
HttpServletRequest request) {
- auth(appkey, params, request);
+ //auth(appkey, params, request);
List<WMSAndAGVInterfaceParam> params1 =new ArrayList<>();
- for (WMSAndAGVInterfaceParam param:params){
+ for (CarryParam param:params){
if (Cools.isEmpty(param)){
return R.error("鍙傛暟涓虹┖锛�");
} else if (Cools.isEmpty(param.getTaskNo())){
return R.error("浠诲姟鍙蜂负绌猴紒");
- } else if (Cools.isEmpty(param.getTaskType())){
+ } else if (Cools.isEmpty(param.getIoType())){
return R.error("浠诲姟绫诲瀷涓虹┖锛�");
}
- if (Cools.isEmpty(param.getTaskPriority())){
- param.setTaskPriority(1);
- }
- if (Cools.isEmpty(param.getSourceLocationCode()) || Cools.isEmpty(param.getTargetLocationCode())){
+ if (Cools.isEmpty(param.getStartPoint()) || Cools.isEmpty(param.getTargetPoint())){
return R.error("鍒濆鐩爣鎴栬�呯洰鏍囦綅涓虹┖");
}
// if (Cools.isEmpty(param.getContainerCode())){
@@ -265,50 +263,27 @@
// }
// }
- LocMast locMast = locMastService.selectByLocNo(param.getSourceLocationCode());
+ LocMast locMast = locMastService.selectByLocNo(param.getStartPoint());
if(Cools.isEmpty(locMast)){
return R.error("鍒濆搴撲綅鏃犳硶鎵惧埌");
}
- Integer ioType = TaskCreateParam.convertParamIoType(param.getTaskType());
- if(ioType == 2){
+ R r = null;
+
+ if(param.getIoType() == 2){
//鍑哄簱浠诲姟鍒涘缓
StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
.eq("type_no",2)
.eq("crn_no",locMast.getCrnNo())
- .eq("stn_no",param.getTargetLocationCode()));
+ .eq("stn_no",param.getTargetPoint()));
if(Cools.isEmpty(staDesc)){
return R.error("鍑哄簱璺姴涓嶅瓨鍦�");
}
- param.setTargetLocationCode(staDesc.getStnNo().toString());
- R r = openService.taskCreate(new TaskCreateParam(param));
- }else if (ioType == 3){
+ r = openService.taskCreate(new TaskCreateParam(param,staDesc.getCrnNo()));
+ }else if (param.getIoType() == 3){
//绉诲簱浠诲姟鍒涘缓
-
+ r = openService.taskCreate(new TaskCreateParam(param,locMast.getCrnNo()));
}
-
-// if (param.getTaskType().equals("CK") && param.getTargetWharf().contains("J")){
-// staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
-// .eq("crn_no",param.getTaskTunnel())
-// .eq("type_no",2)
-// .lt("stn_no",200));
-// }else if (param.getTaskType().equals("CK") && param.getTargetWharf().contains("H")){
-// staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
-// .eq("crn_no",param.getTaskTunnel())
-// .eq("type_no",2)
-// .lt("stn_no",400)
-// .gt("stn_no",200));
-// }else {
-// staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
-// .eq("crn_no",param.getTaskTunnel())
-// .eq("type_no",2)
-// .lt("stn_no",500)
-// .ge("stn_no",400));
-// }
- //param.setTargetLocationCode(staDesc.getStnNo().toString());
-
-
- R r = openService.taskCreate(new TaskCreateParam(param));
apiLogService.save("Wms浠诲姟涓嬪彂鎺ュ彛"
,request.getRemoteAddr()+request.getRequestURI()
diff --git a/src/main/java/com/zy/asrs/entity/ToWmsDTO.java b/src/main/java/com/zy/asrs/entity/ToWmsDTO.java
index 0a3fe8b..ae15179 100644
--- a/src/main/java/com/zy/asrs/entity/ToWmsDTO.java
+++ b/src/main/java/com/zy/asrs/entity/ToWmsDTO.java
@@ -22,11 +22,12 @@
//鍏ュ簱绔欑紪鍙�
private Integer stationCode;
//搴撲綅绫诲瀷
- private String locType;
+ private Integer locType;
- public ToWmsDTO(String barcode, Integer stationCode){
+ public ToWmsDTO(String barcode, Integer stationCode, Integer locType){
this.barcode = barcode;
this.stationCode = stationCode;
+ this.locType = locType;
}
public ToWmsDTO(){
diff --git a/src/main/java/com/zy/asrs/entity/param/CarryParam.java b/src/main/java/com/zy/asrs/entity/param/CarryParam.java
new file mode 100644
index 0000000..4676313
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/CarryParam.java
@@ -0,0 +1,25 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+@Data
+public class CarryParam {
+ //宸ヤ綔鍙�
+ private String taskNo;
+
+ //鍏ュ嚭搴撶被鍨�
+ private Integer ioType;
+
+ //瀹瑰櫒缂栫爜
+ private String barcode;
+
+ //璧风偣
+ private String startPoint;
+
+ //鐩爣鐐�
+ private String targetPoint;
+
+ //澶囨敞
+ private String meno;
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/param/TaskCreateParam.java b/src/main/java/com/zy/asrs/entity/param/TaskCreateParam.java
index fd7803e..d87cda4 100644
--- a/src/main/java/com/zy/asrs/entity/param/TaskCreateParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/TaskCreateParam.java
@@ -1,5 +1,6 @@
package com.zy.asrs.entity.param;
+import io.swagger.models.auth.In;
import lombok.Data;
@Data
@@ -44,6 +45,17 @@
this.crn = param.getTaskTunnel();
};
+ public TaskCreateParam(CarryParam param, Integer crn){
+ this.taskNo = param.getTaskNo();
+ this.ioType = param.getIoType();
+ this.barcode = param.getBarcode();
+ this.taskPriority = 300;
+ this.startPoint = param.getStartPoint();
+ this.targetPoint = param.getTargetPoint();
+ this.emptyContainer = "N";
+ this.crn = crn;
+ };
+
public static Integer convertParamIoType(String paramIoType){
switch (paramIoType){
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 8e385bd..030453e 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -111,8 +111,6 @@
Short workNo = staProtocol.getWorkNo();
Short stano = staProtocol.getStaNo();
-
-
// 灏哄妫�娴嬪紓甯�
boolean back = false;
String errMsg = "";
@@ -180,7 +178,7 @@
String barcode = barcodeThread.getBarcode();
if(!Cools.isEmpty(barcode)) {
// 璇锋眰wms鎺ュ彛锛岃幏鍙栧伐浣滃彿鍜岀洰鏍囧簱浣�
- ToWmsDTO toWmsDTO = new ToWmsDTO(barcode,staProtocol.getSiteId());
+ ToWmsDTO toWmsDTO = new ToWmsDTO(barcode,staProtocol.getSiteId(),staProtocol.isHigh() ? 2 : 1);
String response;
response = new HttpHandler.Builder()
.setHeaders(null)
@@ -592,25 +590,6 @@
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;
}
}
--
Gitblit v1.9.1